From 3c026b7cf601c0b83dd02436f17714fcf48cb9a8 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 16 Sep 2013 12:09:15 +0200 Subject: recreate an etag within the scanner if the cache contains an empty etag --- lib/files/cache/scanner.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 9d180820e9d..78cab6ed2da 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -97,13 +97,19 @@ class Scanner extends BasicEmitter { } $newData = $data; if ($reuseExisting and $cacheData = $this->cache->get($file)) { + // prevent empty etag + $etag = $cacheData['etag']; + if (empty($etag)) { + $etag = $data['etag']; + } + // only reuse data if the file hasn't explicitly changed if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; } if ($reuseExisting & self::REUSE_ETAG) { - $data['etag'] = $cacheData['etag']; + $data['etag'] = $etag; } } // Only update metadata that has changed -- cgit v1.2.3 From c8f9efeb94b136ed0906cefe946629a091796ff2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 16 Sep 2013 23:32:17 +0200 Subject: etag changes are now propagated up the file tree --- lib/files/cache/scanner.php | 14 ++++++++++++++ tests/lib/files/cache/scanner.php | 21 +++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 78cab6ed2da..fdbce0d51fe 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -99,8 +99,10 @@ class Scanner extends BasicEmitter { if ($reuseExisting and $cacheData = $this->cache->get($file)) { // prevent empty etag $etag = $cacheData['etag']; + $propagateETagChange = false; if (empty($etag)) { $etag = $data['etag']; + $propagateETagChange = true; } // only reuse data if the file hasn't explicitly changed @@ -110,6 +112,18 @@ class Scanner extends BasicEmitter { } if ($reuseExisting & self::REUSE_ETAG) { $data['etag'] = $etag; + if ($propagateETagChange) { + $parent = $file; + while ($parent !== '') { + $parent = dirname($parent); + if ($parent === '.') { + $parent = ''; + } + $parentCacheData = $this->cache->get($parent); + $parentCacheData['etag'] = $this->storage->getETag($parent); + $this->cache->put($parent, $parentCacheData); + } + } } } // Only update metadata that has changed diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index fa1b3406040..b137799bbcf 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -187,17 +187,26 @@ class Scanner extends \PHPUnit_Framework_TestCase { public function testETagRecreation() { $this->fillTestFolders(); - $this->scanner->scan(''); + $this->scanner->scan('folder/bar.txt'); // manipulate etag to simulate an empty etag $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); - $data['etag'] = ''; - $this->cache->put('', $data); + $data0 = $this->cache->get('folder/bar.txt'); + $data1 = $this->cache->get('folder'); + $data2 = $this->cache->get(''); + $data0['etag'] = ''; + $this->cache->put('folder/bar.txt', $data0); // rescan - $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); - $newData = $this->cache->get(''); - $this->assertNotEmpty($newData['etag']); + $this->scanner->scan('folder/bar.txt', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG); + + // verify cache content + $newData0 = $this->cache->get('folder/bar.txt'); + $newData1 = $this->cache->get('folder'); + $newData2 = $this->cache->get(''); + $this->assertNotEmpty($newData0['etag']); + $this->assertNotEquals($data1['etag'], $newData1['etag']); + $this->assertNotEquals($data2['etag'], $newData2['etag']); } -- cgit v1.2.3 From d84d548618651c0a66bd2696d6547b33ca6b8e87 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 20 Sep 2013 20:34:17 +0200 Subject: when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy --- lib/files/cache/scanner.php | 2 ++ tests/lib/files/cache/scanner.php | 1 + 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index fdbce0d51fe..d296c606865 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -121,6 +121,8 @@ class Scanner extends BasicEmitter { } $parentCacheData = $this->cache->get($parent); $parentCacheData['etag'] = $this->storage->getETag($parent); + // the boolean to int conversion is necessary to make pg happy + $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0; $this->cache->put($parent, $parentCacheData); } } diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index b137799bbcf..8112eada17c 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -195,6 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase { $data1 = $this->cache->get('folder'); $data2 = $this->cache->get(''); $data0['etag'] = ''; + $data0['encrypted'] = $data0['encrypted'] ? 1: 0; $this->cache->put('folder/bar.txt', $data0); // rescan -- cgit v1.2.3 From a2f82da572eaf9cebfe4de53b329af700d63e93f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 20 Sep 2013 23:52:05 +0200 Subject: Use update() instead of put(). --- lib/files/cache/scanner.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index d296c606865..3f1970fb4a2 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -121,9 +121,7 @@ class Scanner extends BasicEmitter { } $parentCacheData = $this->cache->get($parent); $parentCacheData['etag'] = $this->storage->getETag($parent); - // the boolean to int conversion is necessary to make pg happy - $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0; - $this->cache->put($parent, $parentCacheData); + $this->cache->update($parentCacheData['fileid'], $parentCacheData); } } } -- cgit v1.2.3 From 011bca7b7f0a67c9cf23773b625ee334db1e6c06 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 20 Sep 2013 23:53:02 +0200 Subject: Only update the etag. Do not re-submit any other unchanged data. --- lib/files/cache/scanner.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 3f1970fb4a2..fcb8ccdc8d5 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -120,8 +120,9 @@ class Scanner extends BasicEmitter { $parent = ''; } $parentCacheData = $this->cache->get($parent); - $parentCacheData['etag'] = $this->storage->getETag($parent); - $this->cache->update($parentCacheData['fileid'], $parentCacheData); + $this->cache->update($parentCacheData['fileid'], array( + 'etag' => $this->storage->getETag($parent), + )); } } } -- cgit v1.2.3 From 2a17025d537c41b9366c9592c985b911d9394337 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 21 Sep 2013 02:20:01 +0200 Subject: Move bool to int conversion to buildParts(), so it also happens for update(). --- lib/files/cache/cache.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 39e36684b7b..e69733727af 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -201,7 +201,6 @@ class Cache { $data['path'] = $file; $data['parent'] = $this->getParentId($file); $data['name'] = \OC_Util::basename($file); - $data['encrypted'] = isset($data['encrypted']) ? ((int)$data['encrypted']) : 0; list($queryParts, $params) = $this->buildParts($data); $queryParts[] = '`storage`'; @@ -265,6 +264,9 @@ class Cache { $params[] = $value; $queryParts[] = '`mtime`'; } + } elseif ($name === 'encrypted') { + // Boolean to integer conversion + $value = $value ? 1 : 0; } $params[] = $value; $queryParts[] = '`' . $name . '`'; -- cgit v1.2.3