Compile join operator

Fixes #30
runreveal · Feb 16, 2024 · 40e2b3e · 40e2b3e
1 parent 2a1be1a
commit 40e2b3e
Show file tree

Hide file tree

Showing 34 changed files with 413 additions and 123 deletions.
diff --git a/pql.go b/pql.go
diff --git a/testdata/Goldens/Join/input.pql b/testdata/Goldens/Join/input.pql
@@ -0,0 +1,4 @@
+LexResults
+| join (Tokens) on Kind
+| sort by SpanStart asc
+| project TokenConstant, Value
diff --git a/testdata/Goldens/Join/output.csv b/testdata/Goldens/Join/output.csv
@@ -0,0 +1,3 @@
+TokenIdentifier,foo
+TokenPipe,
+TokenIdentifier,bar
diff --git a/testdata/Goldens/Join/output.sql b/testdata/Goldens/Join/output.sql
@@ -0,0 +1,3 @@
+WITH "subquery0" AS (SELECT * FROM "Tokens"),
+"subquery1" AS (SELECT * FROM (SELECT DISTINCT * FROM "LexResults") AS "$left" JOIN "subquery0" AS "$right" ON "$left"."Kind" = "$right"."Kind" ORDER BY "SpanStart" ASC NULLS FIRST)
+SELECT "TokenConstant" AS "TokenConstant", "Value" AS "Value" FROM "subquery1";
diff --git a/testdata/Goldens/JoinExplicit/input.pql b/testdata/Goldens/JoinExplicit/input.pql
@@ -0,0 +1,4 @@
+LexResults
+| join (Tokens) on $left.Kind == $right.Kind
+| sort by SpanStart asc
+| project TokenConstant, Value
diff --git a/testdata/Goldens/JoinExplicit/output.csv b/testdata/Goldens/JoinExplicit/output.csv
@@ -0,0 +1,3 @@
+TokenIdentifier,foo
+TokenPipe,
+TokenIdentifier,bar
diff --git a/testdata/Goldens/JoinExplicit/output.sql b/testdata/Goldens/JoinExplicit/output.sql
@@ -0,0 +1,3 @@
+WITH "subquery0" AS (SELECT * FROM "Tokens"),
+"subquery1" AS (SELECT * FROM (SELECT DISTINCT * FROM "LexResults") AS "$left" JOIN "subquery0" AS "$right" ON "$left"."Kind" = "$right"."Kind" ORDER BY "SpanStart" ASC NULLS FIRST)
+SELECT "TokenConstant" AS "TokenConstant", "Value" AS "Value" FROM "subquery1";
diff --git a/testdata/Goldens/JoinExtraCond/input.pql b/testdata/Goldens/JoinExtraCond/input.pql
@@ -0,0 +1,4 @@
+LexResults
+| join (Tokens) on Kind, Value != "bar"
+| sort by SpanStart asc
+| project TokenConstant, Value
diff --git a/testdata/Goldens/JoinExtraCond/output.csv b/testdata/Goldens/JoinExtraCond/output.csv
@@ -0,0 +1,2 @@
+TokenIdentifier,foo
+TokenPipe,
diff --git a/testdata/Goldens/JoinExtraCond/output.sql b/testdata/Goldens/JoinExtraCond/output.sql
@@ -0,0 +1,3 @@
+WITH "subquery0" AS (SELECT * FROM "Tokens"),
+"subquery1" AS (SELECT * FROM (SELECT DISTINCT * FROM "LexResults") AS "$left" JOIN "subquery0" AS "$right" ON ("$left"."Kind" = "$right"."Kind") AND (coalesce("Value" <> 'bar', FALSE)) ORDER BY "SpanStart" ASC NULLS FIRST)
+SELECT "TokenConstant" AS "TokenConstant", "Value" AS "Value" FROM "subquery1";
diff --git a/testdata/Goldens/JoinInner/input.pql b/testdata/Goldens/JoinInner/input.pql
@@ -0,0 +1,4 @@
+StormEvents
+| project State
+| join kind=inner (StateCapitals | project State = upper(State), StateCapital) on State
+| sort by State asc
diff --git a/testdata/Goldens/JoinInner/output.csv b/testdata/Goldens/JoinInner/output.csv
@@ -0,0 +1,4 @@
+FLORIDA,FLORIDA,Tallahassee
+FLORIDA,FLORIDA,Tallahassee
+GEORGIA,GEORGIA,Atlanta
+MISSISSIPPI,MISSISSIPPI,Jackson
diff --git a/testdata/Goldens/JoinInner/output.sql b/testdata/Goldens/JoinInner/output.sql
@@ -0,0 +1,3 @@
+WITH "subquery0" AS (SELECT "State" AS "State" FROM "StormEvents"),
+"subquery1" AS (SELECT upper("State") AS "State", "StateCapital" AS "StateCapital" FROM "StateCapitals")
+SELECT * FROM "subquery0" AS "$left" JOIN "subquery1" AS "$right" ON "$left"."State" = "$right"."State" ORDER BY "State" ASC NULLS FIRST;
diff --git a/testdata/Goldens/JoinInnerUnique/input.pql b/testdata/Goldens/JoinInnerUnique/input.pql
@@ -0,0 +1,4 @@
+StormEvents
+| project State
+| join kind=innerunique (StateCapitals | project State = upper(State), StateCapital) on State
+| sort by State asc
diff --git a/testdata/Goldens/JoinInnerUnique/output.csv b/testdata/Goldens/JoinInnerUnique/output.csv
@@ -0,0 +1,3 @@
+FLORIDA,FLORIDA,Tallahassee
+GEORGIA,GEORGIA,Atlanta
+MISSISSIPPI,MISSISSIPPI,Jackson
diff --git a/testdata/Goldens/JoinInnerUnique/output.sql b/testdata/Goldens/JoinInnerUnique/output.sql
@@ -0,0 +1,3 @@
+WITH "subquery0" AS (SELECT "State" AS "State" FROM "StormEvents"),
+"subquery1" AS (SELECT upper("State") AS "State", "StateCapital" AS "StateCapital" FROM "StateCapitals")
+SELECT * FROM (SELECT DISTINCT * FROM "subquery0") AS "$left" JOIN "subquery1" AS "$right" ON "$left"."State" = "$right"."State" ORDER BY "State" ASC NULLS FIRST;
diff --git a/testdata/Goldens/OpParens/input.pql b/testdata/Goldens/OpParens/input.pql
@@ -1,3 +1,3 @@
 Tokens
