summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-12-05 22:06:19 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-12-05 22:06:19 +0100
commit72f3882d4b405ad8035f795120f6c2e7a3dda174 (patch)
tree6a8dbd29be4326134de305950800e19fe0613b60
parent1e0339775057201f54c87fb18e329c1fb94f7a60 (diff)
downloadnextcloud-server-72f3882d4b405ad8035f795120f6c2e7a3dda174.tar.gz
nextcloud-server-72f3882d4b405ad8035f795120f6c2e7a3dda174.zip
No need to propogate changes in appdata
Right now we propogate a lof of changes in appdata. So for example we propogate each and every preview that is added to the system. This has no real added value as far as I can tell. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--lib/private/Files/Cache/Propagator.php15
-rw-r--r--lib/private/Files/Storage/Common.php3
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index ae51b2e52d8..7634029e73f 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -46,12 +46,14 @@ class Propagator implements IPropagator {
private $connection;
/**
- * @param \OC\Files\Storage\Storage $storage
- * @param IDBConnection $connection
+ * @var array
*/
- public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
+ private $ignore = [];
+
+ public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
$this->storage = $storage;
$this->connection = $connection;
+ $this->ignore = $ignore;
}
@@ -62,6 +64,13 @@ class Propagator implements IPropagator {
* @suppress SqlInjectionChecker
*/
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+ // Do not propogate changes in ignored paths
+ foreach ($this->ignore as $ignore) {
+ if (strpos($internalPath, $ignore) === 0) {
+ return;
+ }
+ }
+
$storageId = (int)$this->storage->getStorageCache()->getNumericId();
$parents = $this->getParents($internalPath);
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 72fe3a79792..657a8ba611a 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -368,7 +368,8 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$storage = $this;
}
if (!isset($storage->propagator)) {
- $storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection());
+ $config = \OC::$server->getSystemConfig();
+ $storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_' . $config->getValue('instanceid')]);
}
return $storage->propagator;
}