PR feedback - remove check on QueryRewriteContext class only

kderusso · Dec 5, 2024 · bc7f735 · bc7f735
1 parent 9640ad1
commit bc7f735
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 27 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java
@@ -149,11 +149,6 @@ public CoordinatorRewriteContext convertToCoordinatorRewriteContext() {
         return this;
     }
 
-    @Override
-    public QueryRewriteContext convertToQueryRewriteContext() {
-        return null;
-    }
-
     @Override
     public String getTierPreference() {
         // dominant branch first (tier preference is configured)

diff --git a/server/src/main/java/org/elasticsearch/index/query/DataRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/DataRewriteContext.java
@@ -30,8 +30,4 @@ public DataRewriteContext convertToDataRewriteContext() {
         return this;
     }
 
-    @Override
-    public QueryRewriteContext convertToQueryRewriteContext() {
-        return null;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/query/InnerHitsRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitsRewriteContext.java
@@ -26,11 +26,6 @@ public InnerHitsRewriteContext convertToInnerHitsRewriteContext() {
         return this;
     }
 
-    @Override
-    public QueryRewriteContext convertToQueryRewriteContext() {
-        return null;
-    }
-
     @Override
     public void executeAsyncActions(ActionListener<Void> listener) {
         // InnerHitsRewriteContext does not support async actions at all, and doesn't supply a valid `client` object

diff --git a/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java
@@ -209,10 +209,6 @@ public InnerHitsRewriteContext convertToInnerHitsRewriteContext() {
         return null;
     }
 
-    public QueryRewriteContext convertToQueryRewriteContext() {
-        return this;
-    }
-
     /**
      * Returns the {@link MappedFieldType} for the provided field name.
      * If the field is not mapped, the behaviour depends on the index.query.parse.allow_unmapped_fields setting, which defaults to true.

diff --git a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java
@@ -662,11 +662,6 @@ public final SearchExecutionContext convertToSearchExecutionContext() {
         return this;
     }
 
-    @Override
-    public QueryRewriteContext convertToQueryRewriteContext() {
-        return null;
-    }
-
     /** Return the current {@link IndexReader}, or {@code null} if no index reader is available,
      *  for instance if this rewrite context is used to index queries (percolation).
      */

diff --git a/.../java/org/elasticsearch/xpack/inference/queries/SemanticMatchQueryRewriteInterceptor.java b/.../java/org/elasticsearch/xpack/inference/queries/SemanticMatchQueryRewriteInterceptor.java
@@ -39,10 +39,6 @@ public QueryBuilder rewrite(QueryRewriteContext context, QueryBuilder queryBuild
             return queryBuilder;
         }
 
-        if (context.convertToQueryRewriteContext() == null) {
-            return queryBuilder;
-        }
-
         MatchQueryBuilder matchQueryBuilder = (MatchQueryBuilder) queryBuilder;
         QueryBuilder rewritten = queryBuilder;
         if (matchQueryBuilder.getInterceptedAndRewritten() == false) {