-| where Value - 3 > 0
-| sort by Value asc
+| where Kind - 3 > 0
+| sort by Kind asc
diff --git a/testdata/Goldens/OpParens/output.csv b/testdata/Goldens/OpParens/output.csv
@@ -1,3 +1,4 @@
 4,TokenString
 5,TokenAnd
 6,TokenOr
+7,TokenPipe
diff --git a/testdata/Goldens/OpParens/output.sql b/testdata/Goldens/OpParens/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE ("Value" - 3) > 0 ORDER BY "Value" ASC NULLS FIRST;
+SELECT * FROM "Tokens" WHERE ("Kind" - 3) > 0 ORDER BY "Kind" ASC NULLS FIRST;
diff --git a/testdata/Goldens/WhereFunc/input.pql b/testdata/Goldens/WhereFunc/input.pql
@@ -1,2 +1,2 @@
 Tokens
-| where abs(Value) == 1
+| where abs(Kind) == 1
diff --git a/testdata/Goldens/WhereFunc/output.sql b/testdata/Goldens/WhereFunc/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE coalesce(abs("Value") = 1, FALSE);
+SELECT * FROM "Tokens" WHERE coalesce(abs("Kind") = 1, FALSE);
diff --git a/testdata/Goldens/WhereIsNotNull/input.pql b/testdata/Goldens/WhereIsNotNull/input.pql
@@ -1,2 +1,2 @@
 Tokens
-| where isnotnull(Value)
+| where isnotnull(Kind)
diff --git a/testdata/Goldens/WhereIsNotNull/output.csv b/testdata/Goldens/WhereIsNotNull/output.csv
@@ -4,4 +4,5 @@
 4,TokenString
 5,TokenAnd
 6,TokenOr
+7,TokenPipe
 -1,TokenError
