Compare commits

...

1 Commits

Author SHA1 Message Date
Robin Appelman 98435359d0
add wrapper to close connection while uploading/downloading from object store
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-02-11 17:40:06 +01:00
3 changed files with 76 additions and 0 deletions

View File

@ -966,6 +966,7 @@ return array(
'OC\\Files\\Notify\\Change' => $baseDir . '/lib/private/Files/Notify/Change.php',
'OC\\Files\\Notify\\RenameChange' => $baseDir . '/lib/private/Files/Notify/RenameChange.php',
'OC\\Files\\ObjectStore\\Azure' => $baseDir . '/lib/private/Files/ObjectStore/Azure.php',
'OC\\Files\\ObjectStore\\DBReOpenWrapper' => $baseDir . '/lib/private/Files/ObjectStore/DBReOpenWrapper.php',
'OC\\Files\\ObjectStore\\HomeObjectStoreStorage' => $baseDir . '/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php',
'OC\\Files\\ObjectStore\\Mapper' => $baseDir . '/lib/private/Files/ObjectStore/Mapper.php',
'OC\\Files\\ObjectStore\\NoopScanner' => $baseDir . '/lib/private/Files/ObjectStore/NoopScanner.php',

View File

@ -995,6 +995,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Files\\Notify\\Change' => __DIR__ . '/../../..' . '/lib/private/Files/Notify/Change.php',
'OC\\Files\\Notify\\RenameChange' => __DIR__ . '/../../..' . '/lib/private/Files/Notify/RenameChange.php',
'OC\\Files\\ObjectStore\\Azure' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Azure.php',
'OC\\Files\\ObjectStore\\DBReOpenWrapper' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/DBReOpenWrapper.php',
'OC\\Files\\ObjectStore\\HomeObjectStoreStorage' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php',
'OC\\Files\\ObjectStore\\Mapper' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Mapper.php',
'OC\\Files\\ObjectStore\\NoopScanner' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/NoopScanner.php',

View File

@ -0,0 +1,74 @@
<?php declare(strict_types=1);
/**
* @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Files\ObjectStore;
use OCP\Files\ObjectStore\IObjectStore;
use OCP\IDBConnection;
/**
* Close an reopen the database connection when reading and writing from the object store
*
* this prevents php keeping the database connection open and idle for a long time
*/
class DBReOpenWrapper implements IObjectStore {
/** @var string */
private $innerClass;
/** @var IObjectStore */
private $inner;
/** @var IDBConnection */
private $database;
public function __construct(array $parameters) {
$class = $parameters['class'];
$this->innerClass = $class;
$this->inner = new $class($parameters);
$this->database = \OC::$server->getDatabaseConnection();
}
public function getStorageId() {
return $this->inner->getStorageId();
}
public function readObject($urn) {
$this->database->close();
$result = $this->inner->readObject($urn);
$this->database->connect();
return $result;
}
public function writeObject($urn, $stream) {
$this->database->close();
$result = $this->inner->writeObject($urn, $stream);
$this->database->connect();
return $result;
}
public function deleteObject($urn) {
$this->inner->deleteObject($urn);
}
public function objectExists($urn) {
return $this->inner->objectExists($urn);
}
}