rerank buildRankFeaturePhaseShardContext add SearchContext parameter

TextSimilarityRankBuilder add check field

Author: weizijun

server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java

@@ -542,7 +542,7 @@ public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId)
                     }
                 };
             else {
-                return super.buildRankFeaturePhaseShardContext();
+                return super.buildRankFeaturePhaseShardContext(searchContext);
             }
         }
 

server/src/test/java/org/elasticsearch/search/SearchServiceSingleNodeTests.java

@@ -511,7 +511,7 @@ public RankShardResult combineQueryPhaseResults(List<TopDocs> rankResults) {
                             }
 
                             @Override
-                            public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext() {
+                            public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
                                 return new RankFeaturePhaseRankShardContext(rankFeatureFieldName) {
                                     @Override
                                     public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId) {
@@ -748,7 +748,7 @@ public RankShardResult combineQueryPhaseResults(List<TopDocs> rankResults) {
                                 }
 
                                 @Override
-                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext() {
+                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
                                     return new RankFeaturePhaseRankShardContext(rankFeatureFieldName) {
                                         @Override
                                         public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId) {
@@ -875,7 +875,7 @@ public RankShardResult combineQueryPhaseResults(List<TopDocs> rankResults) {
                             }
 
                             @Override
-                            public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext() {
+                            public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
                                 return new RankFeaturePhaseRankShardContext(rankFeatureFieldName) {
                                     @Override
                                     public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId) {
@@ -1008,7 +1008,7 @@ public RankShardResult combineQueryPhaseResults(List<TopDocs> rankResults) {
                                 }
 
                                 @Override
-                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext() {
+                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
                                     return new RankFeaturePhaseRankShardContext(rankFeatureFieldName) {
                                         @Override
                                         public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId) {
@@ -1136,7 +1136,7 @@ public RankShardResult combineQueryPhaseResults(List<TopDocs> rankResults) {
                                 }
 
                                 @Override
-                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext() {
+                                public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
                                     return new RankFeaturePhaseRankShardContext(rankFeatureFieldName) {
                                         @Override
                                         public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId) {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java

@@ -170,7 +170,13 @@ public QueryPhaseRankCoordinatorContext buildQueryPhaseCoordinatorContext(int si
     public RankFeaturePhaseRankShardContext buildRankFeaturePhaseShardContext(SearchContext searchContext) {
 
         // check field in mapping
-        Mapper mapper = searchContext.indexShard().mapperService().mappingLookup().getMapper(field);
+        Mapper mapper;
+        try {
+            mapper = searchContext.indexShard().mapperService().mappingLookup().getMapper(field);
+        } catch (NullPointerException e) {
+            mapper = null;
+        }
+
         if (mapper == null) {
             throw new IllegalArgumentException("field [" + field + "] does not exist in mapping");
         }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankTests.java

@@ -262,6 +262,18 @@ public void testRerankInputSizeAndInferenceResultsMismatch() {
         assertThat(ex.getDetailedMessage(), containsString("Reranker input document count and returned score count mismatch"));
     }
 
+    public void testRerankInputSizeAndInferenceResultsFieldMissing() {
+        SearchPhaseExecutionException ex = expectThrows(
+            SearchPhaseExecutionException.class,
+            // Execute search with text similarity reranking
+            client.prepareSearch()
+                .setRankBuilder(new TextSimilarityRankBuilder("missing_field", "my-rerank-model", "my query", 100, 0.0f, false))
+                .setQuery(QueryBuilders.matchAllQuery())
+        );
+        assertThat(ex.status(), equalTo(RestStatus.BAD_REQUEST));
+        assertThat(ex.getDetailedMessage(), containsString("field [missing_field] does not exist in mapping"));
+    }
+
     private static Matcher<SearchHit> searchHitWith(int expectedRank, float expectedScore, String expectedText) {
         return allOf(
             hasRank(expectedRank),