Skip to content

Commit 2758b53

Browse files
committed
Update list of commands
1 parent 3cff2a0 commit 2758b53

File tree

4 files changed

+681
-499
lines changed

4 files changed

+681
-499
lines changed

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

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ emp_no:integer | gender:keyword | x:keyword | a:keyword | b:keyword | _fork:keyw
446446
10087 | F | F foobar | F | foobar | fork2
447447
;
448448

449-
450449
forkBranchWithDissect
451450
required_capability: fork_v8
452451

@@ -466,7 +465,6 @@ emp_no:integer | gender:keyword | x:keyword | a:keyword | b:keyword | _fork:keyw
466465
10087 | F | null | null | null | fork2
467466
;
468467

469-
470468
forkAfterDissect
471469
required_capability: fork_v8
472470

@@ -757,3 +755,61 @@ emp_no:integer | first_name:keyword | last_name:keyword | x:keyword | _fo
757755
10081 | Zhongwei | Rosen | ZHONGWEI ROSEN | fork2
758756
10087 | Xinglin | Eugenio | XINGLIN EUGENIO | fork2
759757
;
758+
759+
forkAfterGrok
760+
required_capability: fork_v8
761+
762+
FROM employees
763+
| EVAL x = concat(gender, " foobar")
764+
| GROK x "%{WORD:a} %{WORD:b}"
765+
| FORK (WHERE emp_no == 10048 OR emp_no == 10081)
766+
(WHERE emp_no == 10081 OR emp_no == 10087)
767+
| SORT _fork, emp_no
768+
| KEEP emp_no, gender, x, a, b, _fork
769+
;
770+
771+
emp_no:integer | gender:keyword | x:keyword | a:keyword | b:keyword | _fork:keyword
772+
10048 | M | M foobar | M | foobar | fork1
773+
10081 | M | M foobar | M | foobar | fork1
774+
10081 | M | M foobar | M | foobar | fork2
775+
10087 | F | F foobar | F | foobar | fork2
776+
;
777+
778+
forkBranchWithGrok
779+
required_capability: fork_v8
780+
781+
FROM employees
782+
| WHERE emp_no == 10048 OR emp_no == 10081
783+
| FORK (EVAL a = CONCAT(first_name, " ", emp_no::keyword, " ", last_name)
784+
| GROK a "%{WORD:x} %{WORD:y} %{WORD:z}" )
785+
(EVAL b = CONCAT(last_name, " ", emp_no::keyword, " ", first_name)
786+
| GROK b "%{WORD:x} %{WORD:y} %{WORD:z}" )
787+
| KEEP _fork, emp_no, x, y, z
788+
| SORT _fork, emp_no
789+
;
790+
791+
_fork:keyword | emp_no:integer | x:keyword | y:keyword | z:keyword
792+
fork1 | 10048 | Florian | 10048 | Syrotiuk
793+
fork1 | 10081 | Zhongwei | 10081 | Rosen
794+
fork2 | 10048 | Syrotiuk | 10048 | Florian
795+
fork2 | 10081 | Rosen | 10081 | Zhongwei
796+
;
797+
798+
forkBeforeGrok
799+
required_capability: fork_v8
800+
801+
FROM employees
802+
| FORK (WHERE emp_no == 10048 OR emp_no == 10081)
803+
(WHERE emp_no == 10081 OR emp_no == 10087)
804+
| EVAL x = concat(gender, " foobar")
805+
| GROK x "%{WORD:a} %{WORD:b}"
806+
| SORT _fork, emp_no
807+
| KEEP emp_no, gender, x, a, b, _fork
808+
;
809+
810+
emp_no:integer | gender:keyword | x:keyword | a:keyword | b:keyword | _fork:keyword
811+
10048 | M | M foobar | M | foobar | fork1
812+
10081 | M | M foobar | M | foobar | fork1
813+
10081 | M | M foobar | M | foobar | fork2
814+
10087 | F | F foobar | F | foobar | fork2
815+
;

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,16 @@ forkSubQueryCommand
291291
;
292292

293293
forkSubQueryProcessingCommand
294-
: processingCommand
294+
: evalCommand
295+
| whereCommand
296+
| limitCommand
297+
| statsCommand
298+
| sortCommand
299+
| dissectCommand
300+
| changePointCommand
301+
| completionCommand
302+
| grokCommand
303+
| {this.isDevVersion()}? inlinestatsCommand
295304
;
296305

297306
rrfCommand

0 commit comments

Comments
 (0)