commit d4200bc3da89afc787ffba68decf1488d6e0f6e2
author Marija Savtchouk <mariasavtchouk@google.com> Fri Jan 20 09:15:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 20 09:15:36 2023 +0000
tree 51eb43baafb31ce58c6f4ed286d8be603fe8af87
parent 88fbefa57d36f414b08c26e908bc9b7fe53eae3d
parent 095dc67e9f27199af8cef2319c86181432d42eed

Merge "Allow applying index-specific rewrites to queries"

java/com/google/gerrit/index/Index.java

diff --git a/java/com/google/gerrit/index/Index.java b/java/com/google/gerrit/index/Index.java
index f2aafcf9..870d827 100644
--- a/java/com/google/gerrit/index/Index.java
+++ b/java/com/google/gerrit/index/Index.java
@@ -156,4 +156,14 @@
   default boolean isEnabled() {
     return true;
   }
+
+  /**
+   * Rewriter that should be invoked on queries to this index.
+   *
+   * <p>The default implementation does not do anything. Should be overridden by implementation, if
+   * needed.
+   */
+  default IndexRewriter<V> getIndexRewriter() {
+    return (in, opts) -> in;
+  }
 }

java/com/google/gerrit/index/query/QueryProcessor.java

diff --git a/java/com/google/gerrit/index/query/QueryProcessor.java b/java/com/google/gerrit/index/query/QueryProcessor.java
index f237006..1c8bbc3 100644
--- a/java/com/google/gerrit/index/query/QueryProcessor.java
+++ b/java/com/google/gerrit/index/query/QueryProcessor.java
@@ -268,7 +268,9 @@
                 limit,
                 getRequestedFields());
         logger.atFine().log("Query options: %s", opts);
-        Predicate<T> pred = rewriter.rewrite(q, opts);
+        // Apply index-specific rewrite first
+        Predicate<T> pred = indexes.getSearchIndex().getIndexRewriter().rewrite(q, opts);
+        pred = rewriter.rewrite(pred, opts);
         if (enforceVisibility) {
           pred = enforceVisibility(pred);
         }