ES|QL: Fix ResolvedEnrichPolicy serialization (bwc) in v 8.15 (elasti…

…c#112985)
davidkyle · Sep 17, 2024 · 5d8a04b · 5d8a04b
1 parent 3deca9e
commit 5d8a04b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/docs/changelog/112985.yaml b/docs/changelog/112985.yaml
@@ -0,0 +1,6 @@
+pr: 112985
+summary: "ES|QL: Fix `ResolvedEnrichPolicy` serialization (bwc) in v 8.15"
+area: ES|QL
+type: bug
+issues:
+ - 112968
diff --git a/...ck/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DateEsField.java b/...ck/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DateEsField.java
@@ -30,7 +30,7 @@ protected DateEsField(StreamInput in) throws IOException {
     }
 
     @Override
-    protected void writeContent(StreamOutput out) throws IOException {
+    public void writeContent(StreamOutput out) throws IOException {
         out.writeString(getName());
         out.writeMap(getProperties(), (o, x) -> x.writeTo(out));
         out.writeBoolean(isAggregatable());

diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/EsField.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/EsField.java
@@ -58,7 +58,7 @@ public EsField(String name, DataType esDataType, Map<String, EsField> properties
         this.isAlias = isAlias;
     }
 
-    protected EsField(StreamInput in) throws IOException {
+    public EsField(StreamInput in) throws IOException {
         this.name = in.readString();
         this.esDataType = DataType.readFrom(in);
         this.properties = in.readImmutableMap(EsField::readFrom);
@@ -80,7 +80,7 @@ public void writeTo(StreamOutput out) throws IOException {
     /**
      * This needs to be overridden by subclasses for specific serialization
      */
-    protected void writeContent(StreamOutput out) throws IOException {
+    public void writeContent(StreamOutput out) throws IOException {
         out.writeString(name);
         out.writeString(esDataType.typeName());
         out.writeMap(properties, (o, x) -> x.writeTo(out));

diff --git a/...in/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/InvalidMappedField.java b/...in/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/InvalidMappedField.java
@@ -60,7 +60,7 @@ public Set<DataType> types() {
     }
 
     @Override
-    protected void writeContent(StreamOutput out) throws IOException {
+    public void writeContent(StreamOutput out) throws IOException {
         out.writeString(getName());
         out.writeString(errorMessage);
         out.writeMap(getProperties(), (o, x) -> x.writeTo(out));

diff --git a/...plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/KeywordEsField.java b/...plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/KeywordEsField.java
@@ -70,7 +70,7 @@ public KeywordEsField(StreamInput in) throws IOException {
     }
 
     @Override
-    protected void writeContent(StreamOutput out) throws IOException {
+    public void writeContent(StreamOutput out) throws IOException {
         out.writeString(getName());
         out.writeMap(getProperties(), (o, x) -> x.writeTo(out));
         out.writeBoolean(isAggregatable());

diff --git a/...ck/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/TextEsField.java b/...ck/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/TextEsField.java
@@ -36,7 +36,7 @@ protected TextEsField(StreamInput in) throws IOException {
     }
 
     @Override
-    protected void writeContent(StreamOutput out) throws IOException {
+    public void writeContent(StreamOutput out) throws IOException {
         out.writeString(getName());
         out.writeMap(getProperties(), (o, x) -> x.writeTo(out));
         out.writeBoolean(isAggregatable());

diff --git a/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/ResolvedEnrichPolicy.java b/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/ResolvedEnrichPolicy.java
@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.enrich;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -29,10 +30,17 @@ public ResolvedEnrichPolicy(StreamInput in) throws IOException {
             in.readString(),
             in.readStringCollectionAsList(),
             in.readMap(StreamInput::readString),
-            in.readMap(EsField::readFrom)
+            in.readMap(getEsFieldReader(in))
         );
     }
 
+    private static Reader<EsField> getEsFieldReader(StreamInput in) {
+        if (in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_ATTRIBUTE_CACHED_SERIALIZATION_8_15)) {
+            return EsField::readFrom;
+        }
+        return EsField::new;
+    }
+
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(matchField);
@@ -45,7 +53,13 @@ public void writeTo(StreamOutput out) throws IOException {
              * There are lots of subtypes of ESField, but we always write the field
              * as though it were the base class.
              */
-            (o, v) -> new EsField(v.getName(), v.getDataType(), v.getProperties(), v.isAggregatable(), v.isAlias()).writeTo(o)
+            (o, v) -> {
+                if (out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_ATTRIBUTE_CACHED_SERIALIZATION_8_15)) {
+                    new EsField(v.getName(), v.getDataType(), v.getProperties(), v.isAggregatable(), v.isAlias()).writeTo(o);
+                } else {
+                    new EsField(v.getName(), v.getDataType(), v.getProperties(), v.isAggregatable(), v.isAlias()).writeContent(o);
+                }
+            }
         );
     }
 }