Skip to content

[ES|QL] Supports date_nanos in bucket #213319

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
stratoula merged 3 commits into from
Mar 10, 2025
Merged

[ES|QL] Supports date_nanos in bucket #213319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
495019f
[ES|QL] Supports date_nanos in bucket
stratoula Mar 6, 2025
33616a0
Merge branch 'main' into esql-support-date_nanos-bucket
stratoula Mar 10, 2025
12bf56d
Run on updated es
stratoula Mar 10, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...packages/shared/kbn-esql-validation-autocomplete/scripts/generate_function_definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const bucketParameterTypes: Array<
// field // bucket //from // to //result
['date', 'date_period', null, null, 'date'],
['date', 'integer', 'date', 'date', 'date'],
['date_nanos', 'date_period', null, null, 'date_nanos'],
['date_nanos', 'integer', 'date', 'date', 'date_nanos'],
// Modified time_duration to time_literal
['date', 'time_literal', null, null, 'date'],
['double', 'double', null, null, 'double'],
Expand Down
36 changes: 24 additions & 12 deletions ...sql-validation-autocomplete/src/autocomplete/__tests__/autocomplete.command.stats.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,16 @@ describe('autocomplete.suggest', () => {
const { assertSuggestions } = await setup();

await assertSuggestions('from a | stats by bucket(/', [
...getFieldNamesByType([...ESQL_COMMON_NUMERIC_TYPES, 'date']).map(
...getFieldNamesByType([...ESQL_COMMON_NUMERIC_TYPES, 'date', 'date_nanos']).map(
(field) => `${field}, `
),
...getFunctionSignaturesByReturnType('eval', ['date', ...ESQL_COMMON_NUMERIC_TYPES], {
scalar: true,
}).map((s) => ({ ...s, text: `${s.text},` })),
...getFunctionSignaturesByReturnType(
'eval',
['date', 'date_nanos', ...ESQL_COMMON_NUMERIC_TYPES],
{
scalar: true,
}
).map((s) => ({ ...s, text: `${s.text},` })),
]);
await assertSuggestions('from a | stats round(/', [
...getFunctionSignaturesByReturnType('stats', roundParameterTypes, {
Expand Down Expand Up @@ -318,17 +322,25 @@ describe('autocomplete.suggest', () => {
const { assertSuggestions } = await setup();
await assertSuggestions('from a | stats avg(b) by BUCKET(/, 50, ?_tstart, ?_tend)', [
// Note there's no space or comma in the suggested field names
...getFieldNamesByType(['date', ...ESQL_COMMON_NUMERIC_TYPES]),
...getFunctionSignaturesByReturnType('eval', ['date', ...ESQL_COMMON_NUMERIC_TYPES], {
scalar: true,
}),
...getFieldNamesByType(['date', 'date_nanos', ...ESQL_COMMON_NUMERIC_TYPES]),
...getFunctionSignaturesByReturnType(
'eval',
['date', 'date_nanos', ...ESQL_COMMON_NUMERIC_TYPES],
{
scalar: true,
}
),
]);
await assertSuggestions('from a | stats avg(b) by BUCKET( / , 50, ?_tstart, ?_tend)', [
// Note there's no space or comma in the suggested field names
...getFieldNamesByType(['date', ...ESQL_COMMON_NUMERIC_TYPES]),
...getFunctionSignaturesByReturnType('eval', ['date', ...ESQL_COMMON_NUMERIC_TYPES], {
scalar: true,
}),
...getFieldNamesByType(['date', 'date_nanos', ...ESQL_COMMON_NUMERIC_TYPES]),
...getFunctionSignaturesByReturnType(
'eval',
['date', 'date_nanos', ...ESQL_COMMON_NUMERIC_TYPES],
{
scalar: true,
}
),
]);

await assertSuggestions(
Expand Down
38 changes: 38 additions & 0 deletions ...s/shared/kbn-esql-validation-autocomplete/src/definitions/generated/grouping_functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,44 @@ const bucketDefinition: FunctionDefinition = {
],
returnType: 'date',
},
{
params: [
{
name: 'field',
type: 'date_nanos',
},
{
name: 'buckets',
type: 'date_period',
constantOnly: true,
},
],
returnType: 'date_nanos',
},
{
params: [
{
name: 'field',
type: 'date_nanos',
},
{
name: 'buckets',
type: 'integer',
constantOnly: true,
},
{
name: 'startDate',
type: 'date',
constantOnly: true,
},
{
name: 'endDate',
type: 'date',
constantOnly: true,
},
],
returnType: 'date_nanos',
},
{
params: [
{
Expand Down