Rename LearnToRankInferenceRescorerContext into LearnToRankRescorerCo…

…ntext
afoucret · Nov 23, 2023 · 239e73a · 239e73a
1 parent 2113447
commit 239e73a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorer.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorer.java
@@ -51,7 +51,7 @@ public TopDocs rescore(TopDocs topDocs, IndexSearcher searcher, RescoreContext r
         if (topDocs.scoreDocs.length == 0) {
             return topDocs;
         }
-        LearnToRankInferenceRescorerContext ltrRescoreContext = (LearnToRankInferenceRescorerContext) rescoreContext;
+        LearnToRankRescorerContext ltrRescoreContext = (LearnToRankRescorerContext) rescoreContext;
         if (ltrRescoreContext.regressionModelDefinition == null) {
             throw new IllegalStateException("local model reference is null, missing rewriteAndFetch before rescore phase?");
         }

diff --git a/...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilder.java b/...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilder.java
@@ -361,9 +361,9 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     }
 
     @Override
-    protected LearnToRankInferenceRescorerContext innerBuildContext(int windowSize, SearchExecutionContext context) {
+    protected LearnToRankRescorerContext innerBuildContext(int windowSize, SearchExecutionContext context) {
         rescoreOccurred = true;
-        return new LearnToRankInferenceRescorerContext(
+        return new LearnToRankRescorerContext(
             windowSize,
             LearnToRankRescorer.INSTANCE,
             inferenceConfig,

diff --git a/.../LearnToRankInferenceRescorerContext.java → ...ck/ml/ltr/LearnToRankRescorerContext.java b/.../LearnToRankInferenceRescorerContext.java → ...ck/ml/ltr/LearnToRankRescorerContext.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class LearnToRankInferenceRescorerContext extends RescoreContext {
+public class LearnToRankRescorerContext extends RescoreContext {
 
     final SearchExecutionContext executionContext;
     final LocalModel regressionModelDefinition;
@@ -37,7 +37,7 @@ public class LearnToRankInferenceRescorerContext extends RescoreContext {
      * @param regressionModelDefinition The local model inference definition, may be null during certain search phases.
      * @param executionContext The local shard search context
      */
-    public LearnToRankInferenceRescorerContext(
+    public LearnToRankRescorerContext(
         int windowSize,
         Rescorer rescorer,
         LearnToRankConfig learnToRankConfig,

diff --git a/.../src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderRewriteTests.java b/.../src/test/java/org/elasticsearch/xpack/ml/ltr/LearnToRankRescorerBuilderRewriteTests.java
@@ -96,17 +96,17 @@ public void testMustRewrite() {
             () -> testModelLoader
         );
         SearchExecutionContext context = createSearchExecutionContext();
-        LearnToRankInferenceRescorerContext learnToRankInferenceRescorerContext = learnToRankRescorerBuilder.innerBuildContext(
+        LearnToRankRescorerContext learnToRankRescorerContext = learnToRankRescorerBuilder.innerBuildContext(
             randomIntBetween(1, 30),
             context
         );
         IllegalStateException e = expectThrows(
             IllegalStateException.class,
-            () -> learnToRankInferenceRescorerContext.rescorer()
+            () -> learnToRankRescorerContext.rescorer()
                 .rescore(
                     new TopDocs(new TotalHits(10, TotalHits.Relation.EQUAL_TO), new ScoreDoc[10]),
                     mock(IndexSearcher.class),
-                    learnToRankInferenceRescorerContext
+                    learnToRankRescorerContext
                 )
         );
         assertEquals("local model reference is null, missing rewriteAndFetch before rescore phase?", e.getMessage());
@@ -274,7 +274,7 @@ public void testBuildContext() throws Exception {
             (LearnToRankConfig) GOOD_MODEL_CONFIG.getInferenceConfig(),
             localModel
         );
-        LearnToRankInferenceRescorerContext rescoreContext = learnToRankRescorerBuilder.innerBuildContext(20, context);
+        LearnToRankRescorerContext rescoreContext = learnToRankRescorerBuilder.innerBuildContext(20, context);
         assertNotNull(rescoreContext);
         assertThat(rescoreContext.getWindowSize(), equalTo(20));
         List<FeatureExtractor> featureExtractors = rescoreContext.buildFeatureExtractors(context.searcher());