Improved performance of pm import (mybb)

diff --git a/files/lib/system/exporter/MyBB16xExporter.class.php b/files/lib/system/exporter/MyBB16xExporter.class.php
index e35f0577a99d216f06d51b61f50b6dfefe43d8f7..9be6792c65c994445781db758a6527466a4aec70 100644 (file)
--- a/files/lib/system/exporter/MyBB16xExporter.class.php
+++ b/files/lib/system/exporter/MyBB16xExporter.class.php
@@ -75,7 +75,8 @@ class MyBB16xExporter extends AbstractExporter {
        protected $limits = [
                'com.woltlab.wcf.user' => 200,
                'com.woltlab.wcf.user.avatar' => 100,
-               'com.woltlab.wcf.user.follower' => 100
+               'com.woltlab.wcf.user.follower' => 100,
+               'com.woltlab.wcf.conversation' => 100
        ];
        
        /**
@@ -577,12 +578,7 @@ class MyBB16xExporter extends AbstractExporter {
         * Counts conversations.
         */
        public function countConversations() {
-               $sql = "SELECT          COUNT(DISTINCT fromid, dateline) AS count
-                       FROM            ".$this->databasePrefix."privatemessages";
-               $statement = $this->database->prepareStatement($sql);
-               $statement->execute();
-               $row = $statement->fetchArray();
-               return $row['count'];
+               return $this->__getMaxID($this->databasePrefix."privatemessages", 'pmid');
        }
        
        /**
@@ -596,14 +592,15 @@ class MyBB16xExporter extends AbstractExporter {
                        FROM            ".$this->databasePrefix."privatemessages message_table
                        LEFT JOIN       ".$this->databasePrefix."users user_table
                        ON              user_table.uid = message_table.fromid
-                       WHERE           pmid IN (
+                       WHERE           pmid BETWEEN ? AND ?
+                                       AND pmid IN (
                                                SELECT          MIN(pmID)
                                                FROM            ".$this->databasePrefix."privatemessages
                                                GROUP BY        fromid, dateline
                                        )
                        ORDER BY        pmid";
-               $statement = $this->database->prepareStatement($sql, $limit, $offset);
-               $statement->execute();
+               $statement = $this->database->prepareStatement($sql);
+               $statement->execute([$offset + 1, $offset + $limit]);
                while ($row = $statement->fetchArray()) {
                        $row['isDraft'] = $row['folder'] == 3 ? 1 : 0;