Skip to content

ESQL: Claim transport version for partitioning #127775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 7, 2025
Merged

ESQL: Claim transport version for partitioning #127775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98e0111
ESQL: Claim transport version for partitioning
nik9000 May 6, 2025
a907689
Merge branch 'main' into esql_auto_partition_claim
nik9000 May 6, 2025
cd722b1
Merge branch 'main' into esql_auto_partition_claim
nik9000 May 7, 2025
ab4f1da
Merge branch 'main' into esql_auto_partition_claim
nik9000 May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ static TransportVersion def(int id) {
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19 = def(8_841_0_25);
public static final TransportVersion INTRODUCE_FAILURES_DEFAULT_RETENTION_BACKPORT_8_19 = def(8_841_0_26);
public static final TransportVersion RESCORE_VECTOR_ALLOW_ZERO_BACKPORT_8_19 = def(8_841_0_27);
public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING_8_19 = def(8_841_0_28);
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
Expand Down
9 changes: 7 additions & 2 deletions ...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.stream.Collectors;

import static org.elasticsearch.TransportVersions.ESQL_REPORT_SHARD_PARTITIONING;
import static org.elasticsearch.TransportVersions.ESQL_REPORT_SHARD_PARTITIONING_8_19;

public abstract class LuceneOperator extends SourceOperator {
private static final Logger logger = LogManager.getLogger(LuceneOperator.class);
Expand Down Expand Up @@ -352,7 +353,7 @@ private Status(LuceneOperator operator) {
} else {
rowsEmitted = 0;
}
partitioningStrategies = in.getTransportVersion().onOrAfter(ESQL_REPORT_SHARD_PARTITIONING)
partitioningStrategies = serializeShardPartitioning(in.getTransportVersion())
? in.readMap(LuceneSliceQueue.PartitioningStrategy::readFrom)
: Map.of();
}
Expand All @@ -376,11 +377,15 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_PROFILE_ROWS_PROCESSED)) {
out.writeVLong(rowsEmitted);
}
if (out.getTransportVersion().onOrAfter(ESQL_REPORT_SHARD_PARTITIONING)) {
if (serializeShardPartitioning(out.getTransportVersion())) {
out.writeMap(partitioningStrategies, StreamOutput::writeString, StreamOutput::writeWriteable);
}
}

private static boolean serializeShardPartitioning(TransportVersion version) {
return version.onOrAfter(ESQL_REPORT_SHARD_PARTITIONING) || version.isPatchFrom(ESQL_REPORT_SHARD_PARTITIONING_8_19);
}

@Override
public String getWriteableName() {
return ENTRY.name;
Expand Down