aboutsummaryrefslogtreecommitdiff
path: root/sql/hive
diff options
context:
space:
mode:
authorXiao Li <gatorsmile@gmail.com>2017-02-14 09:35:08 +0100
committerHerman van Hovell <hvanhovell@databricks.com>2017-02-14 09:35:08 +0100
commit457850e6f57b8e0de44cfe28e177c9b24e27af25 (patch)
tree06ab72ddfb723531a9710c333f0e716bd5a00c3d /sql/hive
parent9b5e460a9168ab78607034434ca45ab6cb51e5a6 (diff)
downloadspark-457850e6f57b8e0de44cfe28e177c9b24e27af25.tar.gz
spark-457850e6f57b8e0de44cfe28e177c9b24e27af25.tar.bz2
spark-457850e6f57b8e0de44cfe28e177c9b24e27af25.zip
[SPARK-19589][SQL] Removal of SQLGEN files
### What changes were proposed in this pull request? SQLGen is removed. Thus, the generated files should be removed too. ### How was this patch tested? N/A Author: Xiao Li <gatorsmile@gmail.com> Closes #16921 from gatorsmile/removeSQLGenFiles.
Diffstat (limited to 'sql/hive')
-rw-r--r--sql/hive/src/test/resources/sqlgen/agg1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/agg2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/agg3.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/aggregate_functions_and_window.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/broadcast_join_subquery.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/case.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/case_with_else.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/case_with_key.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/case_with_key_and_else.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/cluster_by.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/data_source_json_parquet_t0.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/data_source_orc_parquet_t0.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/data_source_parquet_parquet_t0.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/distinct_aggregation.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/distribute_by.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/distribute_by_with_sort_by.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/except.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/filter_after_subquery.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generate_with_other_1.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/generate_with_other_2.sql10
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_non_udtf_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_non_udtf_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_referenced_table_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_referenced_table_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_1.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_2.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_without_from_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/generator_without_from_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_1.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_2_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_2_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_2_3.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_2_4.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/grouping_sets_2_5.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/in.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/inline_tables.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/intersect.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/interval_arithmetic.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/join_2_tables.sql7
-rw-r--r--sql/hive/src/test/resources/sqlgen/json_tuple_generator_1.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/json_tuple_generator_2.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/limit.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/multi_distinct.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_1.sql7
-rw-r--r--sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_2.sql7
-rw-r--r--sql/hive/src/test/resources/sqlgen/not_in.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/not_like.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/predicate_subquery.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/range.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/range_with_splits.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/regular_expressions_and_window.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_1_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_1_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_2_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_2_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_3_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_3_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_4_1.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_4_2.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_5_1.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_5_2.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_3.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_4.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_5.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_6_6.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_7_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_7_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_7_3.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_8_1.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_8_2.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_9_1.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/rollup_cube_9_2.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_alias_list.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_alias_list_with_type.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_row_format_multiple.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_row_format_one.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_row_format_serde.sql10
-rw-r--r--sql/hive/src/test/resources/sqlgen/script_transformation_row_format_without_serde.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/select_distinct.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/select_orc_table.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/select_parquet_table.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/self_join.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/self_join_with_group_by.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/sort_asc_nulls_last.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/sort_by_after_having.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/sort_desc_nulls_first.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/subq2.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_exists_1.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_exists_2.sql9
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_exists_having_1.sql9
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_exists_having_2.sql10
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_exists_having_3.sql9
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_in.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_in_having_1.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_in_having_2.sql10
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_not_exists_1.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_not_exists_2.sql8
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_1.sql9
-rw-r--r--sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_2.sql9
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_2.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_3.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_4.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_5.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/tablesample_6.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/three_child_union.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/type_widening.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/union_distinct.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_basic_1.sql4
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_basic_2.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_basic_3.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_basic_asc_nulls_last.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_basic_desc_nulls_first.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_with_join.sql5
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg.sql7
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_filter.sql7
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_functions.sql6
-rw-r--r--sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_having.sql6
126 files changed, 0 insertions, 654 deletions
diff --git a/sql/hive/src/test/resources/sqlgen/agg1.sql b/sql/hive/src/test/resources/sqlgen/agg1.sql
deleted file mode 100644
index 05403a9dd8..0000000000
--- a/sql/hive/src/test/resources/sqlgen/agg1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key HAVING MAX(key) > 0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT count(`gen_attr_3`) AS `gen_attr_0`, max(`gen_attr_2`) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_2` HAVING (`gen_attr_1` > CAST(0 AS BIGINT))) AS gen_subquery_1) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/agg2.sql b/sql/hive/src/test/resources/sqlgen/agg2.sql
deleted file mode 100644
index adbfdb7e79..0000000000
--- a/sql/hive/src/test/resources/sqlgen/agg2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key ORDER BY MAX(key)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT count(`gen_attr_3`) AS `gen_attr_0`, max(`gen_attr_2`) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_2` ORDER BY `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/agg3.sql b/sql/hive/src/test/resources/sqlgen/agg3.sql
deleted file mode 100644
index 207542d226..0000000000
--- a/sql/hive/src/test/resources/sqlgen/agg3.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key ORDER BY key, MAX(key)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT count(`gen_attr_4`) AS `gen_attr_0`, `gen_attr_3` AS `gen_attr_1`, max(`gen_attr_3`) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_3` ORDER BY `gen_attr_1` ASC NULLS FIRST, `gen_attr_2` ASC NULLS FIRST) AS gen_subquery_1) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/aggregate_functions_and_window.sql b/sql/hive/src/test/resources/sqlgen/aggregate_functions_and_window.sql
deleted file mode 100644
index e3e372d5ec..0000000000
--- a/sql/hive/src/test/resources/sqlgen/aggregate_functions_and_window.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT MAX(c) + COUNT(a) OVER () FROM parquet_t2 GROUP BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `(max(c) + count(a) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING))` FROM (SELECT (`gen_attr_1` + `gen_attr_2`) AS `gen_attr_0` FROM (SELECT gen_subquery_1.`gen_attr_1`, gen_subquery_1.`gen_attr_3`, count(`gen_attr_3`) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_2` FROM (SELECT max(`gen_attr_5`) AS `gen_attr_1`, `gen_attr_3` FROM (SELECT `a` AS `gen_attr_3`, `b` AS `gen_attr_4`, `c` AS `gen_attr_5`, `d` AS `gen_attr_6` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_3`, `gen_attr_4`) AS gen_subquery_1) AS gen_subquery_2) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/broadcast_join_subquery.sql b/sql/hive/src/test/resources/sqlgen/broadcast_join_subquery.sql
deleted file mode 100644
index adddc41024..0000000000
--- a/sql/hive/src/test/resources/sqlgen/broadcast_join_subquery.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT /*+ MAPJOIN(srcpart) */ subq.key1, z.value
-FROM (SELECT x.key as key1, x.value as value1, y.key as key2, y.value as value2
- FROM src1 x JOIN src y ON (x.key = y.key)) subq
-JOIN srcpart z ON (subq.key1 = z.key and z.ds='2008-04-08' and z.hr=11)
-ORDER BY subq.key1, z.value
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key1`, `gen_attr_1` AS `value` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_7` AS `gen_attr_6`, `gen_attr_9` AS `gen_attr_8`, `gen_attr_11` AS `gen_attr_10` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_7` FROM `default`.`src1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_9`, `value` AS `gen_attr_11` FROM `default`.`src`) AS gen_subquery_1 ON (`gen_attr_5` = `gen_attr_9`)) AS subq INNER JOIN (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_1`, `ds` AS `gen_attr_3`, `hr` AS `gen_attr_4` FROM `default`.`srcpart`) AS gen_subquery_2 ON (((`gen_attr_0` = `gen_attr_2`) AND (`gen_attr_3` = '2008-04-08')) AND (CAST(`gen_attr_4` AS INT) = 11)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/case.sql b/sql/hive/src/test/resources/sqlgen/case.sql
deleted file mode 100644
index 99630e88cf..0000000000
--- a/sql/hive/src/test/resources/sqlgen/case.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT CASE WHEN id % 2 > 0 THEN 0 WHEN id % 2 = 0 THEN 1 END FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `CASE WHEN ((id % CAST(2 AS BIGINT)) > CAST(0 AS BIGINT)) THEN 0 WHEN ((id % CAST(2 AS BIGINT)) = CAST(0 AS BIGINT)) THEN 1 END` FROM (SELECT CASE WHEN ((`gen_attr_1` % CAST(2 AS BIGINT)) > CAST(0 AS BIGINT)) THEN 0 WHEN ((`gen_attr_1` % CAST(2 AS BIGINT)) = CAST(0 AS BIGINT)) THEN 1 END AS `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/case_with_else.sql b/sql/hive/src/test/resources/sqlgen/case_with_else.sql
deleted file mode 100644
index aed8f08804..0000000000
--- a/sql/hive/src/test/resources/sqlgen/case_with_else.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT CASE WHEN id % 2 > 0 THEN 0 ELSE 1 END FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `CASE WHEN ((id % CAST(2 AS BIGINT)) > CAST(0 AS BIGINT)) THEN 0 ELSE 1 END` FROM (SELECT CASE WHEN ((`gen_attr_1` % CAST(2 AS BIGINT)) > CAST(0 AS BIGINT)) THEN 0 ELSE 1 END AS `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/case_with_key.sql b/sql/hive/src/test/resources/sqlgen/case_with_key.sql
deleted file mode 100644
index e991ebafdc..0000000000
--- a/sql/hive/src/test/resources/sqlgen/case_with_key.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT CASE id WHEN 0 THEN 'foo' WHEN 1 THEN 'bar' END FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `CASE WHEN (id = CAST(0 AS BIGINT)) THEN foo WHEN (id = CAST(1 AS BIGINT)) THEN bar END` FROM (SELECT CASE WHEN (`gen_attr_1` = CAST(0 AS BIGINT)) THEN 'foo' WHEN (`gen_attr_1` = CAST(1 AS BIGINT)) THEN 'bar' END AS `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/case_with_key_and_else.sql b/sql/hive/src/test/resources/sqlgen/case_with_key_and_else.sql
deleted file mode 100644
index 492777e376..0000000000
--- a/sql/hive/src/test/resources/sqlgen/case_with_key_and_else.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT CASE id WHEN 0 THEN 'foo' WHEN 1 THEN 'bar' ELSE 'baz' END FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `CASE WHEN (id = CAST(0 AS BIGINT)) THEN foo WHEN (id = CAST(1 AS BIGINT)) THEN bar ELSE baz END` FROM (SELECT CASE WHEN (`gen_attr_1` = CAST(0 AS BIGINT)) THEN 'foo' WHEN (`gen_attr_1` = CAST(1 AS BIGINT)) THEN 'bar' ELSE 'baz' END AS `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/cluster_by.sql b/sql/hive/src/test/resources/sqlgen/cluster_by.sql
deleted file mode 100644
index 3154791c3c..0000000000
--- a/sql/hive/src/test/resources/sqlgen/cluster_by.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0 CLUSTER BY id
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0 CLUSTER BY `gen_attr_0`) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/data_source_json_parquet_t0.sql b/sql/hive/src/test/resources/sqlgen/data_source_json_parquet_t0.sql
deleted file mode 100644
index e41b645937..0000000000
--- a/sql/hive/src/test/resources/sqlgen/data_source_json_parquet_t0.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM json_parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`json_parquet_t0`) AS gen_subquery_0) AS json_parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/data_source_orc_parquet_t0.sql b/sql/hive/src/test/resources/sqlgen/data_source_orc_parquet_t0.sql
deleted file mode 100644
index f5ceccde8c..0000000000
--- a/sql/hive/src/test/resources/sqlgen/data_source_orc_parquet_t0.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM orc_parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`orc_parquet_t0`) AS gen_subquery_0) AS orc_parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/data_source_parquet_parquet_t0.sql b/sql/hive/src/test/resources/sqlgen/data_source_parquet_parquet_t0.sql
deleted file mode 100644
index 2bccefe55e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/data_source_parquet_parquet_t0.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_parquet_t0`) AS gen_subquery_0) AS parquet_parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/distinct_aggregation.sql b/sql/hive/src/test/resources/sqlgen/distinct_aggregation.sql
deleted file mode 100644
index bced711cae..0000000000
--- a/sql/hive/src/test/resources/sqlgen/distinct_aggregation.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(DISTINCT id) FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(DISTINCT id)` FROM (SELECT count(DISTINCT `gen_attr_1`) AS `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/distribute_by.sql b/sql/hive/src/test/resources/sqlgen/distribute_by.sql
deleted file mode 100644
index 72863dcaf5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/distribute_by.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0 DISTRIBUTE BY id
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0 DISTRIBUTE BY `gen_attr_0`) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/distribute_by_with_sort_by.sql b/sql/hive/src/test/resources/sqlgen/distribute_by_with_sort_by.sql
deleted file mode 100644
index 96b9b2dae8..0000000000
--- a/sql/hive/src/test/resources/sqlgen/distribute_by_with_sort_by.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0 DISTRIBUTE BY id SORT BY id
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0 CLUSTER BY `gen_attr_0`) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/except.sql b/sql/hive/src/test/resources/sqlgen/except.sql
deleted file mode 100644
index 7a7d27fcd6..0000000000
--- a/sql/hive/src/test/resources/sqlgen/except.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM t0 EXCEPT SELECT * FROM t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM ((SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0`) AS gen_subquery_0 ) EXCEPT ( SELECT `gen_attr_1` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`t0`) AS gen_subquery_1)) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/filter_after_subquery.sql b/sql/hive/src/test/resources/sqlgen/filter_after_subquery.sql
deleted file mode 100644
index 9cd6514d77..0000000000
--- a/sql/hive/src/test/resources/sqlgen/filter_after_subquery.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a FROM (SELECT key + 1 AS a FROM parquet_t1) t WHERE a > 5
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a` FROM (SELECT `gen_attr_0` FROM (SELECT (`gen_attr_1` + CAST(1 AS BIGINT)) AS `gen_attr_0` FROM (SELECT `key` AS `gen_attr_1`, `value` AS `gen_attr_2` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t WHERE (`gen_attr_0` > CAST(5 AS BIGINT))) AS t
diff --git a/sql/hive/src/test/resources/sqlgen/generate_with_other_1.sql b/sql/hive/src/test/resources/sqlgen/generate_with_other_1.sql
deleted file mode 100644
index 0739f8fff5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generate_with_other_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(arr) AS val, id
-FROM parquet_t3
-WHERE id > 2
-ORDER BY val, id
-LIMIT 5
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM ((SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT gen_subquery_0.`gen_attr_2`, gen_subquery_0.`gen_attr_3`, gen_subquery_0.`gen_attr_4`, gen_subquery_0.`gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 WHERE (`gen_attr_1` > CAST(2 AS BIGINT))) AS gen_subquery_1 LATERAL VIEW explode(`gen_attr_2`) gen_subquery_2 AS `gen_attr_0` ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST LIMIT 5)) AS parquet_t3
diff --git a/sql/hive/src/test/resources/sqlgen/generate_with_other_2.sql b/sql/hive/src/test/resources/sqlgen/generate_with_other_2.sql
deleted file mode 100644
index c4b344ee23..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generate_with_other_2.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT val, id
-FROM parquet_t3
-LATERAL VIEW EXPLODE(arr2) exp1 AS nested_array
-LATERAL VIEW EXPLODE(nested_array) exp1 AS val
-WHERE val > 2
-ORDER BY val, id
-LIMIT 5
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM ((SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_4`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_5`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_3`) gen_subquery_2 AS `gen_attr_2` LATERAL VIEW explode(`gen_attr_2`) gen_subquery_3 AS `gen_attr_0` WHERE (`gen_attr_0` > CAST(2 AS BIGINT)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST LIMIT 5)) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_1.sql b/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_1.sql
deleted file mode 100644
index 2f6596ef42..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT val, id FROM parquet_t3 LATERAL VIEW EXPLODE(arr) exp AS val
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_2`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_2.sql b/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_2.sql
deleted file mode 100644
index 239980dd80..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_in_lateral_view_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT val, id FROM parquet_t3 LATERAL VIEW OUTER EXPLODE(arr) exp AS val
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW OUTER explode(`gen_attr_2`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_1.sql b/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_1.sql
deleted file mode 100644
index 7fe0298c8e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(ARRAY(1,2,3)) FROM t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `col` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`t0`) AS gen_subquery_0 LATERAL VIEW explode(array(1, 2, 3)) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_2.sql b/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_2.sql
deleted file mode 100644
index 8db834acc7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_non_referenced_table_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(ARRAY(1,2,3)) AS val FROM t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`t0`) AS gen_subquery_0 LATERAL VIEW explode(array(1, 2, 3)) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_non_udtf_1.sql b/sql/hive/src/test/resources/sqlgen/generator_non_udtf_1.sql
deleted file mode 100644
index fef65e0068..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_non_udtf_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(arr), id FROM parquet_t3
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `col`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_2`) gen_subquery_1 AS `gen_attr_0`) AS parquet_t3
diff --git a/sql/hive/src/test/resources/sqlgen/generator_non_udtf_2.sql b/sql/hive/src/test/resources/sqlgen/generator_non_udtf_2.sql
deleted file mode 100644
index e0e310888f..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_non_udtf_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(arr) AS val, id as a FROM parquet_t3
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `a` FROM (SELECT `gen_attr_0`, `gen_attr_2` AS `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_3`, `arr2` AS `gen_attr_4`, `json` AS `gen_attr_5`, `id` AS `gen_attr_2` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_3`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_referenced_table_1.sql b/sql/hive/src/test/resources/sqlgen/generator_referenced_table_1.sql
deleted file mode 100644
index ea5db850be..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_referenced_table_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(arr) FROM parquet_t3
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `col` FROM (SELECT `gen_attr_0` FROM (SELECT `arr` AS `gen_attr_1`, `arr2` AS `gen_attr_2`, `json` AS `gen_attr_3`, `id` AS `gen_attr_4` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_1`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_referenced_table_2.sql b/sql/hive/src/test/resources/sqlgen/generator_referenced_table_2.sql
deleted file mode 100644
index 8f75b82547..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_referenced_table_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(arr) AS val FROM parquet_t3
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val` FROM (SELECT `gen_attr_0` FROM (SELECT `arr` AS `gen_attr_1`, `arr2` AS `gen_attr_2`, `json` AS `gen_attr_3`, `id` AS `gen_attr_4` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_1`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_1.sql b/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_1.sql
deleted file mode 100644
index 984cce8a2c..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT exp.id, parquet_t3.id
-FROM parquet_t3
-LATERAL VIEW EXPLODE(arr) exp AS id
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_2`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_2.sql b/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_2.sql
deleted file mode 100644
index 5c55b164c7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_with_ambiguous_names_2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT exp.id, parquet_t3.id
-FROM parquet_t3
-LATERAL VIEW OUTER EXPLODE(arr) exp AS id
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_2`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_4`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW OUTER explode(`gen_attr_2`) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/generator_without_from_1.sql b/sql/hive/src/test/resources/sqlgen/generator_without_from_1.sql
deleted file mode 100644
index ee22fe8728..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_without_from_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(ARRAY(1,2,3))
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `col` FROM (SELECT `gen_attr_0` FROM (SELECT 1) gen_subquery_1 LATERAL VIEW explode(array(1, 2, 3)) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_0
diff --git a/sql/hive/src/test/resources/sqlgen/generator_without_from_2.sql b/sql/hive/src/test/resources/sqlgen/generator_without_from_2.sql
deleted file mode 100644
index 0acded74b3..0000000000
--- a/sql/hive/src/test/resources/sqlgen/generator_without_from_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT EXPLODE(ARRAY(1,2,3)) AS val
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val` FROM (SELECT `gen_attr_0` FROM (SELECT 1) gen_subquery_1 LATERAL VIEW explode(array(1, 2, 3)) gen_subquery_2 AS `gen_attr_0`) AS gen_subquery_0
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_1.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_1.sql
deleted file mode 100644
index db2b2cc732..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) AS cnt, key % 5 AS k1, key - 5 AS k2, grouping_id() AS k3
-FROM (SELECT key, key % 2, key - 5 FROM parquet_t1) t GROUP BY key % 5, key - 5
-GROUPING SETS (key % 5, key - 5)
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `cnt`, `gen_attr_4` AS `k1`, `gen_attr_5` AS `k2`, `gen_attr_6` AS `k3` FROM (SELECT count(1) AS `gen_attr_3`, (`gen_attr_7` % CAST(5 AS BIGINT)) AS `gen_attr_4`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_5`, grouping_id() AS `gen_attr_6` FROM (SELECT `gen_attr_7`, (`gen_attr_7` % CAST(2 AS BIGINT)) AS `gen_attr_8`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_9` FROM (SELECT `key` AS `gen_attr_7`, `value` AS `gen_attr_12` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t GROUP BY (`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_7` % CAST(5 AS BIGINT))), ((`gen_attr_7` - CAST(5 AS BIGINT))))) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_1.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_2_1.sql
deleted file mode 100644
index 245b523416..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY a, b GROUPING SETS (a, b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((`gen_attr_5`), (`gen_attr_6`)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_2.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_2_2.sql
deleted file mode 100644
index 1505dea11e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY a, b GROUPING SETS (a) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((`gen_attr_5`)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_3.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_2_3.sql
deleted file mode 100644
index 281add6aab..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_3.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY a, b GROUPING SETS (b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((`gen_attr_6`)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_4.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_2_4.sql
deleted file mode 100644
index f8d64742b1..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_4.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY a, b GROUPING SETS (()) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS(()) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_5.sql b/sql/hive/src/test/resources/sqlgen/grouping_sets_2_5.sql
deleted file mode 100644
index 09e6ec2a5f..0000000000
--- a/sql/hive/src/test/resources/sqlgen/grouping_sets_2_5.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY a, b
-GROUPING SETS ((), (a), (a, b)) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((), (`gen_attr_5`), (`gen_attr_5`, `gen_attr_6`)) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/in.sql b/sql/hive/src/test/resources/sqlgen/in.sql
deleted file mode 100644
index 7cff62b1af..0000000000
--- a/sql/hive/src/test/resources/sqlgen/in.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0 WHERE id IN (1, 2, 3)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0 WHERE (CAST(`gen_attr_0` AS BIGINT) IN (CAST(1 AS BIGINT), CAST(2 AS BIGINT), CAST(3 AS BIGINT)))) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/inline_tables.sql b/sql/hive/src/test/resources/sqlgen/inline_tables.sql
deleted file mode 100644
index 18803a3ee5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/inline_tables.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from values ("one", 1), ("two", 2), ("three", null) as data(a, b) where b > 1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (VALUES ('one', 1), ('two', 2), ('three', CAST(NULL AS INT)) AS gen_subquery_0(gen_attr_0, gen_attr_1)) AS data WHERE (`gen_attr_1` > 1)) AS data
diff --git a/sql/hive/src/test/resources/sqlgen/intersect.sql b/sql/hive/src/test/resources/sqlgen/intersect.sql
deleted file mode 100644
index 4143a6208d..0000000000
--- a/sql/hive/src/test/resources/sqlgen/intersect.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM t0 INTERSECT SELECT * FROM t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM ((SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0`) AS gen_subquery_0 ) INTERSECT ( SELECT `gen_attr_1` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`t0`) AS gen_subquery_1)) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/interval_arithmetic.sql b/sql/hive/src/test/resources/sqlgen/interval_arithmetic.sql
deleted file mode 100644
index 31d0034876..0000000000
--- a/sql/hive/src/test/resources/sqlgen/interval_arithmetic.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select ts + interval 1 day, ts + interval 2 days,
- ts - interval 1 day, ts - interval 2 days,
- ts + interval '1' day, ts + interval '2' days,
- ts - interval '1' day, ts - interval '2' days
-from dates
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `CAST(ts + interval 1 days AS TIMESTAMP)`, `gen_attr_2` AS `CAST(ts + interval 2 days AS TIMESTAMP)`, `gen_attr_3` AS `CAST(ts - interval 1 days AS TIMESTAMP)`, `gen_attr_4` AS `CAST(ts - interval 2 days AS TIMESTAMP)`, `gen_attr_5` AS `CAST(ts + interval 1 days AS TIMESTAMP)`, `gen_attr_6` AS `CAST(ts + interval 2 days AS TIMESTAMP)`, `gen_attr_7` AS `CAST(ts - interval 1 days AS TIMESTAMP)`, `gen_attr_8` AS `CAST(ts - interval 2 days AS TIMESTAMP)` FROM (SELECT CAST(`gen_attr_1` + interval 1 days AS TIMESTAMP) AS `gen_attr_0`, CAST(`gen_attr_1` + interval 2 days AS TIMESTAMP) AS `gen_attr_2`, CAST(`gen_attr_1` - interval 1 days AS TIMESTAMP) AS `gen_attr_3`, CAST(`gen_attr_1` - interval 2 days AS TIMESTAMP) AS `gen_attr_4`, CAST(`gen_attr_1` + interval 1 days AS TIMESTAMP) AS `gen_attr_5`, CAST(`gen_attr_1` + interval 2 days AS TIMESTAMP) AS `gen_attr_6`, CAST(`gen_attr_1` - interval 1 days AS TIMESTAMP) AS `gen_attr_7`, CAST(`gen_attr_1` - interval 2 days AS TIMESTAMP) AS `gen_attr_8` FROM (SELECT `ts` AS `gen_attr_1` FROM `default`.`dates`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/join_2_tables.sql b/sql/hive/src/test/resources/sqlgen/join_2_tables.sql
deleted file mode 100644
index 0f033a04ae..0000000000
--- a/sql/hive/src/test/resources/sqlgen/join_2_tables.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(a.value), b.KEY, a.KEY
-FROM parquet_t1 a CROSS JOIN parquet_t1 b
-GROUP BY a.KEY, b.KEY
-HAVING MAX(a.KEY) > 0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)`, `gen_attr_1` AS `KEY`, `gen_attr_2` AS `KEY` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2` FROM (SELECT count(`gen_attr_4`) AS `gen_attr_0`, `gen_attr_1`, `gen_attr_2`, max(`gen_attr_2`) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 CROSS JOIN (SELECT `key` AS `gen_attr_1`, `value` AS `gen_attr_5` FROM `default`.`parquet_t1`) AS gen_subquery_1 GROUP BY `gen_attr_2`, `gen_attr_1` HAVING (`gen_attr_3` > CAST(0 AS BIGINT))) AS gen_subquery_2) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/json_tuple_generator_1.sql b/sql/hive/src/test/resources/sqlgen/json_tuple_generator_1.sql
deleted file mode 100644
index 11e45a48f1..0000000000
--- a/sql/hive/src/test/resources/sqlgen/json_tuple_generator_1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT c0, c1, c2
-FROM parquet_t3
-LATERAL VIEW JSON_TUPLE(json, 'f1', 'f2', 'f3') jt
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `c0`, `gen_attr_1` AS `c1`, `gen_attr_2` AS `c2` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2` FROM (SELECT `arr` AS `gen_attr_4`, `arr2` AS `gen_attr_5`, `json` AS `gen_attr_3`, `id` AS `gen_attr_6` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW json_tuple(`gen_attr_3`, 'f1', 'f2', 'f3') gen_subquery_1 AS `gen_attr_0`, `gen_attr_1`, `gen_attr_2`) AS jt
diff --git a/sql/hive/src/test/resources/sqlgen/json_tuple_generator_2.sql b/sql/hive/src/test/resources/sqlgen/json_tuple_generator_2.sql
deleted file mode 100644
index d86b39df57..0000000000
--- a/sql/hive/src/test/resources/sqlgen/json_tuple_generator_2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, c
-FROM parquet_t3
-LATERAL VIEW JSON_TUPLE(json, 'f1', 'f2', 'f3') jt AS a, b, c
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_2` AS `c` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2` FROM (SELECT `arr` AS `gen_attr_4`, `arr2` AS `gen_attr_5`, `json` AS `gen_attr_3`, `id` AS `gen_attr_6` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW json_tuple(`gen_attr_3`, 'f1', 'f2', 'f3') gen_subquery_1 AS `gen_attr_0`, `gen_attr_1`, `gen_attr_2`) AS jt
diff --git a/sql/hive/src/test/resources/sqlgen/limit.sql b/sql/hive/src/test/resources/sqlgen/limit.sql
deleted file mode 100644
index 7a6b060fbf..0000000000
--- a/sql/hive/src/test/resources/sqlgen/limit.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM (SELECT id FROM tbl LIMIT 2)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0`, `name` AS `gen_attr_1` FROM `default`.`tbl`) AS gen_subquery_0 LIMIT 2)) AS tbl
diff --git a/sql/hive/src/test/resources/sqlgen/multi_distinct.sql b/sql/hive/src/test/resources/sqlgen/multi_distinct.sql
deleted file mode 100644
index 3ca526fcc4..0000000000
--- a/sql/hive/src/test/resources/sqlgen/multi_distinct.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, COUNT(DISTINCT b), COUNT(DISTINCT c), SUM(d) FROM parquet_t2 GROUP BY a
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `count(DISTINCT b)`, `gen_attr_3` AS `count(DISTINCT c)`, `gen_attr_5` AS `sum(d)` FROM (SELECT `gen_attr_0`, count(DISTINCT `gen_attr_2`) AS `gen_attr_1`, count(DISTINCT `gen_attr_4`) AS `gen_attr_3`, sum(`gen_attr_6`) AS `gen_attr_5` FROM (SELECT `a` AS `gen_attr_0`, `b` AS `gen_attr_2`, `c` AS `gen_attr_4`, `d` AS `gen_attr_6` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_0`) AS parquet_t2
diff --git a/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_1.sql b/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_1.sql
deleted file mode 100644
index e681c2b635..0000000000
--- a/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_1.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT val, id
-FROM parquet_t3
-LATERAL VIEW EXPLODE(arr2) exp1 AS nested_array
-LATERAL VIEW EXPLODE(nested_array) exp1 AS val
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_4`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_5`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_3`) gen_subquery_2 AS `gen_attr_2` LATERAL VIEW explode(`gen_attr_2`) gen_subquery_3 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_2.sql b/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_2.sql
deleted file mode 100644
index e9d6522c91..0000000000
--- a/sql/hive/src/test/resources/sqlgen/nested_generator_in_lateral_view_2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT val, id
-FROM parquet_t3
-LATERAL VIEW EXPLODE(arr2) exp1 AS nested_array
-LATERAL VIEW OUTER EXPLODE(nested_array) exp1 AS val
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `val`, `gen_attr_1` AS `id` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `arr` AS `gen_attr_4`, `arr2` AS `gen_attr_3`, `json` AS `gen_attr_5`, `id` AS `gen_attr_1` FROM `default`.`parquet_t3`) AS gen_subquery_0 LATERAL VIEW explode(`gen_attr_3`) gen_subquery_2 AS `gen_attr_2` LATERAL VIEW OUTER explode(`gen_attr_2`) gen_subquery_3 AS `gen_attr_0`) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/not_in.sql b/sql/hive/src/test/resources/sqlgen/not_in.sql
deleted file mode 100644
index 797d22e8e9..0000000000
--- a/sql/hive/src/test/resources/sqlgen/not_in.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM t0 WHERE id NOT IN (1, 2, 3)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0`) AS gen_subquery_0 WHERE (NOT (CAST(`gen_attr_0` AS BIGINT) IN (CAST(1 AS BIGINT), CAST(2 AS BIGINT), CAST(3 AS BIGINT))))) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/not_like.sql b/sql/hive/src/test/resources/sqlgen/not_like.sql
deleted file mode 100644
index 22485045e2..0000000000
--- a/sql/hive/src/test/resources/sqlgen/not_like.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM t0 WHERE id + 5 NOT LIKE '1%'
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0`) AS gen_subquery_0 WHERE (NOT CAST((`gen_attr_0` + CAST(5 AS BIGINT)) AS STRING) LIKE '1%')) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/predicate_subquery.sql b/sql/hive/src/test/resources/sqlgen/predicate_subquery.sql
deleted file mode 100644
index 6e5bd98600..0000000000
--- a/sql/hive/src/test/resources/sqlgen/predicate_subquery.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from t1 b where exists (select * from t1 a)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a` FROM (SELECT `gen_attr_0` FROM (SELECT `a` AS `gen_attr_0` FROM `default`.`t1`) AS gen_subquery_0 WHERE EXISTS(SELECT `gen_attr_1` AS `a` FROM ((SELECT `gen_attr_1` FROM (SELECT `a` AS `gen_attr_1` FROM `default`.`t1`) AS gen_subquery_2) AS gen_subquery_1) AS gen_subquery_1)) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/range.sql b/sql/hive/src/test/resources/sqlgen/range.sql
deleted file mode 100644
index 53c72ea71e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/range.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from range(100)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT id AS `gen_attr_0` FROM range(0, 100, 1)) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/range_with_splits.sql b/sql/hive/src/test/resources/sqlgen/range_with_splits.sql
deleted file mode 100644
index 83d637d54a..0000000000
--- a/sql/hive/src/test/resources/sqlgen/range_with_splits.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from range(1, 100, 20, 10)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT id AS `gen_attr_0` FROM range(1, 100, 20, 10)) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/regular_expressions_and_window.sql b/sql/hive/src/test/resources/sqlgen/regular_expressions_and_window.sql
deleted file mode 100644
index 37cd5568ba..0000000000
--- a/sql/hive/src/test/resources/sqlgen/regular_expressions_and_window.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT MAX(key) OVER (PARTITION BY key % 3) + key FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `(max(key) OVER (PARTITION BY (key % CAST(3 AS BIGINT)) ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) + key)` FROM (SELECT (`gen_attr_1` + `gen_attr_2`) AS `gen_attr_0` FROM (SELECT gen_subquery_1.`gen_attr_2`, gen_subquery_1.`gen_attr_3`, max(`gen_attr_2`) OVER (PARTITION BY `gen_attr_3` ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_1` FROM (SELECT `gen_attr_2`, (`gen_attr_2` % CAST(3 AS BIGINT)) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_1_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_1_1.sql
deleted file mode 100644
index c54963ab5c..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_1_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) as cnt, key%5, grouping_id() FROM parquet_t1 GROUP BY key % 5 WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_2` AS `cnt`, `gen_attr_3` AS `(key % CAST(5 AS BIGINT))`, `gen_attr_4` AS `grouping_id()` FROM (SELECT count(1) AS `gen_attr_2`, (`gen_attr_5` % CAST(5 AS BIGINT)) AS `gen_attr_3`, grouping_id() AS `gen_attr_4` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_6` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY (`gen_attr_5` % CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_5` % CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_1_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_1_2.sql
deleted file mode 100644
index 6c869063c3..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_1_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) as cnt, key%5, grouping_id() FROM parquet_t1 GROUP BY key % 5 WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_2` AS `cnt`, `gen_attr_3` AS `(key % CAST(5 AS BIGINT))`, `gen_attr_4` AS `grouping_id()` FROM (SELECT count(1) AS `gen_attr_2`, (`gen_attr_5` % CAST(5 AS BIGINT)) AS `gen_attr_3`, grouping_id() AS `gen_attr_4` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_6` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY (`gen_attr_5` % CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_5` % CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_2_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_2_1.sql
deleted file mode 100644
index 9628e38572..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_2_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value, count(value) FROM parquet_t1 GROUP BY key, value WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_3` AS `count(value)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_4` AS `gen_attr_1`, count(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_4` GROUPING SETS((`gen_attr_5`, `gen_attr_4`), (`gen_attr_5`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_2_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_2_2.sql
deleted file mode 100644
index d6b61929df..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_2_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value, count(value) FROM parquet_t1 GROUP BY key, value WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_3` AS `count(value)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_4` AS `gen_attr_1`, count(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_4` GROUPING SETS((`gen_attr_5`, `gen_attr_4`), (`gen_attr_5`), (`gen_attr_4`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_3_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_3_1.sql
deleted file mode 100644
index d04b6578fc..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_3_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, count(value), grouping_id() FROM parquet_t1 GROUP BY key, value WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_3` AS `count(value)`, `gen_attr_5` AS `grouping_id()` FROM (SELECT `gen_attr_6` AS `gen_attr_0`, count(`gen_attr_4`) AS `gen_attr_3`, grouping_id() AS `gen_attr_5` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_6`, `gen_attr_4` GROUPING SETS((`gen_attr_6`, `gen_attr_4`), (`gen_attr_6`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_3_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_3_2.sql
deleted file mode 100644
index 80a5d93438..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_3_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, count(value), grouping_id() FROM parquet_t1 GROUP BY key, value WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_3` AS `count(value)`, `gen_attr_5` AS `grouping_id()` FROM (SELECT `gen_attr_6` AS `gen_attr_0`, count(`gen_attr_4`) AS `gen_attr_3`, grouping_id() AS `gen_attr_5` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_6`, `gen_attr_4` GROUPING SETS((`gen_attr_6`, `gen_attr_4`), (`gen_attr_6`), (`gen_attr_4`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_4_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_4_1.sql
deleted file mode 100644
index 619a554875..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_4_1.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) as cnt, key % 5 as k1, key - 5 as k2, grouping_id() FROM parquet_t1
-GROUP BY key % 5, key - 5 WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `cnt`, `gen_attr_4` AS `k1`, `gen_attr_5` AS `k2`, `gen_attr_6` AS `grouping_id()` FROM (SELECT count(1) AS `gen_attr_3`, (`gen_attr_7` % CAST(5 AS BIGINT)) AS `gen_attr_4`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_5`, grouping_id() AS `gen_attr_6` FROM (SELECT `key` AS `gen_attr_7`, `value` AS `gen_attr_8` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY (`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT))), ((`gen_attr_7` % CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_4_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_4_2.sql
deleted file mode 100644
index 8bf1645191..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_4_2.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) as cnt, key % 5 as k1, key - 5 as k2, grouping_id() FROM parquet_t1
-GROUP BY key % 5, key - 5 WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `cnt`, `gen_attr_4` AS `k1`, `gen_attr_5` AS `k2`, `gen_attr_6` AS `grouping_id()` FROM (SELECT count(1) AS `gen_attr_3`, (`gen_attr_7` % CAST(5 AS BIGINT)) AS `gen_attr_4`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_5`, grouping_id() AS `gen_attr_6` FROM (SELECT `key` AS `gen_attr_7`, `value` AS `gen_attr_8` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY (`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT))), ((`gen_attr_7` % CAST(5 AS BIGINT))), ((`gen_attr_7` - CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_5_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_5_1.sql
deleted file mode 100644
index 17e78a0a70..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_5_1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) AS cnt, key % 5 AS k1, key - 5 AS k2, grouping_id(key % 5, key - 5) AS k3
-FROM (SELECT key, key%2, key - 5 FROM parquet_t1) t GROUP BY key%5, key-5
-WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `cnt`, `gen_attr_4` AS `k1`, `gen_attr_5` AS `k2`, `gen_attr_6` AS `k3` FROM (SELECT count(1) AS `gen_attr_3`, (`gen_attr_7` % CAST(5 AS BIGINT)) AS `gen_attr_4`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_5`, grouping_id() AS `gen_attr_6` FROM (SELECT `gen_attr_7`, (`gen_attr_7` % CAST(2 AS BIGINT)) AS `gen_attr_8`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_9` FROM (SELECT `key` AS `gen_attr_7`, `value` AS `gen_attr_12` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t GROUP BY (`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT))), ((`gen_attr_7` % CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_5_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_5_2.sql
deleted file mode 100644
index 72506ef72a..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_5_2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT count(*) AS cnt, key % 5 AS k1, key - 5 AS k2, grouping_id(key % 5, key - 5) AS k3
-FROM (SELECT key, key % 2, key - 5 FROM parquet_t1) t GROUP BY key % 5, key - 5
-WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `cnt`, `gen_attr_4` AS `k1`, `gen_attr_5` AS `k2`, `gen_attr_6` AS `k3` FROM (SELECT count(1) AS `gen_attr_3`, (`gen_attr_7` % CAST(5 AS BIGINT)) AS `gen_attr_4`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_5`, grouping_id() AS `gen_attr_6` FROM (SELECT `gen_attr_7`, (`gen_attr_7` % CAST(2 AS BIGINT)) AS `gen_attr_8`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_9` FROM (SELECT `key` AS `gen_attr_7`, `value` AS `gen_attr_12` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t GROUP BY (`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS(((`gen_attr_7` % CAST(5 AS BIGINT)), (`gen_attr_7` - CAST(5 AS BIGINT))), ((`gen_attr_7` % CAST(5 AS BIGINT))), ((`gen_attr_7` - CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_1.sql
deleted file mode 100644
index c364c32dd5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY ROLLUP(a, b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((`gen_attr_5`, `gen_attr_6`), (`gen_attr_5`), ()) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_2.sql
deleted file mode 100644
index 36c0223fce..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(c) FROM parquet_t2 GROUP BY CUBE(a, b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(c)` FROM (SELECT `gen_attr_5` AS `gen_attr_0`, `gen_attr_6` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_4`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_5`, `gen_attr_6` GROUPING SETS((`gen_attr_5`, `gen_attr_6`), (`gen_attr_5`), (`gen_attr_6`), ()) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_3.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_3.sql
deleted file mode 100644
index ed33f2a1de..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_3.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(a) FROM parquet_t2 GROUP BY ROLLUP(a, b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(a)` FROM (SELECT `gen_attr_4` AS `gen_attr_0`, `gen_attr_5` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_4`, `b` AS `gen_attr_5`, `c` AS `gen_attr_6`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_4`, `gen_attr_5` GROUPING SETS((`gen_attr_4`, `gen_attr_5`), (`gen_attr_4`), ()) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_4.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_4.sql
deleted file mode 100644
index e0e4024148..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_4.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, sum(a) FROM parquet_t2 GROUP BY CUBE(a, b) ORDER BY a, b
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `sum(a)` FROM (SELECT `gen_attr_4` AS `gen_attr_0`, `gen_attr_5` AS `gen_attr_1`, sum(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_4`, `b` AS `gen_attr_5`, `c` AS `gen_attr_6`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_4`, `gen_attr_5` GROUPING SETS((`gen_attr_4`, `gen_attr_5`), (`gen_attr_4`), (`gen_attr_5`), ()) ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_5.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_5.sql
deleted file mode 100644
index 26885a26e2..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_5.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a + b, b, sum(a - b) FROM parquet_t2 GROUP BY a + b, b WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `(a + b)`, `gen_attr_1` AS `b`, `gen_attr_4` AS `sum((a - b))` FROM (SELECT (`gen_attr_5` + `gen_attr_6`) AS `gen_attr_3`, `gen_attr_6` AS `gen_attr_1`, sum((`gen_attr_5` - `gen_attr_6`)) AS `gen_attr_4` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_7`, `d` AS `gen_attr_8` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY (`gen_attr_5` + `gen_attr_6`), `gen_attr_6` GROUPING SETS(((`gen_attr_5` + `gen_attr_6`), `gen_attr_6`), ((`gen_attr_5` + `gen_attr_6`)), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_6.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_6_6.sql
deleted file mode 100644
index dd97c976af..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_6_6.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a + b, b, sum(a - b) FROM parquet_t2 GROUP BY a + b, b WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `(a + b)`, `gen_attr_1` AS `b`, `gen_attr_4` AS `sum((a - b))` FROM (SELECT (`gen_attr_5` + `gen_attr_6`) AS `gen_attr_3`, `gen_attr_6` AS `gen_attr_1`, sum((`gen_attr_5` - `gen_attr_6`)) AS `gen_attr_4` FROM (SELECT `a` AS `gen_attr_5`, `b` AS `gen_attr_6`, `c` AS `gen_attr_7`, `d` AS `gen_attr_8` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY (`gen_attr_5` + `gen_attr_6`), `gen_attr_6` GROUPING SETS(((`gen_attr_5` + `gen_attr_6`), `gen_attr_6`), ((`gen_attr_5` + `gen_attr_6`)), (`gen_attr_6`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_7_1.sql
deleted file mode 100644
index aae2d75d79..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, grouping_id(a, b) FROM parquet_t2 GROUP BY cube(a, b)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `grouping_id(a, b)` FROM (SELECT `gen_attr_4` AS `gen_attr_0`, `gen_attr_5` AS `gen_attr_1`, grouping_id() AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_4`, `b` AS `gen_attr_5`, `c` AS `gen_attr_6`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_4`, `gen_attr_5` GROUPING SETS((`gen_attr_4`, `gen_attr_5`), (`gen_attr_4`), (`gen_attr_5`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_7_2.sql
deleted file mode 100644
index 9958c8f38b..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, grouping(b) FROM parquet_t2 GROUP BY cube(a, b)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `grouping(b)` FROM (SELECT `gen_attr_4` AS `gen_attr_0`, `gen_attr_5` AS `gen_attr_1`, grouping(`gen_attr_5`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_4`, `b` AS `gen_attr_5`, `c` AS `gen_attr_6`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_4`, `gen_attr_5` GROUPING SETS((`gen_attr_4`, `gen_attr_5`), (`gen_attr_4`), (`gen_attr_5`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_3.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_7_3.sql
deleted file mode 100644
index fd012043cf..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_7_3.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a, b, grouping(a) FROM parquet_t2 GROUP BY cube(a, b)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `a`, `gen_attr_1` AS `b`, `gen_attr_3` AS `grouping(a)` FROM (SELECT `gen_attr_4` AS `gen_attr_0`, `gen_attr_5` AS `gen_attr_1`, grouping(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `a` AS `gen_attr_4`, `b` AS `gen_attr_5`, `c` AS `gen_attr_6`, `d` AS `gen_attr_7` FROM `default`.`parquet_t2`) AS gen_subquery_0 GROUP BY `gen_attr_4`, `gen_attr_5` GROUPING SETS((`gen_attr_4`, `gen_attr_5`), (`gen_attr_4`), (`gen_attr_5`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_8_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_8_1.sql
deleted file mode 100644
index 61c27067e1..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_8_1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT hkey AS k1, value - 5 AS k2, hash(grouping_id()) AS hgid
-FROM (SELECT hash(key) as hkey, key as value FROM parquet_t1) t GROUP BY hkey, value-5
-WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `k1`, `gen_attr_4` AS `k2`, `gen_attr_5` AS `hgid` FROM (SELECT `gen_attr_6` AS `gen_attr_3`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_4`, hash(grouping_id()) AS `gen_attr_5` FROM (SELECT hash(`gen_attr_10`) AS `gen_attr_6`, `gen_attr_10` AS `gen_attr_7` FROM (SELECT `key` AS `gen_attr_10`, `value` AS `gen_attr_11` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t GROUP BY `gen_attr_6`, (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS((`gen_attr_6`, (`gen_attr_7` - CAST(5 AS BIGINT))), (`gen_attr_6`), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_8_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_8_2.sql
deleted file mode 100644
index 16f254fa41..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_8_2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT hkey AS k1, value - 5 AS k2, hash(grouping_id()) AS hgid
-FROM (SELECT hash(key) as hkey, key as value FROM parquet_t1) t GROUP BY hkey, value-5
-WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `k1`, `gen_attr_4` AS `k2`, `gen_attr_5` AS `hgid` FROM (SELECT `gen_attr_6` AS `gen_attr_3`, (`gen_attr_7` - CAST(5 AS BIGINT)) AS `gen_attr_4`, hash(grouping_id()) AS `gen_attr_5` FROM (SELECT hash(`gen_attr_10`) AS `gen_attr_6`, `gen_attr_10` AS `gen_attr_7` FROM (SELECT `key` AS `gen_attr_10`, `value` AS `gen_attr_11` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t GROUP BY `gen_attr_6`, (`gen_attr_7` - CAST(5 AS BIGINT)) GROUPING SETS((`gen_attr_6`, (`gen_attr_7` - CAST(5 AS BIGINT))), (`gen_attr_6`), ((`gen_attr_7` - CAST(5 AS BIGINT))), ())) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_9_1.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_9_1.sql
deleted file mode 100644
index cfce175843..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_9_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT t.key - 5, cnt, SUM(cnt)
-FROM (SELECT x.key, COUNT(*) as cnt
-FROM parquet_t1 x JOIN parquet_t1 y ON x.key = y.key GROUP BY x.key) t
-GROUP BY cnt, t.key - 5
-WITH ROLLUP
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `(key - CAST(5 AS BIGINT))`, `gen_attr_0` AS `cnt`, `gen_attr_4` AS `sum(cnt)` FROM (SELECT (`gen_attr_6` - CAST(5 AS BIGINT)) AS `gen_attr_3`, `gen_attr_5` AS `gen_attr_0`, sum(`gen_attr_5`) AS `gen_attr_4` FROM (SELECT `gen_attr_6`, count(1) AS `gen_attr_5` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_10` FROM `default`.`parquet_t1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_9`, `value` AS `gen_attr_11` FROM `default`.`parquet_t1`) AS gen_subquery_1 ON (`gen_attr_6` = `gen_attr_9`) GROUP BY `gen_attr_6`) AS t GROUP BY `gen_attr_5`, (`gen_attr_6` - CAST(5 AS BIGINT)) GROUPING SETS((`gen_attr_5`, (`gen_attr_6` - CAST(5 AS BIGINT))), (`gen_attr_5`), ())) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/rollup_cube_9_2.sql b/sql/hive/src/test/resources/sqlgen/rollup_cube_9_2.sql
deleted file mode 100644
index d950674b74..0000000000
--- a/sql/hive/src/test/resources/sqlgen/rollup_cube_9_2.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT t.key - 5, cnt, SUM(cnt)
-FROM (SELECT x.key, COUNT(*) as cnt
-FROM parquet_t1 x JOIN parquet_t1 y ON x.key = y.key GROUP BY x.key) t
-GROUP BY cnt, t.key - 5
-WITH CUBE
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `(key - CAST(5 AS BIGINT))`, `gen_attr_0` AS `cnt`, `gen_attr_4` AS `sum(cnt)` FROM (SELECT (`gen_attr_6` - CAST(5 AS BIGINT)) AS `gen_attr_3`, `gen_attr_5` AS `gen_attr_0`, sum(`gen_attr_5`) AS `gen_attr_4` FROM (SELECT `gen_attr_6`, count(1) AS `gen_attr_5` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_10` FROM `default`.`parquet_t1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_9`, `value` AS `gen_attr_11` FROM `default`.`parquet_t1`) AS gen_subquery_1 ON (`gen_attr_6` = `gen_attr_9`) GROUP BY `gen_attr_6`) AS t GROUP BY `gen_attr_5`, (`gen_attr_6` - CAST(5 AS BIGINT)) GROUPING SETS((`gen_attr_5`, (`gen_attr_6` - CAST(5 AS BIGINT))), (`gen_attr_5`), ((`gen_attr_6` - CAST(5 AS BIGINT))), ())) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_1.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_1.sql
deleted file mode 100644
index 1736d74b0c..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (a, b, c, d) USING 'cat' FROM parquet_t2
---------------------------------------------------------------------------------
-SELECT `gen_attr_4` AS `key`, `gen_attr_5` AS `value` FROM (SELECT TRANSFORM (`gen_attr_0`, `gen_attr_1`, `gen_attr_2`, `gen_attr_3`) USING 'cat' AS (`gen_attr_4` string, `gen_attr_5` string) FROM (SELECT `a` AS `gen_attr_0`, `b` AS `gen_attr_1`, `c` AS `gen_attr_2`, `d` AS `gen_attr_3` FROM `default`.`parquet_t2`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_2.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_2.sql
deleted file mode 100644
index 07f59d6bff..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (*) USING 'cat' FROM parquet_t2
---------------------------------------------------------------------------------
-SELECT `gen_attr_4` AS `key`, `gen_attr_5` AS `value` FROM (SELECT TRANSFORM (`gen_attr_0`, `gen_attr_1`, `gen_attr_2`, `gen_attr_3`) USING 'cat' AS (`gen_attr_4` string, `gen_attr_5` string) FROM (SELECT `a` AS `gen_attr_0`, `b` AS `gen_attr_1`, `c` AS `gen_attr_2`, `d` AS `gen_attr_3` FROM `default`.`parquet_t2`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list.sql
deleted file mode 100644
index fc0cabec23..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (a, b, c, d) USING 'cat' AS (d1, d2, d3, d4) FROM parquet_t2
---------------------------------------------------------------------------------
-SELECT `gen_attr_4` AS `d1`, `gen_attr_5` AS `d2`, `gen_attr_6` AS `d3`, `gen_attr_7` AS `d4` FROM (SELECT TRANSFORM (`gen_attr_0`, `gen_attr_1`, `gen_attr_2`, `gen_attr_3`) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = ' ') USING 'cat' AS (`gen_attr_4` string, `gen_attr_5` string, `gen_attr_6` string, `gen_attr_7` string) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = ' ') FROM (SELECT `a` AS `gen_attr_0`, `b` AS `gen_attr_1`, `c` AS `gen_attr_2`, `d` AS `gen_attr_3` FROM `default`.`parquet_t2`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list_with_type.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list_with_type.sql
deleted file mode 100644
index a45f9a2c62..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_alias_list_with_type.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-FROM
-(FROM parquet_t1 SELECT TRANSFORM(key, value) USING 'cat' AS (thing1 int, thing2 string)) t
-SELECT thing1 + 1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `(thing1 + 1)` FROM (SELECT (`gen_attr_1` + 1) AS `gen_attr_0` FROM (SELECT TRANSFORM (`gen_attr_2`, `gen_attr_3`) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = ' ') USING 'cat' AS (`gen_attr_1` int, `gen_attr_4` string) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = ' ') FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS t) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_multiple.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_multiple.sql
deleted file mode 100644
index 30d37c78b5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_multiple.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (key)
-ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\t'
-USING 'cat' AS (tKey)
-ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\t'
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_1` AS `tKey` FROM (SELECT TRANSFORM (`gen_attr_0`) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\t' USING 'cat' AS (`gen_attr_1` string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LINES TERMINATED BY '\t' FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_2` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_one.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_one.sql
deleted file mode 100644
index 0b694e0d6d..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_one.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (key) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
-USING 'cat' AS (tKey) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_1` AS `tKey` FROM (SELECT TRANSFORM (`gen_attr_0`) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' USING 'cat' AS (`gen_attr_1` string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_2` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_serde.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_serde.sql
deleted file mode 100644
index 14cff37385..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_serde.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (key, value)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
-WITH SERDEPROPERTIES('field.delim' = '|')
-USING 'cat' AS (tKey, tValue)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
-WITH SERDEPROPERTIES('field.delim' = '|')
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_2` AS `tKey`, `gen_attr_3` AS `tValue` FROM (SELECT TRANSFORM (`gen_attr_0`, `gen_attr_1`) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = '|') USING 'cat' AS (`gen_attr_2` string, `gen_attr_3` string) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' WITH SERDEPROPERTIES('field.delim' = '|') FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_without_serde.sql b/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_without_serde.sql
deleted file mode 100644
index d20caf7afc..0000000000
--- a/sql/hive/src/test/resources/sqlgen/script_transformation_row_format_without_serde.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT TRANSFORM (key, value)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
-USING 'cat' AS (tKey, tValue)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_2` AS `tKey`, `gen_attr_3` AS `tValue` FROM (SELECT TRANSFORM (`gen_attr_0`, `gen_attr_1`) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' USING 'cat' AS (`gen_attr_2` string, `gen_attr_3` string) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1
diff --git a/sql/hive/src/test/resources/sqlgen/select_distinct.sql b/sql/hive/src/test/resources/sqlgen/select_distinct.sql
deleted file mode 100644
index 09d93cac8e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/select_distinct.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT DISTINCT id FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT DISTINCT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/select_orc_table.sql b/sql/hive/src/test/resources/sqlgen/select_orc_table.sql
deleted file mode 100644
index 18ff021798..0000000000
--- a/sql/hive/src/test/resources/sqlgen/select_orc_table.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from orc_t
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `c1`, `gen_attr_1` AS `c2` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `c1` AS `gen_attr_0`, `c2` AS `gen_attr_1` FROM `default`.`orc_t`) AS gen_subquery_0) AS orc_t
diff --git a/sql/hive/src/test/resources/sqlgen/select_parquet_table.sql b/sql/hive/src/test/resources/sqlgen/select_parquet_table.sql
deleted file mode 100644
index d2eac9c08f..0000000000
--- a/sql/hive/src/test/resources/sqlgen/select_parquet_table.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select * from parquet_t
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `c1`, `gen_attr_1` AS `c2` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `c1` AS `gen_attr_0`, `c2` AS `gen_attr_1` FROM `default`.`parquet_t`) AS gen_subquery_0) AS parquet_t
diff --git a/sql/hive/src/test/resources/sqlgen/self_join.sql b/sql/hive/src/test/resources/sqlgen/self_join.sql
deleted file mode 100644
index d6dcee2f67..0000000000
--- a/sql/hive/src/test/resources/sqlgen/self_join.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT x.key FROM parquet_t1 x JOIN parquet_t1 y ON x.key = y.key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key` FROM (SELECT `gen_attr_0` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_2` FROM `default`.`parquet_t1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_1`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_1 ON (`gen_attr_0` = `gen_attr_1`)) AS x
diff --git a/sql/hive/src/test/resources/sqlgen/self_join_with_group_by.sql b/sql/hive/src/test/resources/sqlgen/self_join_with_group_by.sql
deleted file mode 100644
index 1dedb44dbf..0000000000
--- a/sql/hive/src/test/resources/sqlgen/self_join_with_group_by.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT x.key, COUNT(*) FROM parquet_t1 x JOIN parquet_t1 y ON x.key = y.key group by x.key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `count(1)` FROM (SELECT `gen_attr_0`, count(1) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_1 ON (`gen_attr_0` = `gen_attr_2`) GROUP BY `gen_attr_0`) AS x
diff --git a/sql/hive/src/test/resources/sqlgen/sort_asc_nulls_last.sql b/sql/hive/src/test/resources/sqlgen/sort_asc_nulls_last.sql
deleted file mode 100644
index da4e3678a3..0000000000
--- a/sql/hive/src/test/resources/sqlgen/sort_asc_nulls_last.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key ORDER BY key nulls last, MAX(key)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT count(`gen_attr_4`) AS `gen_attr_0`, `gen_attr_3` AS `gen_attr_1`, max(`gen_attr_3`) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_3` ORDER BY `gen_attr_1` ASC NULLS LAST, `gen_attr_2` ASC NULLS FIRST) AS gen_subquery_1) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/sort_by_after_having.sql b/sql/hive/src/test/resources/sqlgen/sort_by_after_having.sql
deleted file mode 100644
index a4f3ddc761..0000000000
--- a/sql/hive/src/test/resources/sqlgen/sort_by_after_having.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key HAVING MAX(key) > 0 SORT BY key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT count(`gen_attr_3`) AS `gen_attr_0`, max(`gen_attr_1`) AS `gen_attr_2`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_1`, `value` AS `gen_attr_3` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_1` HAVING (`gen_attr_2` > CAST(0 AS BIGINT))) AS gen_subquery_1 SORT BY `gen_attr_1` ASC NULLS FIRST) AS gen_subquery_2) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/sort_desc_nulls_first.sql b/sql/hive/src/test/resources/sqlgen/sort_desc_nulls_first.sql
deleted file mode 100644
index d995e3bdfa..0000000000
--- a/sql/hive/src/test/resources/sqlgen/sort_desc_nulls_first.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT COUNT(value) FROM parquet_t1 GROUP BY key ORDER BY key desc nulls first,MAX(key)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `count(value)` FROM (SELECT `gen_attr_0` FROM (SELECT count(`gen_attr_4`) AS `gen_attr_0`, `gen_attr_3` AS `gen_attr_1`, max(`gen_attr_3`) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_3` ORDER BY `gen_attr_1` DESC NULLS FIRST, `gen_attr_2` ASC NULLS FIRST) AS gen_subquery_1) AS gen_subquery_2
diff --git a/sql/hive/src/test/resources/sqlgen/subq2.sql b/sql/hive/src/test/resources/sqlgen/subq2.sql
deleted file mode 100644
index ee7e80c1fc..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subq2.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT a.k, a.c
-FROM (SELECT b.key as k, count(1) as c
- FROM src b
- GROUP BY b.key) a
-WHERE a.k >= 90
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `k`, `gen_attr_1` AS `c` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_2` AS `gen_attr_0`, count(1) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_3` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_2`) AS a WHERE (`gen_attr_0` >= 90)) AS a
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_exists_1.sql b/sql/hive/src/test/resources/sqlgen/subquery_exists_1.sql
deleted file mode 100644
index bd28d8dca9..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_exists_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from src b
-where exists (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9')
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_0 WHERE EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_3`, `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_2` > 'val_9')) AS gen_subquery_1 WHERE ((`gen_attr_1` = `gen_attr_2`) AND (`gen_attr_3` = `gen_attr_0`))) AS gen_subquery_3)) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_exists_2.sql b/sql/hive/src/test/resources/sqlgen/subquery_exists_2.sql
deleted file mode 100644
index d2965fc0b9..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_exists_2.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from (select *
- from src b
- where exists (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9')) a
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_0 WHERE EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_3`, `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_2` > 'val_9')) AS gen_subquery_1 WHERE ((`gen_attr_1` = `gen_attr_2`) AND (`gen_attr_3` = `gen_attr_0`))) AS gen_subquery_3)) AS a) AS a
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_1.sql b/sql/hive/src/test/resources/sqlgen/subquery_exists_having_1.sql
deleted file mode 100644
index 93ce902b75..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_1.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select b.key, count(*)
-from src b
-group by b.key
-having exists (select a.key
- from src a
- where a.key = b.key and a.value > 'val_9')
---------------------------------------------------------------------------------
-SELECT `gen_attr_1` AS `key`, `gen_attr_2` AS `count(1)` FROM (SELECT `gen_attr_1`, count(1) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_1`, `value` AS `gen_attr_3` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_1` HAVING EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_0` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_5` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_5` > 'val_9')) AS gen_subquery_1 WHERE (`gen_attr_0` = `gen_attr_1`)) AS gen_subquery_3)) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_2.sql b/sql/hive/src/test/resources/sqlgen/subquery_exists_having_2.sql
deleted file mode 100644
index 411e073f0d..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_2.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from (select b.key, count(*)
- from src b
- group by b.key
- having exists (select a.key
- from src a
- where a.key = b.key and a.value > 'val_9')) a
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `count(1)` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_0`, count(1) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_3` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_0` HAVING EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_2` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_5` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_5` > 'val_9')) AS gen_subquery_1 WHERE (`gen_attr_2` = `gen_attr_0`)) AS gen_subquery_3)) AS a) AS a
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_3.sql b/sql/hive/src/test/resources/sqlgen/subquery_exists_having_3.sql
deleted file mode 100644
index b2ed0b0557..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_exists_having_3.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select b.key, min(b.value)
-from src b
-group by b.key
-having exists (select a.key
- from src a
- where a.value > 'val_9' and a.value = min(b.value))
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `min(value)` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_0`, min(`gen_attr_4`) AS `gen_attr_1`, min(`gen_attr_4`) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_4` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_0` HAVING EXISTS(SELECT `gen_attr_5` AS `1` FROM (SELECT 1 AS `gen_attr_5` FROM (SELECT `gen_attr_6`, `gen_attr_2` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_3 WHERE (`gen_attr_2` > 'val_9')) AS gen_subquery_2 WHERE (`gen_attr_2` = `gen_attr_3`)) AS gen_subquery_4)) AS gen_subquery_1) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_in.sql b/sql/hive/src/test/resources/sqlgen/subquery_in.sql
deleted file mode 100644
index 0fe62248db..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_in.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key
-FROM src
-WHERE key in (SELECT max(key) FROM src)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key` FROM (SELECT `gen_attr_0` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_0 WHERE (`gen_attr_0` IN (SELECT `gen_attr_3` AS `_c0` FROM (SELECT `gen_attr_1` AS `gen_attr_3` FROM (SELECT max(`gen_attr_4`) AS `gen_attr_1` FROM (SELECT `key` AS `gen_attr_4`, `value` AS `gen_attr_5` FROM `default`.`src`) AS gen_subquery_2) AS gen_subquery_1) AS gen_subquery_3))) AS src
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_in_having_1.sql b/sql/hive/src/test/resources/sqlgen/subquery_in_having_1.sql
deleted file mode 100644
index 55afb869d7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_in_having_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select key, count(*)
-from src
-group by key
-having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key)
-order by key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `count(1)` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_0`, count(1) AS `gen_attr_1`, count(1) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_4` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_0` HAVING (`gen_attr_2` IN (SELECT `gen_attr_5` AS `_c0` FROM (SELECT `gen_attr_3` AS `gen_attr_5` FROM (SELECT count(1) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_6`, `value` AS `gen_attr_7` FROM `default`.`src`) AS gen_subquery_3 WHERE (`gen_attr_6` = CAST('90' AS INT)) GROUP BY `gen_attr_6`) AS gen_subquery_2) AS gen_subquery_4))) AS gen_subquery_1 ORDER BY `gen_attr_0` ASC NULLS FIRST) AS src
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_in_having_2.sql b/sql/hive/src/test/resources/sqlgen/subquery_in_having_2.sql
deleted file mode 100644
index cdda29af50..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_in_having_2.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select b.key, min(b.value)
-from src b
-group by b.key
-having b.key in (select a.key
- from src a
- where a.value > 'val_9' and a.value = min(b.value))
-order by b.key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `min(value)` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `gen_attr_0`, min(`gen_attr_5`) AS `gen_attr_1`, min(`gen_attr_5`) AS `gen_attr_4` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_5` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_0` HAVING (named_struct('gen_attr_0', `gen_attr_0`, 'gen_attr_4', `gen_attr_4`) IN (SELECT `gen_attr_6` AS `_c0`, `gen_attr_7` AS `_c1` FROM (SELECT `gen_attr_2` AS `gen_attr_6`, `gen_attr_3` AS `gen_attr_7` FROM (SELECT `gen_attr_2`, `gen_attr_3` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_3` FROM `default`.`src`) AS gen_subquery_3 WHERE (`gen_attr_3` > 'val_9')) AS gen_subquery_2) AS gen_subquery_4))) AS gen_subquery_1 ORDER BY `gen_attr_0` ASC NULLS FIRST) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_1.sql b/sql/hive/src/test/resources/sqlgen/subquery_not_exists_1.sql
deleted file mode 100644
index eed20a5d31..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_1.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from src b
-where not exists (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_2')
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_0 WHERE (NOT EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_3`, `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_2` > 'val_2')) AS gen_subquery_1 WHERE ((`gen_attr_1` = `gen_attr_2`) AND (`gen_attr_3` = `gen_attr_0`))) AS gen_subquery_3))) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_2.sql b/sql/hive/src/test/resources/sqlgen/subquery_not_exists_2.sql
deleted file mode 100644
index 7040e106e7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_2.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from src b
-where not exists (select a.key
- from src a
- where b.value = a.value and a.value > 'val_2')
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_0 WHERE (NOT EXISTS(SELECT `gen_attr_3` AS `1` FROM (SELECT 1 AS `gen_attr_3` FROM (SELECT `gen_attr_4`, `gen_attr_2` FROM (SELECT `key` AS `gen_attr_4`, `value` AS `gen_attr_2` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_2` > 'val_2')) AS gen_subquery_1 WHERE (`gen_attr_1` = `gen_attr_2`)) AS gen_subquery_3))) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_1.sql b/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_1.sql
deleted file mode 100644
index 3c0e90ed42..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_1.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from src b
-group by key, value
-having not exists (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_12')
---------------------------------------------------------------------------------
-SELECT `gen_attr_3` AS `key`, `gen_attr_0` AS `value` FROM (SELECT `gen_attr_3`, `gen_attr_0` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_0` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_3`, `gen_attr_0` HAVING (NOT EXISTS(SELECT `gen_attr_4` AS `1` FROM (SELECT 1 AS `gen_attr_4` FROM (SELECT `gen_attr_2`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_1` > 'val_12')) AS gen_subquery_1 WHERE ((`gen_attr_0` = `gen_attr_1`) AND (`gen_attr_2` = `gen_attr_3`))) AS gen_subquery_3))) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_2.sql b/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_2.sql
deleted file mode 100644
index 0c16f9e58b..0000000000
--- a/sql/hive/src/test/resources/sqlgen/subquery_not_exists_having_2.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-select *
-from src b
-group by key, value
-having not exists (select distinct a.key
- from src a
- where b.value = a.value and a.value > 'val_12')
---------------------------------------------------------------------------------
-SELECT `gen_attr_2` AS `key`, `gen_attr_0` AS `value` FROM (SELECT `gen_attr_2`, `gen_attr_0` FROM (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_0` FROM `default`.`src`) AS gen_subquery_0 GROUP BY `gen_attr_2`, `gen_attr_0` HAVING (NOT EXISTS(SELECT `gen_attr_3` AS `1` FROM (SELECT 1 AS `gen_attr_3` FROM (SELECT DISTINCT `gen_attr_4`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_4`, `value` AS `gen_attr_1` FROM `default`.`src`) AS gen_subquery_2 WHERE (`gen_attr_1` > 'val_12')) AS gen_subquery_1 WHERE (`gen_attr_0` = `gen_attr_1`)) AS gen_subquery_3))) AS b
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_1.sql b/sql/hive/src/test/resources/sqlgen/tablesample_1.sql
deleted file mode 100644
index 291f2f59d7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT s.id FROM parquet_t0 TABLESAMPLE(100 PERCENT) s
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0` TABLESAMPLE(100.0 PERCENT)) AS gen_subquery_0) AS s
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_2.sql b/sql/hive/src/test/resources/sqlgen/tablesample_2.sql
deleted file mode 100644
index 6a92d7aef7..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_2.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM parquet_t0 TABLESAMPLE(100 PERCENT)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0` TABLESAMPLE(100.0 PERCENT)) AS gen_subquery_0) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_3.sql b/sql/hive/src/test/resources/sqlgen/tablesample_3.sql
deleted file mode 100644
index 4a17d7105e..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_3.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT s.id FROM t0 TABLESAMPLE(100 PERCENT) s
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0` TABLESAMPLE(100.0 PERCENT)) AS gen_subquery_0) AS s
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_4.sql b/sql/hive/src/test/resources/sqlgen/tablesample_4.sql
deleted file mode 100644
index 873de051a6..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_4.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM t0 TABLESAMPLE(100 PERCENT)
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0` TABLESAMPLE(100.0 PERCENT)) AS gen_subquery_0) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_5.sql b/sql/hive/src/test/resources/sqlgen/tablesample_5.sql
deleted file mode 100644
index f958b2f111..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_5.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT s.id FROM parquet_t0 TABLESAMPLE(0.1 PERCENT) s WHERE 1=0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0` TABLESAMPLE(0.1 PERCENT)) AS gen_subquery_0 WHERE (1 = 0)) AS s
diff --git a/sql/hive/src/test/resources/sqlgen/tablesample_6.sql b/sql/hive/src/test/resources/sqlgen/tablesample_6.sql
deleted file mode 100644
index 688a102d1d..0000000000
--- a/sql/hive/src/test/resources/sqlgen/tablesample_6.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM parquet_t0 TABLESAMPLE(0.1 PERCENT) WHERE 1=0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0` TABLESAMPLE(0.1 PERCENT)) AS gen_subquery_0 WHERE (1 = 0)) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/three_child_union.sql b/sql/hive/src/test/resources/sqlgen/three_child_union.sql
deleted file mode 100644
index 713c7502f5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/three_child_union.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0
-UNION ALL SELECT id FROM parquet_t0
-UNION ALL SELECT id FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM ((SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0) UNION ALL (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_1) UNION ALL (SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_2)) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/type_widening.sql b/sql/hive/src/test/resources/sqlgen/type_widening.sql
deleted file mode 100644
index ebb8a92afd..0000000000
--- a/sql/hive/src/test/resources/sqlgen/type_widening.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT id FROM parquet_t0 UNION ALL SELECT CAST(id AS INT) AS id FROM parquet_t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM ((SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_0) UNION ALL (SELECT CAST(CAST(`gen_attr_0` AS INT) AS BIGINT) AS `gen_attr_1` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`parquet_t0`) AS gen_subquery_1)) AS parquet_t0
diff --git a/sql/hive/src/test/resources/sqlgen/union_distinct.sql b/sql/hive/src/test/resources/sqlgen/union_distinct.sql
deleted file mode 100644
index 46644b89eb..0000000000
--- a/sql/hive/src/test/resources/sqlgen/union_distinct.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT * FROM t0 UNION SELECT * FROM t0
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `id` FROM ((SELECT `gen_attr_0` FROM (SELECT `id` AS `gen_attr_0` FROM `default`.`t0`) AS gen_subquery_0) UNION DISTINCT (SELECT `gen_attr_1` FROM (SELECT `id` AS `gen_attr_1` FROM `default`.`t0`) AS gen_subquery_1)) AS t0
diff --git a/sql/hive/src/test/resources/sqlgen/window_basic_1.sql b/sql/hive/src/test/resources/sqlgen/window_basic_1.sql
deleted file mode 100644
index 000c4e735a..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_basic_1.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT MAX(value) OVER (PARTITION BY key % 3) FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `max(value) OVER (PARTITION BY (key % CAST(3 AS BIGINT)) ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)` FROM (SELECT `gen_attr_0` FROM (SELECT gen_subquery_1.`gen_attr_1`, gen_subquery_1.`gen_attr_2`, max(`gen_attr_1`) OVER (PARTITION BY `gen_attr_2` ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_0` FROM (SELECT `gen_attr_1`, (`gen_attr_3` % CAST(3 AS BIGINT)) AS `gen_attr_2` FROM (SELECT `key` AS `gen_attr_3`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2) AS gen_subquery_3
diff --git a/sql/hive/src/test/resources/sqlgen/window_basic_2.sql b/sql/hive/src/test/resources/sqlgen/window_basic_2.sql
deleted file mode 100644
index 0e2a9a5473..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_basic_2.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value, ROUND(AVG(key) OVER (), 2)
-FROM parquet_t1 ORDER BY key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `round(avg(key) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), 2)` FROM (SELECT `gen_attr_0`, `gen_attr_1`, round(`gen_attr_3`, 2) AS `gen_attr_2` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, avg(`gen_attr_0`) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_3` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2 ORDER BY `gen_attr_0` ASC NULLS FIRST) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_basic_3.sql b/sql/hive/src/test/resources/sqlgen/window_basic_3.sql
deleted file mode 100644
index d727caa583..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_basic_3.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT value, MAX(key + 1) OVER (PARTITION BY key % 5 ORDER BY key % 7) AS max
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `value`, `gen_attr_1` AS `max` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_2`, gen_subquery_1.`gen_attr_3`, gen_subquery_1.`gen_attr_4`, max(`gen_attr_2`) OVER (PARTITION BY `gen_attr_3` ORDER BY `gen_attr_4` ASC NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_1` FROM (SELECT `gen_attr_0`, (`gen_attr_5` + CAST(1 AS BIGINT)) AS `gen_attr_2`, (`gen_attr_5` % CAST(5 AS BIGINT)) AS `gen_attr_3`, (`gen_attr_5` % CAST(7 AS BIGINT)) AS `gen_attr_4` FROM (SELECT `key` AS `gen_attr_5`, `value` AS `gen_attr_0` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_basic_asc_nulls_last.sql b/sql/hive/src/test/resources/sqlgen/window_basic_asc_nulls_last.sql
deleted file mode 100644
index 4739f05808..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_basic_asc_nulls_last.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value, ROUND(AVG(key) OVER (), 2)
-FROM parquet_t1 ORDER BY key nulls last
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `round(avg(key) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), 2)` FROM (SELECT `gen_attr_0`, `gen_attr_1`, round(`gen_attr_3`, 2) AS `gen_attr_2` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, avg(`gen_attr_0`) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_3` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2 ORDER BY `gen_attr_0` ASC NULLS LAST) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_basic_desc_nulls_first.sql b/sql/hive/src/test/resources/sqlgen/window_basic_desc_nulls_first.sql
deleted file mode 100644
index 1b9db2993b..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_basic_desc_nulls_first.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value, ROUND(AVG(key) OVER (), 2)
-FROM parquet_t1 ORDER BY key desc nulls first
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `round(avg(key) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING), 2)` FROM (SELECT `gen_attr_0`, `gen_attr_1`, round(`gen_attr_3`, 2) AS `gen_attr_2` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, avg(`gen_attr_0`) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS `gen_attr_3` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2 ORDER BY `gen_attr_0` DESC NULLS FIRST) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_with_join.sql b/sql/hive/src/test/resources/sqlgen/window_with_join.sql
deleted file mode 100644
index 43d5b47be8..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_with_join.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT x.key, MAX(y.key) OVER (PARTITION BY x.key % 5 ORDER BY x.key)
-FROM parquet_t1 x JOIN parquet_t1 y ON x.key = y.key
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `max(key) OVER (PARTITION BY (key % CAST(5 AS BIGINT)) ORDER BY key ASC NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT gen_subquery_2.`gen_attr_0`, gen_subquery_2.`gen_attr_2`, gen_subquery_2.`gen_attr_3`, max(`gen_attr_2`) OVER (PARTITION BY `gen_attr_3` ORDER BY `gen_attr_0` ASC NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_1` FROM (SELECT `gen_attr_0`, `gen_attr_2`, (`gen_attr_0` % CAST(5 AS BIGINT)) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_4` FROM `default`.`parquet_t1`) AS gen_subquery_0 INNER JOIN (SELECT `key` AS `gen_attr_2`, `value` AS `gen_attr_5` FROM `default`.`parquet_t1`) AS gen_subquery_1 ON (`gen_attr_0` = `gen_attr_2`)) AS gen_subquery_2) AS gen_subquery_3) AS x
diff --git a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg.sql b/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg.sql
deleted file mode 100644
index 33a8e83750..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value,
-DENSE_RANK() OVER (DISTRIBUTE BY key SORT BY key, value) AS dr,
-COUNT(key)
-FROM parquet_t1 GROUP BY key, value
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `dr`, `gen_attr_3` AS `count(key)` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2`, `gen_attr_3` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, gen_subquery_1.`gen_attr_3`, DENSE_RANK() OVER (PARTITION BY `gen_attr_0` ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_2` FROM (SELECT `gen_attr_0`, `gen_attr_1`, count(`gen_attr_0`) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_0`, `gen_attr_1`) AS gen_subquery_1) AS gen_subquery_2) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_filter.sql b/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_filter.sql
deleted file mode 100644
index e01bc034d3..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_filter.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value,
-DENSE_RANK() OVER (DISTRIBUTE BY key SORT BY key, value) AS dr,
-COUNT(key) OVER(DISTRIBUTE BY key SORT BY key, value) AS ca
-FROM parquet_t1
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `dr`, `gen_attr_3` AS `ca` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2`, `gen_attr_3` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, DENSE_RANK() OVER (PARTITION BY `gen_attr_0` ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_2`, count(`gen_attr_0`) OVER (PARTITION BY `gen_attr_0` ORDER BY `gen_attr_0` ASC NULLS FIRST, `gen_attr_1` ASC NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_3` FROM (SELECT `gen_attr_0`, `gen_attr_1` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_2) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_functions.sql b/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_functions.sql
deleted file mode 100644
index dbfa408fa5..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_functions.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value,
-MAX(value) OVER (PARTITION BY key % 5 ORDER BY key) AS max
-FROM parquet_t1 GROUP BY key, value
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `max` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, gen_subquery_1.`gen_attr_3`, max(`gen_attr_1`) OVER (PARTITION BY `gen_attr_3` ORDER BY `gen_attr_0` ASC NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_2` FROM (SELECT `gen_attr_0`, `gen_attr_1`, (`gen_attr_0` % CAST(5 AS BIGINT)) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_0`, `gen_attr_1`) AS gen_subquery_1) AS gen_subquery_2) AS parquet_t1
diff --git a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_having.sql b/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_having.sql
deleted file mode 100644
index 6f5741b946..0000000000
--- a/sql/hive/src/test/resources/sqlgen/window_with_the_same_window_with_agg_having.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- This file is automatically generated by LogicalPlanToSQLSuite.
-SELECT key, value,
-MAX(value) OVER (PARTITION BY key % 5 ORDER BY key DESC) AS max
-FROM parquet_t1 GROUP BY key, value HAVING key > 5
---------------------------------------------------------------------------------
-SELECT `gen_attr_0` AS `key`, `gen_attr_1` AS `value`, `gen_attr_2` AS `max` FROM (SELECT `gen_attr_0`, `gen_attr_1`, `gen_attr_2` FROM (SELECT gen_subquery_1.`gen_attr_0`, gen_subquery_1.`gen_attr_1`, gen_subquery_1.`gen_attr_3`, max(`gen_attr_1`) OVER (PARTITION BY `gen_attr_3` ORDER BY `gen_attr_0` DESC NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS `gen_attr_2` FROM (SELECT `gen_attr_0`, `gen_attr_1`, (`gen_attr_0` % CAST(5 AS BIGINT)) AS `gen_attr_3` FROM (SELECT `key` AS `gen_attr_0`, `value` AS `gen_attr_1` FROM `default`.`parquet_t1`) AS gen_subquery_0 GROUP BY `gen_attr_0`, `gen_attr_1` HAVING (`gen_attr_0` > CAST(5 AS BIGINT))) AS gen_subquery_1) AS gen_subquery_2) AS parquet_t1