Skip to content

Commit fc4cbad

Browse files
committed
ESQL: Add GROUP BY ALL
Add output of the dimension list into the _timeseries column. Part of #136253
1 parent c60d4f8 commit fc4cbad

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesMetadataFieldBlockLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*/
2323
public final class TimeSeriesMetadataFieldBlockLoader implements BlockLoader {
2424

25-
private final Set<String> includes;
25+
private final Set<String> dimensions;
2626

27-
public TimeSeriesMetadataFieldBlockLoader(Set<String> includes) {
28-
this.includes = Collections.unmodifiableSet(includes);
27+
public TimeSeriesMetadataFieldBlockLoader(Set<String> dimensions) {
28+
this.dimensions = Collections.unmodifiableSet(dimensions);
2929
}
3030

3131
@Override
@@ -45,7 +45,7 @@ public RowStrideReader rowStrideReader(LeafReaderContext context) throws IOExcep
4545

4646
@Override
4747
public StoredFieldsSpec rowStrideStoredFieldSpec() {
48-
return StoredFieldsSpec.withSourcePaths(IgnoredSourceFieldMapper.IgnoredSourceFormat.COALESCED_SINGLE_IGNORED_SOURCE, includes);
48+
return StoredFieldsSpec.withSourcePaths(IgnoredSourceFieldMapper.IgnoredSourceFormat.COALESCED_SINGLE_IGNORED_SOURCE, dimensions);
4949
}
5050

5151
@Override

x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s-timeseries.csv-spec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ max_deriv:double | max_rate:double | time_bucket:datetime | cluster:keyword
798798
;
799799

800800
bare_count_over_time_outputs_dimensions
801-
required_capability: ts_command_v0
801+
required_capability: metrics_group_by_all
802802
required_capability: metrics_group_by_all_with_ts_dimensions
803803

804804
TS k8s
@@ -820,7 +820,7 @@ count:long | _timeseries:keyword
820820
;
821821

822822
bare_count_over_time_with_tbucket_outputs_dimensions
823-
required_capability: ts_command_v0
823+
required_capability: metrics_group_by_all
824824
required_capability: metrics_group_by_all_with_ts_dimensions
825825

826826
TS k8s
@@ -842,7 +842,7 @@ count:long | _timeseries:keyword
842842
;
843843

844844
bare_avg_over_time_outputs_dimensions
845-
required_capability: ts_command_v0
845+
required_capability: metrics_group_by_all
846846
required_capability: metrics_group_by_all_with_ts_dimensions
847847

848848
TS k8s
@@ -864,7 +864,7 @@ avg:double | _timeseries:keyword
864864
;
865865

866866
bare_avg_over_time_with_tbucket_outputs_dimensions
867-
required_capability: ts_command_v0
867+
required_capability: metrics_group_by_all
868868
required_capability: metrics_group_by_all_with_ts_dimensions
869869

870870
TS k8s
@@ -886,7 +886,7 @@ avg:double | _timeseries:keyword
886886
;
887887

888888
bare_sum_over_time_outputs_dimensions
889-
required_capability: ts_command_v0
889+
required_capability: metrics_group_by_all
890890
required_capability: metrics_group_by_all_with_ts_dimensions
891891

892892
TS k8s
@@ -908,7 +908,7 @@ sum:double | _timeseries:keyword
908908
;
909909

910910
bare_sum_over_time_with_tbucket_outputs_dimensions
911-
required_capability: ts_command_v0
911+
required_capability: metrics_group_by_all
912912
required_capability: metrics_group_by_all_with_ts_dimensions
913913

914914
TS k8s
@@ -930,7 +930,7 @@ sum:double | _timeseries:keyword
930930
;
931931

932932
bare_rate_outputs_dimensions
933-
required_capability: ts_command_v0
933+
required_capability: metrics_group_by_all
934934
required_capability: metrics_group_by_all_with_ts_dimensions
935935

936936
TS k8s
@@ -952,7 +952,7 @@ rate:double | _timeseries:keyword
952952
;
953953

954954
bare_rate_with_tbucket_outputs_dimensions
955-
required_capability: ts_command_v0
955+
required_capability: metrics_group_by_all
956956
required_capability: metrics_group_by_all_with_ts_dimensions
957957

958958
TS k8s
@@ -974,7 +974,7 @@ rate:double | _timeseries:keyword
974974
;
975975

976976
wrapped_rate
977-
required_capability: ts_command_v0
977+
required_capability: metrics_group_by_all
978978
required_capability: metrics_group_by_all_with_ts_dimensions
979979

980980
TS k8s

0 commit comments

Comments
 (0)