Bugfix: dba::num_rows hadn't checked the object variable

diff --git a/include/dba.php b/include/dba.php
index 3af8522516c64ca9f4306cdff9b836f02302bfac..76ac538aa84decf20edab4c00ee61c3d0d49915a 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -521,6 +521,16 @@ class dba {
                        logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
                }
 
+               // beautify the SQL query - useful for "SHOW PROCESSLIST"
+               // This is safe because we bind the parameters later.
+               // The parameter values aren't part of the SQL.
+               $search = array("\n", "\r", "  ");
+               $replace = array(' ', ' ', ' ');
+               do {
+                       $oldsql = $sql;
+                       $sql = str_replace($search, $replace, $sql);
+               } while ($oldsql != $sql);
+
                $sql = self::$dbo->any_value_fallback($sql);
 
                if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
@@ -708,6 +718,9 @@ class dba {
         * @return int Number of rows
         */
        static public function num_rows($stmt) {
+               if (!is_object($stmt)) {
+                       return 0;
+               }
                switch (self::$dbo->driver) {
                        case 'pdo':
                                return $stmt->rowCount();

diff --git a/include/dbclean.php b/include/dbclean.php
index 36f4f46e535c63d81c933ed171e7a1c0f31f4d05..ff4993c4a0b61a4601bda3172bed2c898fbdfc1e 100644 (file)
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -19,7 +19,7 @@ function dbclean_run(&$argv, &$argc) {
 
        if ($stage == 0) {
                for ($i = 1; $i <= 7; $i++) {
-                       if (!Config::get('system', 'finished-dbclean-'.$i)) {
+                       if (!Config::get('system', 'finished-dbclean-'.$i, false)) {
                                proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
                        }
                }
@@ -40,131 +40,178 @@ function remove_orphans($stage = 0) {
        $limit = 1000;
 
        if ($stage == 1) {
-               logger("Deleting old global item entries from item table without user copy");
-               $r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0
-                               AND NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0)
-                               AND `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-1', 0);
+
+               logger("Deleting old global item entries from item table without user copy. Last ID: ".$last_id);
+               $r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
+                                       NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
+                                       `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ?
+                               ORDER BY `id` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found global item orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
                                dba::delete('item', array('id' => $orphan["id"]));
                        }
                } else {
                        logger("No global item orphans found");
-
                }
                dba::close($r);
-               logger("Done deleting ".$count." old global item entries from item table without user copy");
+               logger("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-1', $last_id);
 
                // We will eventually set this value when we found a good way to delete these items in another way.
                // if ($count < $limit) {
                //      Config::set('system', 'finished-dbclean-1', true);
                // }
        } elseif ($stage == 2) {
-               logger("Deleting items without parents");
-               $r = dba::p("SELECT `id` FROM `item` WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-2', 0);
+
+               logger("Deleting items without parents. Last ID: ".$last_id);
+               $r = dba::p("SELECT `id` FROM `item`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`)
+                               AND `id` >= ? ORDER BY `id` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found item orphans without parents: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
                                dba::delete('item', array('id' => $orphan["id"]));
                        }
                } else {
                        logger("No item orphans without parents found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." items without parents");
+               logger("Done deleting ".$count." items without parents. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-2', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-2', true);
                }
        } elseif ($stage == 3) {
-               logger("Deleting orphaned data from thread table");
-               $r = dba::p("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-3', 0);
+
+               logger("Deleting orphaned data from thread table. Last ID: ".$last_id);
+               $r = dba::p("SELECT `iid` FROM `thread`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) AND `iid` >= ?
+                               ORDER BY `iid` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found thread orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["iid"];
                                dba::delete('thread', array('iid' => $orphan["iid"]));
                        }
                } else {
                        logger("No thread orphans found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." orphaned data from thread table");
+               logger("Done deleting ".$count." orphaned data from thread table. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-3', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-3', true);
                }
        } elseif ($stage == 4) {
-               logger("Deleting orphaned data from notify table");
-               $r = dba::p("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-4', 0);
+
+               logger("Deleting orphaned data from notify table. Last ID: ".$last_id);
+               $r = dba::p("SELECT `iid`, `id` FROM `notify`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) AND `id` >= ?
+                               ORDER BY `id` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found notify orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
                                dba::delete('notify', array('iid' => $orphan["iid"]));
                        }
                } else {
                        logger("No notify orphans found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." orphaned data from notify table");
+               logger("Done deleting ".$count." orphaned data from notify table. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-4', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-4', true);
                }
        } elseif ($stage == 5) {
-               logger("Deleting orphaned data from notify-threads table");
-               $r = dba::p("SELECT `id` FROM `notify-threads` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-5', 0);
+
+               logger("Deleting orphaned data from notify-threads table. Last ID: ".$last_id);
+               $r = dba::p("SELECT `id` FROM `notify-threads`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) AND `id` >= ?
+                               ORDER BY `id` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found notify-threads orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
                                dba::delete('notify-threads', array('id' => $orphan["id"]));
                        }
                } else {
                        logger("No notify-threads orphans found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." orphaned data from notify-threads table");
+               logger("Done deleting ".$count." orphaned data from notify-threads table. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-5', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-5', true);
                }
        } elseif ($stage == 6) {
-               logger("Deleting orphaned data from sign table");
-               $r = dba::p("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-6', 0);
+
+               logger("Deleting orphaned data from sign table. Last ID: ".$last_id);
+               $r = dba::p("SELECT `iid`, `id` FROM `sign`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) AND `id` >= ?
+                               ORDER BY `id` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found sign orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["id"];
                                dba::delete('sign', array('iid' => $orphan["iid"]));
                        }
                } else {
                        logger("No sign orphans found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." orphaned data from sign table");
+               logger("Done deleting ".$count." orphaned data from sign table. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-6', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-6', true);
                }
        } elseif ($stage == 7) {
-               logger("Deleting orphaned data from term table");
-               $r = dba::p("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) LIMIT ".intval($limit));
+               $last_id = Config::get('system', 'dbclean-last-id-7', 0);
+
+               logger("Deleting orphaned data from term table. Last ID: ".$last_id);
+               $r = dba::p("SELECT `oid`, `tid` FROM `term`
+                               WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) AND `tid` >= ?
+                               ORDER BY `tid` LIMIT ".intval($limit), $last_id);
                $count = dba::num_rows($r);
                if ($count > 0) {
                        logger("found term orphans: ".$count);
                        while ($orphan = dba::fetch($r)) {
+                               $last_id = $orphan["tid"];
                                dba::delete('term', array('oid' => $orphan["oid"]));
                        }
                } else {
                        logger("No term orphans found");
                }
                dba::close($r);
-               logger("Done deleting ".$count." orphaned data from term table");
+               logger("Done deleting ".$count." orphaned data from term table. Last ID: ".$last_id);
+
+               Config::set('system', 'dbclean-last-id-7', $last_id);
 
                if ($count < $limit) {
                        Config::set('system', 'finished-dbclean-7', true);