perform file search in a single query

Signed-off-by: Robin Appelman <robin@icewind.nl>

3 files changed, 11 insertions, 9 deletions

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 592e71b2b70..c2f426acd2d 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -803,7 +803,7 @@ class Cache implements ICache {
 	}
 
 	public function searchQuery(ISearchQuery $searchQuery) {
-		return $this->querySearchHelper->searchInCaches($searchQuery, [$this]);
+		return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));
 	}
 
 	/**
diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
index 6bf3835df6c..64a888f492c 100644
--- a/lib/private/Files/Cache/QuerySearchHelper.php
+++ b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -29,6 +29,7 @@ use OC\Files\Search\SearchBinaryOperator;
 use OC\SystemConfig;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Cache\ICache;
+use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
@@ -254,9 +255,10 @@ class QuerySearchHelper {
 	}
 
 	/**
+	 * @template T of array-key
 	 * @param ISearchQuery $searchQuery
-	 * @param ICache[] $caches
-	 * @return CacheEntry[]
+	 * @param array<T, ICache> $caches
+	 * @return array<T, ICacheEntry[]>
 	 */
 	public function searchInCaches(ISearchQuery $searchQuery, array $caches): array {
 		// search in multiple caches at once by creating one query in the following format
@@ -297,9 +299,9 @@ class QuerySearchHelper {
 			$query->andWhere($searchExpr);
 		}
 
-		$storageFilters = array_map(function (ICache $cache) {
+		$storageFilters = array_values(array_map(function (ICache $cache) {
 			return $cache->getQueryFilterForStorage();
-		}, $caches);
+		}, $caches));
 		$query->andWhere($this->searchOperatorToDBExpr($builder, new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, $storageFilters)));
 
 		if ($searchQuery->limitToHome() && ($this instanceof HomeCache)) {
@@ -325,12 +327,12 @@ class QuerySearchHelper {
 		$result->closeCursor();
 
 		// loop trough all caches for each result to see if the result matches that storage
-		$results = [];
+		$results = array_fill_keys(array_keys($caches), []);
 		foreach ($rawEntries as $rawEntry) {
-			foreach ($caches as $cache) {
+			foreach ($caches as $cacheKey => $cache) {
 				$entry = $cache->getCacheEntryFromSearchResult($rawEntry);
 				if ($entry) {
-					$results[] = $entry;
+					$results[$cacheKey][] = $entry;
 				}
 			}
 		}
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index 70f05103865..e25282942b2 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -226,7 +226,7 @@ class CacheWrapper extends Cache {
 	}
 
 	public function searchQuery(ISearchQuery $searchQuery) {
-		return $this->querySearchHelper->searchInCaches($searchQuery, [$this]);
+		return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));
 	}
 
 	/**