Skip to content

Commit dfabe77

Browse files
committed
ESQL: Claim transport version to backport elastic#124913
Claims a transport version in main that we will use to backport elastic#124913 to 8.19.
1 parent 245f5ee commit dfabe77

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

docs/reference/query-languages/esql/_snippets/functions/functionNamedParams/qstr.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/definition/functions/qstr.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ static TransportVersion def(int id) {
163163
public static final TransportVersion BATCHED_QUERY_PHASE_VERSION_BACKPORT_8_X = def(8_841_0_19);
164164
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19 = def(8_841_0_20);
165165
public static final TransportVersion ML_INFERENCE_SAGEMAKER_8_19 = def(8_841_0_21);
166+
public static final TransportVersion ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19 = def(8_841_0_22);
166167
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
167168
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
168169
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/UnsupportedEsField.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public UnsupportedEsField(StreamInput in) throws IOException {
4545
}
4646

4747
private static List<String> readOriginalTypes(StreamInput in) throws IOException {
48-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)) {
48+
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)
49+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19)) {
4950
return in.readCollectionAsList(i -> ((PlanStreamInput) i).readCachedString());
5051
} else {
5152
return List.of(readCachedStringWithVersionCheck(in).split(","));
@@ -55,7 +56,8 @@ private static List<String> readOriginalTypes(StreamInput in) throws IOException
5556
@Override
5657
public void writeContent(StreamOutput out) throws IOException {
5758
writeCachedStringWithVersionCheck(out, getName());
58-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)) {
59+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)
60+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19)) {
5961
out.writeCollection(getOriginalTypes(), (o, s) -> ((PlanStreamOutput) o).writeCachedString(s));
6062
} else {
6163
writeCachedStringWithVersionCheck(out, String.join(",", getOriginalTypes()));

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/ColumnInfoImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ private static DataType calculateSuggestedCast(List<String> originalTypes) {
100100
public ColumnInfoImpl(StreamInput in) throws IOException {
101101
this.name = in.readString();
102102
this.type = DataType.fromEs(in.readString());
103-
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)) {
103+
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)
104+
|| in.getTransportVersion().isPatchFrom(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19)) {
104105
this.originalTypes = in.readOptionalStringCollectionAsList();
105106
this.suggestedCast = calculateSuggestedCast(this.originalTypes);
106107
} else {
@@ -113,7 +114,8 @@ public ColumnInfoImpl(StreamInput in) throws IOException {
113114
public void writeTo(StreamOutput out) throws IOException {
114115
out.writeString(name);
115116
out.writeString(type.outputType());
116-
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)) {
117+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES)
118+
|| out.getTransportVersion().isPatchFrom(TransportVersions.ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19)) {
117119
out.writeOptionalStringCollection(originalTypes);
118120
}
119121
}

0 commit comments

Comments
 (0)