Skip to content

Patch enhance query performance #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wackerm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch enhance query performance #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51fe5d4
add keys to enhance query performance
wackerm Mar 31, 2020
225e815
remov unused query
wackerm Mar 31, 2020
1fb1fa8
prevent select * for performance reason
wackerm Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions plugins/inlineImagePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,17 @@ class inlineImagePlugin extends phplistPlugin
"imgid" => array("integer not null primary key auto_increment","Image numerical ID"),
"file_name" => array("varchar(255) not null","File name including extension"),
"cksum" => array ("varchar(45) not null", "sha1 checksum for the file contents"),
'local_name' => array("varchar(255) not null","A unique local file name including extension"),
"type" => array("char(50)", "MIME type of the image"),
"cid" => array("char(32) not null","MIME content ID")
'local_name' => array("varchar(255) not null","A unique local file name including extension"),
"type" => array("char(50)", "MIME type of the image"),
"cid" => array("char(32) not null","MIME content ID")
),
'msg' => array(
"id" => array("integer not null", "Message ID"),
"imgid" => array("integer not null","Image numerical ID"),
"id" => array("integer unsigned not null default 0", "Message ID"),
"imgid" => array("integer unsigned not null default 0","Image numerical ID"),
"original" => array ("Text", "Original HTML image tag"),
"imagetag" => array("Text", "HTML image tag with attributes and cid")
"imagetag" => array("Text", "HTML image tag with attributes and cid"),
'primary key' => array('(id,imgid)', ''),
'index_1' => array('imgid(imgid)',''),
)
); // Structure of database tables for this plugin
public $settings = array(
Expand Down Expand Up @@ -230,11 +232,7 @@ function allowMessageToBeQueued($messagedata = array())
$msgtbl = $GLOBALS['tables']['inlineImagePlugin_msg'];

$msg = $messagedata['message'];
$id = $messagedata['id'];

// We could get here if a message has been queued and then suspended for
// re-editing. So make sure that we have not stored any data for this message
$query = sprintf ("select * from %s where id=%d", $msgtbl, $id);
$id = $messagedata['id'];

$tempfile = $this->coderoot . 'images/tempimg.tmp';
$limit = getConfig("ImageAttachLimit");
Expand Down Expand Up @@ -299,7 +297,16 @@ private function saveImageData ($msgdata = array()) {

$id = $msgdata ['id'];
$msg = $msgdata['message'];
$query = sprintf ("select * from %s where id=%d", $msgtbl, $id);
$query = sprintf ("select imgid from %s where id=%d", $msgtbl, $id);

// Remove old data connecting this message with its images.We save the new data
// below. We don't bother clearing old images from the
// directory here, because they will eventually be deleted anyway, as we clean
// older files from the database
if (Sql_Num_Rows(Sql_Query($query)) > 0) {
$query = sprintf("delete from %s where id=%d", $msgtbl, $id);
Sql_Query($query);
}

// Merge the message and template to check the images
// Make sure that we have all parts of the message that may contain images
Expand All @@ -312,16 +319,7 @@ private function saveImageData ($msgdata = array()) {
if (strpos($msg, "[FOOTER]") !== false)
$msg = str_ireplace("[FOOTER]", $msgdata["footer"],$msg);
else // Phplist always adds a footer.
$msg .= $msgdata["footer"]; // We're not constructing the message, just collecting inline image files

// Remove old data connecting this message with its images.We save the new data
// below. We don't bother clearing old images from the
// directory here, because they will eventually be deleted anyway, as we clean
// older files from the database
if (Sql_Num_Rows(Sql_Query($query)) > 0) {
$query = sprintf("delete from %s where id=%d", $msgtbl, $id);
Sql_Query($query);
}
$msg .= $msgdata["footer"]; // We're not constructing the message, just collecting inline image files

// Collect the inline image tags
preg_match_all('#<img[^<>]+\Winline(?:\W.*(?:/)?)?>#Ui', $msg, $match);
Expand Down Expand Up @@ -579,4 +577,4 @@ function messageHeaders($mail) {
}
return '';
}
}
}