Skip to content

Commit 2c93edc

Browse files
nik9000nik9000
committed
ESQL: Fix transport versions
In elastic#127623 we backported elastic#127299 and added a backport transport version for it - `ESQL_AGGREGATE_METRIC_DOUBLE_BLOCK_8_19` aka `8_841_0_24`. This brings that version forwards to `main` and adds support for parsing streams with that version. In elastic#127639 we backported elastic#126401 and added a backport transport version for it - `PINNED_RETRIEVER_8_19` aka `8_841_0_23`. This brings that version forwards to `main` and adds support for parsing streams with that versions. In elastic#127633 we a claimed a backport transport version to backport elastic#127314 - `INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19` aka `8_841_0_23`. That's the same versions as `PINNED_RETRIEVER_8_19`. It's just that this one is in `main` and `PINNED_RETRIEVER_8_19` is in `8.19`. To allow me to bring `PINNED_RETRIEVER_8_19` for wards I've had to revert elastic#127633. Closes elastic#127667
1 parent 0df0873 commit 2c93edc

File tree

7 files changed

+37
-47
lines changed

7 files changed

+37
-47
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ static TransportVersion def(int id) {
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);
166166
public static final TransportVersion ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19 = def(8_841_0_22);
167-
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19 = def(8_841_0_23);
167+
public static final TransportVersion PINNED_RETRIEVER_8_19 = def(8_841_0_23);
168+
public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_BLOCK_8_19 = def(8_841_0_24);
168169
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
169170
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
170171
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);

‎server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ public DataStreamFailureStore(StreamInput in) throws IOException {
7575
this(
7676
in.readOptionalBoolean(),
7777
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
78-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
79-
? in.readOptionalWriteable(DataStreamLifecycle::new)
80-
: null
78+
? in.readOptionalWriteable(DataStreamLifecycle::new)
79+
: null
8180
);
8281
}
8382

@@ -88,8 +87,7 @@ public static Diff<DataStreamFailureStore> readDiffFrom(StreamInput in) throws I
8887
@Override
8988
public void writeTo(StreamOutput out) throws IOException {
9089
out.writeOptionalBoolean(enabled);
91-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
92-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
90+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
9391
out.writeOptionalWriteable(lifecycle);
9492
}
9593
}
@@ -169,17 +167,15 @@ public Template(@Nullable Boolean enabled, @Nullable DataStreamLifecycle.Templat
169167
@Override
170168
public void writeTo(StreamOutput out) throws IOException {
171169
ResettableValue.write(out, enabled, StreamOutput::writeBoolean);
172-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
173-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
170+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
174171
ResettableValue.write(out, lifecycle, (o, v) -> v.writeTo(o));
175172
}
176173
}
177174

178175
public static Template read(StreamInput in) throws IOException {
179176
ResettableValue<Boolean> enabled = ResettableValue.read(in, StreamInput::readBoolean);
180177
ResettableValue<DataStreamLifecycle.Template> lifecycle = ResettableValue.undefined();
181-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
182-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
178+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
183179
lifecycle = ResettableValue.read(in, DataStreamLifecycle.Template::read);
184180
}
185181
return new Template(enabled, lifecycle);

‎server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ public void writeTo(StreamOutput out) throws IOException {
341341
}
342342
out.writeBoolean(enabled());
343343
}
344-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
345-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
344+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
346345
lifecycleType.writeTo(out);
347346
}
348347
}
@@ -371,9 +370,8 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
371370
enabled = true;
372371
}
373372
lifecycleType = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
374-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
375-
? LifecycleType.read(in)
376-
: LifecycleType.DATA;
373+
? LifecycleType.read(in)
374+
: LifecycleType.DATA;
377375
}
378376

