nextcloud / server

lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php

Indentation +26 added lines, -26 removed lines

@@ -27,31 +27,31 @@
 use OCP\Files\Search\ISearchOperator;
 
 class QueryOptimizerStep {
-	/**
-	 * Allow optimizer steps to inspect the entire query before starting processing
-	 *
-	 * @param ISearchOperator $operator
-	 * @return void
-	 */
-	public function inspectOperator(ISearchOperator $operator): void {
-		if ($operator instanceof ISearchBinaryOperator) {
-			foreach ($operator->getArguments() as $argument) {
-				$this->inspectOperator($argument);
-			}
-		}
-	}
+    /**
+     * Allow optimizer steps to inspect the entire query before starting processing
+     *
+     * @param ISearchOperator $operator
+     * @return void
+     */
+    public function inspectOperator(ISearchOperator $operator): void {
+        if ($operator instanceof ISearchBinaryOperator) {
+            foreach ($operator->getArguments() as $argument) {
+                $this->inspectOperator($argument);
+            }
+        }
+    }
 
-	/**
-	 * Allow optimizer steps to modify query operators
-	 *
-	 * @param ISearchOperator $operator
-	 * @return void
-	 */
-	public function processOperator(ISearchOperator &$operator) {
-		if ($operator instanceof ISearchBinaryOperator) {
-			foreach ($operator->getArguments() as $argument) {
-				$this->processOperator($argument);
-			}
-		}
-	}
+    /**
+     * Allow optimizer steps to modify query operators
+     *
+     * @param ISearchOperator $operator
+     * @return void
+     */
+    public function processOperator(ISearchOperator &$operator) {
+        if ($operator instanceof ISearchBinaryOperator) {
+            foreach ($operator->getArguments() as $argument) {
+                $this->processOperator($argument);
+            }
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param ISearchOperator $operator
 	 * @return void
 	 */
-	public function processOperator(ISearchOperator &$operator) {
+	public function processOperator(ISearchOperator & $operator) {
 		if ($operator instanceof ISearchBinaryOperator) {
 			foreach ($operator->getArguments() as $argument) {
 				$this->processOperator($argument);

lib/private/Files/Search/QueryOptimizer/QueryOptimizer.php

Indentation +17 added lines, -17 removed lines

@@ -26,23 +26,23 @@
 use OCP\Files\Search\ISearchOperator;
 
 class QueryOptimizer {
-	/** @var QueryOptimizerStep[] */
-	private $steps = [];
+    /** @var QueryOptimizerStep[] */
+    private $steps = [];
 
-	public function __construct(
-		PathPrefixOptimizer $pathPrefixOptimizer
-	) {
-		$this->steps = [
-			$pathPrefixOptimizer
-		];
-	}
+    public function __construct(
+        PathPrefixOptimizer $pathPrefixOptimizer
+    ) {
+        $this->steps = [
+            $pathPrefixOptimizer
+        ];
+    }
 
-	public function processOperator(ISearchOperator $operator) {
-		foreach ($this->steps as $step) {
-			$step->inspectOperator($operator);
-		}
-		foreach ($this->steps as $step) {
-			$step->processOperator($operator);
-		}
-	}
+    public function processOperator(ISearchOperator $operator) {
+        foreach ($this->steps as $step) {
+            $step->inspectOperator($operator);
+        }
+        foreach ($this->steps as $step) {
+            $step->processOperator($operator);
+        }
+    }
 }

lib/private/Files/Search/QueryOptimizer/PathPrefixOptimizer.php

Indentation +39 added lines, -39 removed lines

@@ -29,49 +29,49 @@
 use OCP\Files\Search\ISearchOperator;
 
 class PathPrefixOptimizer extends QueryOptimizerStep {
-	private bool $useHashEq = true;
+    private bool $useHashEq = true;
 
-	public function inspectOperator(ISearchOperator $operator): void {
-		// normally any `path = "$path"` search filter would be generated as an `path_hash = md5($path)` sql query
-		// since the `path_hash` sql column usually provides much faster querying that selecting on the `path` sql column
-		//
-		// however, if 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 there is any operator in the query that matches this pattern, we change all `path = "$path"` instances to not the `path_hash` equality,
-		// otherwise mariadb has a tendency of ignoring the path_prefix index
-		if ($this->useHashEq && $this->isPathPrefixOperator($operator)) {
-			$this->useHashEq = false;
-		}
+    public function inspectOperator(ISearchOperator $operator): void {
+        // normally any `path = "$path"` search filter would be generated as an `path_hash = md5($path)` sql query
+        // since the `path_hash` sql column usually provides much faster querying that selecting on the `path` sql column
+        //
+        // however, if 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 there is any operator in the query that matches this pattern, we change all `path = "$path"` instances to not the `path_hash` equality,
+        // otherwise mariadb has a tendency of ignoring the path_prefix index
+        if ($this->useHashEq && $this->isPathPrefixOperator($operator)) {
+            $this->useHashEq = false;
+        }
 
-		parent::inspectOperator($operator);
-	}
+        parent::inspectOperator($operator);
+    }
 
-	public function processOperator(ISearchOperator &$operator) {
-		if (!$this->useHashEq && $operator instanceof ISearchComparison && $operator->getField() === 'path' && $operator->getType() === ISearchComparison::COMPARE_EQUAL) {
-			$operator->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, false);
-		}
+    public function processOperator(ISearchOperator &$operator) {
+        if (!$this->useHashEq && $operator instanceof ISearchComparison && $operator->getField() === 'path' && $operator->getType() === ISearchComparison::COMPARE_EQUAL) {
+            $operator->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, false);
+        }
 
-		parent::processOperator($operator);
-	}
+        parent::processOperator($operator);
+    }
 
-	private function isPathPrefixOperator(ISearchOperator $operator): bool {
-		if ($operator instanceof ISearchBinaryOperator && $operator->getType() === ISearchBinaryOperator::OPERATOR_OR && count($operator->getArguments()) == 2) {
-			$a = $operator->getArguments()[0];
-			$b = $operator->getArguments()[1];
-			if ($this->operatorPairIsPathPrefix($a, $b) || $this->operatorPairIsPathPrefix($b, $a)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    private function isPathPrefixOperator(ISearchOperator $operator): bool {
+        if ($operator instanceof ISearchBinaryOperator && $operator->getType() === ISearchBinaryOperator::OPERATOR_OR && count($operator->getArguments()) == 2) {
+            $a = $operator->getArguments()[0];
+            $b = $operator->getArguments()[1];
+            if ($this->operatorPairIsPathPrefix($a, $b) || $this->operatorPairIsPathPrefix($b, $a)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	private function operatorPairIsPathPrefix(ISearchOperator $like, ISearchOperator $equal): bool {
-		return (
-			$like instanceof ISearchComparison && $equal instanceof ISearchComparison &&
-			$like->getField() === 'path' && $equal->getField() === 'path' &&
-			$like->getType() === ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE && $equal->getType() === ISearchComparison::COMPARE_EQUAL
-			&& $like->getValue() === SearchComparison::escapeLikeParameter($equal->getValue()) . '/%'
-		);
-	}
+    private function operatorPairIsPathPrefix(ISearchOperator $like, ISearchOperator $equal): bool {
+        return (
+            $like instanceof ISearchComparison && $equal instanceof ISearchComparison &&
+            $like->getField() === 'path' && $equal->getField() === 'path' &&
+            $like->getType() === ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE && $equal->getType() === ISearchComparison::COMPARE_EQUAL
+            && $like->getValue() === SearchComparison::escapeLikeParameter($equal->getValue()) . '/%'
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 		parent::inspectOperator($operator);
 	}
 
-	public function processOperator(ISearchOperator &$operator) {
+	public function processOperator(ISearchOperator & $operator) {
 		if (!$this->useHashEq && $operator instanceof ISearchComparison && $operator->getField() === 'path' && $operator->getType() === ISearchComparison::COMPARE_EQUAL) {
 			$operator->setQueryHint(ISearchComparison::HINT_PATH_EQ_HASH, false);
 		}
@@ -71,7 +71,7 @@ 
 			$like instanceof ISearchComparison && $equal instanceof ISearchComparison &&
 			$like->getField() === 'path' && $equal->getField() === 'path' &&
 			$like->getType() === ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE && $equal->getType() === ISearchComparison::COMPARE_EQUAL
-			&& $like->getValue() === SearchComparison::escapeLikeParameter($equal->getValue()) . '/%'
+			&& $like->getValue() === SearchComparison::escapeLikeParameter($equal->getValue()).'/%'
 		);
 	}
 }