Merge pull request #4016 from annando/dbclean-conversation

DBClean now works with the conversation table as well
This commit is contained in:
Hypolite Petovan 2017-12-05 16:37:43 -05:00 committed by GitHub
commit 2bcc70fa77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 16 deletions

View file

@ -44,7 +44,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus'); define('FRIENDICA_CODENAME', 'Asparagus');
define('FRIENDICA_VERSION', '3.6-dev'); define('FRIENDICA_VERSION', '3.6-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1235); define('DB_UPDATE_VERSION', 1236);
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.
@ -686,7 +686,7 @@ function update_db(App $a)
// Compare the current structure with the defined structure // Compare the current structure with the defined structure
$t = Config::get('database', 'dbupdate_' . DB_UPDATE_VERSION); $t = Config::get('database', 'dbupdate_' . DB_UPDATE_VERSION);
if ($t !== false) { if (!is_null($t)) {
return; return;
} }

View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 3.6-dev (Asparagus) -- Friendica 3.6-dev (Asparagus)
-- DB_UPDATE_VERSION 1235 -- DB_UPDATE_VERSION 1236
-- ------------------------------------------ -- ------------------------------------------
@ -216,7 +216,8 @@ CREATE TABLE IF NOT EXISTS `conversation` (
`source` mediumtext, `source` mediumtext,
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY(`item-uri`), PRIMARY KEY(`item-uri`),
INDEX `conversation-uri` (`conversation-uri`) INDEX `conversation-uri` (`conversation-uri`),
INDEX `received` (`received`)
) DEFAULT COLLATE utf8mb4_general_ci; ) DEFAULT COLLATE utf8mb4_general_ci;
-- --

View file

@ -831,6 +831,7 @@ function db_definition() {
"indexes" => array( "indexes" => array(
"PRIMARY" => array("item-uri"), "PRIMARY" => array("item-uri"),
"conversation-uri" => array("conversation-uri"), "conversation-uri" => array("conversation-uri"),
"received" => array("received"),
) )
); );
$database["event"] = array( $database["event"] = array(

View file

@ -21,10 +21,10 @@ class DBClean {
$days = Config::get('system', 'dbclean-expire-days', 0); $days = Config::get('system', 'dbclean-expire-days', 0);
if ($stage == 0) { if ($stage == 0) {
for ($i = 1; $i <= 9; $i++) { for ($i = 1; $i <= 10; $i++) {
// Execute the background script for a step when it isn't finished. // Execute the background script for a step when it isn't finished.
// Execute step 8 and 9 only when $days is defined. // Execute step 8 and 9 only when $days is defined.
if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($days > 0))) { if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($i > 9) || ($days > 0))) {
Worker::add(PRIORITY_LOW, 'DBClean', $i); Worker::add(PRIORITY_LOW, 'DBClean', $i);
} }
} }
@ -47,7 +47,8 @@ class DBClean {
* 6: Orphaned data from sign table. * 6: Orphaned data from sign table.
* 7: Orphaned data from term table. * 7: Orphaned data from term table.
* 8: Expired threads. * 8: Expired threads.
* 9: Old global item entries from expired threads * 9: Old global item entries from expired threads.
* 10: Old conversations.
*/ */
private static function removeOrphans($stage = 0) { private static function removeOrphans($stage = 0) {
global $db; global $db;
@ -293,6 +294,27 @@ class DBClean {
logger("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id); logger("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id);
Config::set('system', 'dbclean-last-id-9', $last_id); Config::set('system', 'dbclean-last-id-9', $last_id);
} elseif ($stage == 10) {
$last_id = Config::get('system', 'dbclean-last-id-10', 0);
logger("Deleting old conversations. Last created: ".$last_id);
$r = dba::p("SELECT `received`, `item-uri` FROM `conversation`
WHERE `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY
ORDER BY `received` LIMIT ".intval($limit));
$count = dba::num_rows($r);
if ($count > 0) {
logger("found old conversations: ".$count);
while ($orphan = dba::fetch($r)) {
$last_id = $orphan["received"];
dba::delete('conversation', array('item-uri' => $orphan["item-uri"]));
}
} else {
logger("No old conversations found");
}
dba::close($r);
logger("Done deleting ".$count." conversations. Last created: ".$last_id);
Config::set('system', 'dbclean-last-id-10', $last_id);
} }
// Call it again if not all entries were purged // Call it again if not all entries were purged

View file

@ -1,6 +1,6 @@
<?php <?php
define('UPDATE_VERSION' , 1235); define('UPDATE_VERSION' , 1236);
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;