Merge remote-tracking branch 'origin/ltr_two_pass' into ltr_two_pass

Author: jimczi

docs/changelog/125103.yaml

@@ -0,0 +1,5 @@
+pr: 125103
+summary: Fix LTR query feature with phrases (and two-phase) queries
+area: Ranking
+type: bug
+issues: []

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractor.java

@@ -81,6 +81,7 @@ public List<String> featureNames() {
 
     private static class FeatureDisiWrapper extends DisiWrapper {
         final String featureName;
+
         FeatureDisiWrapper(Scorer scorer, String featureName) {
             super(scorer, false);
             this.featureName = featureName;

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ltr/QueryFeatureExtractorTests.java

@@ -63,31 +63,37 @@ private IndexReader addDocs(Directory dir, String[] textValues, int[] numberValu
 
     public void testQueryExtractor() throws IOException {
         try (var dir = newDirectory()) {
-            try (var reader = addDocs(
+            try (
+                var reader = addDocs(
                     dir,
-                    new String[]{"the quick brown fox", "the slow brown fox", "the grey dog", "yet another string"},
-                    new int[]{5, 10, 12, 11}
-            )) {
+                    new String[] { "the quick brown fox", "the slow brown fox", "the grey dog", "yet another string" },
+                    new int[] { 5, 10, 12, 11 }
+                )
+            ) {
                 var searcher = newSearcher(reader);
                 searcher.setSimilarity(new ClassicSimilarity());
                 QueryRewriteContext ctx = createQueryRewriteContext();
                 List<QueryExtractorBuilder> queryExtractorBuilders = List.of(
-                        new QueryExtractorBuilder("text_score", QueryProvider.fromParsedQuery(QueryBuilders.matchQuery(TEXT_FIELD_NAME, "quick fox")))
-                                .rewrite(ctx),
-                        new QueryExtractorBuilder(
-                                "number_score",
-                                QueryProvider.fromParsedQuery(QueryBuilders.rangeQuery(INT_FIELD_NAME).from(12).to(12))
-                        ).rewrite(ctx),
-                        new QueryExtractorBuilder(
-                                "matching_none",
-                                QueryProvider.fromParsedQuery(QueryBuilders.termQuery(TEXT_FIELD_NAME, "never found term"))
-                        ).rewrite(ctx),
-                        new QueryExtractorBuilder(
-                                "matching_missing_field",
-                                QueryProvider.fromParsedQuery(QueryBuilders.termQuery("missing_text", "quick fox"))
-                        ).rewrite(ctx),
-                        new QueryExtractorBuilder("phrase_score", QueryProvider.fromParsedQuery(QueryBuilders.matchPhraseQuery(TEXT_FIELD_NAME, "slow brown fox"))
-                        ).rewrite(ctx)
+                    new QueryExtractorBuilder(
+                        "text_score",
+                        QueryProvider.fromParsedQuery(QueryBuilders.matchQuery(TEXT_FIELD_NAME, "quick fox"))
+                    ).rewrite(ctx),
+                    new QueryExtractorBuilder(
+                        "number_score",
+                        QueryProvider.fromParsedQuery(QueryBuilders.rangeQuery(INT_FIELD_NAME).from(12).to(12))
+                    ).rewrite(ctx),
+                    new QueryExtractorBuilder(
+                        "matching_none",
+                        QueryProvider.fromParsedQuery(QueryBuilders.termQuery(TEXT_FIELD_NAME, "never found term"))
+                    ).rewrite(ctx),
+                    new QueryExtractorBuilder(
+                        "matching_missing_field",
+                        QueryProvider.fromParsedQuery(QueryBuilders.termQuery("missing_text", "quick fox"))
+                    ).rewrite(ctx),
+                    new QueryExtractorBuilder(
+                        "phrase_score",
+                        QueryProvider.fromParsedQuery(QueryBuilders.matchPhraseQuery(TEXT_FIELD_NAME, "slow brown fox"))
+                    ).rewrite(ctx)
                 );
                 SearchExecutionContext dummySEC = createSearchExecutionContext();
                 List<Weight> weights = new ArrayList<>();
@@ -138,11 +144,13 @@ public void testEmptyDisiPriorityQueue() throws IOException {
         try (var dir = newDirectory()) {
             var config = newIndexWriterConfig();
             config.setMergePolicy(NoMergePolicy.INSTANCE);
-            try (var reader = addDocs(
+            try (
+                var reader = addDocs(
                     dir,
-                    new String[]{"the quick brown fox", "the slow brown fox", "the grey dog", "yet another string"},
-                    new int[]{5, 10, 12, 11}
-            )) {
+                    new String[] { "the quick brown fox", "the slow brown fox", "the grey dog", "yet another string" },
+                    new int[] { 5, 10, 12, 11 }
+                )
+            ) {
 
                 var searcher = newSearcher(reader);
                 searcher.setSimilarity(new ClassicSimilarity());