Create PostUpdate class

create new class and update call from worker

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
new file mode 100644 (file)
index 0000000..f43985a
--- /dev/null
+++ b/src/Database/PostUpdate.php
@@ -0,0 +1,276 @@
+<?php\r
+/**\r
+ * @file src/Database/PostUpdate.php\r
+ */\r
+namespace Friendica\Database;\r
+\r
+use Friendica\Core\Config;\r
+use Friendica\Database\DBM;\r
+use Friendica\Model\Contact;\r
+use Friendica\Model\GContact;\r
+use dba;\r
+\r
+require_once 'include/dba.php';\r
+\r
+/**\r
+ * Post update functions\r
+ */\r
+class PostUpdate\r
+{\r
+    /**\r
+     * @brief Calls the post update functions\r
+     */\r
+    public static function update()\r
+    {\r
+        if (!self::update1192()) {\r
+            return;\r
+        }\r
+        if (!self::update1194()) {\r
+            return;\r
+        }\r
+        if (!self::update1198()) {\r
+            return;\r
+        }\r
+        if (!self::update1206()) {\r
+            return;\r
+        }\r
+    }\r
+\r
+    /**\r
+     * @brief set the gcontact-id in all item entries\r
+     *\r
+     * This job has to be started multiple times until all entries are set.\r
+     * It isn't started in the update function since it would consume too much time and can be done in the background.\r
+     *\r
+     * @return bool "true" when the job is done\r
+     */\r
+    private static function update1192()\r
+    {\r
+        // Was the script completed?\r
+        if (Config::get("system", "post_update_version") >= 1192)\r
+            return true;\r
+\r
+        // Check if the first step is done (Setting "gcontact-id" in the item table)\r
+        $r = q("SELECT `author-link`, `author-name`, `author-avatar`, `uid`, `network` FROM `item` WHERE `gcontact-id` = 0 LIMIT 1000");\r
+        if (!$r) {\r
+            // Are there unfinished entries in the thread table?\r
+            $r = q("SELECT COUNT(*) AS `total` FROM `thread`\r
+                INNER JOIN `item` ON `item`.`id` =`thread`.`iid`\r
+                WHERE `thread`.`gcontact-id` = 0 AND\r
+                    (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");\r
+\r
+            if ($r && ($r[0]["total"] == 0)) {\r
+                Config::set("system", "post_update_version", 1192);\r
+                return true;\r
+            }\r
+\r
+            // Update the thread table from the item table\r
+            q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`\r
+                    SET `thread`.`gcontact-id` = `item`.`gcontact-id`\r
+                WHERE `thread`.`gcontact-id` = 0 AND\r
+                    (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");\r
+\r
+            return false;\r
+        }\r
+\r
+        $item_arr = [];\r
+        foreach ($r as $item) {\r
+            $index = $item["author-link"]."-".$item["uid"];\r
+            $item_arr[$index] = ["author-link" => $item["author-link"],\r
+                            "uid" => $item["uid"],\r
+                            "network" => $item["network"]];\r
+        }\r
+\r
+        // Set the "gcontact-id" in the item table and add a new gcontact entry if needed\r
+        foreach ($item_arr as $item) {\r
+            $gcontact_id = GContact::getId(["url" => $item['author-link'], "network" => $item['network'],\r
+                            "photo" => $item['author-avatar'], "name" => $item['author-name']]);\r
+            q("UPDATE `item` SET `gcontact-id` = %d WHERE `uid` = %d AND `author-link` = '%s' AND `gcontact-id` = 0",\r
+                intval($gcontact_id), intval($item["uid"]), dbesc($item["author-link"]));\r
+        }\r
+        return false;\r
+    }\r
+\r
+    /**\r
+     * @brief Updates the "global" field in the item table\r
+     *\r
+     * @return bool "true" when the job is done\r
+     */\r
+    private static function update1194()\r
+    {\r
+        // Was the script completed?\r
+        if (Config::get("system", "post_update_version") >= 1194)\r
+            return true;\r
+\r
+        logger("Start", LOGGER_DEBUG);\r
+\r
+        $end_id = Config::get("system", "post_update_1194_end");\r
+        if (!$end_id) {\r
+            $r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");\r
+            if ($r) {\r
+                Config::set("system", "post_update_1194_end", $r[0]["id"]);\r
+                $end_id = Config::get("system", "post_update_1194_end");\r
+            }\r
+        }\r
+\r
+        logger("End ID: ".$end_id, LOGGER_DEBUG);\r
+\r
+        $start_id = Config::get("system", "post_update_1194_start");\r
+\r
+        $query1 = "SELECT `item`.`id` FROM `item` ";\r
+\r
+        $query2 = "INNER JOIN `item` AS `shadow` ON `item`.`uri` = `shadow`.`uri` AND `shadow`.`uid` = 0 ";\r
+\r
+        $query3 = "WHERE `item`.`uid` != 0 AND `item`.`id` >= %d AND `item`.`id` <= %d\r
+                AND `item`.`visible` AND NOT `item`.`private`\r
+                AND NOT `item`.`deleted` AND NOT `item`.`moderated`\r
+                AND `item`.`network` IN ('%s', '%s', '%s', '')\r
+                AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''\r
+                AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''\r
+                AND NOT `item`.`global`";\r
+\r
+        $r = q($query1.$query2.$query3."  ORDER BY `item`.`id` LIMIT 1",\r
+            intval($start_id), intval($end_id),\r
+            dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));\r
+        if (!$r) {\r
+            Config::set("system", "post_update_version", 1194);\r
+            logger("Update is done", LOGGER_DEBUG);\r
+            return true;\r
+        } else {\r
+            Config::set("system", "post_update_1194_start", $r[0]["id"]);\r
+            $start_id = Config::get("system", "post_update_1194_start");\r
+        }\r
+\r
+        logger("Start ID: ".$start_id, LOGGER_DEBUG);\r
+\r
+        $r = q($query1.$query2.$query3."  ORDER BY `item`.`id` LIMIT 1000,1",\r
+            intval($start_id), intval($end_id),\r
+            dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));\r
+        if ($r)\r
+            $pos_id = $r[0]["id"];\r
+        else\r
+            $pos_id = $end_id;\r
+\r
+        logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);\r
+\r
+        q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,\r
+            intval($start_id), intval($pos_id),\r
+            dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));\r
+\r
+        logger("Done", LOGGER_DEBUG);\r
+    }\r
+\r
+    /**\r
+     * @brief set the author-id and owner-id in all item entries\r
+     *\r
+     * This job has to be started multiple times until all entries are set.\r
+     * It isn't started in the update function since it would consume too much time and can be done in the background.\r
+     *\r
+     * @return bool "true" when the job is done\r
+     */\r
+    private static function update1198()\r
+    {\r
+        // Was the script completed?\r
+        if (Config::get("system", "post_update_version") >= 1198)\r
+            return true;\r
+\r
+        logger("Start", LOGGER_DEBUG);\r
+\r
+        // Check if the first step is done (Setting "author-id" and "owner-id" in the item table)\r
+        $r = q("SELECT `author-link`, `owner-link`, `uid` FROM `item` WHERE `author-id` = 0 AND `owner-id` = 0 LIMIT 100");\r
+        if (!$r) {\r
+            // Are there unfinished entries in the thread table?\r
+            $r = q("SELECT COUNT(*) AS `total` FROM `thread`\r
+                INNER JOIN `item` ON `item`.`id` =`thread`.`iid`\r
+                WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND\r
+                    (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");\r
+\r
+            if ($r && ($r[0]["total"] == 0)) {\r
+                Config::set("system", "post_update_version", 1198);\r
+                logger("Done", LOGGER_DEBUG);\r
+                return true;\r
+            }\r
+\r
+            // Update the thread table from the item table\r
+            $r = q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`\r
+                    SET `thread`.`author-id` = `item`.`author-id`,\r
+                    `thread`.`owner-id` = `item`.`owner-id`\r
+                WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND\r
+                    (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");\r
+\r
+            logger("Updated threads", LOGGER_DEBUG);\r
+            if (DBM::is_result($r)) {\r
+                Config::set("system", "post_update_version", 1198);\r
+                logger("Done", LOGGER_DEBUG);\r
+                return true;\r
+            }\r
+            return false;\r
+        }\r
+\r
+        logger("Query done", LOGGER_DEBUG);\r
+\r
+        $item_arr = [];\r
+        foreach ($r AS $item) {\r
+            $index = $item["author-link"]."-".$item["owner-link"]."-".$item["uid"];\r
+            $item_arr[$index] = ["author-link" => $item["author-link"],\r
+                            "owner-link" => $item["owner-link"],\r
+                            "uid" => $item["uid"]];\r
+        }\r
+\r
+        // Set the "gcontact-id" in the item table and add a new gcontact entry if needed\r
+        foreach ($item_arr AS $item) {\r
+            $author_id = Contact::getIdForURL($item["author-link"], 0);\r
+            $owner_id = Contact::getIdForURL($item["owner-link"], 0);\r
+\r
+            if ($author_id == 0)\r
+                $author_id = -1;\r
+\r
+            if ($owner_id == 0)\r
+                $owner_id = -1;\r
+\r
+            q("UPDATE `item` SET `author-id` = %d, `owner-id` = %d\r
+                WHERE `uid` = %d AND `author-link` = '%s' AND `owner-link` = '%s'\r
+                    AND `author-id` = 0 AND `owner-id` = 0",\r
+                intval($author_id), intval($owner_id), intval($item["uid"]),\r
+                dbesc($item["author-link"]), dbesc($item["owner-link"]));\r
+        }\r
+\r
+        logger("Updated items", LOGGER_DEBUG);\r
+        return false;\r
+    }\r
+\r
+    /**\r
+     * @brief update the "last-item" field in the "self" contact\r
+     *\r
+     * This field avoids cost intensive calls in the admin panel and in "nodeinfo"\r
+     *\r
+     * @return bool "true" when the job is done\r
+     */\r
+    private static function update1206()\r
+    {\r
+        // Was the script completed?\r
+        if (Config::get("system", "post_update_version") >= 1206)\r
+            return true;\r
+\r
+        logger("Start", LOGGER_DEBUG);\r
+        $r = q("SELECT `contact`.`id`, `contact`.`last-item`,\r
+            (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`\r
+            FROM `user`\r
+            INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");\r
+\r
+        if (!DBM::is_result($r)) {\r
+            return false;\r
+        }\r
+        foreach ($r AS $user) {\r
+            if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {\r
+                q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d",\r
+                    dbesc($user["lastitem_date"]),\r
+                    intval($user["id"]));\r
+            }\r
+        }\r
+\r
+        Config::set("system", "post_update_version", 1206);\r
+        logger("Done", LOGGER_DEBUG);\r
+        return true;\r
+    }\r
+}\r

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 9e130d9ef0933d66245b62405f96508e1a863ffb..25113dada135b16c315eb23c0bcaf05841c28880 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * @file src/worker/CronJobs.php
  */
-
 namespace Friendica\Worker;
 
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Database\PostUpdate;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Photo;
@@ -18,7 +17,6 @@ use Friendica\Protocol\PortableContact;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/post_update.php';
 require_once 'mod/nodeinfo.php';
 
 class CronJobs
@@ -28,7 +26,6 @@ class CronJobs
                global $a;
 
                require_once 'include/datetime.php';
-               require_once 'include/post_update.php';
                require_once 'mod/nodeinfo.php';
 
                // No parameter set? So return
@@ -39,9 +36,9 @@ class CronJobs
                logger("Starting cronjob " . $command, LOGGER_DEBUG);
 
                // Call possible post update functions
-               // see include/post_update.php for more details
+               // see src/Database/PostUpdate.php for more details
                if ($command == 'post_update') {
-                       post_update();
+                       PostUpdate::update();
                        return;
                }