diff --git a/testdata/Goldens/WhereIsNotNull/output.sql b/testdata/Goldens/WhereIsNotNull/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE "Value" IS NOT NULL;
+SELECT * FROM "Tokens" WHERE "Kind" IS NOT NULL;
diff --git a/testdata/Goldens/WhereIsNull/input.pql b/testdata/Goldens/WhereIsNull/input.pql
@@ -1,2 +1,2 @@
 Tokens
-| where isnull(Value)
+| where isnull(Kind)
diff --git a/testdata/Goldens/WhereIsNull/output.sql b/testdata/Goldens/WhereIsNull/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE "Value" IS NULL;
+SELECT * FROM "Tokens" WHERE "Kind" IS NULL;
diff --git a/testdata/Goldens/WhereNot/input.pql b/testdata/Goldens/WhereNot/input.pql
@@ -1,2 +1,2 @@
 Tokens
-| where not(Value > 0)
+| where not(Kind > 0)
diff --git a/testdata/Goldens/WhereNot/output.sql b/testdata/Goldens/WhereNot/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE NOT ("Value" > 0);
+SELECT * FROM "Tokens" WHERE NOT ("Kind" > 0);
diff --git a/testdata/Goldens/WhereNotEqualsNegative/input.pql b/testdata/Goldens/WhereNotEqualsNegative/input.pql
@@ -1,2 +1,2 @@
 Tokens
-| where Value != -1
+| where Kind != -1
diff --git a/testdata/Goldens/WhereNotEqualsNegative/output.csv b/testdata/Goldens/WhereNotEqualsNegative/output.csv
@@ -4,3 +4,4 @@
 4,TokenString
 5,TokenAnd
 6,TokenOr
+7,TokenPipe
diff --git a/testdata/Goldens/WhereNotEqualsNegative/output.sql b/testdata/Goldens/WhereNotEqualsNegative/output.sql
@@ -1 +1 @@
-SELECT * FROM "Tokens" WHERE coalesce("Value" <> -1, FALSE);
+SELECT * FROM "Tokens" WHERE coalesce("Kind" <> -1, FALSE);
diff --git a/testdata/Tables/LexResults.csv b/testdata/Tables/LexResults.csv
@@ -0,0 +1,4 @@
+Kind,SpanStart,SpanEnd,Value
+1,0,3,foo
+7,4,5,""
+1,6,9,bar
diff --git a/testdata/Tables/StateCapitals.csv b/testdata/Tables/StateCapitals.csv
@@ -0,0 +1,51 @@
+"State","StateCapital"
+Alabama,Montgomery
+Alaska,Juneau
+Arizona,Phoenix
+Arkansas,Little
+California,Sacramento
+Colorado,Denver
+Connecticut,Hartford
+Delaware,Dover
+Florida,Tallahassee
+Georgia,Atlanta
+Hawaii,Honolulu
+Idaho,Boise
+Illinois,Springfield
+Indiana,Indianapolis
+Iowa,Des
+Kansas,Topeka
+Kentucky,Frankfort
+Louisiana,Baton
+Maine,Augusta
+Maryland,Annapolis
+Massachusetts,Boston
+Michigan,Lansing
+Minnesota,Saint
+Mississippi,Jackson
+Missouri,Jefferson
+Montana,Helena
+Nebraska,Lincoln
+Nevada,Carson
+New Hampshire,Concord
+New Jersey,Trenton
+New Mexico,Santa
+New York,Albany
+North Carolina,Raleigh
+North Dakota,Bismarck
+Ohio,Columbus
+Oklahoma,Oklahoma
+Oregon,Salem
+Pennsylvania,Harrisburg
+Rhode Island,Providence
+South Carolina,Columbia
+South Dakota,Pierre
+Tennessee,Nashville
+Texas,Austin
+Utah,Salt
+Vermont,Montpelier
+Virginia,Richmond
+Washington,Olympia
+West Virginia,Charleston
+Wisconsin,Madison
+Wyoming,Cheyenne
diff --git a/testdata/Tables/Tokens.csv b/testdata/Tables/Tokens.csv
@@ -1,8 +1,9 @@
-Value,Name
+Kind,TokenConstant
 1,TokenIdentifier
 2,TokenQuotedIdentifier
 3,TokenNumber
 4,TokenString
 5,TokenAnd
 6,TokenOr
+7,TokenPipe
 -1,TokenError