X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FPostUpdate.php;h=acafea900c78fb62dafd7ef4e8e7fd4ff0b2edaf;hb=6071fe81b410ec6a971d0e45379a51809cbeec71;hp=dbadcbbb1b588c785b9b13fc1bb6a27bc814fa61;hpb=5250552fe28cd4a5d2b148ca7a431233191e92c9;p=friendica.git

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index dbadcbbb1b..acafea900c 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -5,14 +5,12 @@
 namespace Friendica\Database;
 
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\PermissionSet;
-use Friendica\Database\DBA;
-
-require_once 'include/dba.php';
 
 /**
  * Post update functions
@@ -36,6 +34,9 @@ class PostUpdate
 		if (!self::update1281()) {
 			return false;
 		}
+		if (!self::update1297()) {
+			return false;
+		}
 
 		return true;
 	}
@@ -44,6 +45,7 @@ class PostUpdate
 	 * @brief Updates the "global" field in the item table
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1194()
 	{
@@ -52,7 +54,7 @@ class PostUpdate
 			return true;
 		}
 
-		logger("Start", LOGGER_DEBUG);
+		Logger::log("Start", Logger::DEBUG);
 
 		$end_id = Config::get("system", "post_update_1194_end");
 		if (!$end_id) {
@@ -63,7 +65,7 @@ class PostUpdate
 			}
 		}
 
-		logger("End ID: ".$end_id, LOGGER_DEBUG);
+		Logger::log("End ID: ".$end_id, Logger::DEBUG);
 
 		$start_id = Config::get("system", "post_update_1194_start");
 
@@ -82,14 +84,14 @@ class PostUpdate
 			DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
 		if (!$r) {
 			Config::set("system", "post_update_version", 1194);
-			logger("Update is done", LOGGER_DEBUG);
+			Logger::log("Update is done", Logger::DEBUG);
 			return true;
 		} else {
 			Config::set("system", "post_update_1194_start", $r[0]["id"]);
 			$start_id = Config::get("system", "post_update_1194_start");
 		}
 
-		logger("Start ID: ".$start_id, LOGGER_DEBUG);
+		Logger::log("Start ID: ".$start_id, Logger::DEBUG);
 
 		$r = q($query1.$query2.$query3."  ORDER BY `item`.`id` LIMIT 1000,1",
 			intval($start_id), intval($end_id),
@@ -99,13 +101,13 @@ class PostUpdate
 		} else {
 			$pos_id = $end_id;
 		}
-		logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
+		Logger::log("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, Logger::DEBUG);
 
 		q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
 			intval($start_id), intval($pos_id),
 			DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
 
-		logger("Done", LOGGER_DEBUG);
+		Logger::log("Done", Logger::DEBUG);
 	}
 
 	/**
@@ -114,6 +116,7 @@ class PostUpdate
 	 * This field avoids cost intensive calls in the admin panel and in "nodeinfo"
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1206()
 	{
@@ -122,7 +125,7 @@ class PostUpdate
 			return true;
 		}
 
-		logger("Start", LOGGER_DEBUG);
+		Logger::log("Start", Logger::DEBUG);
 		$r = q("SELECT `contact`.`id`, `contact`.`last-item`,
 			(SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
 			FROM `user`
@@ -138,7 +141,7 @@ class PostUpdate
 		}
 
 		Config::set("system", "post_update_version", 1206);
-		logger("Done", LOGGER_DEBUG);
+		Logger::log("Done", Logger::DEBUG);
 		return true;
 	}
 
@@ -146,6 +149,8 @@ class PostUpdate
 	 * @brief update the item related tables
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	private static function update1279()
 	{
@@ -156,7 +161,7 @@ class PostUpdate
 
 		$id = Config::get("system", "post_update_version_1279_id", 0);
 
-		logger("Start from item " . $id, LOGGER_DEBUG);
+		Logger::log("Start from item " . $id, Logger::DEBUG);
 
 		$fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
 			'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
@@ -170,7 +175,7 @@ class PostUpdate
 		$items = Item::select($fields, $condition, $params);
 
 		if (DBA::errorNo() != 0) {
-			logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+			Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
 			return false;
 		}
 
@@ -225,7 +230,7 @@ class PostUpdate
 
 		Config::set("system", "post_update_version_1279_id", $id);
 
-		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
+		Logger::log("Processed rows: " . $rows . " - last processed item:  " . $id, Logger::DEBUG);
 
 		if ($start_id == $id) {
 			// Set all deprecated fields to "null" if they contain an empty string
@@ -237,13 +242,13 @@ class PostUpdate
 			foreach ($nullfields as $field) {
 				$fields = [$field => null];
 				$condition = [$field => ''];
-				logger("Setting '" . $field . "' to null if empty.", LOGGER_DEBUG);
+				Logger::log("Setting '" . $field . "' to null if empty.", Logger::DEBUG);
 				// Important: This has to be a "DBA::update", not a "Item::update"
 				DBA::update('item', $fields, $condition);
 			}
 
 			Config::set("system", "post_update_version", 1279);
-			logger("Done", LOGGER_DEBUG);
+			Logger::log("Done", Logger::DEBUG);
 			return true;
 		}
 
@@ -296,6 +301,7 @@ class PostUpdate
 	 * @brief update item-uri data. Prerequisite for the next item structure update.
 	 *
 	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function update1281()
 	{
@@ -306,7 +312,7 @@ class PostUpdate
 
 		$id = Config::get("system", "post_update_version_1281_id", 0);
 
-		logger("Start from item " . $id, LOGGER_DEBUG);
+		Logger::log("Start from item " . $id, Logger::DEBUG);
 
 		$fields = ['id', 'guid', 'uri', 'uri-id', 'parent-uri', 'parent-uri-id', 'thr-parent', 'thr-parent-id'];
 
@@ -317,7 +323,7 @@ class PostUpdate
 		$items = DBA::select('item', $fields, $condition, $params);
 
 		if (DBA::errorNo() != 0) {
-			logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+			Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
 			return false;
 		}
 
@@ -358,20 +364,56 @@ class PostUpdate
 
 		Config::set("system", "post_update_version_1281_id", $id);
 
-		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
+		Logger::log("Processed rows: " . $rows . " - last processed item:  " . $id, Logger::DEBUG);
 
 		if ($start_id == $id) {
-			logger("Updating item-uri in item-activity", LOGGER_DEBUG);
+			Logger::log("Updating item-uri in item-activity", Logger::DEBUG);
 			DBA::e("UPDATE `item-activity` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-activity`.`uri` SET `item-activity`.`uri-id` = `item-uri`.`id` WHERE `item-activity`.`uri-id` IS NULL");
 
-			logger("Updating item-uri in item-content", LOGGER_DEBUG);
+			Logger::log("Updating item-uri in item-content", Logger::DEBUG);
 			DBA::e("UPDATE `item-content` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-content`.`uri` SET `item-content`.`uri-id` = `item-uri`.`id` WHERE `item-content`.`uri-id` IS NULL");
 
 			Config::set("system", "post_update_version", 1281);
-			logger("Done", LOGGER_DEBUG);
+			Logger::log("Done", Logger::DEBUG);
 			return true;
 		}
 
 		return false;
 	}
+
+	/**
+	 * Set the delivery queue count to a negative value for all items preceding the feature.
+	 *
+	 * @return bool "true" when the job is done
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function update1297()
+	{
+		// Was the script completed?
+		if (Config::get('system', 'post_update_version') >= 1297) {
+			return true;
+		}
+
+		$max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
+		$max_iid = $max_item_delivery_data['iid'];
+
+		Logger::info('Start update1297 with max iid: ' . $max_iid);
+
+		$condition = ['`queue_count` = 0 AND `iid` < ?', $max_iid];
+
+		DBA::update('item-delivery-data', ['queue_count' => -1], $condition);
+
+		if (DBA::errorNo() != 0) {
+			Logger::error('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+			return false;
+		}
+
+		Logger::info('Processed rows: ' . DBA::affectedRows());
+
+		Config::set('system', 'post_update_version', 1297);
+
+		Logger::info('Done');
+
+		return true;
+	}
 }