Skip to content

Commit 5de595a

Browse files
Merge branch 'main' into failure-store-feature-update
2 parents f04e918 + 492b036 commit 5de595a

File tree

21 files changed

+2041
-7
lines changed

21 files changed

+2041
-7
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,14 @@ static TransportVersion def(int id) {
222222
public static final TransportVersion REPO_ANALYSIS_COPY_BLOB = def(9_048_0_00);
223223
public static final TransportVersion AMAZON_BEDROCK_TASK_SETTINGS = def(9_049_0_00);
224224
public static final TransportVersion ESQL_REPORT_SHARD_PARTITIONING = def(9_050_0_00);
225-
public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_051_0_00);
226-
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
227-
public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
228-
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_054_0_00);
225+
public static final TransportVersion DEAD_ESQL_QUERY_PLANNING_DURATION = def(9_051_0_00);
226+
public static final TransportVersion DEAD_ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
227+
public static final TransportVersion DEAD_BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
228+
public static final TransportVersion DEAD_SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_054_0_00);
229+
public static final TransportVersion ESQL_QUERY_PLANNING_DURATION = def(9_055_0_00);
230+
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_056_0_00);
231+
public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_057_0_00);
232+
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL = def(9_058_0_00);
229233

230234
/*
231235
* STOP! READ THIS FIRST! No, really,

x-pack/plugin/esql/compute/build.gradle

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,4 +862,27 @@ tasks.named('stringTemplates').configure {
862862
it.outputFile = "org/elasticsearch/xpack/compute/operator/lookup/EnrichResultBuilderForBoolean.java"
863863
}
864864

865+
// TODO: add last_over_time for other types: boolean, bytes_refs
866+
File lastOverTimeAggregatorInputFile = file("src/main/java/org/elasticsearch/compute/aggregation/X-LastOverTimeAggregator.java.st")
867+
template {
868+
it.properties = intProperties
869+
it.inputFile = lastOverTimeAggregatorInputFile
870+
it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java"
871+
}
872+
template {
873+
it.properties = longProperties
874+
it.inputFile = lastOverTimeAggregatorInputFile
875+
it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java"
876+
}
877+
template {
878+
it.properties = floatProperties
879+
it.inputFile = lastOverTimeAggregatorInputFile
880+
it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java"
881+
}
882+
template {
883+
it.properties = doubleProperties
884+
it.inputFile = lastOverTimeAggregatorInputFile
885+
it.outputFile = "org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java"
886+
}
887+
865888
}

x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java

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

x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java

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

0 commit comments

Comments
 (0)