From 361399a47216f28815e7aebad77783867636398d Mon Sep 17 00:00:00 2001 From: Richard Tia Date: Thu, 19 Sep 2024 13:50:58 -0700 Subject: [PATCH 1/2] fix: update to use latest duckdb and modify groupby relation tests --- .../sql/relations/aggregate_relations.py | 20 +- .../aggregate_with_group_by_plan.json | 158 ++++---- .../aggregate_with_group_by_rollup_plan.json | 188 ++++----- .../aggregate_in_subquery_plan.json | 225 ++++++----- .../aggregate_with_computation_plan.json | 2 +- .../aggregate_with_group_by_cube_plan.json | 51 +-- .../aggregate_with_group_by_plan.json | 68 ++-- .../aggregate_with_group_by_rollup_plan.json | 51 +-- .../aggregate_with_grouping_set_plan.json | 2 +- .../computation_between_aggregates_plan.json | 2 +- .../compute_within_aggregate_plan.json | 2 +- .../multiple_measure_aggregate_plan.json | 2 +- .../single_measure_aggregate_plan.json | 2 +- .../aggregate_with_group_by_cube_plan.json | 357 +++++++----------- .../aggregate_with_group_by_plan.json | 309 +++++++-------- .../aggregate_with_group_by_rollup_plan.json | 333 +++++++--------- .../aggregate_with_group_by_cube_result.txt | 54 +-- .../aggregate_with_group_by_result.txt | 19 +- .../aggregate_with_group_by_rollup_result.txt | 37 +- .../DuckDBProducer/fetch_plan.json | 28 +- .../fetch_with_offset_plan.json | 30 +- .../DuckDBProducer/having_plan.json | 2 +- .../DuckDBProducer/where_and_plan.json | 2 +- .../DuckDBProducer/where_between_plan.json | 28 +- .../where_equal_multi_col_plan.json | 2 +- .../where_gt_multi_col_plan.json | 2 +- .../where_gte_multi_col_plan.json | 2 +- .../DuckDBProducer/where_in_plan.json | 2 +- .../DuckDBProducer/where_like_plan.json | 2 +- .../where_lt_multi_col_plan.json | 2 +- .../where_lte_multi_col_plan.json | 2 +- .../where_not_equal_multi_col_plan.json | 2 +- .../DuckDBProducer/where_or_plan.json | 2 +- .../DuckDBProducer/cross_join_plan.json | 94 ++--- .../DuckDBProducer/full_join_plan.json | 313 +++++++++++++++ .../DuckDBProducer/inner_join_plan.json | 86 ++--- .../DuckDBProducer/left_join_plan.json | 2 +- .../DuckDBProducer/left_semi_join_plan.json | 2 +- .../DuckDBProducer/right_join_plan.json | 92 +++-- .../DuckDBProducer/right_semi_join_plan.json | 2 +- .../count_distinct_in_project_plan.json | 5 +- .../DuckDBProducer/extended_project_plan.json | 4 +- .../DuckDBProducer/project_all_col_plan.json | 4 +- .../project_multi_col_plan.json | 4 +- .../project_single_col_plan.json | 4 +- .../subquery_in_project_plan.json | 6 +- .../DuckDBProducer/read_named_table_plan.json | 2 +- .../DuckDBProducer/except_plan.json | 2 +- .../DuckDBProducer/intersect_plan.json | 2 +- .../DuckDBProducer/union_all_plan.json | 2 +- .../DuckDBProducer/union_distinct_plan.json | 2 +- .../multi_col_asc_desc_plan.json | 2 +- .../DuckDBProducer/multi_col_asc_plan.json | 2 +- .../multi_col_desc_asc_plan.json | 2 +- .../DuckDBProducer/multi_col_desc_plan.json | 2 +- .../order_by_col_number_plan.json | 2 +- .../DuckDBProducer/single_col_asc_plan.json | 2 +- .../single_col_default_sort_plan.json | 2 +- .../DuckDBProducer/single_col_desc_plan.json | 2 +- .../relations/test_join_relation.py | 4 +- 60 files changed, 1351 insertions(+), 1287 deletions(-) create mode 100644 substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join_plan.json diff --git a/substrait_consumer/functional/queries/sql/relations/aggregate_relations.py b/substrait_consumer/functional/queries/sql/relations/aggregate_relations.py index 19ca3b02..64128657 100644 --- a/substrait_consumer/functional/queries/sql/relations/aggregate_relations.py +++ b/substrait_consumer/functional/queries/sql/relations/aggregate_relations.py @@ -49,31 +49,29 @@ ), "aggregate_with_group_by": ( """ - - SELECT SUM(L_EXTENDEDPRICE), L_LINENUMBER + SELECT L_ORDERKEY, L_LINENUMBER, count(*) FROM '{}' - GROUP BY L_LINENUMBER - ORDER BY L_LINENUMBER + GROUP BY L_ORDERKEY, L_LINENUMBER + ORDER BY L_ORDERKEY, L_LINENUMBER """, [DuckDBProducer, DataFusionProducer, IsthmusProducer], ), "aggregate_with_group_by_cube": ( """ - - SELECT SUM(L_EXTENDEDPRICE), L_LINENUMBER, L_ORDERKEY + SELECT L_ORDERKEY, L_LINENUMBER, count(*) FROM '{}' - GROUP BY CUBE(L_LINENUMBER, L_ORDERKEY) - ORDER BY L_LINENUMBER, L_ORDERKEY + GROUP BY CUBE(L_ORDERKEY, L_LINENUMBER) + ORDER BY L_ORDERKEY, L_LINENUMBER """, [DuckDBProducer, DataFusionProducer, IsthmusProducer], ), "aggregate_with_group_by_rollup": ( """ - SELECT SUM(L_EXTENDEDPRICE), L_LINENUMBER, L_ORDERKEY + SELECT L_ORDERKEY, L_LINENUMBER, count(*) FROM '{}' - GROUP BY ROLLUP(L_LINENUMBER, L_ORDERKEY) - ORDER BY L_LINENUMBER, L_ORDERKEY + GROUP BY ROLLUP(L_ORDERKEY, L_LINENUMBER) + ORDER BY L_ORDERKEY, L_LINENUMBER """, [DuckDBProducer, DataFusionProducer, IsthmusProducer], ), diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_plan.json index 012f058f..dc2b1b1b 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_plan.json @@ -3,7 +3,7 @@ { "extensionFunction": { "extensionUriReference": 4294967295, - "name": "sum" + "name": "count" } } ], @@ -13,106 +13,97 @@ "input": { "sort": { "input": { - "project": { + "aggregate": { "input": { - "aggregate": { - "input": { - "read": { - "baseSchema": { - "names": [ - "l_orderkey", - "l_partkey", - "l_suppkey", - "l_linenumber", - "l_quantity", - "l_extendedprice", - "l_discount", - "l_tax", - "l_returnflag", - "l_linestatus", - "l_shipdate", - "l_commitdate", - "l_receiptdate", - "l_shipinstruct", - "l_shipmode", - "l_comment" - ] - }, - "projection": { - "select": { - "structItems": [ - { - "field": 3 - }, - { - "field": 5 - } - ] - } - }, - "namedTable": { - "names": [ - "lineitem_small" - ] - } - } + "read": { + "baseSchema": { + "names": [ + "l_orderkey", + "l_partkey", + "l_suppkey", + "l_linenumber", + "l_quantity", + "l_extendedprice", + "l_discount", + "l_tax", + "l_returnflag", + "l_linestatus", + "l_shipdate", + "l_commitdate", + "l_receiptdate", + "l_shipinstruct", + "l_shipmode", + "l_comment" + ] }, - "groupings": [ - { - "groupingExpressions": [ + "projection": { + "select": { + "structItems": [ + {}, { - "selection": { - "directReference": { - "structField": {} - } - } + "field": 3 } ] } - ], - "measures": [ + }, + "namedTable": { + "names": [ + "lineitem_small" + ] + } + } + }, + "groupings": [ + { + "groupingExpressions": [ { - "measure": { - "invocation": "AGGREGATION_INVOCATION_ALL", - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - } - } - } + "selection": { + "directReference": { + "structField": {} + } + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } - ] + } } } ] } - }, - "expressions": [ + ], + "measures": [ { - "selection": { - "directReference": { - "structField": { - "field": 1 + "measure": { + "invocation": "AGGREGATION_INVOCATION_ALL", + "arguments": [ + { + "value": { + "literal": { + "i64": "1" + } + } } - } - } - }, - { - "selection": { - "directReference": { - "structField": {} - } + ] } } ] } }, "sorts": [ + { + "expr": { + "selection": { + "directReference": { + "structField": {} + } + } + }, + "direction": "SORT_DIRECTION_ASC_NULLS_LAST" + }, { "expr": { "selection": { @@ -129,8 +120,9 @@ } }, "names": [ - "sum(lineitem_small.l_extendedprice)", - "l_linenumber" + "l_orderkey", + "l_linenumber", + "count(*)" ] } } diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup_plan.json index ffb6918a..efc4ced6 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup_plan.json @@ -3,7 +3,7 @@ { "extensionFunction": { "extensionUriReference": 4294967295, - "name": "sum" + "name": "count" } } ], @@ -13,133 +13,93 @@ "input": { "sort": { "input": { - "project": { + "aggregate": { "input": { - "aggregate": { - "input": { - "read": { - "baseSchema": { - "names": [ - "l_orderkey", - "l_partkey", - "l_suppkey", - "l_linenumber", - "l_quantity", - "l_extendedprice", - "l_discount", - "l_tax", - "l_returnflag", - "l_linestatus", - "l_shipdate", - "l_commitdate", - "l_receiptdate", - "l_shipinstruct", - "l_shipmode", - "l_comment" - ] - }, - "projection": { - "select": { - "structItems": [ - {}, - { - "field": 3 - }, - { - "field": 5 - } - ] - } - }, - "namedTable": { - "names": [ - "lineitem_small" - ] - } - } + "read": { + "baseSchema": { + "names": [ + "l_orderkey", + "l_partkey", + "l_suppkey", + "l_linenumber", + "l_quantity", + "l_extendedprice", + "l_discount", + "l_tax", + "l_returnflag", + "l_linestatus", + "l_shipdate", + "l_commitdate", + "l_receiptdate", + "l_shipinstruct", + "l_shipmode", + "l_comment" + ] }, - "groupings": [ - { - "groupingExpressions": [ - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - } - } - }, + "projection": { + "select": { + "structItems": [ + {}, { - "selection": { - "directReference": { - "structField": {} - } - } + "field": 3 } ] - }, + } + }, + "namedTable": { + "names": [ + "lineitem_small" + ] + } + } + }, + "groupings": [ + { + "groupingExpressions": [ { - "groupingExpressions": [ - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - } - } + "selection": { + "directReference": { + "structField": {} } - ] + } }, - {} - ], - "measures": [ { - "measure": { - "invocation": "AGGREGATION_INVOCATION_ALL", - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - } - } - } + "selection": { + "directReference": { + "structField": { + "field": 1 } - ] + } } } ] - } - }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - } - } }, { - "selection": { - "directReference": { - "structField": {} + "groupingExpressions": [ + { + "selection": { + "directReference": { + "structField": {} + } + } } - } + ] }, + {} + ], + "measures": [ { - "selection": { - "directReference": { - "structField": { - "field": 1 + "measure": { + "invocation": "AGGREGATION_INVOCATION_ALL", + "arguments": [ + { + "value": { + "literal": { + "i64": "1" + } + } } - } + ] } } ] @@ -150,9 +110,7 @@ "expr": { "selection": { "directReference": { - "structField": { - "field": 1 - } + "structField": {} } } }, @@ -163,7 +121,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } } } @@ -174,9 +132,9 @@ } }, "names": [ - "sum(lineitem_small.l_extendedprice)", + "l_orderkey", "l_linenumber", - "l_orderkey" + "count(*)" ] } } diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery_plan.json index 871bc647..5a8b3f9c 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery_plan.json @@ -124,137 +124,132 @@ "right": { "aggregate": { "input": { - "fetch": { + "project": { "input": { - "project": { + "aggregate": { "input": { - "aggregate": { - "input": { - "read": { - "baseSchema": { - "names": [ - "o_orderkey", - "o_custkey", - "o_orderstatus", - "o_totalprice", - "o_orderdate", - "o_orderpriority", - "o_clerk", - "o_shippriority", - "o_comment" - ], - "struct": { - "types": [ - { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "date": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "i32": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - } - ], - "nullability": "NULLABILITY_REQUIRED" - } - }, - "projection": { - "select": { - "structItems": [ - { - "field": 3 - } - ] + "read": { + "baseSchema": { + "names": [ + "o_orderkey", + "o_custkey", + "o_orderstatus", + "o_totalprice", + "o_orderdate", + "o_orderpriority", + "o_clerk", + "o_shippriority", + "o_comment" + ], + "struct": { + "types": [ + { + "i64": { + "nullability": "NULLABILITY_NULLABLE" + } }, - "maintainSingularStruct": true - }, - "namedTable": { - "names": [ - "orders_small" - ] - } - } - }, - "groupings": [ - {} - ], - "measures": [ - { - "measure": { - "functionReference": 1, - "outputType": { - "fp64": { + { + "i64": { "nullability": "NULLABILITY_NULLABLE" } }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + { + "string": { + "nullability": "NULLABILITY_NULLABLE" } - ] - } + }, + { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "date": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + } + ], + "nullability": "NULLABILITY_REQUIRED" } - ] + }, + "projection": { + "select": { + "structItems": [ + { + "field": 3 + } + ] + }, + "maintainSingularStruct": true + }, + "namedTable": { + "names": [ + "orders_small" + ] + } } }, - "expressions": [ + "groupings": [ + {} + ], + "measures": [ { - "selection": { - "directReference": { - "structField": {} + "measure": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } }, - "rootReference": {} + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + } + ] } } ] } }, - "count": "1" + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + ] } }, "groupings": [ @@ -373,7 +368,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation_plan.json index 2af73c22..36e7d69b 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation_plan.json @@ -185,7 +185,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube_plan.json index 00b5eb3c..15729190 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube_plan.json @@ -2,7 +2,7 @@ "extensionUris": [ { "extensionUriAnchor": 1, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/" + "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_aggregate_generic.yaml" } ], "extensions": [ @@ -10,7 +10,7 @@ "extensionFunction": { "extensionUriReference": 1, "functionAnchor": 1, - "name": "sum:decimal" + "name": "count" } } ], @@ -141,12 +141,9 @@ "projection": { "select": { "structItems": [ - { - "field": 3 - }, {}, { - "field": 5 + "field": 3 } ] }, @@ -188,26 +185,10 @@ "measure": { "functionReference": 1, "outputType": { - "decimal": { - "scale": 2, - "precision": 38, + "i64": { "nullability": "NULLABILITY_NULLABLE" } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - }, - "rootReference": {} - } - } - } - ] + } } } ] @@ -217,9 +198,7 @@ { "selection": { "directReference": { - "structField": { - "field": 2 - } + "structField": {} }, "rootReference": {} } @@ -227,7 +206,9 @@ { "selection": { "directReference": { - "structField": {} + "structField": { + "field": 1 + } }, "rootReference": {} } @@ -236,7 +217,7 @@ "selection": { "directReference": { "structField": { - "field": 1 + "field": 2 } }, "rootReference": {} @@ -250,9 +231,7 @@ "expr": { "selection": { "directReference": { - "structField": { - "field": 1 - } + "structField": {} }, "rootReference": {} } @@ -264,7 +243,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } }, "rootReference": {} @@ -276,15 +255,15 @@ } }, "names": [ - "sum(l_extendedprice)", + "l_orderkey", "l_linenumber", - "l_orderkey" + "count_star()" ] } } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_plan.json index fc595d82..15729190 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_plan.json @@ -2,7 +2,7 @@ "extensionUris": [ { "extensionUriAnchor": 1, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/" + "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_aggregate_generic.yaml" } ], "extensions": [ @@ -10,7 +10,7 @@ "extensionFunction": { "extensionUriReference": 1, "functionAnchor": 1, - "name": "sum:decimal" + "name": "count" } } ], @@ -141,11 +141,9 @@ "projection": { "select": { "structItems": [ + {}, { "field": 3 - }, - { - "field": 5 } ] }, @@ -168,6 +166,16 @@ }, "rootReference": {} } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": {} + } } ] } @@ -177,32 +185,24 @@ "measure": { "functionReference": 1, "outputType": { - "decimal": { - "scale": 2, - "precision": 38, + "i64": { "nullability": "NULLABILITY_NULLABLE" } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } - } - ] + } } } ] } }, "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, { "selection": { "directReference": { @@ -216,7 +216,9 @@ { "selection": { "directReference": { - "structField": {} + "structField": { + "field": 2 + } }, "rootReference": {} } @@ -225,6 +227,17 @@ } }, "sorts": [ + { + "expr": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + "direction": "SORT_DIRECTION_ASC_NULLS_LAST" + }, { "expr": { "selection": { @@ -242,14 +255,15 @@ } }, "names": [ - "sum(l_extendedprice)", - "l_linenumber" + "l_orderkey", + "l_linenumber", + "count_star()" ] } } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup_plan.json index 00b5eb3c..15729190 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup_plan.json @@ -2,7 +2,7 @@ "extensionUris": [ { "extensionUriAnchor": 1, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/" + "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_aggregate_generic.yaml" } ], "extensions": [ @@ -10,7 +10,7 @@ "extensionFunction": { "extensionUriReference": 1, "functionAnchor": 1, - "name": "sum:decimal" + "name": "count" } } ], @@ -141,12 +141,9 @@ "projection": { "select": { "structItems": [ - { - "field": 3 - }, {}, { - "field": 5 + "field": 3 } ] }, @@ -188,26 +185,10 @@ "measure": { "functionReference": 1, "outputType": { - "decimal": { - "scale": 2, - "precision": 38, + "i64": { "nullability": "NULLABILITY_NULLABLE" } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - }, - "rootReference": {} - } - } - } - ] + } } } ] @@ -217,9 +198,7 @@ { "selection": { "directReference": { - "structField": { - "field": 2 - } + "structField": {} }, "rootReference": {} } @@ -227,7 +206,9 @@ { "selection": { "directReference": { - "structField": {} + "structField": { + "field": 1 + } }, "rootReference": {} } @@ -236,7 +217,7 @@ "selection": { "directReference": { "structField": { - "field": 1 + "field": 2 } }, "rootReference": {} @@ -250,9 +231,7 @@ "expr": { "selection": { "directReference": { - "structField": { - "field": 1 - } + "structField": {} }, "rootReference": {} } @@ -264,7 +243,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } }, "rootReference": {} @@ -276,15 +255,15 @@ } }, "names": [ - "sum(l_extendedprice)", + "l_orderkey", "l_linenumber", - "l_orderkey" + "count_star()" ] } } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set_plan.json index 100d3e00..bb67434e 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set_plan.json @@ -271,7 +271,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates_plan.json index 1ede42a6..be2bb472 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates_plan.json @@ -230,7 +230,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate_plan.json index dca7de2a..dc8f8c85 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate_plan.json @@ -190,7 +190,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate_plan.json index 99aacc8a..10d97ccd 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate_plan.json @@ -237,7 +237,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate_plan.json index a1e4b6c7..10fae6b9 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate_plan.json @@ -189,7 +189,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube_plan.json index d782639a..e6ad8f39 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube_plan.json @@ -1,12 +1,12 @@ { "extensionUris": [{ "extensionUriAnchor": 1, - "uri": "/functions_arithmetic_decimal.yaml" + "uri": "/functions_aggregate_generic.yaml" }], "extensions": [{ "extensionFunction": { "extensionUriReference": 1, - "name": "sum:dec" + "name": "count:" } }], "relations": [{ @@ -18,249 +18,185 @@ } }, "input": { - "project": { + "aggregate": { "common": { - "emit": { - "outputMapping": [3, 4, 5] + "direct": { } }, "input": { - "aggregate": { + "project": { "common": { - "direct": { + "emit": { + "outputMapping": [16, 17] } }, "input": { - "project": { + "read": { "common": { - "emit": { - "outputMapping": [16, 17, 18] + "direct": { } }, - "input": { - "read": { - "common": { - "direct": { + "baseSchema": { + "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], + "struct": { + "types": [{ + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "baseSchema": { - "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], - "struct": { - "types": [{ - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }], + }, { + "i64": { "nullability": "NULLABILITY_REQUIRED" } - }, - "namedTable": { - "names": ["LINEITEM_SMALL"] - } - } - }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 3 + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { - "field": 5 + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }], + "nullability": "NULLABILITY_REQUIRED" } - }] + }, + "namedTable": { + "names": ["LINEITEM_SMALL"] + } } }, - "groupings": [{ - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": { - } - } - }] - }, { - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - } - }, - "rootReference": { - } - } - }] - }, { - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": { + "expressions": [{ + "selection": { + "directReference": { + "structField": { } + }, + "rootReference": { } - }] + } }, { - }], - "measures": [{ - "measure": { - "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", - "outputType": { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" + "selection": { + "directReference": { + "structField": { + "field": 3 } }, - "invocation": "AGGREGATION_INVOCATION_ALL", - "arguments": [{ - "value": { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - }, - "rootReference": { - } - } - } - }] + "rootReference": { + } } }] } }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 2 + "groupings": [{ + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { } - }, - "rootReference": { } - } + }, { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": { + } + } + }] }, { - "selection": { - "directReference": { - "structField": { + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { } - }, - "rootReference": { } - } + }] }, { - "selection": { - "directReference": { - "structField": { - "field": 1 + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": { } - }, - "rootReference": { } + }] + }, { + }], + "measures": [{ + "measure": { + "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", + "outputType": { + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, + "invocation": "AGGREGATION_INVOCATION_ALL" } }] } @@ -270,7 +206,6 @@ "selection": { "directReference": { "structField": { - "field": 1 } }, "rootReference": { @@ -283,7 +218,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } }, "rootReference": { @@ -294,7 +229,7 @@ }] } }, - "names": ["EXPR$0", "L_LINENUMBER", "L_ORDERKEY"] + "names": ["L_ORDERKEY", "L_LINENUMBER", "EXPR$2"] } }] } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json index a879056f..e83e47d1 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json @@ -1,12 +1,12 @@ { "extensionUris": [{ "extensionUriAnchor": 1, - "uri": "/functions_arithmetic_decimal.yaml" + "uri": "/functions_aggregate_generic.yaml" }], "extensions": [{ "extensionFunction": { "extensionUriReference": 1, - "name": "sum:dec" + "name": "count:" } }], "relations": [{ @@ -18,201 +18,178 @@ } }, "input": { - "project": { + "aggregate": { "common": { - "emit": { - "outputMapping": [2, 3] + "direct": { } }, "input": { - "aggregate": { + "project": { "common": { - "direct": { + "emit": { + "outputMapping": [16, 17] } }, "input": { - "project": { + "read": { "common": { - "emit": { - "outputMapping": [16, 17] + "direct": { } }, - "input": { - "read": { - "common": { - "direct": { - } - }, - "baseSchema": { - "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], - "struct": { - "types": [{ - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }], - "nullability": "NULLABILITY_REQUIRED" - } - }, - "namedTable": { - "names": ["LINEITEM_SMALL"] - } + "baseSchema": { + "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], + "struct": { + "types": [{ + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }], + "nullability": "NULLABILITY_REQUIRED" } }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 3 - } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { - "field": 5 - } - }, - "rootReference": { - } - } - }] + "namedTable": { + "names": ["LINEITEM_SMALL"] + } } }, - "groupings": [{ - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - } - }, - "rootReference": { + "expressions": [{ + "selection": { + "directReference": { + "structField": { } + }, + "rootReference": { } - }] - }], - "measures": [{ - "measure": { - "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", - "outputType": { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" + } + }, { + "selection": { + "directReference": { + "structField": { + "field": 3 } }, - "invocation": "AGGREGATION_INVOCATION_ALL", - "arguments": [{ - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": { - } - } - } - }] + "rootReference": { + } } }] } }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 1 + "groupings": [{ + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { } - }, - "rootReference": { } - } - }, { - "selection": { - "directReference": { - "structField": { + }, { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": { } - }, - "rootReference": { } + }] + }], + "measures": [{ + "measure": { + "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", + "outputType": { + "i64": { + "nullability": "NULLABILITY_REQUIRED" + } + }, + "invocation": "AGGREGATION_INVOCATION_ALL" } }] } }, "sorts": [{ + "expr": { + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { + } + } + }, + "direction": "SORT_DIRECTION_ASC_NULLS_LAST" + }, { "expr": { "selection": { "directReference": { @@ -228,7 +205,7 @@ }] } }, - "names": ["EXPR$0", "L_LINENUMBER"] + "names": ["L_ORDERKEY", "L_LINENUMBER", "EXPR$2"] } }] } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup_plan.json b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup_plan.json index b6515b80..7a94fbd0 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup_plan.json +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup_plan.json @@ -1,12 +1,12 @@ { "extensionUris": [{ "extensionUriAnchor": 1, - "uri": "/functions_arithmetic_decimal.yaml" + "uri": "/functions_aggregate_generic.yaml" }], "extensions": [{ "extensionFunction": { "extensionUriReference": 1, - "name": "sum:dec" + "name": "count:" } }], "relations": [{ @@ -18,237 +18,173 @@ } }, "input": { - "project": { + "aggregate": { "common": { - "emit": { - "outputMapping": [3, 4, 5] + "direct": { } }, "input": { - "aggregate": { + "project": { "common": { - "direct": { + "emit": { + "outputMapping": [16, 17] } }, "input": { - "project": { + "read": { "common": { - "emit": { - "outputMapping": [16, 17, 18] + "direct": { } }, - "input": { - "read": { - "common": { - "direct": { + "baseSchema": { + "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], + "struct": { + "types": [{ + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "baseSchema": { - "names": ["L_ORDERKEY", "L_PARTKEY", "L_SUPPKEY", "L_LINENUMBER", "L_QUANTITY", "L_EXTENDEDPRICE", "L_DISCOUNT", "L_TAX", "L_RETURNFLAG", "L_LINESTATUS", "L_SHIPDATE", "L_COMMITDATE", "L_RECEIPTDATE", "L_SHIPINSTRUCT", "L_SHIPMODE", "L_COMMENT"], - "struct": { - "types": [{ - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "i64": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "date": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }], + }, { + "i64": { "nullability": "NULLABILITY_REQUIRED" } - }, - "namedTable": { - "names": ["LINEITEM_SMALL"] - } - } - }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 3 + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { + }, { + "i64": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { - "field": 5 + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "date": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" + } + }, { + "string": { + "nullability": "NULLABILITY_REQUIRED" } - }, - "rootReference": { - } + }], + "nullability": "NULLABILITY_REQUIRED" } - }] + }, + "namedTable": { + "names": ["LINEITEM_SMALL"] + } } }, - "groupings": [{ - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - } - }, - "rootReference": { - } - } - }, { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": { - } - } - }] - }, { - "groupingExpressions": [{ - "selection": { - "directReference": { - "structField": { - } - }, - "rootReference": { + "expressions": [{ + "selection": { + "directReference": { + "structField": { } + }, + "rootReference": { } - }] + } }, { - }], - "measures": [{ - "measure": { - "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", - "outputType": { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" + "selection": { + "directReference": { + "structField": { + "field": 3 } }, - "invocation": "AGGREGATION_INVOCATION_ALL", - "arguments": [{ - "value": { - "selection": { - "directReference": { - "structField": { - "field": 2 - } - }, - "rootReference": { - } - } - } - }] + "rootReference": { + } } }] } }, - "expressions": [{ - "selection": { - "directReference": { - "structField": { - "field": 2 + "groupings": [{ + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { } - }, - "rootReference": { } - } + }, { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": { + } + } + }] }, { - "selection": { - "directReference": { - "structField": { + "groupingExpressions": [{ + "selection": { + "directReference": { + "structField": { + } + }, + "rootReference": { } - }, - "rootReference": { } - } + }] }, { - "selection": { - "directReference": { - "structField": { - "field": 1 + }], + "measures": [{ + "measure": { + "phase": "AGGREGATION_PHASE_INITIAL_TO_RESULT", + "outputType": { + "i64": { + "nullability": "NULLABILITY_REQUIRED" } }, - "rootReference": { - } + "invocation": "AGGREGATION_INVOCATION_ALL" } }] } @@ -258,7 +194,6 @@ "selection": { "directReference": { "structField": { - "field": 1 } }, "rootReference": { @@ -271,7 +206,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } }, "rootReference": { @@ -282,7 +217,7 @@ }] } }, - "names": ["EXPR$0", "L_LINENUMBER", "L_ORDERKEY"] + "names": ["L_ORDERKEY", "L_LINENUMBER", "EXPR$2"] } }] } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt index 25702586..19fe30ab 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt @@ -1,45 +1,45 @@ -15317.00 -15317.00 -32436.00 -32436.00 -7208.00 -7208.00 -25228.00 -25228.00 -21624.00 -21624.00 -28832.00 -28832.00 -130645.00 -130645.00 - 1 +1 +1 +1 +1 +1 +1 +None +None +None +None +None +None +None + 1 2 -2 -3 3 4 -4 5 -5 -6 6 None +1 +2 +3 +4 +5 +6 None 1 -None 1 -None 1 -None 1 -None 1 -None 1 -None +6 1 -None +1 +1 +1 +1 +1 +6 \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt index 2d983d68..cdfc7c60 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt @@ -1,9 +1,9 @@ -15317.00 -32436.00 -7208.00 -25228.00 -21624.00 -28832.00 +1 +1 +1 +1 +1 +1 1 2 @@ -11,4 +11,11 @@ 4 5 6 + +1 +1 +1 +1 +1 +1 \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt index 7a128353..8d7f9a4b 100644 --- a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt +++ b/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt @@ -1,42 +1,27 @@ -15317.00 -15317.00 -32436.00 -32436.00 -7208.00 -7208.00 -25228.00 -25228.00 -21624.00 -21624.00 -28832.00 -28832.00 -130645.00 - 1 +1 +1 +1 +1 +1 +1 +None + 1 2 -2 -3 3 4 -4 5 -5 -6 6 None +None 1 -None 1 -None 1 -None 1 -None 1 -None 1 -None -None +6 +6 \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_plan.json b/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_plan.json index 483e82cb..08a73aae 100644 --- a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_plan.json +++ b/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_plan.json @@ -3,9 +3,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -88,19 +88,19 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - ] + "count": "1" } }, - "count": "1" + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + ] } }, "names": [ @@ -110,7 +110,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset_plan.json b/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset_plan.json index 4c880155..16457434 100644 --- a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset_plan.json +++ b/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset_plan.json @@ -3,9 +3,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -88,20 +88,20 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - ] + "offset": "5", + "count": "5" } }, - "offset": "5", - "count": "5" + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + ] } }, "names": [ @@ -111,7 +111,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having_plan.json index 6b09cdcb..d816107e 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having_plan.json @@ -274,7 +274,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and_plan.json index ccf15ee7..9fe4ca32 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and_plan.json @@ -368,7 +368,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between_plan.json index 16256fa6..cae24ffd 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between_plan.json @@ -43,9 +43,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -288,19 +288,19 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - ] + "count": "20" } }, - "count": "20" + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + ] } }, "names": [ @@ -310,7 +310,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col_plan.json index b06bc20f..6fc97399 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col_plan.json @@ -244,7 +244,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col_plan.json index cfdb3a61..b0de8d89 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col_plan.json @@ -257,7 +257,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col_plan.json index afb45aeb..73c7dfa9 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col_plan.json @@ -257,7 +257,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in_plan.json index 6823d172..48ab1e76 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in_plan.json @@ -305,7 +305,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like_plan.json index c365b745..a578e128 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like_plan.json @@ -239,7 +239,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col_plan.json index bf76159b..ae1a26dc 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col_plan.json @@ -257,7 +257,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col_plan.json index cc4a9d08..d0d8b77c 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col_plan.json @@ -257,7 +257,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col_plan.json index ba9b6f52..4143871a 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col_plan.json @@ -257,7 +257,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or_plan.json b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or_plan.json index 2e47d4f5..b2102016 100644 --- a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or_plan.json +++ b/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or_plan.json @@ -271,7 +271,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join_plan.json index 3204a553..3f4b8028 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join_plan.json @@ -10,23 +10,17 @@ "read": { "baseSchema": { "names": [ - "o_orderkey", - "o_custkey", - "o_orderstatus", - "o_totalprice", - "o_orderdate", - "o_orderpriority", - "o_clerk", - "o_shippriority", - "o_comment" + "c_custkey", + "c_name", + "c_address", + "c_nationkey", + "c_phone", + "c_acctbal", + "c_mktsegment", + "c_comment" ], "struct": { "types": [ - { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, { "i64": { "nullability": "NULLABILITY_NULLABLE" @@ -38,14 +32,12 @@ } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, { - "date": { + "i32": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -55,12 +47,14 @@ } }, { - "string": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "i32": { + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -76,14 +70,17 @@ "projection": { "select": { "structItems": [ - {} + {}, + { + "field": 1 + } ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "orders_small" + "customer_small" ] } } @@ -92,14 +89,15 @@ "read": { "baseSchema": { "names": [ - "c_custkey", - "c_name", - "c_address", - "c_nationkey", - "c_phone", - "c_acctbal", - "c_mktsegment", - "c_comment" + "o_orderkey", + "o_custkey", + "o_orderstatus", + "o_totalprice", + "o_orderdate", + "o_orderpriority", + "o_clerk", + "o_shippriority", + "o_comment" ], "struct": { "types": [ @@ -109,7 +107,7 @@ } }, { - "string": { + "i64": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -119,19 +117,19 @@ } }, { - "i32": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "string": { + "date": { "nullability": "NULLABILITY_NULLABLE" } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -140,6 +138,11 @@ "nullability": "NULLABILITY_NULLABLE" } }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, { "string": { "nullability": "NULLABILITY_NULLABLE" @@ -152,17 +155,14 @@ "projection": { "select": { "structItems": [ - {}, - { - "field": 1 - } + {} ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "customer_small" + "orders_small" ] } } @@ -173,9 +173,7 @@ { "selection": { "directReference": { - "structField": { - "field": 1 - } + "structField": {} }, "rootReference": {} } @@ -184,7 +182,7 @@ "selection": { "directReference": { "structField": { - "field": 2 + "field": 1 } }, "rootReference": {} @@ -193,7 +191,9 @@ { "selection": { "directReference": { - "structField": {} + "structField": { + "field": 2 + } }, "rootReference": {} } @@ -210,7 +210,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join_plan.json new file mode 100644 index 00000000..92079b20 --- /dev/null +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join_plan.json @@ -0,0 +1,313 @@ +{ + "extensionUris": [ + { + "extensionUriAnchor": 1, + "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/" + } + ], + "extensions": [ + { + "extensionFunction": { + "extensionUriReference": 1, + "functionAnchor": 1, + "name": "equal:i64_i64" + } + } + ], + "relations": [ + { + "root": { + "input": { + "project": { + "input": { + "project": { + "input": { + "join": { + "left": { + "read": { + "baseSchema": { + "names": [ + "c_custkey", + "c_name", + "c_address", + "c_nationkey", + "c_phone", + "c_acctbal", + "c_mktsegment", + "c_comment" + ], + "struct": { + "types": [ + { + "i64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + } + ], + "nullability": "NULLABILITY_REQUIRED" + } + }, + "projection": { + "select": { + "structItems": [ + {}, + { + "field": 1 + } + ] + }, + "maintainSingularStruct": true + }, + "namedTable": { + "names": [ + "customer_small" + ] + } + } + }, + "right": { + "read": { + "baseSchema": { + "names": [ + "o_orderkey", + "o_custkey", + "o_orderstatus", + "o_totalprice", + "o_orderdate", + "o_orderpriority", + "o_clerk", + "o_shippriority", + "o_comment" + ], + "struct": { + "types": [ + { + "i64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "i64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "date": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + { + "string": { + "nullability": "NULLABILITY_NULLABLE" + } + } + ], + "nullability": "NULLABILITY_REQUIRED" + } + }, + "projection": { + "select": { + "structItems": [ + { + "field": 1 + }, + {} + ] + }, + "maintainSingularStruct": true + }, + "namedTable": { + "names": [ + "orders_small" + ] + } + } + }, + "expression": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "bool": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 2 + } + }, + "rootReference": {} + } + } + } + ] + } + }, + "type": "JOIN_TYPE_OUTER" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 2 + } + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 3 + } + }, + "rootReference": {} + } + } + ] + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 + } + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 3 + } + }, + "rootReference": {} + } + } + ] + } + }, + "names": [ + "c_custkey", + "c_name", + "o_orderkey" + ] + } + } + ], + "version": { + "minorNumber": 53, + "producer": "DuckDB" + } +} \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join_plan.json index 71d392cf..e7182699 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join_plan.json @@ -27,23 +27,17 @@ "read": { "baseSchema": { "names": [ - "o_orderkey", - "o_custkey", - "o_orderstatus", - "o_totalprice", - "o_orderdate", - "o_orderpriority", - "o_clerk", - "o_shippriority", - "o_comment" + "c_custkey", + "c_name", + "c_address", + "c_nationkey", + "c_phone", + "c_acctbal", + "c_mktsegment", + "c_comment" ], "struct": { "types": [ - { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, { "i64": { "nullability": "NULLABILITY_NULLABLE" @@ -55,14 +49,12 @@ } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, { - "date": { + "i32": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -72,12 +64,14 @@ } }, { - "string": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "i32": { + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -93,17 +87,17 @@ "projection": { "select": { "structItems": [ + {}, { "field": 1 - }, - {} + } ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "orders_small" + "customer_small" ] } } @@ -112,14 +106,15 @@ "read": { "baseSchema": { "names": [ - "c_custkey", - "c_name", - "c_address", - "c_nationkey", - "c_phone", - "c_acctbal", - "c_mktsegment", - "c_comment" + "o_orderkey", + "o_custkey", + "o_orderstatus", + "o_totalprice", + "o_orderdate", + "o_orderpriority", + "o_clerk", + "o_shippriority", + "o_comment" ], "struct": { "types": [ @@ -129,7 +124,7 @@ } }, { - "string": { + "i64": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -139,19 +134,19 @@ } }, { - "i32": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "string": { + "date": { "nullability": "NULLABILITY_NULLABLE" } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -160,6 +155,11 @@ "nullability": "NULLABILITY_NULLABLE" } }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, { "string": { "nullability": "NULLABILITY_NULLABLE" @@ -172,17 +172,17 @@ "projection": { "select": { "structItems": [ - {}, { "field": 1 - } + }, + {} ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "customer_small" + "orders_small" ] } } @@ -279,7 +279,7 @@ "selection": { "directReference": { "structField": { - "field": 3 + "field": 1 } }, "rootReference": {} @@ -289,7 +289,7 @@ "selection": { "directReference": { "structField": { - "field": 1 + "field": 3 } }, "rootReference": {} @@ -307,7 +307,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join_plan.json index 735b449b..65d685c3 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join_plan.json @@ -307,7 +307,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join_plan.json index 1b88a5ad..1153a98a 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join_plan.json @@ -289,7 +289,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join_plan.json index 4af36ecb..d07d72b1 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join_plan.json @@ -27,23 +27,17 @@ "read": { "baseSchema": { "names": [ - "o_orderkey", - "o_custkey", - "o_orderstatus", - "o_totalprice", - "o_orderdate", - "o_orderpriority", - "o_clerk", - "o_shippriority", - "o_comment" + "c_custkey", + "c_name", + "c_address", + "c_nationkey", + "c_phone", + "c_acctbal", + "c_mktsegment", + "c_comment" ], "struct": { "types": [ - { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, { "i64": { "nullability": "NULLABILITY_NULLABLE" @@ -55,14 +49,12 @@ } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, { - "date": { + "i32": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -72,12 +64,14 @@ } }, { - "string": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "i32": { + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -93,17 +87,17 @@ "projection": { "select": { "structItems": [ + {}, { "field": 1 - }, - {} + } ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "orders_small" + "customer_small" ] } } @@ -112,14 +106,15 @@ "read": { "baseSchema": { "names": [ - "c_custkey", - "c_name", - "c_address", - "c_nationkey", - "c_phone", - "c_acctbal", - "c_mktsegment", - "c_comment" + "o_orderkey", + "o_custkey", + "o_orderstatus", + "o_totalprice", + "o_orderdate", + "o_orderpriority", + "o_clerk", + "o_shippriority", + "o_comment" ], "struct": { "types": [ @@ -129,7 +124,7 @@ } }, { - "string": { + "i64": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -139,19 +134,19 @@ } }, { - "i32": { + "decimal": { + "scale": 2, + "precision": 15, "nullability": "NULLABILITY_NULLABLE" } }, { - "string": { + "date": { "nullability": "NULLABILITY_NULLABLE" } }, { - "decimal": { - "scale": 2, - "precision": 15, + "string": { "nullability": "NULLABILITY_NULLABLE" } }, @@ -160,6 +155,11 @@ "nullability": "NULLABILITY_NULLABLE" } }, + { + "i32": { + "nullability": "NULLABILITY_NULLABLE" + } + }, { "string": { "nullability": "NULLABILITY_NULLABLE" @@ -172,17 +172,17 @@ "projection": { "select": { "structItems": [ - {}, { "field": 1 - } + }, + {} ] }, "maintainSingularStruct": true }, "namedTable": { "names": [ - "customer_small" + "orders_small" ] } } @@ -221,7 +221,7 @@ ] } }, - "type": "JOIN_TYPE_LEFT" + "type": "JOIN_TYPE_RIGHT" } }, "expressions": [ @@ -270,9 +270,7 @@ { "selection": { "directReference": { - "structField": { - "field": 2 - } + "structField": {} }, "rootReference": {} } @@ -281,7 +279,7 @@ "selection": { "directReference": { "structField": { - "field": 3 + "field": 1 } }, "rootReference": {} @@ -291,7 +289,7 @@ "selection": { "directReference": { "structField": { - "field": 1 + "field": 3 } }, "rootReference": {} @@ -309,7 +307,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join_plan.json b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join_plan.json index fdedd489..03386ece 100644 --- a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join_plan.json +++ b/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join_plan.json @@ -287,7 +287,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project_plan.json index 09035959..eec4e67e 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project_plan.json @@ -148,7 +148,7 @@ }, "namedTable": { "names": [ - "lineitemsmall" + "lineitem_small" ] } } @@ -165,6 +165,7 @@ "nullability": "NULLABILITY_NULLABLE" } }, + "invocation": "AGGREGATION_INVOCATION_DISTINCT", "arguments": [ { "value": { @@ -201,7 +202,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project_plan.json index 4db88fdf..eeff096e 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project_plan.json @@ -149,7 +149,7 @@ }, "namedTable": { "names": [ - "lineitemsmall" + "lineitem_small" ] } } @@ -210,7 +210,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col_plan.json index 5abb8f9f..6be7845c 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col_plan.json @@ -49,7 +49,7 @@ }, "namedTable": { "names": [ - "regionsmall" + "region_small" ] } } @@ -95,7 +95,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col_plan.json index 2ba857a6..4b13193b 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col_plan.json @@ -134,7 +134,7 @@ }, "namedTable": { "names": [ - "lineitemsmall" + "lineitem_small" ] } } @@ -169,7 +169,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col_plan.json index 0006a053..d8f9317c 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col_plan.json @@ -174,7 +174,7 @@ }, "namedTable": { "names": [ - "lineitemsmall" + "lineitem_small" ] } } @@ -363,7 +363,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project_plan.json b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project_plan.json index e705e5dd..f05f3485 100644 --- a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project_plan.json +++ b/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project_plan.json @@ -101,7 +101,7 @@ }, "namedTable": { "names": [ - "customersmall" + "customer_small" ] } } @@ -192,7 +192,7 @@ }, "namedTable": { "names": [ - "orderssmall" + "orders_small" ] } } @@ -362,7 +362,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table_plan.json b/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table_plan.json index 5b88e089..f921e268 100644 --- a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table_plan.json +++ b/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table_plan.json @@ -81,7 +81,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except_plan.json b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except_plan.json index 87ce7dc8..7c7dc3c6 100644 --- a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except_plan.json +++ b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except_plan.json @@ -206,7 +206,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect_plan.json b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect_plan.json index bd4a4aad..1811bef1 100644 --- a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect_plan.json +++ b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect_plan.json @@ -172,7 +172,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all_plan.json b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all_plan.json index 65e2e8ac..0fb4f4e7 100644 --- a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all_plan.json +++ b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all_plan.json @@ -172,7 +172,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct_plan.json b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct_plan.json index 87f668e0..cfe14d77 100644 --- a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct_plan.json +++ b/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct_plan.json @@ -189,7 +189,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc_plan.json index 88d7fa5a..d2b2fb0c 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc_plan.json @@ -132,7 +132,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_plan.json index 53efb342..a7273ae5 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_plan.json @@ -132,7 +132,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc_plan.json index 73552c33..c8ab6681 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc_plan.json @@ -132,7 +132,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_plan.json index d4f805d7..bf6c2576 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_plan.json @@ -105,7 +105,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number_plan.json index 53efb342..a7273ae5 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number_plan.json @@ -132,7 +132,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc_plan.json index 3ef7661b..4c3b9c71 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc_plan.json @@ -105,7 +105,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort_plan.json index 36fa9ab5..fd302fb7 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort_plan.json @@ -105,7 +105,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc_plan.json index d4f805d7..bf6c2576 100644 --- a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc_plan.json +++ b/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc_plan.json @@ -105,7 +105,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/test_join_relation.py b/substrait_consumer/tests/functional/relations/test_join_relation.py index 7b4626c0..3139835a 100644 --- a/substrait_consumer/tests/functional/relations/test_join_relation.py +++ b/substrait_consumer/tests/functional/relations/test_join_relation.py @@ -18,9 +18,7 @@ def mark_producer_tests_as_xfail(request): producer = request.getfixturevalue('producer') test_case_name = request.node.callspec.id.split('-')[-1] if producer.__class__.__name__ == 'DuckDBProducer': - if test_case_name == "full_join": - pytest.skip(reason='INTERNAL Error: Unsupported join type FULL') - elif test_case_name in ["left_anti_join", "right_anti_join"]: + if test_case_name in ["left_anti_join", "right_anti_join"]: pytest.skip(reason='INTERNAL Error: Unsupported join type ANTI') elif test_case_name in ["left_single_join", "right_single_join"]: pytest.skip(reason='INTERNAL Error: Unsupported join comparison: !=') From 62bebf00654e547b717e4fcdf2b51bf1f491188a Mon Sep 17 00:00:00 2001 From: Richard Tia Date: Thu, 19 Sep 2024 17:15:35 -0700 Subject: [PATCH 2/2] chore: update DuckDB extension function snapshots --- .../approx_count_distinct_plan.json | 2 +- .../DuckDBProducer/add_plan.json | 106 +++++------ .../DuckDBProducer/avg_plan.json | 2 +- .../DuckDBProducer/divide_plan.json | 166 +++++++++--------- .../DuckDBProducer/max_plan.json | 2 +- .../DuckDBProducer/min_plan.json | 2 +- .../DuckDBProducer/modulus_plan.json | 148 ++++++++-------- .../DuckDBProducer/multiply_plan.json | 148 ++++++++-------- .../DuckDBProducer/subtract_plan.json | 106 +++++------ .../DuckDBProducer/sum_plan.json | 2 +- .../DuckDBProducer/abs_plan.json | 66 +++---- .../DuckDBProducer/acos_plan.json | 104 +++++------ .../DuckDBProducer/add_plan.json | 102 +++++------ .../DuckDBProducer/asin_plan.json | 104 +++++------ .../DuckDBProducer/atan2_plan.json | 136 +++++++------- .../DuckDBProducer/atan_plan.json | 104 +++++------ .../DuckDBProducer/avg_plan.json | 2 +- .../DuckDBProducer/cos_plan.json | 104 +++++------ .../DuckDBProducer/count_plan.json | 2 +- .../DuckDBProducer/count_star_plan.json | 2 +- .../DuckDBProducer/divide_plan.json | 92 +++++----- .../DuckDBProducer/exp_plan.json | 116 ++++++------ .../DuckDBProducer/factorial_plan.json | 68 +++---- .../DuckDBProducer/max_plan.json | 2 +- .../DuckDBProducer/median_plan.json | 2 +- .../DuckDBProducer/min_plan.json | 2 +- .../DuckDBProducer/mode_plan.json | 2 +- .../DuckDBProducer/modulus_plan.json | 78 ++++---- .../DuckDBProducer/multiply_plan.json | 78 ++++---- .../DuckDBProducer/power_plan.json | 92 +++++----- .../DuckDBProducer/product_plan.json | 2 +- .../DuckDBProducer/sign_plan.json | 66 +++---- .../DuckDBProducer/sin_plan.json | 104 +++++------ .../DuckDBProducer/sqrt_plan.json | 116 ++++++------ .../DuckDBProducer/std_dev_plan.json | 2 +- .../DuckDBProducer/subtract_plan.json | 102 +++++------ .../DuckDBProducer/sum_plan.json | 2 +- .../DuckDBProducer/tan_plan.json | 104 +++++------ .../DuckDBProducer/variance_plan.json | 2 +- .../DuckDBProducer/and_plan.json | 2 +- .../DuckDBProducer/bool_and_plan.json | 2 +- .../DuckDBProducer/bool_or_plan.json | 2 +- .../DuckDBProducer/not_plan.json | 2 +- .../DuckDBProducer/or_plan.json | 2 +- .../DuckDBProducer/xor_plan.json | 11 +- .../DuckDBProducer/between_plan.json | 2 +- .../DuckDBProducer/equal_plan.json | 2 +- .../DuckDBProducer/gt_plan.json | 2 +- .../DuckDBProducer/gte_plan.json | 2 +- .../DuckDBProducer/is_finite_plan.json | 2 +- .../DuckDBProducer/is_infinite_plan.json | 2 +- .../DuckDBProducer/is_nan_plan.json | 2 +- .../is_not_distinct_from_plan.json | 2 +- .../DuckDBProducer/is_not_null_plan.json | 2 +- .../DuckDBProducer/is_null_plan.json | 2 +- .../DuckDBProducer/lt_plan.json | 2 +- .../DuckDBProducer/lte_plan.json | 2 +- .../DuckDBProducer/not_equal_plan.json | 2 +- .../DuckDBProducer/add_plan.json | 81 ++++----- .../DuckDBProducer/extract_plan.json | 74 ++++---- .../DuckDBProducer/gt_plan.json | 102 +++++------ .../DuckDBProducer/gte_plan.json | 102 +++++------ .../DuckDBProducer/lt_plan.json | 102 +++++------ .../DuckDBProducer/lte_plan.json | 102 +++++------ .../DuckDBProducer/subtract_plan.json | 81 ++++----- .../DuckDBProducer/ln_plan.json | 116 ++++++------ .../DuckDBProducer/log10_plan.json | 116 ++++++------ .../DuckDBProducer/log2_plan.json | 116 ++++++------ .../DuckDBProducer/ceil_plan.json | 78 ++++---- .../DuckDBProducer/floor_plan.json | 78 ++++---- .../DuckDBProducer/round_plan.json | 92 +++++----- .../DuckDBProducer/bit_length_plan.json | 2 +- .../DuckDBProducer/char_length_plan.json | 2 +- .../DuckDBProducer/concat_plan.json | 2 +- .../DuckDBProducer/concat_ws_plan.json | 2 +- .../DuckDBProducer/contains_plan.json | 2 +- .../DuckDBProducer/ends_with_plan.json | 2 +- .../DuckDBProducer/left_plan.json | 2 +- .../DuckDBProducer/like_plan.json | 2 +- .../DuckDBProducer/lower_plan.json | 2 +- .../DuckDBProducer/lpad_plan.json | 2 +- .../DuckDBProducer/ltrim_plan.json | 2 +- .../DuckDBProducer/repeat_plan.json | 2 +- .../DuckDBProducer/replace_plan.json | 2 +- .../DuckDBProducer/reverse_plan.json | 2 +- .../DuckDBProducer/right_plan.json | 2 +- .../DuckDBProducer/rpad_plan.json | 2 +- .../DuckDBProducer/rtrim_plan.json | 2 +- .../DuckDBProducer/starts_with_plan.json | 2 +- .../DuckDBProducer/string_agg_plan.json | 2 +- .../DuckDBProducer/strpos_plan.json | 2 +- .../DuckDBProducer/substring_plan.json | 2 +- .../DuckDBProducer/trim_plan.json | 2 +- .../DuckDBProducer/upper_plan.json | 66 +++---- 94 files changed, 1924 insertions(+), 1915 deletions(-) diff --git a/substrait_consumer/tests/functional/extension_functions/approximation_snapshots/DuckDBProducer/approx_count_distinct_plan.json b/substrait_consumer/tests/functional/extension_functions/approximation_snapshots/DuckDBProducer/approx_count_distinct_plan.json index 07991f67..8ccf3f00 100644 --- a/substrait_consumer/tests/functional/extension_functions/approximation_snapshots/DuckDBProducer/approx_count_distinct_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/approximation_snapshots/DuckDBProducer/approx_count_distinct_plan.json @@ -201,7 +201,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/add_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/add_plan.json index ea35d640..d99d25f2 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/add_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/add_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,65 +156,65 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "decimal": { + "scale": 2, + "precision": 16, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "decimal": { - "scale": 2, - "precision": 16, - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -226,7 +226,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/avg_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/avg_plan.json index bf1cc0ed..ad2fd3f3 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/avg_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/avg_plan.json @@ -233,7 +233,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/divide_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/divide_plan.json index ced52aab..35e76db7 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/divide_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/divide_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -167,102 +167,102 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - "input": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } + "rootReference": {} } } - }, - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + } + } + }, + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -274,7 +274,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/max_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/max_plan.json index 75849a02..ac70d58c 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/max_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/max_plan.json @@ -203,7 +203,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/min_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/min_plan.json index 183d8271..b2b50985 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/min_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/min_plan.json @@ -203,7 +203,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/modulus_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/modulus_plan.json index c9c3d3f0..d57eb157 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/modulus_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/modulus_plan.json @@ -24,9 +24,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -162,88 +162,88 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "decimal": { - "scale": 2, - "precision": 15, - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "decimal": { + "scale": 2, + "precision": 15, + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] - } - } - }, - { - "value": { - "literal": { - "i32": 2 + } } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -255,7 +255,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/multiply_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/multiply_plan.json index 2cb0a285..02b733c6 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/multiply_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/multiply_plan.json @@ -24,9 +24,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -162,88 +162,88 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "decimal": { + "scale": 2, + "precision": 18, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "decimal": { - "scale": 2, - "precision": 18, - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "decimal": { - "scale": 4, - "precision": 18, - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "decimal": { + "scale": 4, + "precision": 18, + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } + }, + "rootReference": {} } - ] - } - } - }, - { - "value": { - "literal": { - "i32": 2 + } } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -255,7 +255,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/subtract_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/subtract_plan.json index bbae5595..5a6a406e 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/subtract_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/subtract_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,65 +156,65 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "decimal": { + "scale": 2, + "precision": 16, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "decimal": { - "scale": 2, - "precision": 16, - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -226,7 +226,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/sum_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/sum_plan.json index 8b90cedf..0fdc9589 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/sum_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_decimal_snapshots/DuckDBProducer/sum_plan.json @@ -203,7 +203,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/abs_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/abs_plan.json index fb1c68e4..0b10a8da 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/abs_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/abs_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -71,41 +71,41 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -116,7 +116,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/acos_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/acos_plan.json index 03a29363..56c8a147 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/acos_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/acos_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -164,63 +164,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -230,7 +230,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/add_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/add_plan.json index 0053b195..949b981e 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/add_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/add_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -82,63 +82,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -150,7 +150,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/asin_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/asin_plan.json index 4be57002..0820a881 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/asin_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/asin_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -164,63 +164,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -230,7 +230,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan2_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan2_plan.json index da0fac54..dce48355 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan2_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan2_plan.json @@ -29,11 +29,11 @@ { "root": { "input": { - "fetch": { + "project": { "input": { "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -166,85 +166,85 @@ } } }, - "expressions": [ - { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - } - } - ] + "count": "10" } }, "expressions": [ { - "scalarFunction": { - "functionReference": 2, - "outputType": { + "cast": { + "type": { "fp64": { "nullability": "NULLABILITY_NULLABLE" } }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - } - ] - } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + "input": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } } ] } }, - "count": "10" + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + } + } + ] + } + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } + } + ] + } + } + ] } }, "names": [ @@ -254,7 +254,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan_plan.json index 67cc6cf0..f87aae87 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/atan_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -164,63 +164,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -230,7 +230,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/avg_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/avg_plan.json index 1ef2a662..b6733727 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/avg_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/avg_plan.json @@ -161,7 +161,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/cos_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/cos_plan.json index 425b2326..3017d7b5 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/cos_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/cos_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,63 +92,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -158,7 +158,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_plan.json index 7c5f454d..28ce5542 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_plan.json @@ -117,7 +117,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_star_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_star_plan.json index 0161426c..bb05d764 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_star_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/count_star_plan.json @@ -107,7 +107,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/divide_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/divide_plan.json index c66d1814..c4dbb2f4 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/divide_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/divide_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -79,57 +79,57 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } - } - }, - { - "value": { - "literal": { - "fp64": 10 + }, + "input": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } } } - ] + } + }, + { + "value": { + "literal": { + "fp64": 10 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -140,7 +140,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/exp_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/exp_plan.json index 1e911406..90ddf1f8 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/exp_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/exp_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -90,71 +90,71 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -165,7 +165,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/factorial_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/factorial_plan.json index 2015c4e3..b82d769e 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/factorial_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/factorial_plan.json @@ -47,9 +47,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -167,42 +167,42 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "100" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 4, + "outputType": { + "decimal": { + "precision": 38, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 4, - "outputType": { - "decimal": { - "precision": 38, - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "100" + ] } }, "names": [ @@ -213,7 +213,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/max_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/max_plan.json index be6bae9a..c83b2630 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/max_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/max_plan.json @@ -131,7 +131,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/median_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/median_plan.json index 3cfdc55e..d21a559b 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/median_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/median_plan.json @@ -124,7 +124,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/min_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/min_plan.json index f40b37ef..24fe0d46 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/min_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/min_plan.json @@ -131,7 +131,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/mode_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/mode_plan.json index f0b12b71..b3ebf460 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/mode_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/mode_plan.json @@ -124,7 +124,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/modulus_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/modulus_plan.json index 701adcb9..2f2a2c02 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/modulus_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/modulus_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -79,48 +79,48 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "i64": "10" - } - } + } + }, + { + "value": { + "literal": { + "i64": "10" } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -131,7 +131,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/multiply_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/multiply_plan.json index f1f0bb68..5c0daa6e 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/multiply_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/multiply_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -79,48 +79,48 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "i64": "10" - } - } + } + }, + { + "value": { + "literal": { + "i64": "10" } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -131,7 +131,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/power_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/power_plan.json index d15bd3b6..a41bf6f1 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/power_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/power_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -79,57 +79,57 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } - } - }, - { - "value": { - "literal": { - "fp64": 2 + }, + "input": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } } } - ] + } + }, + { + "value": { + "literal": { + "fp64": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -140,7 +140,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/product_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/product_plan.json index e44babfa..8c65674d 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/product_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/product_plan.json @@ -138,7 +138,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sign_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sign_plan.json index 445fca4b..13f2e4a1 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sign_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sign_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -71,41 +71,41 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i8": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i8": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -116,7 +116,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sin_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sin_plan.json index d1b3368f..e9cdf178 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sin_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sin_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,63 +92,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -158,7 +158,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sqrt_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sqrt_plan.json index a3851793..6854a486 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sqrt_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sqrt_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -90,71 +90,71 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -165,7 +165,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/std_dev_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/std_dev_plan.json index b9730fd8..630d79d7 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/std_dev_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/std_dev_plan.json @@ -170,7 +170,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/subtract_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/subtract_plan.json index cdae45dd..baabd03c 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/subtract_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/subtract_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -82,63 +82,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -150,7 +150,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sum_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sum_plan.json index 212e5eb9..09e3db76 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sum_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/sum_plan.json @@ -131,7 +131,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/tan_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/tan_plan.json index c2a05a8f..2d89e4c7 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/tan_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/tan_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,63 +92,63 @@ } } }, - "expressions": [ - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "count": "10" + } + }, + "expressions": [ + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -158,7 +158,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/variance_plan.json b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/variance_plan.json index 16c0d87b..1a5ed283 100644 --- a/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/variance_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/arithmetic_snapshots/DuckDBProducer/variance_plan.json @@ -170,7 +170,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/and_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/and_plan.json index b637f087..3b515507 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/and_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/and_plan.json @@ -281,7 +281,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_and_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_and_plan.json index 0bc66d5c..4f87de7e 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_and_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_and_plan.json @@ -121,7 +121,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_or_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_or_plan.json index 05a2989e..1b31ec43 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_or_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/bool_or_plan.json @@ -121,7 +121,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/not_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/not_plan.json index 3e8e8eb5..dde72101 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/not_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/not_plan.json @@ -75,7 +75,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/or_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/or_plan.json index 4ae86322..5e169592 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/or_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/or_plan.json @@ -177,7 +177,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/xor_plan.json b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/xor_plan.json index 50e836ca..54d27814 100644 --- a/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/xor_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/boolean_snapshots/DuckDBProducer/xor_plan.json @@ -1,9 +1,16 @@ { + "extensionUris": [ + { + "extensionUriAnchor": 1, + "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_arithmetic.yaml" + } + ], "extensions": [ { "extensionFunction": { + "extensionUriReference": 1, "functionAnchor": 1, - "name": "xor" + "name": "bitwise_xor:i64_i64" } } ], @@ -130,7 +137,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/between_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/between_plan.json index 1e2f7c8d..b6bf11f3 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/between_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/between_plan.json @@ -242,7 +242,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/equal_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/equal_plan.json index 91d724ca..a48d16e2 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/equal_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/equal_plan.json @@ -148,7 +148,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gt_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gt_plan.json index 258fb377..01f97f1d 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gt_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gt_plan.json @@ -204,7 +204,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gte_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gte_plan.json index 7b10ae94..1120bc38 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gte_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/gte_plan.json @@ -204,7 +204,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_finite_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_finite_plan.json index 7ad40462..c27134ee 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_finite_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_finite_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_infinite_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_infinite_plan.json index 1dc01550..98998bd6 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_infinite_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_infinite_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_nan_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_nan_plan.json index dc7aed5f..3e2bdac3 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_nan_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_nan_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_distinct_from_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_distinct_from_plan.json index c5801810..0f523a65 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_distinct_from_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_distinct_from_plan.json @@ -121,7 +121,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_null_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_null_plan.json index 14032c70..103eb4f2 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_null_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_not_null_plan.json @@ -114,7 +114,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_null_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_null_plan.json index 9de63d93..f0b46347 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_null_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/is_null_plan.json @@ -114,7 +114,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lt_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lt_plan.json index 1e1630e0..78b46dea 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lt_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lt_plan.json @@ -204,7 +204,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lte_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lte_plan.json index 14a4ec0c..f9a9dbcd 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lte_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/lte_plan.json @@ -204,7 +204,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/not_equal_plan.json b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/not_equal_plan.json index 94dd58a5..433edb1d 100644 --- a/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/not_equal_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/comparison_snapshots/DuckDBProducer/not_equal_plan.json @@ -123,7 +123,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/add_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/add_plan.json index cadab61b..97ea219f 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/add_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/add_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -153,50 +153,51 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "precisionTimestamp": { + "precision": 6, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "timestamp": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "intervalDayToSecond": { - "days": 5 - } - } + } + }, + { + "value": { + "literal": { + "intervalDayToSecond": { + "days": 5 } } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -207,7 +208,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/extract_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/extract_plan.json index df24aca4..ab0e156b 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/extract_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/extract_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -153,55 +153,55 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "i64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "i64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "enum": "year" - }, - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "enum": "year" + }, + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ "l_shipdate", - "year(l_shipdate)" + "\"year\"(l_shipdate)" ] } } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gt_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gt_plan.json index 6ff99697..8ebb1d35 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gt_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gt_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,63 +156,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "bool": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -224,7 +224,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gte_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gte_plan.json index 1669f29f..dc40ae1b 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gte_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/gte_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,63 +156,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "bool": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -224,7 +224,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lt_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lt_plan.json index 7b2dddd2..57b38a03 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lt_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lt_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,63 +156,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "bool": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -224,7 +224,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lte_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lte_plan.json index 28e7555d..90f094f0 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lte_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/lte_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -156,63 +156,63 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "selection": { + "directReference": { + "structField": { + "field": 1 } }, - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "bool": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} + } + }, + { + "value": { + "selection": { + "directReference": { + "structField": { + "field": 1 } - } + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -224,7 +224,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/subtract_plan.json b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/subtract_plan.json index 3fecd381..1b755662 100644 --- a/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/subtract_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/datetime_snapshots/DuckDBProducer/subtract_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -153,50 +153,51 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "precisionTimestamp": { + "precision": 6, + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "timestamp": { - "nullability": "NULLABILITY_NULLABLE" + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "intervalDayToSecond": { - "days": 5 - } - } + } + }, + { + "value": { + "literal": { + "intervalDayToSecond": { + "days": 5 } } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -207,7 +208,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/ln_plan.json b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/ln_plan.json index 66adf732..ec5f7cb6 100644 --- a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/ln_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/ln_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,71 +92,71 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -167,7 +167,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log10_plan.json b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log10_plan.json index 34ef1fcf..a6d438de 100644 --- a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log10_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log10_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,71 +92,71 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -167,7 +167,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log2_plan.json b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log2_plan.json index 8458384c..3760755b 100644 --- a/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log2_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/logarithmic_snapshots/DuckDBProducer/log2_plan.json @@ -29,9 +29,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -92,71 +92,71 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 2, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - }, - { - "value": { - "literal": { - "i32": 2 - } - } + ] } - ] + } + }, + { + "value": { + "literal": { + "i32": 2 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -167,7 +167,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/ceil_plan.json b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/ceil_plan.json index 60ca6682..69c13a89 100644 --- a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/ceil_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/ceil_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -81,50 +81,50 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -135,7 +135,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/floor_plan.json b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/floor_plan.json index b8fc382a..1aa6176a 100644 --- a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/floor_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/floor_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -81,50 +81,50 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" + } + }, + "input": { + "selection": { + "directReference": { + "structField": {} }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "rootReference": {} } } } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -135,7 +135,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/round_plan.json b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/round_plan.json index bf6f1337..86a05c43 100644 --- a/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/round_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/rounding_snapshots/DuckDBProducer/round_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -153,57 +153,57 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "cast": { - "type": { - "fp64": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "input": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "cast": { + "type": { + "fp64": { + "nullability": "NULLABILITY_NULLABLE" } - } - }, - { - "value": { - "literal": { - "i32": 1 + }, + "input": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } } } - ] + } + }, + { + "value": { + "literal": { + "i32": 1 + } + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -214,7 +214,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/bit_length_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/bit_length_plan.json index a931e4b3..d0f67f4e 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/bit_length_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/bit_length_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/char_length_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/char_length_plan.json index 6e48d084..6dabb12e 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/char_length_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/char_length_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_plan.json index 46968886..f6e317a2 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_plan.json @@ -121,7 +121,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_ws_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_ws_plan.json index 36fc6917..4b9c4901 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_ws_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/concat_ws_plan.json @@ -119,7 +119,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/contains_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/contains_plan.json index e587ceb7..e18f2b13 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/contains_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/contains_plan.json @@ -123,7 +123,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ends_with_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ends_with_plan.json index f741e834..8b9b1b95 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ends_with_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ends_with_plan.json @@ -123,7 +123,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/left_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/left_plan.json index 370833ac..1329dab8 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/left_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/left_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/like_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/like_plan.json index da5e54e3..4a965f6d 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/like_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/like_plan.json @@ -179,7 +179,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lower_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lower_plan.json index 197221f0..a79e277c 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lower_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lower_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lpad_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lpad_plan.json index c8fe6581..7caf0741 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lpad_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/lpad_plan.json @@ -127,7 +127,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ltrim_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ltrim_plan.json index 98d207f1..2bacfb8c 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ltrim_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/ltrim_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/repeat_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/repeat_plan.json index d299041e..8572a8da 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/repeat_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/repeat_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/replace_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/replace_plan.json index 8c5775f0..b473696a 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/replace_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/replace_plan.json @@ -127,7 +127,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/reverse_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/reverse_plan.json index a1672e22..6fb95c2f 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/reverse_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/reverse_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/right_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/right_plan.json index f9e66ee0..41d377d9 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/right_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/right_plan.json @@ -113,7 +113,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rpad_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rpad_plan.json index 4872c01c..320b3056 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rpad_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rpad_plan.json @@ -127,7 +127,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rtrim_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rtrim_plan.json index 73596bc1..19ffb2b7 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rtrim_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/rtrim_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json index a7fa66ae..1436c861 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json @@ -277,7 +277,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/string_agg_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/string_agg_plan.json index 674f619b..c2eccb78 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/string_agg_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/string_agg_plan.json @@ -153,7 +153,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/strpos_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/strpos_plan.json index 7acf34c6..6eb46831 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/strpos_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/strpos_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/substring_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/substring_plan.json index c3837a5a..0f799c17 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/substring_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/substring_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/trim_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/trim_plan.json index 50109642..1cf74cec 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/trim_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/trim_plan.json @@ -120,7 +120,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/upper_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/upper_plan.json index b7048081..58250bd4 100644 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/upper_plan.json +++ b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/upper_plan.json @@ -18,9 +18,9 @@ { "root": { "input": { - "fetch": { + "project": { "input": { - "project": { + "fetch": { "input": { "read": { "baseSchema": { @@ -105,41 +105,41 @@ } } }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} + "count": "10" + } + }, + "expressions": [ + { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} + } + }, + { + "scalarFunction": { + "functionReference": 1, + "outputType": { + "string": { + "nullability": "NULLABILITY_NULLABLE" } }, - { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } + "arguments": [ + { + "value": { + "selection": { + "directReference": { + "structField": {} + }, + "rootReference": {} } - ] + } } - } - ] + ] + } } - }, - "count": "10" + ] } }, "names": [ @@ -150,7 +150,7 @@ } ], "version": { - "minorNumber": 48, + "minorNumber": 53, "producer": "DuckDB" } } \ No newline at end of file