add extra flatten step to improve "or eq" -> "in" optimization

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Feb 7, 2024 · 18b5963 · 18b5963
1 parent 3547a4d
commit 18b5963
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php b/lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php
@@ -35,6 +35,7 @@ public function __construct() {
 			new PathPrefixOptimizer(),
 			new MergeDistributiveOperations(),
 			new FlattenSingleArgumentBinaryOperation(),
+			new FlattenNestedBool(),
 			new OrEqualsToIn(),
 			new FlattenNestedBool(),
 			new SplitLargeIn(),

diff --git a/tests/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php b/tests/lib/Files/Search/QueryOptimizer/OrEqualsToInTest.php
@@ -83,16 +83,16 @@ public function testOrSomeEq() {
 			ISearchBinaryOperator::OPERATOR_OR,
 			[
 				new SearchComparison(ISearchComparison::COMPARE_EQUAL, "path", "foo"),
+				new SearchComparison(ISearchComparison::COMPARE_LIKE, "path", "foo%"),
 				new SearchComparison(ISearchComparison::COMPARE_EQUAL, "path", "bar"),
-				new SearchComparison(ISearchComparison::COMPARE_LIKE, "path", "asd%"),
 			]
 		);
-		$this->assertEquals('(path eq "foo" or path eq "bar" or path like "asd%")', $operator->__toString());
+		$this->assertEquals('(path eq "foo" or path like "foo%" or path eq "bar")', $operator->__toString());
 
 		$this->optimizer->processOperator($operator);
 		$this->simplifier->processOperator($operator);
 
-		$this->assertEquals('(path in ["foo","bar"] or path like "asd%")', $operator->__toString());
+		$this->assertEquals('(path in ["foo","bar"] or path like "foo%")', $operator->__toString());
 	}
 
 	public function testOrsInside() {