commit 6754c8a1cba5545cfb7aee4dda8708a00f2132c5
author Edwin Kempin <edwin.kempin@sap.com> Mon Oct 07 18:08:47 2013 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Tue Oct 08 08:53:16 2013 +0200
tree b68b61b00d5f36bda6c08fc9e8020e889e0db519
parent 07915790ab0aa6531f8ebfeac75732528f1d1ea3

Refactor checking if secondary index is enabled

Have one method to check if the secondary index is enabled which can
be used from all search operators which require an index.

Change-Id: Ic9d91be5c428aaeb89f926c1193cd4d93e943ca6
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
index 760287c..5ede452 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
@@ -229,10 +229,7 @@
 
   @Operator
   public Predicate<ChangeData> comment(String value) throws QueryParseException {
-    ChangeIndex index = args.indexes.getSearchIndex();
-    if (index == null) {
-      throw error("secondary index must be enabled for comment:" + value);
-    }
+    ChangeIndex index = requireIndex(FIELD_COMMENT, value);
     return new CommentPredicate(args.dbProvider, index, value);
   }
 
@@ -347,15 +344,12 @@
   @Operator
   public Predicate<ChangeData> file(String file) throws QueryParseException {
     if (file.startsWith("^")) {
-      if (allowFileRegex || args.indexes.getSearchIndex() != null) {
-        return new RegexFilePredicate(args.dbProvider, args.patchListCache, file);
-      } else {
-        throw error("secondary index must be enabled for file:" + file);
+      if (!allowFileRegex) {
+        requireIndex(FIELD_FILE, file);
       }
+      return new RegexFilePredicate(args.dbProvider, args.patchListCache, file);
     } else {
-      if (args.indexes.getSearchIndex() == null) {
-        throw error("secondary index must be enabled for file:" + file);
-      }
+      requireIndex(FIELD_FILE, file);
       return new EqualsFilePredicate(args.dbProvider, args.patchListCache, file);
     }
   }
@@ -671,4 +665,13 @@
     }
     throw new IllegalArgumentException();
   }
+
+  private ChangeIndex requireIndex(String field, String value)
+      throws QueryParseException {
+    ChangeIndex idx = args.indexes.getSearchIndex();
+    if (idx == null) {
+      throw error("secondary index must be enabled for " + field + ":" + value);
+    }
+    return idx;
+  }
 }