-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ES|QL]
JOIN
command parser support (#202749)
## Summary Partially addresses #200858 - Adds `JOIN` command support in Kibana ES|QL AST and parser. - Adds `commandType` to AST nodes, to support `<TYPE> JOIN ...` in join commands. - Adds `AS` binary expression, to support *target* aliassing in `JOIN` commands: `LEFT JOIN a AS b` ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
- Loading branch information
1 parent
51ef0e7
commit df37092
Showing
7 changed files
with
301 additions
and
6 deletions.
There are no files selected for viewing
202 changes: 202 additions & 0 deletions
202
packages/kbn-esql-ast/src/parser/__tests__/join.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the "Elastic License | ||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
* Public License v 1"; you may not use this file except in compliance with, at | ||
* your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
* License v3.0 only", or the "Server Side Public License, v 1". | ||
*/ | ||
|
||
import { EsqlQuery } from '../../query'; | ||
import { Walker } from '../../walker'; | ||
|
||
describe('<TYPE> JOIN command', () => { | ||
describe('correctly formatted', () => { | ||
it('can parse out JOIN command', () => { | ||
const text = `FROM employees | LOOKUP JOIN languages_lookup ON language_code`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
type: 'command', | ||
name: 'join', | ||
commandType: 'lookup', | ||
}); | ||
}); | ||
|
||
it('supports all join types', () => { | ||
const assertJoinType = (type: string) => { | ||
const text = `FROM employees | ${type} JOIN languages_lookup ON language_code`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
type: 'command', | ||
name: 'join', | ||
commandType: type.toLowerCase(), | ||
}); | ||
}; | ||
|
||
assertJoinType('LOOKUP'); | ||
assertJoinType('LEFT'); | ||
assertJoinType('RIGHT'); | ||
expect(() => assertJoinType('HASH')).toThrow(); | ||
}); | ||
|
||
it('can parse out target identifier', () => { | ||
const text = `FROM employees | LOOKUP JOIN languages_lookup ON language_code`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
commandType: 'lookup', | ||
args: [ | ||
{ | ||
type: 'identifier', | ||
name: 'languages_lookup', | ||
}, | ||
{}, | ||
], | ||
}); | ||
}); | ||
|
||
it('can parse out target with "AS" alias expression', () => { | ||
const text = `FROM employees | LOOKUP JOIN languages_lookup AS ll ON language_code`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
commandType: 'lookup', | ||
args: [ | ||
{ | ||
type: 'function', | ||
subtype: 'binary-expression', | ||
name: 'as', | ||
args: [ | ||
{ | ||
type: 'identifier', | ||
name: 'languages_lookup', | ||
}, | ||
{ | ||
type: 'identifier', | ||
name: 'll', | ||
}, | ||
], | ||
}, | ||
{}, | ||
], | ||
}); | ||
}); | ||
|
||
it('can parse out a single "ON" predicate expression', () => { | ||
const text = `FROM employees | LOOKUP JOIN languages_lookup AS ll ON language_code`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
commandType: 'lookup', | ||
args: [ | ||
{}, | ||
{ | ||
type: 'option', | ||
name: 'on', | ||
args: [ | ||
{ | ||
type: 'column', | ||
name: 'language_code', | ||
args: [ | ||
{ | ||
type: 'identifier', | ||
name: 'language_code', | ||
}, | ||
], | ||
}, | ||
], | ||
}, | ||
], | ||
}); | ||
}); | ||
|
||
it('can parse out multiple "ON" predicate expressions', () => { | ||
const text = `FROM employees | LOOKUP JOIN languages_lookup AS ll ON a, b, c`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[1]).toMatchObject({ | ||
name: 'join', | ||
args: [ | ||
{}, | ||
{ | ||
type: 'option', | ||
name: 'on', | ||
args: [ | ||
{ | ||
type: 'column', | ||
name: 'a', | ||
}, | ||
{ | ||
type: 'column', | ||
name: 'b', | ||
}, | ||
{ | ||
type: 'column', | ||
name: 'c', | ||
}, | ||
], | ||
}, | ||
], | ||
}); | ||
}); | ||
|
||
it('example from documentation', () => { | ||
const text = ` | ||
FROM employees | ||
| EVAL language_code = languages | ||
| LOOKUP JOIN languages_lookup ON language_code | ||
| WHERE emp_no < 500 | ||
| KEEP emp_no, language_name | ||
| SORT emp_no | ||
| LIMIT 10 | ||
`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.ast.commands[2]).toMatchObject({ | ||
type: 'command', | ||
name: 'join', | ||
commandType: 'lookup', | ||
args: [ | ||
{ | ||
type: 'identifier', | ||
name: 'languages_lookup', | ||
}, | ||
{ | ||
type: 'option', | ||
name: 'on', | ||
args: [ | ||
{ | ||
type: 'column', | ||
name: 'language_code', | ||
}, | ||
], | ||
}, | ||
], | ||
}); | ||
}); | ||
|
||
it('correctly extracts node positions', () => { | ||
const text = `FROM employees | LOOKUP JOIN index AS alias ON on_1, on_2 | LIMIT 1`; | ||
const query = EsqlQuery.fromSrc(text); | ||
const node1 = Walker.match(query.ast, { type: 'identifier', name: 'index' }); | ||
const node2 = Walker.match(query.ast, { type: 'identifier', name: 'alias' }); | ||
const node3 = Walker.match(query.ast, { type: 'column', name: 'on_1' }); | ||
const node4 = Walker.match(query.ast, { type: 'column', name: 'on_2' }); | ||
|
||
expect(query.src.slice(node1?.location.min, node1?.location.max! + 1)).toBe('index'); | ||
expect(query.src.slice(node2?.location.min, node2?.location.max! + 1)).toBe('alias'); | ||
expect(query.src.slice(node3?.location.min, node3?.location.max! + 1)).toBe('on_1'); | ||
expect(query.src.slice(node4?.location.min, node4?.location.max! + 1)).toBe('on_2'); | ||
}); | ||
}); | ||
|
||
describe('incorrectly formatted', () => { | ||
const text = `FROM employees | LOOKUP JOIN index AAS alias ON on_1, on_2 | LIMIT 1`; | ||
const query = EsqlQuery.fromSrc(text); | ||
|
||
expect(query.errors.length > 0).toBe(true); | ||
expect(query.errors[0].message.includes('AAS')).toBe(true); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the "Elastic License | ||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
* Public License v 1"; you may not use this file except in compliance with, at | ||
* your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
* License v3.0 only", or the "Server Side Public License, v 1". | ||
*/ | ||
|
||
import { JoinCommandContext, JoinTargetContext } from '../../antlr/esql_parser'; | ||
import { Builder } from '../../builder'; | ||
import { ESQLAstItem, ESQLBinaryExpression, ESQLCommand, ESQLIdentifier } from '../../types'; | ||
import { createCommand, createIdentifier } from '../factories'; | ||
import { visitValueExpression } from '../walkers'; | ||
|
||
const createNodeFromJoinTarget = ( | ||
ctx: JoinTargetContext | ||
): ESQLIdentifier | ESQLBinaryExpression => { | ||
const index = createIdentifier(ctx._index); | ||
const aliasCtx = ctx._alias; | ||
|
||
if (!aliasCtx) { | ||
return index; | ||
} | ||
|
||
const alias = createIdentifier(aliasCtx); | ||
const renameExpression = Builder.expression.func.binary('as', [ | ||
index, | ||
alias, | ||
]) as ESQLBinaryExpression; | ||
|
||
return renameExpression; | ||
}; | ||
|
||
export const createJoinCommand = (ctx: JoinCommandContext): ESQLCommand => { | ||
const command = createCommand('join', ctx); | ||
|
||
// Pick-up the <TYPE> of the command. | ||
command.commandType = (ctx._type_.text ?? '').toLocaleLowerCase(); | ||
|
||
const joinTarget = createNodeFromJoinTarget(ctx.joinTarget()); | ||
const onOption = Builder.option({ name: 'on' }); | ||
const joinPredicates: ESQLAstItem[] = onOption.args; | ||
|
||
for (const joinPredicateCtx of ctx.joinCondition().joinPredicate_list()) { | ||
const expression = visitValueExpression(joinPredicateCtx.valueExpression()); | ||
|
||
if (expression) { | ||
joinPredicates.push(expression); | ||
} | ||
} | ||
|
||
command.args.push(joinTarget); | ||
command.args.push(onOption); | ||
|
||
return command; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters