bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix moving stored data

Browse source
This commit is contained in:
fabrixxm 2018-12-12 17:50:34 +01:00 committed by Hypolite Petovan
parent 55292c954b
commit f2b29f6591
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Core/StorageManager.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Core;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Logger;
@ -105,35 +106,55 @@ class StorageManager
/** /**
* @brief Move resources to storage $dest * @brief Move resources to storage $dest
* *
* Copy existing data to destination storage and delete from source.
* This method cannot move to legacy in-table `data` field.
*
* @param string $dest Destination storage class name * @param string $dest Destination storage class name
* @param array $tables Tables to look in for resources. Optional, defaults to ['photo'] * @param array $tables Tables to look in for resources. Optional, defaults to ['photo']
* *
* @retur int Number of moved resources * @retur int Number of moved resources
*/ */
public static function move($dest, $tables = null) public static function move(string $dest, $tables = null)
{ {
if (is_null($dest) || empty($dest)) {
throw Exception('Can\'t move to NULL storage backend');
}
if (is_null($tables)) { if (is_null($tables)) {
$tables = ['photo']; $tables = ['photo'];
} }
$moved = 0; $moved = 0;
foreach ($tables as $table) { foreach ($tables as $table) {
$rr = DBA::select($table, ['id', 'data', 'backend-class', 'backend-ref'], ['`backend-class` != ?', $dest]); // Get the rows where backend class is not the destination backend class
$rr = DBA::select(
$table,
['id', 'data', 'backend-class', 'backend-ref'],
['`backend-class` IS NULL or `backend-class` != ?' , $dest ]
);
if (DBA::isResult($rr)) { if (DBA::isResult($rr)) {
while($r = $rr->fetch()) { while($r = $rr->fetch()) {
$id = $r['id']; $id = $r['id'];
$data = $r['data']; $data = $r['data'];
$backendClass = $r['backend-class']; $backendClass = $r['backend-class'];
$backendRef = $r['backend-ref']; $backendRef = $r['backend-ref'];
if ($backendClass !== '') { if (!is_null($backendClass) && $backendClass !== '') {
Logger::log("get data from old backend " . $backendClass . " : " . $backendRef);
$data = $backendClass::get($backendRef); $data = $backendClass::get($backendRef);
} }
Logger::log("save data to new backend " . $dest);
$ref = $dest::put($data); $ref = $dest::put($data);
Logger::log("saved data as " . $ref);
if ($ref !== '') { if ($ref !== '') {
Logger::log("update row");
$ru = DBA::update($table, ['backend-class' => $dest, 'backend-ref' => $ref, 'data' => ''], ['id' => $id]); $ru = DBA::update($table, ['backend-class' => $dest, 'backend-ref' => $ref, 'data' => ''], ['id' => $id]);
if ($ru) { if ($ru) {
if ($backendClass !== '') { if (!is_null($backendClass) && $backendClass !== '') {
Logger::log("delete data from old backend " . $backendClass . " : " . $backendRef);
$backendClass::delete($backendRef); $backendClass::delete($backendRef);
} }
$moved++; $moved++;
@ -146,3 +167,4 @@ class StorageManager
return $moved; return $moved;
} }
} }