hopefully improve propagation of 'path eq hash' hint into 'in' statem…

…ents Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Feb 5, 2024 · aba15a1 · aba15a1
1 parent 4f8db37
commit aba15a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/private/Files/Search/QueryOptimizer/FlattenNestedBool.php b/lib/private/Files/Search/QueryOptimizer/FlattenNestedBool.php
@@ -26,5 +26,4 @@ public function processOperator(ISearchOperator &$operator) {
 		}
 		parent::processOperator($operator);
 	}
-
 }
diff --git a/lib/private/Files/Search/QueryOptimizer/OrEqualsToIn.php b/lib/private/Files/Search/QueryOptimizer/OrEqualsToIn.php
@@ -29,7 +29,10 @@ public function processOperator(ISearchOperator &$operator): bool {
 						return $value;
 					}, $group);
 					$in = new SearchComparison(ISearchComparison::COMPARE_IN, $field, $values);
-					$in->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, $group[0]->getQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, true));
+					$pathEqHash = array_reduce($group, function ($pathEqHash, ISearchComparison $comparison) {
+						return $comparison->getQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, true) && $pathEqHash;
+					}, true);
+					$in->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, $pathEqHash);
 					return $in;
 				} else {
 					return $group[0];
@@ -57,8 +60,7 @@ private function groupEqualsComparisonsByField(array $operators): array {
 		$result = [];
 		foreach ($operators as $operator) {
 			if ($operator instanceof ISearchComparison && $operator->getType() === ISearchComparison::COMPARE_EQUAL) {
-				$key = $operator->getField() . $operator->getQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, true);
-				$result[$key][] = $operator;
+				$result[$operator->getField()][] = $operator;
 			} else {
 				$result[] = [$operator];
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,4 @@ public function processOperator(ISearchOperator &$operator) { @@
     		}
     		parent::processOperator($operator);
     	}
     }