diff options
author | Robin Appelman <robin@icewind.nl> | 2022-03-25 17:15:02 +0300 |
---|---|---|
committer | Robin Appelman <robin@icewind.nl> | 2022-04-04 17:48:18 +0300 |
commit | 89d3cd144746eb9004f45a718986c86451204e12 (patch) | |
tree | 6ec359e8ab871342ca7a69d6603f0b372f75af18 /lib/private/Files/Cache | |
parent | 57ecf55e0f91f28b7b1665bb9765a1f58a285aca (diff) |
don't overwrite the etag from storage backends that already provide "good" etags
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files/Cache')
-rw-r--r-- | lib/private/Files/Cache/Propagator.php | 6 | ||||
-rw-r--r-- | lib/private/Files/Cache/Scanner.php | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php index f8b2548a747..0d2bc9ab078 100644 --- a/lib/private/Files/Cache/Propagator.php +++ b/lib/private/Files/Cache/Propagator.php @@ -21,10 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Files\Cache; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\Files\Cache\IPropagator; +use OCP\Files\Storage\IReliableEtagStorage; use OCP\IDBConnection; /** @@ -91,9 +93,11 @@ class Propagator implements IPropagator { $builder->update('filecache') ->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT))) - ->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR)) ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) ->andWhere($builder->expr()->in('path_hash', $hashParams)); + if (!$this->storage->instanceOfStorage(IReliableEtagStorage::class)) { + $builder->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR)); + } $builder->execute(); diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index af412dd129b..dc36ad5b8ca 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -41,6 +41,7 @@ use OC\Files\Storage\Wrapper\Encoding; use OC\Hooks\BasicEmitter; use OCP\Files\Cache\IScanner; use OCP\Files\ForbiddenException; +use OCP\Files\Storage\IReliableEtagStorage; use OCP\ILogger; use OCP\Lock\ILockingProvider; @@ -208,7 +209,7 @@ class Scanner extends BasicEmitter implements IScanner { if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; } - if ($reuseExisting & self::REUSE_ETAG) { + if ($reuseExisting & self::REUSE_ETAG && !$this->storage->instanceOfStorage(IReliableEtagStorage::class)) { $data['etag'] = $etag; } } |