diff options
35 files changed, 257 insertions, 40 deletions
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 73f16b26ea4..7e5d92ee2b0 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -16,7 +16,7 @@ OC.L10N.register( "Pending shares" : "Predmeti za souporabo na čakanju", "No pending shares" : "Ni nobenega predmeta za souporabo na čakanju", "Shares you have received but not confirmed will show up here" : "To so mape in datoteke, ki ste jih že prejeli v souporabo, vendar ne tudi potrdili.", - "Shares" : "‧ V Souporabi ‧", + "Shares" : "‧ V Souporabi", "No shares" : "Ni še vpisanih mest souporabe", "Shares will show up here" : "Predmeti v souporabi bodo prikazani na tem mestu.", "Restore" : "Obnovi", diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index f80ce4e6e6a..05fd8e7d7e2 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -14,7 +14,7 @@ "Pending shares" : "Predmeti za souporabo na čakanju", "No pending shares" : "Ni nobenega predmeta za souporabo na čakanju", "Shares you have received but not confirmed will show up here" : "To so mape in datoteke, ki ste jih že prejeli v souporabo, vendar ne tudi potrdili.", - "Shares" : "‧ V Souporabi ‧", + "Shares" : "‧ V Souporabi", "No shares" : "Ni še vpisanih mest souporabe", "Shares will show up here" : "Predmeti v souporabi bodo prikazani na tem mestu.", "Restore" : "Obnovi", diff --git a/apps/files_versions/lib/Command/CleanUp.php b/apps/files_versions/lib/Command/CleanUp.php index b51959e9532..d7bb4caa483 100644 --- a/apps/files_versions/lib/Command/CleanUp.php +++ b/apps/files_versions/lib/Command/CleanUp.php @@ -5,6 +5,7 @@ * @author Björn Schießle <bjoern@schiessle.org> * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author Joas Schilling <coding@schilljs.com> + * @author Daniel Rudolf <nextcloud.com@daniel-rudolf.de> * * @license AGPL-3.0 * @@ -29,6 +30,7 @@ use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class CleanUp extends Command { @@ -57,17 +59,35 @@ class CleanUp extends Command { 'user_id', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'delete versions of the given user(s), if no user is given all versions will be deleted' + ) + ->addOption( + 'path', + 'p', + InputOption::VALUE_REQUIRED, + 'only delete versions of this path, e.g. --path="/alice/files/Music"' ); } protected function execute(InputInterface $input, OutputInterface $output): int { $users = $input->getArgument('user_id'); + + $path = $input->getOption('path'); + if ($path) { + if (!preg_match('#^/([^/]+)/files(/.*)?$#', $path, $pathMatches)) { + $output->writeln("<error>Invalid path given</error>"); + return 1; + } + + $users = [ $pathMatches[1] ]; + $path = trim($pathMatches[2], '/'); + } + if (!empty($users)) { foreach ($users as $user) { if ($this->userManager->userExists($user)) { $output->writeln("Delete versions of <info>$user</info>"); - $this->deleteVersions($user); + $this->deleteVersions($user, $path); } else { $output->writeln("<error>Unknown user $user</error>"); return 1; @@ -103,13 +123,16 @@ class CleanUp extends Command { /** * delete versions for the given user * - * @param string $user + * @param string $user + * @param string|null $path */ - protected function deleteVersions($user) { + protected function deleteVersions(string $user, string $path = null): void { \OC_Util::tearDownFS(); \OC_Util::setupFS($user); - if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { - $this->rootFolder->get('/' . $user . '/files_versions')->delete(); + + $fullPath = '/' . $user . '/files_versions' . ($path ? '/' . $path : ''); + if ($this->rootFolder->nodeExists($fullPath)) { + $this->rootFolder->get($fullPath)->delete(); } } } diff --git a/apps/settings/l10n/cs.js b/apps/settings/l10n/cs.js index a67e6901e9b..8ce508156e2 100644 --- a/apps/settings/l10n/cs.js +++ b/apps/settings/l10n/cs.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "Osobní", "Administration" : "Správa", "Additional settings" : "Další nastavení", + "Admin privileges" : "Oprávnění správce", "Groupware" : "Software pro podporu spolupráce", "Overview" : "Přehled", "Basic settings" : "Základní nastavení", diff --git a/apps/settings/l10n/cs.json b/apps/settings/l10n/cs.json index fbda23c68db..aad97638084 100644 --- a/apps/settings/l10n/cs.json +++ b/apps/settings/l10n/cs.json @@ -112,6 +112,7 @@ "Personal" : "Osobní", "Administration" : "Správa", "Additional settings" : "Další nastavení", + "Admin privileges" : "Oprávnění správce", "Groupware" : "Software pro podporu spolupráce", "Overview" : "Přehled", "Basic settings" : "Základní nastavení", diff --git a/apps/settings/l10n/de.js b/apps/settings/l10n/de.js index c209758fcf3..9b6fdcbd5bc 100644 --- a/apps/settings/l10n/de.js +++ b/apps/settings/l10n/de.js @@ -198,7 +198,7 @@ OC.L10N.register( "Device" : "Gerät", "Last activity" : "Letzte Aktivität", "Devices & sessions" : "Geräte & Sitzungen", - "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto angemeldete Web-, Desktop- und Mobil-Clients.", + "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto angemeldete Web-, Desktop- und Mobil-Clients:", "Do you really want to wipe your data from this device?" : "Möchtest Du wirklich alle Daten von diesem Gerät löschen?", "Confirm wipe" : "Löschen bestätigen", "Error while creating device token" : "Fehler beim Erstellen des Geräte-Tokens", diff --git a/apps/settings/l10n/de.json b/apps/settings/l10n/de.json index 4360ab5676d..dccccf54ca0 100644 --- a/apps/settings/l10n/de.json +++ b/apps/settings/l10n/de.json @@ -196,7 +196,7 @@ "Device" : "Gerät", "Last activity" : "Letzte Aktivität", "Devices & sessions" : "Geräte & Sitzungen", - "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto angemeldete Web-, Desktop- und Mobil-Clients.", + "Web, desktop and mobile clients currently logged in to your account." : "Aktuell in Deinem Konto angemeldete Web-, Desktop- und Mobil-Clients:", "Do you really want to wipe your data from this device?" : "Möchtest Du wirklich alle Daten von diesem Gerät löschen?", "Confirm wipe" : "Löschen bestätigen", "Error while creating device token" : "Fehler beim Erstellen des Geräte-Tokens", diff --git a/apps/settings/l10n/de_DE.js b/apps/settings/l10n/de_DE.js index 9aa4158e642..eb90012eb70 100644 --- a/apps/settings/l10n/de_DE.js +++ b/apps/settings/l10n/de_DE.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "Persönlich", "Administration" : "Verwaltung", "Additional settings" : "Zusätzliche Einstellungen", + "Admin privileges" : "Administratorrechte", "Groupware" : "Groupware", "Overview" : "Übersicht", "Basic settings" : "Grundeinstellungen", diff --git a/apps/settings/l10n/de_DE.json b/apps/settings/l10n/de_DE.json index d496f108a60..3fe5add5ee5 100644 --- a/apps/settings/l10n/de_DE.json +++ b/apps/settings/l10n/de_DE.json @@ -112,6 +112,7 @@ "Personal" : "Persönlich", "Administration" : "Verwaltung", "Additional settings" : "Zusätzliche Einstellungen", + "Admin privileges" : "Administratorrechte", "Groupware" : "Groupware", "Overview" : "Übersicht", "Basic settings" : "Grundeinstellungen", diff --git a/apps/settings/l10n/eu.js b/apps/settings/l10n/eu.js index c579fd1921f..71215194028 100644 --- a/apps/settings/l10n/eu.js +++ b/apps/settings/l10n/eu.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "Pertsonala", "Administration" : "Administrazioa", "Additional settings" : "Ezarpen gehiago", + "Admin privileges" : "Administratzaile pribilegioak", "Groupware" : "Taldelanerako tresnak", "Overview" : "Ikuspegi orokorra", "Basic settings" : "Oinarrizko ezarpenak", diff --git a/apps/settings/l10n/eu.json b/apps/settings/l10n/eu.json index a2751128eee..2a1d2f0f951 100644 --- a/apps/settings/l10n/eu.json +++ b/apps/settings/l10n/eu.json @@ -112,6 +112,7 @@ "Personal" : "Pertsonala", "Administration" : "Administrazioa", "Additional settings" : "Ezarpen gehiago", + "Admin privileges" : "Administratzaile pribilegioak", "Groupware" : "Taldelanerako tresnak", "Overview" : "Ikuspegi orokorra", "Basic settings" : "Oinarrizko ezarpenak", diff --git a/apps/settings/l10n/pl.js b/apps/settings/l10n/pl.js index eb2614e4541..e28ab0eebea 100644 --- a/apps/settings/l10n/pl.js +++ b/apps/settings/l10n/pl.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "Osobiste", "Administration" : "Administracja", "Additional settings" : "Ustawienia dodatkowe", + "Admin privileges" : "Uprawnienia administratora", "Groupware" : "Praca grupowa", "Overview" : "Przegląd", "Basic settings" : "Ustawienia podstawowe", diff --git a/apps/settings/l10n/pl.json b/apps/settings/l10n/pl.json index bbbccf861d0..2d6f6f303e8 100644 --- a/apps/settings/l10n/pl.json +++ b/apps/settings/l10n/pl.json @@ -112,6 +112,7 @@ "Personal" : "Osobiste", "Administration" : "Administracja", "Additional settings" : "Ustawienia dodatkowe", + "Admin privileges" : "Uprawnienia administratora", "Groupware" : "Praca grupowa", "Overview" : "Przegląd", "Basic settings" : "Ustawienia podstawowe", diff --git a/apps/settings/l10n/sk.js b/apps/settings/l10n/sk.js index f2d3cffd0ab..333068df230 100644 --- a/apps/settings/l10n/sk.js +++ b/apps/settings/l10n/sk.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "Osobné", "Administration" : "Administrácia", "Additional settings" : "Ďalšie nastavenia", + "Admin privileges" : "Oprávnenie správcu", "Groupware" : "Groupware", "Overview" : "Prehľad", "Basic settings" : "Základné nastavenia", diff --git a/apps/settings/l10n/sk.json b/apps/settings/l10n/sk.json index 1c761334b88..ecc654f8ea7 100644 --- a/apps/settings/l10n/sk.json +++ b/apps/settings/l10n/sk.json @@ -112,6 +112,7 @@ "Personal" : "Osobné", "Administration" : "Administrácia", "Additional settings" : "Ďalšie nastavenia", + "Admin privileges" : "Oprávnenie správcu", "Groupware" : "Groupware", "Overview" : "Prehľad", "Basic settings" : "Základné nastavenia", diff --git a/apps/settings/l10n/zh_CN.js b/apps/settings/l10n/zh_CN.js index de28df21422..52f686855d9 100644 --- a/apps/settings/l10n/zh_CN.js +++ b/apps/settings/l10n/zh_CN.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "个人", "Administration" : "管理", "Additional settings" : "其他设置", + "Admin privileges" : "管理员特权", "Groupware" : "组件", "Overview" : "概览", "Basic settings" : "基本设置", diff --git a/apps/settings/l10n/zh_CN.json b/apps/settings/l10n/zh_CN.json index 9f374103a87..d56a53f07ec 100644 --- a/apps/settings/l10n/zh_CN.json +++ b/apps/settings/l10n/zh_CN.json @@ -112,6 +112,7 @@ "Personal" : "个人", "Administration" : "管理", "Additional settings" : "其他设置", + "Admin privileges" : "管理员特权", "Groupware" : "组件", "Overview" : "概览", "Basic settings" : "基本设置", diff --git a/apps/settings/l10n/zh_TW.js b/apps/settings/l10n/zh_TW.js index 0ada690bb4b..334fd77d760 100644 --- a/apps/settings/l10n/zh_TW.js +++ b/apps/settings/l10n/zh_TW.js @@ -114,6 +114,7 @@ OC.L10N.register( "Personal" : "個人", "Administration" : "管理", "Additional settings" : "其他設定", + "Admin privileges" : "管理員權限", "Groupware" : "協作應用程式", "Overview" : "概覽", "Basic settings" : "基本設定", diff --git a/apps/settings/l10n/zh_TW.json b/apps/settings/l10n/zh_TW.json index d1b9fd87d7e..52e6d713e47 100644 --- a/apps/settings/l10n/zh_TW.json +++ b/apps/settings/l10n/zh_TW.json @@ -112,6 +112,7 @@ "Personal" : "個人", "Administration" : "管理", "Additional settings" : "其他設定", + "Admin privileges" : "管理員權限", "Groupware" : "協作應用程式", "Overview" : "概覽", "Basic settings" : "基本設定", diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 78f9d8d869e..0da1c8fc179 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -3822,14 +3822,6 @@ <code>$this->e->getCode()</code> </InvalidScalarArgument> </file> - <file src="lib/private/Files/Storage/Flysystem.php"> - <ParamNameMismatch occurrences="4"> - <code>$source</code> - <code>$source</code> - <code>$target</code> - <code>$target</code> - </ParamNameMismatch> - </file> <file src="lib/private/Files/Storage/Local.php"> <ImplicitToStringCast occurrences="1"> <code>$file</code> @@ -4466,9 +4458,6 @@ <NullableReturnStatement occurrences="1"> <code>$this->collectionName</code> </NullableReturnStatement> - <RedundantCondition occurrences="1"> - <code>$file !== false</code> - </RedundantCondition> </file> <file src="lib/private/Search.php"> <RedundantCondition occurrences="1"> @@ -5035,18 +5024,12 @@ <InvalidPropertyAssignmentValue occurrences="1"> <code>$resource</code> </InvalidPropertyAssignmentValue> - <InvalidReturnType occurrences="1"> - <code>bool</code> - </InvalidReturnType> <InvalidScalarArgument occurrences="4"> <code>$this->bitDepth</code> <code>$x</code> <code>$y</code> <code>90</code> </InvalidScalarArgument> - <MismatchingDocblockReturnType occurrences="1"> - <code>bool</code> - </MismatchingDocblockReturnType> <RedundantCondition occurrences="1"> <code>$isWritable</code> </RedundantCondition> diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 6c887afda97..823eef1fde3 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1120,6 +1120,9 @@ return array( 'OC\\Files\\ObjectStore\\Swift' => $baseDir . '/lib/private/Files/ObjectStore/Swift.php', 'OC\\Files\\ObjectStore\\SwiftFactory' => $baseDir . '/lib/private/Files/ObjectStore/SwiftFactory.php', 'OC\\Files\\ObjectStore\\SwiftV2CachingAuthService' => $baseDir . '/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php', + 'OC\\Files\\Search\\QueryOptimizer\\PathPrefixOptimizer' => $baseDir . '/lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php', + 'OC\\Files\\Search\\QueryOptimizer\\QueryOptimizer' => $baseDir . '/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php', + 'OC\\Files\\Search\\QueryOptimizer\\QueryOptimizerStep' => $baseDir . '/lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php', 'OC\\Files\\Search\\SearchBinaryOperator' => $baseDir . '/lib/private/Files/Search/SearchBinaryOperator.php', 'OC\\Files\\Search\\SearchComparison' => $baseDir . '/lib/private/Files/Search/SearchComparison.php', 'OC\\Files\\Search\\SearchOrder' => $baseDir . '/lib/private/Files/Search/SearchOrder.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index fc3b1ca10ca..81cd22b0570 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1149,6 +1149,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Files\\ObjectStore\\Swift' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Swift.php', 'OC\\Files\\ObjectStore\\SwiftFactory' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/SwiftFactory.php', 'OC\\Files\\ObjectStore\\SwiftV2CachingAuthService' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php', + 'OC\\Files\\Search\\QueryOptimizer\\PathPrefixOptimizer' => __DIR__ . '/../../..' . '/lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php', + 'OC\\Files\\Search\\QueryOptimizer\\QueryOptimizer' => __DIR__ . '/../../..' . '/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php', + 'OC\\Files\\Search\\QueryOptimizer\\QueryOptimizerStep' => __DIR__ . '/../../..' . '/lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php', 'OC\\Files\\Search\\SearchBinaryOperator' => __DIR__ . '/../../..' . '/lib/private/Files/Search/SearchBinaryOperator.php', 'OC\\Files\\Search\\SearchComparison' => __DIR__ . '/../../..' . '/lib/private/Files/Search/SearchComparison.php', 'OC\\Files\\Search\\SearchOrder' => __DIR__ . '/../../..' . '/lib/private/Files/Search/SearchOrder.php', diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index 683b580d9d1..e065e95e4fd 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -25,6 +25,7 @@ */ namespace OC\Files\Cache; +use OC\Files\Search\QueryOptimizer\QueryOptimizer; use OC\Files\Search\SearchBinaryOperator; use OC\SystemConfig; use OCP\Files\Cache\ICache; @@ -47,19 +48,23 @@ class QuerySearchHelper { private $logger; /** @var SearchBuilder */ private $searchBuilder; + /** @var QueryOptimizer */ + private $queryOptimizer; public function __construct( IMimeTypeLoader $mimetypeLoader, IDBConnection $connection, SystemConfig $systemConfig, ILogger $logger, - SearchBuilder $searchBuilder + SearchBuilder $searchBuilder, + QueryOptimizer $queryOptimizer ) { $this->mimetypeLoader = $mimetypeLoader; $this->connection = $connection; $this->systemConfig = $systemConfig; $this->logger = $logger; $this->searchBuilder = $searchBuilder; + $this->queryOptimizer = $queryOptimizer; } protected function getQueryBuilder() { @@ -115,15 +120,17 @@ class QuerySearchHelper { ->andWhere($builder->expr()->eq('tag.uid', $builder->createNamedParameter($user->getUID()))); } - $searchExpr = $this->searchBuilder->searchOperatorToDBExpr($builder, $searchQuery->getSearchOperation()); - if ($searchExpr) { - $query->andWhere($searchExpr); - } - $storageFilters = array_values(array_map(function (ICache $cache) { return $cache->getQueryFilterForStorage(); }, $caches)); - $query->andWhere($this->searchBuilder->searchOperatorToDBExpr($builder, new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, $storageFilters))); + $storageFilter = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, $storageFilters); + $filter = new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND, [$searchQuery->getSearchOperation(), $storageFilter]); + $this->queryOptimizer->processOperator($filter); + + $searchExpr = $this->searchBuilder->searchOperatorToDBExpr($builder, $filter); + if ($searchExpr) { + $query->andWhere($searchExpr); + } $this->searchBuilder->addSearchOrdersToQuery($query, $searchQuery->getOrder()); diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index be38e5622bf..003d3ac15e7 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -87,7 +87,7 @@ class SearchBuilder { /** * @param IQueryBuilder $builder - * @param ISearchOperator $operator + * @param ISearchOperator[] $operators */ public function searchOperatorArrayToDBExprArray(IQueryBuilder $builder, array $operators) { return array_filter(array_map(function ($operator) use ($builder) { @@ -97,6 +97,7 @@ class SearchBuilder { public function searchOperatorToDBExpr(IQueryBuilder $builder, ISearchOperator $operator) { $expr = $builder->expr(); + if ($operator instanceof ISearchBinaryOperator) { if (count($operator->getArguments()) === 0) { return null; @@ -166,7 +167,7 @@ class SearchBuilder { $field = 'tag.category'; } elseif ($field === 'fileid') { $field = 'file.fileid'; - } elseif ($field === 'path' && $type === ISearchComparison::COMPARE_EQUAL) { + } elseif ($field === 'path' && $type === ISearchComparison::COMPARE_EQUAL && $operator->getQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, true)) { $field = 'path_hash'; $value = md5((string)$value); } diff --git a/lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php b/lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php new file mode 100644 index 00000000000..eea4b430578 --- /dev/null +++ b/lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php @@ -0,0 +1,58 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2021 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\Search\QueryOptimizer; + +use OCP\Files\Search\ISearchBinaryOperator; +use OCP\Files\Search\ISearchComparison; +use OCP\Files\Search\ISearchOperator; + +class PathPrefixOptimizer extends QueryOptimizerStep { + public function escapeLikeParameter(string $param): string { + return addcslashes($param, '\\_%'); + } + + public function processOperator(ISearchOperator &$operator) { + // normally the `path = "$prefix"` search query part of the prefix filter would be generated as an `path_hash = md5($prefix)` sql query + // since the `path_hash` sql column usually provides much faster querying that selecting on the `path` sql column + // + // however, since we're already doing a filter on the `path` column in the form of `path LIKE "$prefix/%"` + // generating a `path = "$prefix"` sql query lets the database handle use the same column for both expressions and potentially use the same index + if ($operator instanceof ISearchBinaryOperator && $operator->getType() === ISearchBinaryOperator::OPERATOR_OR && count($operator->getArguments()) == 2) { + $a = $operator->getArguments()[0]; + $b = $operator->getArguments()[1]; + if ($a instanceof ISearchComparison && $b instanceof ISearchComparison && $a->getField() === 'path' && $b->getField() === 'path') { + if ($a->getType() === ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE && $b->getType() === ISearchComparison::COMPARE_EQUAL + && $a->getValue() === $this->escapeLikeParameter($b->getValue()) . '/%') { + $b->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, false); + } + if ($b->getType() === ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE && $a->getType() === ISearchComparison::COMPARE_EQUAL + && $b->getValue() === $this->escapeLikeParameter($a->getValue()) . '/%') { + $a->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, false); + } + } + } + + parent::processOperator($operator); + } +} diff --git a/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php b/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php new file mode 100644 index 00000000000..1635e50335a --- /dev/null +++ b/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php @@ -0,0 +1,45 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2021 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\Search\QueryOptimizer; + +use OCP\Files\Search\ISearchOperator; + +class QueryOptimizer { + /** @var QueryOptimizerStep[] */ + private $steps = []; + + public function __construct( + PathPrefixOptimizer $pathPrefixOptimizer + ) { + $this->steps = [ + $pathPrefixOptimizer + ]; + } + + public function processOperator(ISearchOperator $operator) { + foreach ($this->steps as $step) { + $step->processOperator($operator); + } + } +} diff --git a/lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php b/lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php new file mode 100644 index 00000000000..4f683899723 --- /dev/null +++ b/lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php @@ -0,0 +1,37 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2021 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\Search\QueryOptimizer; + +use OCP\Files\Search\ISearchBinaryOperator; +use OCP\Files\Search\ISearchOperator; + +class QueryOptimizerStep { + public function processOperator(ISearchOperator &$operator) { + if ($operator instanceof ISearchBinaryOperator) { + foreach ($operator->getArguments() as $argument) { + $this->processOperator($argument); + } + } + } +} diff --git a/lib/private/Files/Search/SearchBinaryOperator.php b/lib/private/Files/Search/SearchBinaryOperator.php index 3ebbae06e3e..d7bba8f1b4e 100644 --- a/lib/private/Files/Search/SearchBinaryOperator.php +++ b/lib/private/Files/Search/SearchBinaryOperator.php @@ -30,6 +30,7 @@ class SearchBinaryOperator implements ISearchBinaryOperator { private $type; /** @var ISearchOperator[] */ private $arguments; + private $hints = []; /** * SearchBinaryOperator constructor. @@ -55,4 +56,12 @@ class SearchBinaryOperator implements ISearchBinaryOperator { public function getArguments() { return $this->arguments; } + + public function getQueryHint(string $name, $default) { + return $this->hints[$name] ?? $default; + } + + public function setQueryHint(string $name, $value): void { + $this->hints[$name] = $value; + } } diff --git a/lib/private/Files/Search/SearchComparison.php b/lib/private/Files/Search/SearchComparison.php index 83d8904776a..ab5a4d0ed73 100644 --- a/lib/private/Files/Search/SearchComparison.php +++ b/lib/private/Files/Search/SearchComparison.php @@ -31,6 +31,7 @@ class SearchComparison implements ISearchComparison { private $field; /** @var string|integer|\DateTime */ private $value; + private $hints = []; /** * SearchComparison constructor. @@ -65,4 +66,12 @@ class SearchComparison implements ISearchComparison { public function getValue() { return $this->value; } + + public function getQueryHint(string $name, $default) { + return $this->hints[$name] ?? $default; + } + + public function setQueryHint(string $name, $value): void { + $this->hints[$name] = $value; + } } diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index ccd331f515f..eea04bd8676 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -568,8 +568,11 @@ class Local extends \OC\Files\Storage\Common { public function writeStream(string $path, $stream, int $size = null): int { $result = $this->file_put_contents($path, $stream); + if (is_resource($stream)) { + fclose($stream); + } if ($result === false) { - throw new GenericFileException("Failed write steam to $path"); + throw new GenericFileException("Failed write stream to $path"); } else { return $result; } diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 3c65cdbc8f6..e44b7afe6fd 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -926,10 +926,10 @@ class Encryption extends Wrapper { } $result = []; - + // first check if it is an encrypted file at all // We would do query to filecache only if we know that entry in filecache exists - + $info = $this->getCache()->get($path); if (isset($info['encrypted']) && $info['encrypted'] === true) { $firstBlock = $this->readFirstBlock($path); @@ -1033,6 +1033,7 @@ class Encryption extends Wrapper { // always fall back to fopen $target = $this->fopen($path, 'w'); [$count, $result] = \OC_Helper::streamCopy($stream, $target); + fclose($stream); fclose($target); return $count; } diff --git a/lib/private/Security/VerificationToken/CleanUpJob.php b/lib/private/Security/VerificationToken/CleanUpJob.php index 331172898ec..be9d24ece45 100644 --- a/lib/private/Security/VerificationToken/CleanUpJob.php +++ b/lib/private/Security/VerificationToken/CleanUpJob.php @@ -59,7 +59,7 @@ class CleanUpJob extends \OCP\BackgroundJob\Job { public function setArgument($argument) { parent::setArgument($argument); - $args = \json_decode($argument); + $args = \json_decode($argument, true); $this->userId = (string)$args['userId']; $this->subject = (string)$args['subject']; $this->pwdPrefix = (string)$args['pp']; diff --git a/lib/public/Files/Search/ISearchComparison.php b/lib/public/Files/Search/ISearchComparison.php index 36d10824653..8ebaeced304 100644 --- a/lib/public/Files/Search/ISearchComparison.php +++ b/lib/public/Files/Search/ISearchComparison.php @@ -35,6 +35,8 @@ interface ISearchComparison extends ISearchOperator { public const COMPARE_LIKE = 'like'; public const COMPARE_LIKE_CASE_SENSITIVE = 'clike'; + public const HINT_PATH_EQ_HASH = 'path_eq_hash'; // transform `path = "$path"` into `path_hash = md5("$path")`, on by default + /** * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants * diff --git a/lib/public/Files/Search/ISearchOperator.php b/lib/public/Files/Search/ISearchOperator.php index bcf2fb86573..1799b97c1ca 100644 --- a/lib/public/Files/Search/ISearchOperator.php +++ b/lib/public/Files/Search/ISearchOperator.php @@ -26,4 +26,22 @@ namespace OCP\Files\Search; * @since 12.0.0 */ interface ISearchOperator { + /** + * Get a query builder hint by name + * + * @param string $name + * @param $default + * @return mixed + * @since 23.0.0 + */ + public function getQueryHint(string $name, $default); + + /** + * Get a query builder hint + * + * @param string $name + * @param $value + * @since 23.0.0 + */ + public function setQueryHint(string $name, $value): void; } diff --git a/tests/lib/Files/Storage/Storage.php b/tests/lib/Files/Storage/Storage.php index ecc2bb50538..9fae1a8484a 100644 --- a/tests/lib/Files/Storage/Storage.php +++ b/tests/lib/Files/Storage/Storage.php @@ -658,6 +658,7 @@ abstract class Storage extends \Test\TestCase { $storage->writeStream('test.txt', $source); $this->assertTrue($storage->file_exists('test.txt')); - $this->assertEquals(file_get_contents($textFile), $storage->file_get_contents('test.txt')); + $this->assertStringEqualsFile($textFile, $storage->file_get_contents('test.txt')); + $this->assertEquals('resource (closed)', gettype($source)); } } |