Skip to content

Commit dd15df3

Browse files
committed
Fix BWC issue
1 parent fdc51f4 commit dd15df3

File tree

5 files changed

+73
-64
lines changed

5 files changed

+73
-64
lines changed

docs/reference/query-languages/esql/_snippets/functions/parameters/bucket.md

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

docs/reference/query-languages/esql/_snippets/functions/types/bucket.md

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

docs/reference/query-languages/esql/images/functions/bucket.svg

Lines changed: 1 addition & 1 deletion
Loading

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ static TransportVersion def(int id) {
323323
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED = def(9_109_00_0);
324324
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
325325
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
326+
public static final TransportVersion ESQL_EMIT_EMPTY_BUCKETS = def(9_112_0_00);
326327

327328
/*
328329
* STOP! READ THIS FIRST! No, really,

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/grouping/Bucket.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package org.elasticsearch.xpack.esql.expression.function.grouping;
99

1010
import org.apache.lucene.util.BytesRef;
11+
import org.elasticsearch.TransportVersions;
1112
import org.elasticsearch.common.Rounding;
1213
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1314
import org.elasticsearch.common.io.stream.StreamInput;
@@ -235,8 +236,10 @@ private Bucket(StreamInput in) throws IOException {
235236
in.readNamedWriteable(Expression.class),
236237
in.readOptionalNamedWriteable(Expression.class),
237238
in.readOptionalNamedWriteable(Expression.class),
238-
in.readOptionalNamedWriteable(Expression.class)
239-
);
239+
in.getTransportVersion().onOrAfter(TransportVersions.ESQL_EMIT_EMPTY_BUCKETS)
240+
? in.readOptionalNamedWriteable(Expression.class)
241+
: null
242+
);
240243
}
241244

242245
private static List<Expression> fields(Expression field, Expression buckets, Expression from, Expression to, Expression emitEmptyBuckets) {
@@ -262,7 +265,9 @@ public void writeTo(StreamOutput out) throws IOException {
262265
out.writeNamedWriteable(buckets);
263266
out.writeOptionalNamedWriteable(from);
264267
out.writeOptionalNamedWriteable(to);
265-
out.writeOptionalNamedWriteable(emitEmptyBuckets);
268+
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_EMIT_EMPTY_BUCKETS)) {
269+
out.writeOptionalNamedWriteable(emitEmptyBuckets);
270+
}
266271
}
267272

268273
@Override

0 commit comments

Comments
 (0)