Skip to content

ESQL: Added status to OrdinalsGroupingOperator #130720

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

Closed
wants to merge 13 commits into from
Closed

ESQL: Added status to OrdinalsGroupingOperator #130720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b45c672
ESQL: Added status to OrdinalsGroupingOperator
ivancea Jul 7, 2025
9d6ac9d
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 8, 2025
76fbdc7
Added emit times and specific times per branch
ivancea Jul 8, 2025
2bb1a40
[CI] Auto commit changes from spotless
Jul 8, 2025
cfdb678
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 8, 2025
70785ff
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 9, 2025
9df4a61
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 10, 2025
bd9a8e1
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 10, 2025
e161686
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 11, 2025
8615764
Added backport transport versions
ivancea Jul 11, 2025
8ca0aa0
Added serialization entry for the status object
ivancea Jul 14, 2025
bfe4b30
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 14, 2025
a21398b
Merge branch 'main' into ordinals-grouping-operator-status
ivancea Jul 14, 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
3 changes: 3 additions & 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 @@ -212,6 +212,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_8_19 = def(8_841_0_63);
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_8_19 = def(8_841_0_64);
public static final TransportVersion ESQL_ORDINALS_OPERATOR_STATUS_8_19 = def(8_841_0_65);
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 Expand Up @@ -330,6 +331,7 @@ static TransportVersion def(int id) {
public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
public static final TransportVersion ESQL_ORDINALS_OPERATOR_STATUS_9_1 = def(9_112_0_03);
// Below is the first version in 9.2 and NOT in 9.1.
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);
Expand All @@ -340,6 +342,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
public static final TransportVersion LOOKUP_JOIN_CCS = def(9_120_0_00);
public static final TransportVersion NODE_USAGE_STATS_FOR_THREAD_POOLS_IN_CLUSTER_INFO = def(9_121_0_00);
public static final TransportVersion ESQL_ORDINALS_OPERATOR_STATUS = def(9_122_0_00);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are going to backport you should make the backport transport versions and use them in this PR before merging.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could do it in a follow-up PR, but this PR is small enough I'd do it in this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Versions added!


/*
* STOP! READ THIS FIRST! No, really,
Expand Down
2 changes: 1 addition & 1 deletion ...sql/compute/src/main/java/org/elasticsearch/compute/operator/HashAggregationOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public String describe() {
/**
* Total nanos for emitting the output
*/
protected long emitNanos;
private long emitNanos;

@SuppressWarnings("this-escape")
public HashAggregationOperator(
Expand Down
Loading