forked from ibis-project/ibis
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(sql): don't fuse subsequent filter operations
- Loading branch information
Showing
10 changed files
with
210 additions
and
131 deletions.
There are no files selected for viewing
40 changes: 23 additions & 17 deletions
40
ibis/backends/tests/sql/snapshots/test_compiler/test_agg_and_non_agg_filter/out.sql
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 |
|---|---|---|
| @@ -1,19 +1,25 @@ | ||
| WITH "t1" AS ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| AND "t0"."a" = ( | ||
| SELECT | ||
| MAX("t1"."a") AS "Max(a)" | ||
| FROM ( | ||
| "t4"."a", | ||
| "t4"."b" | ||
| FROM ( | ||
| SELECT | ||
| "t2"."a", | ||
| "t2"."b" | ||
| FROM "t1" AS "t2" | ||
| WHERE | ||
| "t2"."a" = ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) AS "t1" | ||
| ) | ||
| AND "t0"."b" = 'a' | ||
| MAX("t2"."a") AS "Max(a)" | ||
| FROM "t1" AS "t2" | ||
| ) | ||
| ) AS "t4" | ||
| WHERE | ||
| "t4"."b" = 'a' |
28 changes: 14 additions & 14 deletions
28
ibis/backends/tests/sql/snapshots/test_compiler/test_agg_filter/out.sql
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 |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| WITH "t1" AS ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| "t2"."a", | ||
| "t2"."b2" | ||
| FROM "t1" AS "t2" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| AND "t0"."a" = ( | ||
| "t2"."a" = ( | ||
| SELECT | ||
| MAX("t1"."a") AS "Max(a)" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) AS "t1" | ||
| MAX("t2"."a") AS "Max(a)" | ||
| FROM "t1" AS "t2" | ||
| ) |
28 changes: 14 additions & 14 deletions
28
ibis/backends/tests/sql/snapshots/test_compiler/test_agg_filter_with_alias/out.sql
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 |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| WITH "t1" AS ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| "t2"."a", | ||
| "t2"."b2" | ||
| FROM "t1" AS "t2" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| AND "t0"."a" = ( | ||
| "t2"."a" = ( | ||
| SELECT | ||
| MAX("t1"."a") AS "Max(a)" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" * CAST(2 AS TINYINT) AS "b2" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) AS "t1" | ||
| MAX("t2"."a") AS "Max(a)" | ||
| FROM "t1" AS "t2" | ||
| ) |
35 changes: 20 additions & 15 deletions
35
ibis/backends/tests/sql/snapshots/test_compiler/test_pushdown_with_or/out.sql
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 |
|---|---|---|
| @@ -1,19 +1,24 @@ | ||
| SELECT | ||
| "t0"."double_col", | ||
| "t0"."string_col", | ||
| "t0"."int_col", | ||
| "t0"."float_col" | ||
| FROM "functional_alltypes" AS "t0" | ||
| "t1"."double_col", | ||
| "t1"."string_col", | ||
| "t1"."int_col", | ||
| "t1"."float_col" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."double_col", | ||
| "t0"."string_col", | ||
| "t0"."int_col", | ||
| "t0"."float_col" | ||
| FROM "functional_alltypes" AS "t0" | ||
| WHERE | ||
| "t0"."double_col" > CAST(3.14 AS DOUBLE) AND CONTAINS("t0"."string_col", 'foo') | ||
| ) AS "t1" | ||
| WHERE | ||
| "t0"."double_col" > CAST(3.14 AS DOUBLE) | ||
| AND CONTAINS("t0"."string_col", 'foo') | ||
| AND ( | ||
| ( | ||
| ( | ||
| ( | ||
| "t0"."int_col" - CAST(1 AS TINYINT) | ||
| ) = CAST(0 AS TINYINT) | ||
| ) | ||
| OR ( | ||
| "t0"."float_col" <= CAST(1.34 AS DOUBLE) | ||
| ) | ||
| "t1"."int_col" - CAST(1 AS TINYINT) | ||
| ) = CAST(0 AS TINYINT) | ||
| ) | ||
| OR ( | ||
| "t1"."float_col" <= CAST(1.34 AS DOUBLE) | ||
| ) |
28 changes: 14 additions & 14 deletions
28
ibis/backends/tests/sql/snapshots/test_compiler/test_simple_agg_filter/out.sql
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 |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| WITH "t1" AS ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| "t2"."a", | ||
| "t2"."b" | ||
| FROM "t1" AS "t2" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| AND "t0"."a" = ( | ||
| "t2"."a" = ( | ||
| SELECT | ||
| MAX("t1"."a") AS "Max(a)" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b" | ||
| FROM "my_table" AS "t0" | ||
| WHERE | ||
| "t0"."a" < CAST(100 AS TINYINT) | ||
| ) AS "t1" | ||
| MAX("t2"."a") AS "Max(a)" | ||
| FROM "t1" AS "t2" | ||
| ) |
51 changes: 34 additions & 17 deletions
51
...s/tests/sql/snapshots/test_select_sql/test_aggregate_projection_subquery/agg_filtered.sql
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 |
|---|---|---|
| @@ -1,23 +1,40 @@ | ||
| SELECT | ||
| "t1"."g", | ||
| SUM("t1"."foo") AS "foo total" | ||
| "t2"."g", | ||
| SUM("t2"."foo") AS "foo total" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| "t1"."a", | ||
| "t1"."b", | ||
| "t1"."c", | ||
| "t1"."d", | ||
| "t1"."e", | ||
| "t1"."f", | ||
| "t1"."g", | ||
| "t1"."h", | ||
| "t1"."i", | ||
| "t1"."j", | ||
| "t1"."k", | ||
| "t1"."foo" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) | ||
| ) AS "t1" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) AND "t0"."g" = 'bar' | ||
| ) AS "t1" | ||
| "t1"."g" = 'bar' | ||
| ) AS "t2" | ||
| GROUP BY | ||
| 1 |
53 changes: 34 additions & 19 deletions
53
.../tests/sql/snapshots/test_select_sql/test_aggregate_projection_subquery/agg_filtered2.sql
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 |
|---|---|---|
| @@ -1,25 +1,40 @@ | ||
| SELECT | ||
| "t1"."g", | ||
| SUM("t1"."foo") AS "foo total" | ||
| "t2"."g", | ||
| SUM("t2"."foo") AS "foo total" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| "t1"."a", | ||
| "t1"."b", | ||
| "t1"."c", | ||
| "t1"."d", | ||
| "t1"."e", | ||
| "t1"."f", | ||
| "t1"."g", | ||
| "t1"."h", | ||
| "t1"."i", | ||
| "t1"."j", | ||
| "t1"."k", | ||
| "t1"."foo" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) | ||
| ) AS "t1" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) AND ( | ||
| "t0"."a" + "t0"."b" | ||
| ) < CAST(10 AS TINYINT) | ||
| ) AS "t1" | ||
| "t1"."foo" < CAST(10 AS TINYINT) | ||
| ) AS "t2" | ||
| GROUP BY | ||
| 1 |
45 changes: 31 additions & 14 deletions
45
...kends/tests/sql/snapshots/test_select_sql/test_aggregate_projection_subquery/filtered.sql
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 |
|---|---|---|
| @@ -1,16 +1,33 @@ | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| "t1"."a", | ||
| "t1"."b", | ||
| "t1"."c", | ||
| "t1"."d", | ||
| "t1"."e", | ||
| "t1"."f", | ||
| "t1"."g", | ||
| "t1"."h", | ||
| "t1"."i", | ||
| "t1"."j", | ||
| "t1"."k", | ||
| "t1"."foo" | ||
| FROM ( | ||
| SELECT | ||
| "t0"."a", | ||
| "t0"."b", | ||
| "t0"."c", | ||
| "t0"."d", | ||
| "t0"."e", | ||
| "t0"."f", | ||
| "t0"."g", | ||
| "t0"."h", | ||
| "t0"."i", | ||
| "t0"."j", | ||
| "t0"."k", | ||
| "t0"."a" + "t0"."b" AS "foo" | ||
| FROM "alltypes" AS "t0" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) | ||
| ) AS "t1" | ||
| WHERE | ||
| "t0"."f" > CAST(0 AS TINYINT) AND "t0"."g" = 'bar' | ||
| "t1"."g" = 'bar' |
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
Oops, something went wrong.