Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 04:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8484 from annando/barracuda

Browse source 
Check for Antelope and convert to Barracuda
This commit is contained in:
Hypolite Petovan 2020-04-01 14:20:01 -04:00 committed by GitHub
commit 193e0d9613
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Console/DatabaseStructure.php
View file

@ -54,7 +54,7 @@ Commands
dryrun Show database update schema queries without running them dryrun Show database update schema queries without running them
update Update database schema update Update database schema
dumpsql Dump database schema dumpsql Dump database schema
toinnodb Convert all tables from MyISAM to InnoDB toinnodb Convert all tables from MyISAM or InnoDB in the Antelope file format to InnoDB in the Barracuda file format
Options Options
-h|--help|-? Show help information -h|--help|-? Show help information

12
src/Database/DBStructure.php
View file

@ -49,7 +49,7 @@ class DBStructure
private static $definition = []; private static $definition = [];
/** /**
* Converts all tables from MyISAM to InnoDB * Converts all tables from MyISAM/InnoDB Antelope to InnoDB Barracuda
*/ */
public static function convertToInnoDB() public static function convertToInnoDB()
{ {
@ -59,13 +59,19 @@ class DBStructure
['engine' => 'MyISAM', 'table_schema' => DBA::databaseName()] ['engine' => 'MyISAM', 'table_schema' => DBA::databaseName()]
); );
$tables = array_merge($tables, DBA::selectToArray(
['information_schema' => 'tables'],
['table_name'],
['engine' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()]
));
if (!DBA::isResult($tables)) { if (!DBA::isResult($tables)) {
echo DI::l10n()->t('There are no tables on MyISAM.') . "\n"; echo DI::l10n()->t('There are no tables on MyISAM or InnoDB with the Antelope file format.') . "\n";
return; return;
} }
foreach ($tables AS $table) { foreach ($tables AS $table) {
$sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " engine=InnoDB;"; $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " ENGINE=InnoDB ROW_FORMAT=DYNAMIC;";
echo $sql . "\n"; echo $sql . "\n";
$result = DBA::e($sql); $result = DBA::e($sql);

2
src/Model/Item.php
View file

@ -1957,7 +1957,7 @@ class Item
// There are duplicates. We delete our just created entry. // There are duplicates. We delete our just created entry.
Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]); Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]);
// Yes, we could do a rollback here - but we are having many users with MyISAM. // Yes, we could do a rollback here - but we possibly are still having users with MyISAM.
DBA::delete('item', ['id' => $current_post]); DBA::delete('item', ['id' => $current_post]);
DBA::commit(); DBA::commit();
return 0; return 0;

5
src/Module/Admin/Summary.php
View file

@ -50,6 +50,11 @@ class Summary extends BaseAdmin
$warningtext[] = DI::l10n()->t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); $warningtext[] = DI::l10n()->t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
} }
// are there InnoDB tables in Antelope in the DB? If so, trigger a warning message
if (DBA::count(['information_schema' => 'tables'], ['ENGINE' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()])) {
$warningtext[] = DI::l10n()->t('Your DB still runs with InnoDB tables in the Antelope file format. You should change the file format to Barracuda. Friendica is using features that are not provided by the Antelope format. See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html');
}
// Check if github.com/friendica/master/VERSION is higher then // Check if github.com/friendica/master/VERSION is higher then
// the local version of Friendica. Check is opt-in, source may be master or devel branch // the local version of Friendica. Check is opt-in, source may be master or devel branch
if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') { if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {