瀏覽代碼

[ML] Adjusting bwc for new inference_config change (#54651)

Adjusts bwc serialization for backport pr-#54647
Benjamin Trent 5 年之前
父節點
當前提交
58f1f7f647

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InternalInferModelAction.java

@@ -73,7 +73,7 @@ public class InternalInferModelAction extends ActionType<InternalInferModelActio
             super(in);
             this.modelId = in.readString();
             this.objectsToInfer = Collections.unmodifiableList(in.readList(StreamInput::readMap));
-            if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
                 this.update = (InferenceConfigUpdate<? extends InferenceConfig>)in.readNamedWriteable(InferenceConfigUpdate.class);
             } else {
                 InferenceConfig oldConfig = in.readNamedWriteable(InferenceConfig.class);
@@ -114,7 +114,7 @@ public class InternalInferModelAction extends ActionType<InternalInferModelActio
             super.writeTo(out);
             out.writeString(modelId);
             out.writeCollection(objectsToInfer, StreamOutput::writeMap);
-            if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
                 out.writeNamedWriteable(update);
             } else {
                 out.writeNamedWriteable(update.toConfig());

+ 2 - 2
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java

@@ -182,7 +182,7 @@ public class TrainedModelConfig implements ToXContentObject, Writeable {
         } else {
             this.defaultFieldMap = null;
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             this.inferenceConfig = in.readOptionalNamedWriteable(InferenceConfig.class);
         } else {
             this.inferenceConfig = null;
@@ -296,7 +296,7 @@ public class TrainedModelConfig implements ToXContentObject, Writeable {
                 out.writeBoolean(false);
             }
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeOptionalNamedWriteable(inferenceConfig);
         }
     }

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/InternalInferModelActionRequestTests.java

@@ -69,7 +69,7 @@ public class InternalInferModelActionRequestTests extends AbstractBWCWireSeriali
 
     @Override
     protected Request mutateInstanceForVersion(Request instance, Version version) {
-        if (version.before(Version.V_8_0_0)) {
+        if (version.before(Version.V_7_8_0)) {
             InferenceConfigUpdate update = null;
             if (instance.getUpdate() instanceof ClassificationConfigUpdate) {
                 update = ClassificationConfigUpdate.fromConfig((ClassificationConfig) instance.getUpdate().toConfig());

+ 1 - 1
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java

@@ -320,7 +320,7 @@ public class TrainedModelConfigTests extends AbstractBWCSerializationTestCase<Tr
 
     @Override
     protected TrainedModelConfig mutateInstanceForVersion(TrainedModelConfig instance, Version version) {
-        if (version.before(Version.V_8_0_0)) {
+        if (version.before(Version.V_7_8_0)) {
             return new TrainedModelConfig.Builder(instance).setInferenceConfig(null).build();
         }
         return instance;