Move the ltr code in its own package,

afoucret · Nov 16, 2023 · 22609c3 · 22609c3
1 parent 6a1408d
commit 22609c3
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 25 deletions.
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
@@ -329,8 +329,6 @@
 import org.elasticsearch.xpack.ml.inference.pytorch.process.BlackHolePyTorchProcess;
 import org.elasticsearch.xpack.ml.inference.pytorch.process.NativePyTorchProcessFactory;
 import org.elasticsearch.xpack.ml.inference.pytorch.process.PyTorchProcessFactory;
-import org.elasticsearch.xpack.ml.inference.rescorer.InferenceRescorerFeature;
-import org.elasticsearch.xpack.ml.inference.rescorer.LearnToRankRescorerBuilder;
 import org.elasticsearch.xpack.ml.job.JobManager;
 import org.elasticsearch.xpack.ml.job.JobManagerHolder;
 import org.elasticsearch.xpack.ml.job.NodeLoadDetector;
@@ -358,6 +356,8 @@
 import org.elasticsearch.xpack.ml.job.process.normalizer.NormalizerProcessFactory;
 import org.elasticsearch.xpack.ml.job.snapshot.upgrader.SnapshotUpgradeTaskExecutor;
 import org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutor;
+import org.elasticsearch.xpack.ml.ltr.InferenceRescorerFeature;
+import org.elasticsearch.xpack.ml.ltr.LearnToRankRescorerBuilder;
 import org.elasticsearch.xpack.ml.notifications.AnomalyDetectionAuditor;
 import org.elasticsearch.xpack.ml.notifications.DataFrameAnalyticsAuditor;
 import org.elasticsearch.xpack.ml.notifications.InferenceAuditor;
@@ -872,8 +872,8 @@ public List<RescorerSpec<?>> getRescorers() {
             return List.of(
                 new RescorerSpec<>(
                     LearnToRankRescorerBuilder.NAME,
-                    in -> new LearnToRankRescorerBuilder(in, modelLoadingService::get, scriptService::get),
-                    parser -> LearnToRankRescorerBuilder.fromXContent(parser, modelLoadingService::get, scriptService::get)
+                    in -> new LearnToRankRescorerBuilder(in, modelLoadingService.get(), scriptService.get()),
+                    parser -> LearnToRankRescorerBuilder.fromXContent(parser, modelLoadingService.get(), scriptService.get())
                 )
             );
         }

diff --git a/.../inference/rescorer/FeatureExtractor.java → ...search/xpack/ml/ltr/FeatureExtractor.java b/.../inference/rescorer/FeatureExtractor.java → ...search/xpack/ml/ltr/FeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 

diff --git a/.../rescorer/FieldValueFeatureExtractor.java → ...ck/ml/ltr/FieldValueFeatureExtractor.java b/.../rescorer/FieldValueFeatureExtractor.java → ...ck/ml/ltr/FieldValueFeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.index.mapper.MappedFieldType;

diff --git a/...ce/rescorer/InferenceRescorerFeature.java → ...pack/ml/ltr/InferenceRescorerFeature.java b/...ce/rescorer/InferenceRescorerFeature.java → ...pack/ml/ltr/InferenceRescorerFeature.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.elasticsearch.common.util.FeatureFlag;
 

diff --git a/...ference/rescorer/LearnToRankRescorer.java → ...rch/xpack/ml/ltr/LearnToRankRescorer.java b/...ference/rescorer/LearnToRankRescorer.java → ...rch/xpack/ml/ltr/LearnToRankRescorer.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/.../rescorer/LearnToRankRescorerBuilder.java → ...ck/ml/ltr/LearnToRankRescorerBuilder.java b/.../rescorer/LearnToRankRescorerBuilder.java → ...ck/ml/ltr/LearnToRankRescorerBuilder.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.TransportVersion;
@@ -42,7 +42,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 import static org.elasticsearch.script.Script.DEFAULT_TEMPLATE_LANG;
 
@@ -60,10 +59,10 @@ public class LearnToRankRescorerBuilder extends RescorerBuilder<LearnToRankResco
 
     public static LearnToRankRescorerBuilder fromXContent(
         XContentParser parser,
-        Supplier<ModelLoadingService> modelLoadingServiceSupplier,
-        Supplier<ScriptService> scriptServiceSupplier
+        ModelLoadingService modelLoadingService,
+        ScriptService scriptService
     ) {
-        return PARSER.apply(parser, null).build(modelLoadingServiceSupplier.get(), scriptServiceSupplier.get());
+        return PARSER.apply(parser, null).build(modelLoadingService, scriptService);
     }
 
     private final String modelId;
@@ -103,18 +102,15 @@ public static LearnToRankRescorerBuilder fromXContent(
         this.scriptService = null;
     }
 
-    public LearnToRankRescorerBuilder(
-        StreamInput input,
-        Supplier<ModelLoadingService> modelLoadingServiceSupplier,
-        Supplier<ScriptService> scriptServiceSupplier
-    ) throws IOException {
+    public LearnToRankRescorerBuilder(StreamInput input, ModelLoadingService modelLoadingService, ScriptService scriptService)
+        throws IOException {
         super(input);
         this.modelId = input.readString();
         this.params = input.readMap();
         this.learnToRankConfig = input.readOptionalNamedWriteable(LearnToRankConfig.class);
 
-        this.modelLoadingService = modelLoadingServiceSupplier.get();
-        this.scriptService = scriptServiceSupplier.get();
+        this.modelLoadingService = modelLoadingService;
+        this.scriptService = scriptService;
 
         this.localModel = null;
     }

diff --git a/.../rescorer/LearnToRankRescorerContext.java → ...ck/ml/ltr/LearnToRankRescorerContext.java b/.../rescorer/LearnToRankRescorerContext.java → ...ck/ml/ltr/LearnToRankRescorerContext.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;

diff --git a/...rence/rescorer/QueryFeatureExtractor.java → ...h/xpack/ml/ltr/QueryFeatureExtractor.java b/...rence/rescorer/QueryFeatureExtractor.java → ...h/xpack/ml/ltr/QueryFeatureExtractor.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.DisiPriorityQueue;

diff --git a/...arnToRankRescorerBuilderRewriteTests.java → ...arnToRankRescorerBuilderRewriteTests.java b/...arnToRankRescorerBuilderRewriteTests.java → ...arnToRankRescorerBuilderRewriteTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.ScoreDoc;

diff --git a/...ankRescorerBuilderSerializationTests.java → ...ankRescorerBuilderSerializationTests.java b/...ankRescorerBuilderSerializationTests.java → ...ankRescorerBuilderSerializationTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.common.ParsingException;

diff --git a/.../rescorer/QueryFeatureExtractorTests.java → ...ck/ml/ltr/QueryFeatureExtractorTests.java b/.../rescorer/QueryFeatureExtractorTests.java → ...ck/ml/ltr/QueryFeatureExtractorTests.java
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.ml.inference.rescorer;
+package org.elasticsearch.xpack.ml.ltr;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
      * 2.0.
      */
-    package org.elasticsearch.xpack.ml.inference.rescorer;
+    package org.elasticsearch.xpack.ml.ltr;
     import org.apache.lucene.index.LeafReaderContext;
@@ Expand Down @@