379377
/**
@@ -735,8 +733,7 @@ public void writeTo(StreamOutput out) throws IOException {
735733
}
736734
out.writeBoolean(enabled);
737735
}
738-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
739-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
736+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
740737
lifecycleType.writeTo(out);
741738
}
742739
}
@@ -799,9 +796,8 @@ public static Template read(StreamInput in) throws IOException {
799796
enabled = in.readBoolean();
800797
}
801798
var lifecycleTarget = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
802-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
803-
? LifecycleType.read(in)
804-
: LifecycleType.DATA;
799+
? LifecycleType.read(in)
800+
: LifecycleType.DATA;
805801
return new Template(lifecycleTarget, enabled, dataRetention, downsampling);
806802
}
807803

‎server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public boolean isEmpty() {
7474
@Override
7575
public void writeTo(StreamOutput out) throws IOException {
7676
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
77-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
7877
|| failureStore == null
7978
|| failureStore().enabled() != null) {
8079
out.writeOptionalWriteable(failureStore);
@@ -140,7 +139,6 @@ public Template(DataStreamFailureStore.Template template) {
140139
@Override
141140
public void writeTo(StreamOutput out) throws IOException {
142141
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
143-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
144142
|| failureStore.get() == null
145143
|| failureStore().mapAndGet(DataStreamFailureStore.Template::enabled).get() != null) {
146144
ResettableValue.write(out, failureStore, (o, v) -> v.writeTo(o));

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamFeatureSetUsage.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -134,26 +134,17 @@ public DataStreamStats(StreamInput in) throws IOException {
134134
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
135135
in.getTransportVersion().onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING) ? in.readVLong() : 0,
136136
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
137+
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
138+
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
137139
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
138-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
139-
? in.readVLong()
140-
: 0,
140+
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
141+
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
141142
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
142-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
143-
? in.readVLong()
144-
: 0,
143+
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
144+
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
145145
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
146-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
147-
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
148-
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
149-
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
150-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
151-
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
152-
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
153-
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
154-
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
155-
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
156-
: Map.of()
146+
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
147+
: Map.of()
157148
);
158149
}
159150

@@ -168,8 +159,7 @@ public void writeTo(StreamOutput out) throws IOException {
168159
}
169160
out.writeVLong(this.failureStoreIndicesCount);
170161
}
171-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
172-
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
162+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
173163
out.writeVLong(failuresLifecycleExplicitlyEnabledCount);
174164
out.writeVLong(failuresLifecycleEffectivelyEnabledCount);
175165
failuresLifecycleDataRetentionStats.writeTo(out);

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/Block.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.apache.lucene.util.Accountable;
1111
import org.apache.lucene.util.RamUsageEstimator;
12+
import org.elasticsearch.TransportVersion;
1213
import org.elasticsearch.TransportVersions;
1314
import org.elasticsearch.common.io.stream.StreamOutput;
1415
import org.elasticsearch.common.io.stream.Writeable;
@@ -344,9 +345,8 @@ static Block[] buildAll(Block.Builder... builders) {
344345
* This should be paired with {@link #readTypedBlock(BlockStreamInput)}
345346
*/
346347
static void writeTypedBlock(Block block, StreamOutput out) throws IOException {
347-
if (out.getTransportVersion().before(TransportVersions.AGGREGATE_METRIC_DOUBLE_BLOCK)
348-
&& block instanceof AggregateMetricDoubleBlock aggregateMetricDoubleBlock) {
349-
block = aggregateMetricDoubleBlock.asCompositeBlock();
348+
if (false == supportsAggregateMetricDoubleBlock(out.getTransportVersion()) && block instanceof AggregateMetricDoubleBlock a) {
349+
block = a.asCompositeBlock();
350350
}
351351
block.elementType().writeTo(out);
352352
block.writeTo(out);
@@ -359,13 +359,17 @@ static void writeTypedBlock(Block block, StreamOutput out) throws IOException {
359359
static Block readTypedBlock(BlockStreamInput in) throws IOException {
360360
ElementType elementType = ElementType.readFrom(in);
361361
Block block = elementType.reader.readBlock(in);
362-
if (in.getTransportVersion().before(TransportVersions.AGGREGATE_METRIC_DOUBLE_BLOCK)
363-
&& block instanceof CompositeBlock compositeBlock) {
362+
if (false == supportsAggregateMetricDoubleBlock(in.getTransportVersion()) && block instanceof CompositeBlock compositeBlock) {
364363
block = AggregateMetricDoubleBlock.fromCompositeBlock(compositeBlock);
365364
}
366365
return block;
367366
}
368367

368+
static boolean supportsAggregateMetricDoubleBlock(TransportVersion version) {
369+
return version.after(TransportVersions.AGGREGATE_METRIC_DOUBLE_BLOCK)
370+
|| version.isPatchFrom(TransportVersions.ESQL_AGGREGATE_METRIC_DOUBLE_BLOCK_8_19);
371+
}
372+
369373
/**
370374
* Serialization type for blocks: 0 and 1 replace false/true used in pre-8.14
371375
*/

‎x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/retriever/PinnedRankDoc.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ protected int doHashCode() {
7676

7777
@Override
7878
public TransportVersion getMinimalSupportedVersion() {
79-
return TransportVersions.PINNED_RETRIEVER;
79+
throw new IllegalStateException("not used");
80+
}
81+
82+
@Override
83+
public boolean supportsVersion(TransportVersion version) {
84+
return version.onOrAfter(TransportVersions.PINNED_RETRIEVER) || version.isPatchFrom(TransportVersions.PINNED_RETRIEVER_8_19);
8085
}
8186
}

0 commit comments

Comments
 (0)