Fix some query methods in runtime fields

We were missing a few `@Override` annotations in runtime fields which let us drift from the methods we were supposed to override. Oops. This adds them and links the methods.
elastic · Sep 10, 2020 · 717f62a · 717f62a
1 parent c94f5b9
commit 717f62a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/...main/java/org/elasticsearch/xpack/runtimefields/mapper/AbstractScriptMappedFieldType.java b/...main/java/org/elasticsearch/xpack/runtimefields/mapper/AbstractScriptMappedFieldType.java
@@ -91,6 +91,7 @@ protected abstract Query rangeQuery(
         QueryShardContext context
     );
 
+    @Override
     public Query fuzzyQuery(
         Object value,
         Fuzziness fuzziness,
@@ -102,38 +103,47 @@ public Query fuzzyQuery(
         throw new IllegalArgumentException(unsupported("fuzzy", "keyword and text"));
     }
 
+    @Override
     public Query prefixQuery(String value, MultiTermQuery.RewriteMethod method, QueryShardContext context) {
         throw new IllegalArgumentException(unsupported("prefix", "keyword, text and wildcard"));
     }
 
+    @Override
     public Query wildcardQuery(String value, MultiTermQuery.RewriteMethod method, QueryShardContext context) {
         throw new IllegalArgumentException(unsupported("wildcard", "keyword, text and wildcard"));
     }
 
+    @Override
     public Query regexpQuery(
         String value,
-        int flags,
+        int syntaxFlags,
+        int matchFlags,
         int maxDeterminizedStates,
         MultiTermQuery.RewriteMethod method,
         QueryShardContext context
     ) {
         throw new IllegalArgumentException(unsupported("regexp", "keyword and text"));
     }
 
+    @Override
     public abstract Query existsQuery(QueryShardContext context);
 
+    @Override
     public Query phraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements) throws IOException {
         throw new IllegalArgumentException(unsupported("phrase", "text"));
     }
 
+    @Override
     public Query multiPhraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements) throws IOException {
         throw new IllegalArgumentException(unsupported("phrase", "text"));
     }
 
+    @Override
     public Query phrasePrefixQuery(TokenStream stream, int slop, int maxExpansions) throws IOException {
         throw new IllegalArgumentException(unsupported("phrase prefix", "text"));
     }
 
+    @Override
     public SpanQuery spanPrefixQuery(String value, SpanMultiTermQueryWrapper.SpanRewriteMethod method, QueryShardContext context) {
         throw new IllegalArgumentException(unsupported("span prefix", "text"));
     }

diff --git a/.../main/java/org/elasticsearch/xpack/runtimefields/mapper/ScriptKeywordMappedFieldType.java b/.../main/java/org/elasticsearch/xpack/runtimefields/mapper/ScriptKeywordMappedFieldType.java
@@ -127,9 +127,19 @@ public Query rangeQuery(
     }
 
     @Override
-    public Query regexpQuery(String value, int flags, int maxDeterminizedStates, RewriteMethod method, QueryShardContext context) {
+    public Query regexpQuery(
+        String value,
+        int syntaxFlags,
+        int matchFlags,
+        int maxDeterminizedStates,
+        RewriteMethod method,
+        QueryShardContext context
+    ) {
         checkAllowExpensiveQueries(context);
-        return new StringScriptFieldRegexpQuery(script, leafFactory(context.lookup()), name(), value, flags, maxDeterminizedStates);
+        if (matchFlags != 0) {
+            throw new IllegalArgumentException("Match flags not yet implemented [" + matchFlags + "]");
+        }
+        return new StringScriptFieldRegexpQuery(script, leafFactory(context.lookup()), name(), value, syntaxFlags, maxDeterminizedStates);
     }
 
     @Override

diff --git a/...lasticsearch/xpack/runtimefields/mapper/AbstractNonTextScriptMappedFieldTypeTestCase.java b/...lasticsearch/xpack/runtimefields/mapper/AbstractNonTextScriptMappedFieldTypeTestCase.java
@@ -28,7 +28,7 @@ public void testPrefixQueryIsError() throws IOException {
     public void testRegexpQueryIsError() throws IOException {
         assertQueryOnlyOnTextAndKeyword(
             "regexp",
-            () -> simpleMappedFieldType().regexpQuery("cat", 0, Operations.DEFAULT_MAX_DETERMINIZED_STATES, null, mockContext())
+            () -> simpleMappedFieldType().regexpQuery("cat", 0, 0, Operations.DEFAULT_MAX_DETERMINIZED_STATES, null, mockContext())
         );
     }
 

diff --git a/.../java/org/elasticsearch/xpack/runtimefields/mapper/ScriptKeywordMappedFieldTypeTests.java b/.../java/org/elasticsearch/xpack/runtimefields/mapper/ScriptKeywordMappedFieldTypeTests.java
@@ -249,7 +249,7 @@ public void testRegexpQuery() throws IOException {
                 IndexSearcher searcher = newSearcher(reader);
                 assertThat(
                     searcher.count(
-                        simpleMappedFieldType().regexpQuery("ca.+", 0, Operations.DEFAULT_MAX_DETERMINIZED_STATES, null, mockContext())
+                        simpleMappedFieldType().regexpQuery("ca.+", 0, 0, Operations.DEFAULT_MAX_DETERMINIZED_STATES, null, mockContext())
                     ),
                     equalTo(2)
                 );
@@ -258,7 +258,7 @@ public void testRegexpQuery() throws IOException {
     }
 
     public void testRegexpQueryIsExpensive() throws IOException {
-        checkExpensiveQuery((ft, ctx) -> ft.regexpQuery(randomAlphaOfLengthBetween(1, 1000), randomInt(0xFFFF), randomInt(), null, ctx));
+        checkExpensiveQuery((ft, ctx) -> ft.regexpQuery(randomAlphaOfLengthBetween(1, 1000), randomInt(0xFFFF), 0, randomInt(), null, ctx));
     }
 
     @Override