X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FPostUpdate.php;h=acc98c882c77b7cc27ba34cbf2df8bab7600cdc9;hb=3b173f2007dd955644372b9f795cf3850f33546b;hp=82fe70e3f19be7c0ec625abef6a7bb559d953b41;hpb=79b64cc44f4b3656d9d833a465975d08e96c1095;p=friendica.git diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index 82fe70e3f1..acc98c882c 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -1,6 +1,6 @@ get('system', 'post_update_version') >= 1297) { + if (DI::keyValue()->get('post_update_version') >= 1297) { return true; } if (!DBStructure::existsTable('item-delivery-data')) { - DI::config()->set('system', 'post_update_version', 1297); + DI::keyValue()->set('post_update_version', 1297); return true; } @@ -154,7 +161,7 @@ class PostUpdate Logger::info('Processed rows: ' . DBA::affectedRows()); - DI::config()->set('system', 'post_update_version', 1297); + DI::keyValue()->set('post_update_version', 1297); Logger::info('Done'); @@ -169,7 +176,7 @@ class PostUpdate private static function update1322() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1322) { + if (DI::keyValue()->get('post_update_version') >= 1322) { return true; } @@ -188,7 +195,7 @@ class PostUpdate } DBA::close($contact); - DI::config()->set('system', 'post_update_version', 1322); + DI::keyValue()->set('post_update_version', 1322); Logger::info('Done'); @@ -204,16 +211,16 @@ class PostUpdate private static function update1329() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1329) { + if (DI::keyValue()->get('post_update_version') >= 1329) { return true; } if (!DBStructure::existsTable('item')) { - DI::config()->set('system', 'post_update_version', 1329); + DI::keyValue()->set('post_update_version', 1329); return true; } - $id = DI::config()->get('system', 'post_update_version_1329_id', 0); + $id = DI::keyValue()->get('post_update_version_1329_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -237,12 +244,12 @@ class PostUpdate } DBA::close($items); - DI::config()->set('system', 'post_update_version_1329_id', $id); + DI::keyValue()->set('post_update_version_1329_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - DI::config()->set('system', 'post_update_version', 1329); + DI::keyValue()->set('post_update_version', 1329); Logger::info('Done'); return true; } @@ -259,16 +266,16 @@ class PostUpdate private static function update1341() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1341) { + if (DI::keyValue()->get('post_update_version') >= 1341) { return true; } if (!DBStructure::existsTable('item-content')) { - DI::config()->set('system', 'post_update_version', 1342); + DI::keyValue()->set('post_update_version', 1342); return true; } - $id = DI::config()->get('system', 'post_update_version_1341_id', 0); + $id = DI::keyValue()->get('post_update_version_1341_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -288,19 +295,19 @@ class PostUpdate $id = $item['uri-id']; ++$rows; if ($rows % 1000 == 0) { - DI::config()->set('system', 'post_update_version_1341_id', $id); + DI::keyValue()->set('post_update_version_1341_id', $id); } } DBA::close($items); - DI::config()->set('system', 'post_update_version_1341_id', $id); + DI::keyValue()->set('post_update_version_1341_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); // When there are less than 1,000 items processed this means that we reached the end // The other entries will then be processed with the regular functionality if ($rows < 1000) { - DI::config()->set('system', 'post_update_version', 1341); + DI::keyValue()->set('post_update_version', 1341); Logger::info('Done'); return true; } @@ -317,16 +324,16 @@ class PostUpdate private static function update1342() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1342) { + if (DI::keyValue()->get('post_update_version') >= 1342) { return true; } if (!DBStructure::existsTable('term') || !DBStructure::existsTable('item-content')) { - DI::config()->set('system', 'post_update_version', 1342); + DI::keyValue()->set('post_update_version', 1342); return true; } - $id = DI::config()->get('system', 'post_update_version_1342_id', 0); + $id = DI::keyValue()->get('post_update_version_1342_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -359,24 +366,24 @@ class PostUpdate } } - Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url'], false); + Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url']); $id = $term['tid']; ++$rows; if ($rows % 1000 == 0) { - DI::config()->set('system', 'post_update_version_1342_id', $id); + DI::keyValue()->set('post_update_version_1342_id', $id); } } DBA::close($terms); - DI::config()->set('system', 'post_update_version_1342_id', $id); + DI::keyValue()->set('post_update_version_1342_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); // When there are less than 1,000 items processed this means that we reached the end // The other entries will then be processed with the regular functionality if ($rows < 1000) { - DI::config()->set('system', 'post_update_version', 1342); + DI::keyValue()->set('post_update_version', 1342); Logger::info('Done'); return true; } @@ -393,16 +400,16 @@ class PostUpdate private static function update1345() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1345) { + if (DI::keyValue()->get('post_update_version') >= 1345) { return true; } if (!DBStructure::existsTable('item-delivery-data')) { - DI::config()->set('system', 'post_update_version', 1345); + DI::keyValue()->set('post_update_version', 1345); return true; } - $id = DI::config()->get('system', 'post_update_version_1345_id', 0); + $id = DI::keyValue()->get('post_update_version_1345_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -427,14 +434,14 @@ class PostUpdate } DBA::close($deliveries); - DI::config()->set('system', 'post_update_version_1345_id', $id); + DI::keyValue()->set('post_update_version_1345_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); // When there are less than 100 items processed this means that we reached the end // The other entries will then be processed with the regular functionality if ($rows < 100) { - DI::config()->set('system', 'post_update_version', 1345); + DI::keyValue()->set('post_update_version', 1345); Logger::info('Done'); return true; } @@ -476,16 +483,16 @@ class PostUpdate private static function update1346() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1346) { + if (DI::keyValue()->get('post_update_version') >= 1346) { return true; } if (!DBStructure::existsTable('term')) { - DI::config()->set('system', 'post_update_version', 1346); + DI::keyValue()->set('post_update_version', 1346); return true; } - $id = DI::config()->get('system', 'post_update_version_1346_id', 0); + $id = DI::keyValue()->get('post_update_version_1346_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -514,19 +521,19 @@ class PostUpdate $id = $term['oid']; ++$rows; if ($rows % 100 == 0) { - DI::config()->set('system', 'post_update_version_1346_id', $id); + DI::keyValue()->set('post_update_version_1346_id', $id); } } DBA::close($terms); - DI::config()->set('system', 'post_update_version_1346_id', $id); + DI::keyValue()->set('post_update_version_1346_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); // When there are less than 10 items processed this means that we reached the end // The other entries will then be processed with the regular functionality if ($rows < 10) { - DI::config()->set('system', 'post_update_version', 1346); + DI::keyValue()->set('post_update_version', 1346); Logger::info('Done'); return true; } @@ -544,16 +551,16 @@ class PostUpdate private static function update1347() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1347) { + if (DI::keyValue()->get('post_update_version') >= 1347) { return true; } if (!DBStructure::existsTable('item-activity') || !DBStructure::existsTable('item')) { - DI::config()->set('system', 'post_update_version', 1347); + DI::keyValue()->set('post_update_version', 1347); return true; } - $id = DI::config()->get('system', 'post_update_version_1347_id', 0); + $id = DI::keyValue()->get('post_update_version_1347_id') ?? 0; Logger::info('Start', ['item' => $id]); @@ -563,7 +570,7 @@ class PostUpdate $items = DBA::p("SELECT `item`.`id`, `item`.`verb` AS `item-verb`, `item-content`.`verb`, `item-activity`.`activity` FROM `item` LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id` LEFT JOIN `item-activity` ON `item-activity`.`uri-id` = `item`.`uri-id` AND `item`.`gravity` = ? - WHERE `item`.`id` >= ? AND `item`.`vid` IS NULL ORDER BY `item`.`id` LIMIT 10000", GRAVITY_ACTIVITY, $id); + WHERE `item`.`id` >= ? AND `item`.`vid` IS NULL ORDER BY `item`.`id` LIMIT 10000", Item::GRAVITY_ACTIVITY, $id); if (DBA::errorNo() != 0) { Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); @@ -588,12 +595,12 @@ class PostUpdate } DBA::close($items); - DI::config()->set('system', 'post_update_version_1347_id', $id); + DI::keyValue()->set('post_update_version_1347_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - DI::config()->set('system', 'post_update_version', 1347); + DI::keyValue()->set('post_update_version', 1347); Logger::info('Done'); return true; } @@ -611,11 +618,11 @@ class PostUpdate private static function update1348() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1348) { + if (DI::keyValue()->get('post_update_version') >= 1348) { return true; } - $id = DI::config()->get('system', 'post_update_version_1348_id', 0); + $id = DI::keyValue()->get('post_update_version_1348_id') ?? 0; Logger::info('Start', ['contact' => $id]); @@ -641,12 +648,12 @@ class PostUpdate } DBA::close($contacts); - DI::config()->set('system', 'post_update_version_1348_id', $id); + DI::keyValue()->set('post_update_version_1348_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - DI::config()->set('system', 'post_update_version', 1348); + DI::keyValue()->set('post_update_version', 1348); Logger::info('Done'); return true; } @@ -664,11 +671,11 @@ class PostUpdate private static function update1349() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1349) { + if (DI::keyValue()->get('post_update_version') >= 1349) { return true; } - $id = DI::config()->get('system', 'post_update_version_1349_id', ''); + $id = DI::keyValue()->get('post_update_version_1349_id') ?? ''; Logger::info('Start', ['apcontact' => $id]); @@ -694,12 +701,12 @@ class PostUpdate } DBA::close($apcontacts); - DI::config()->set('system', 'post_update_version_1349_id', $id); + DI::keyValue()->set('post_update_version_1349_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - DI::config()->set('system', 'post_update_version', 1349); + DI::keyValue()->set('post_update_version', 1349); Logger::info('Done'); return true; } @@ -717,7 +724,7 @@ class PostUpdate private static function update1383() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1383) { + if (DI::keyValue()->get('post_update_version') >= 1383) { return true; } @@ -743,7 +750,7 @@ class PostUpdate } DBA::close($photos); - DI::config()->set('system', 'post_update_version', 1383); + DI::keyValue()->set('post_update_version', 1383); Logger::info('Done', ['deleted' => $deleted]); return true; } @@ -758,7 +765,7 @@ class PostUpdate private static function update1384() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1384) { + if (DI::keyValue()->get('post_update_version') >= 1384) { return true; } @@ -788,7 +795,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1384); + DI::keyValue()->set('post_update_version', 1384); Logger::info('Done'); return true; } @@ -806,12 +813,12 @@ class PostUpdate private static function update1400() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1400) { + if (DI::keyValue()->get('post_update_version') >= 1400) { return true; } if (!DBStructure::existsTable('item')) { - DI::config()->set('system', 'post_update_version', 1400); + DI::keyValue()->set('post_update_version', 1400); return true; } @@ -835,7 +842,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1400); + DI::keyValue()->set('post_update_version', 1400); Logger::info('Done'); return true; } @@ -853,7 +860,7 @@ class PostUpdate private static function update1424() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1424) { + if (DI::keyValue()->get('post_update_version') >= 1424) { return true; } @@ -877,7 +884,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1424); + DI::keyValue()->set('post_update_version', 1424); Logger::info('Done'); return true; } @@ -895,7 +902,12 @@ class PostUpdate private static function update1425() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1425) { + if (DI::keyValue()->get('post_update_version') >= 1425) { + return true; + } + + if (!DBStructure::existsTable('fcontact')) { + DI::keyValue()->set('post_update_version', 1425); return true; } @@ -924,7 +936,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1425); + DI::keyValue()->set('post_update_version', 1425); Logger::info('Done'); return true; } @@ -942,7 +954,7 @@ class PostUpdate private static function update1426() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1426) { + if (DI::keyValue()->get('post_update_version') >= 1426) { return true; } @@ -971,7 +983,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1426); + DI::keyValue()->set('post_update_version', 1426); Logger::info('Done'); return true; } @@ -989,7 +1001,7 @@ class PostUpdate private static function update1427() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1427) { + if (DI::keyValue()->get('post_update_version') >= 1427) { return true; } @@ -1018,7 +1030,7 @@ class PostUpdate Logger::info('Processed', ['rows' => $rows]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1427); + DI::keyValue()->set('post_update_version', 1427); Logger::info('Done'); return true; } @@ -1036,11 +1048,16 @@ class PostUpdate private static function update1452() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1452) { + if (DI::keyValue()->get('post_update_version') >= 1452) { return true; } - $id = DI::config()->get('system', 'post_update_version_1452_id', 0); + if (!DBStructure::existsTable('conversation')) { + DI::keyValue()->set('post_update_version', 1452); + return true; + } + + $id = DI::keyValue()->get('post_update_version_1452_id') ?? 0; Logger::info('Start', ['uri-id' => $id]); @@ -1079,12 +1096,12 @@ class PostUpdate DBA::close($conversations); - DI::config()->set('system', 'post_update_version_1452_id', $id); + DI::keyValue()->set('post_update_version_1452_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id, 'last-received' => $received]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1452); + DI::keyValue()->set('post_update_version', 1452); Logger::info('Done'); return true; } @@ -1103,7 +1120,7 @@ class PostUpdate private static function update1483() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1483) { + if (DI::keyValue()->get('post_update_version') >= 1483) { return true; } @@ -1119,7 +1136,7 @@ class PostUpdate } DBA::close($posts); - DI::config()->set('system', 'post_update_version', 1483); + DI::keyValue()->set('post_update_version', 1483); Logger::info('Done'); return true; } @@ -1134,11 +1151,11 @@ class PostUpdate private static function update1484() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1484) { + if (DI::keyValue()->get('post_update_version') >= 1484) { return true; } - $id = DI::config()->get('system', 'post_update_version_1484_id', 0); + $id = DI::keyValue()->get('post_update_version_1484_id') ?? 0; Logger::info('Start', ['id' => $id]); @@ -1153,17 +1170,133 @@ class PostUpdate while ($contact = DBA::fetch($contacts)) { $id = $contact['id']; + if (is_null($contact['uri-id'])) { + $contact['uri-id'] = ItemURI::getIdByURI($contact['url']); + DBA::update('contact', ['uri-id' => $contact['uri-id']], ['id' => $contact['id']]); + } Contact::setAccountUser($contact['id'], $contact['uid'], $contact['uri-id'], $contact['url']); ++$rows; } DBA::close($contacts); - DI::config()->set('system', 'post_update_version_1484_id', $id); + DI::keyValue()->set('post_update_version_1484_id', $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($rows <= 100) { - DI::config()->set('system', 'post_update_version', 1484); + DI::keyValue()->set('post_update_version', 1484); + Logger::info('Done'); + return true; + } + + return false; + } + + /** + * update the "gsid" (global server id) field in the contact table + * + * @return bool "true" when the job is done + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function update1506() + { + // Was the script completed? + if (DI::keyValue()->get('post_update_version') >= 1506) { + return true; + } + + $id = DI::keyValue()->get('post_update_version_1506_id') ?? 0; + + Logger::info('Start', ['contact' => $id]); + + $start_id = $id; + $rows = 0; + $condition = ["`id` > ? AND `gsid` IS NULL AND `network` = ?", $id, Protocol::DIASPORA]; + $params = ['order' => ['id'], 'limit' => 10000]; + $contacts = DBA::select('contact', ['id', 'url'], $condition, $params); + + if (DBA::errorNo() != 0) { + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); + return false; + } + + while ($contact = DBA::fetch($contacts)) { + $id = $contact['id']; + + $parts = parse_url($contact['url']); + unset($parts['path']); + $server = (string)Uri::fromParts($parts); + + DBA::update('contact', + ['gsid' => GServer::getID($server, true), 'baseurl' => GServer::cleanURL($server)], + ['id' => $contact['id']]); + + ++$rows; + } + DBA::close($contacts); + + DI::keyValue()->set('post_update_version_1506_id', $id); + + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); + + if ($start_id == $id) { + DI::keyValue()->set('post_update_version', 1506); + Logger::info('Done'); + return true; + } + + return false; + } + + /** + * update the "gsid" (global server id) field in the inbox-status table + * + * @return bool "true" when the job is done + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function update1507() + { + // Was the script completed? + if (DI::keyValue()->get('post_update_version') >= 1507) { + return true; + } + + $id = DI::keyValue()->get('post_update_version_1507_id') ?? ''; + + Logger::info('Start', ['apcontact' => $id]); + + $start_id = $id; + $rows = 0; + $condition = ["`url` > ? AND NOT `gsid` IS NULL", $id]; + $params = ['order' => ['url'], 'limit' => 10000]; + $apcontacts = DBA::select('apcontact', ['url', 'gsid', 'sharedinbox', 'inbox'], $condition, $params); + + if (DBA::errorNo() != 0) { + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); + return false; + } + + while ($apcontact = DBA::fetch($apcontacts)) { + $id = $apcontact['url']; + + $inbox = [$apcontact['inbox']]; + if (!empty($apcontact['sharedinbox'])) { + $inbox[] = $apcontact['sharedinbox']; + } + $condition = DBA::mergeConditions(['url' => $inbox], ["`gsid` IS NULL"]); + DBA::update('inbox-status', ['gsid' => $apcontact['gsid'], 'archive' => GServer::isDefunctById($apcontact['gsid'])], $condition); + ++$rows; + } + DBA::close($apcontacts); + + DI::keyValue()->set('post_update_version_1507_id', $id); + + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); + + if ($start_id == $id) { + DI::keyValue()->set('post_update_version', 1507); Logger::info('Done'); return true; }