From 164ce8ba3ee56418df027fb7b522353c6d6ac62d Mon Sep 17 00:00:00 2001 From: Rahul Challapalli Date: Thu, 6 Apr 2017 16:47:34 -0700 Subject: [PATCH] Fix tests so that they do not update the metadata cache concurrently. This is necessary to avoid random failure in metadata caching tests due to cache corruption --- .../data/metadata_caching.json | 5 ++++ .../partition_pruning/data/q1.q | 1 - .../partition_pruning/data/q2.q | 1 - .../partition_pruning/data/q3.q | 1 - .../partition_pruning/data/q4.q | 1 - .../partition_pruning/plan/q1.q | 1 - .../partition_pruning/plan/q2.q | 1 - .../partition_pruning/plan/q3.q | 1 - .../partition_pruning/plan/q4.q | 1 - .../ctas_tpch_single_partition1.ddl | 2 ++ .../metadata_caching/advanced_gen.ddl | 1 + .../metadata_caching/advanced_gen.sh | 13 +++++++++ .../refresh_metadata_multilevel.ddl | 10 +++++++ .../refresh_metadata_multilevel.sh | 13 +++++++++ .../parquet_date/metadata_cache.ddl | 27 +++++++++++++++++++ .../general/data/drill4449.q | 2 -- .../general/plan/drill3947_7.e_tsv | 2 +- .../general/plan/drill4449.q | 2 -- .../general/plan/q10.e_tsv | 2 +- .../general/plan/q11.e_tsv | 2 +- .../ctas_auto_partition/general/plan/q3.e_tsv | 2 +- .../ctas_auto_partition/general/plan/q5.e_tsv | 2 +- .../ctas_auto_partition/general/plan/q6.e_tsv | 2 +- .../ctas_auto_partition/general/plan/q8.e_tsv | 2 +- .../ctas_auto_partition/general/plan/q9.e_tsv | 2 +- ... mc1_addautopartitioned_files1.q_disabled} | 0 ... mc1_addautopartitioned_files2.q_disabled} | 0 .../{mc1_adddir1.q => mc1_adddir1.q_disabled} | 0 .../{mc1_adddir2.q => mc1_adddir2.q_disabled} | 0 .../{mc1_adddir3.q => mc1_adddir3.q_disabled} | 0 .../{mc1_adddir4.q => mc1_adddir4.q_disabled} | 0 ...1_addfiles1.q => mc1_addfiles1.q_disabled} | 0 .../metadata_caching/data/mc1_autopartition.q | 2 -- .../metadata_caching/data/mc1_empty.q | 2 -- .../metadata_caching/data/mc1_empty1.q | 2 -- .../metadata_caching/data/mc1_empty2.q | 2 -- .../metadata_caching/data/mc1_empty3.q | 2 -- ...1_removeautopartitioned_files1.q_disabled} | 0 ...1_removeautopartitioned_files2.q_disabled} | 0 ...removedir1.q => mc1_removedir1.q_disabled} | 0 ...removedir2.q => mc1_removedir2.q_disabled} | 0 ...removedir3.q => mc1_removedir3.q_disabled} | 0 .../data/metadata_caching_small.json | 10 +++++++ .../partition_pruning/data/1level_sanity1.q | 1 - .../partition_pruning/data/1level_sanity2.q | 1 - .../partition_pruning/data/1level_sanity3.q | 1 - .../partition_pruning/data/1level_sanity4.q | 1 - .../partition_pruning/data/2level_sanity1.q | 1 - .../partition_pruning/data/2level_sanity2.q | 1 - .../partition_pruning/data/2level_sanity3.q | 1 - .../partition_pruning/data/2level_sanity4.q | 1 - .../partition_pruning/data/2level_sanity5.q | 1 - .../partition_pruning/data/3level_sanity1.q | 1 - .../partition_pruning/data/3level_sanity2.q | 1 - .../partition_pruning/data/3level_sanity3.q | 1 - .../partition_pruning/data/3level_sanity4.q | 1 - .../partition_pruning/data/3level_sanity5.q | 1 - .../partition_pruning/data/3level_sanity6.q | 1 - .../partition_pruning/data/3level_sanity7.q | 1 - .../partition_pruning/data/3level_sanity8.q | 1 - .../partition_pruning/data/3level_sanity9.q | 1 - .../partition_pruning/data/4level_sanity1.q | 1 - .../partition_pruning/data/4level_sanity2.q | 1 - .../partition_pruning/data/5level_sanity1.q | 1 - .../partition_pruning/data/5level_sanity2.q | 1 - .../partition_pruning/data/agg1.q | 1 - .../partition_pruning/data/filter1.q | 1 - .../partition_pruning/data/filter2.q | 1 - .../partition_pruning/data/filter3.q | 1 - .../partition_pruning/data/filter4.q | 1 - .../partition_pruning/data/filter5.q | 1 - .../partition_pruning/data/filter6.q | 1 - .../partition_pruning/data/intrpr_part1.q | 1 - .../partition_pruning/data/join1.q | 6 ----- .../partition_pruning/data/join2.q | 6 ----- .../partition_pruning/data/join3.q | 6 ----- .../data/metadata_caching_pp.json | 7 ++++- .../partition_pruning/data/unionall1.q | 1 - .../partition_pruning/data/unionall2.q | 1 - .../partition_pruning/data/view1.q | 2 -- .../partition_pruning/data/view2.q | 2 -- .../partition_pruning/data/view3.q | 2 -- .../partition_pruning/data/view4.q | 2 -- .../partition_pruning/data/view5.q | 2 -- .../partition_pruning/data/view6.q | 6 ----- .../partition_pruning/data/virtual_cols1.q | 1 - .../partition_pruning/plan/1level_sanity1.q | 1 - .../partition_pruning/plan/1level_sanity2.q | 1 - .../partition_pruning/plan/1level_sanity3.q | 1 - .../partition_pruning/plan/1level_sanity4.q | 1 - .../partition_pruning/plan/2level_sanity1.q | 1 - .../partition_pruning/plan/2level_sanity2.q | 1 - .../partition_pruning/plan/2level_sanity3.q | 1 - .../partition_pruning/plan/2level_sanity4.q | 1 - .../partition_pruning/plan/2level_sanity5.q | 1 - .../partition_pruning/plan/3level_sanity1.q | 1 - .../partition_pruning/plan/3level_sanity2.q | 1 - .../partition_pruning/plan/3level_sanity3.q | 1 - .../partition_pruning/plan/3level_sanity4.q | 1 - .../partition_pruning/plan/3level_sanity5.q | 1 - .../partition_pruning/plan/3level_sanity6.q | 1 - .../partition_pruning/plan/3level_sanity7.q | 1 - ...y8.q => 3level_sanity8.q_nondeterministic} | 1 - .../partition_pruning/plan/3level_sanity9.q | 1 - .../partition_pruning/plan/4level_sanity1.q | 1 - .../partition_pruning/plan/4level_sanity2.q | 1 - .../partition_pruning/plan/5level_sanity1.q | 1 - .../partition_pruning/plan/5level_sanity2.q | 1 - .../partition_pruning/plan/agg1.q | 1 - .../plan/auto_part1.q.drill4828 | 1 - .../partition_pruning/plan/filter1.q | 1 - .../partition_pruning/plan/filter2.q | 1 - .../partition_pruning/plan/filter3.q | 1 - .../partition_pruning/plan/filter4.q | 1 - .../partition_pruning/plan/filter5.q | 1 - .../partition_pruning/plan/filter6.q | 1 - .../partition_pruning/plan/intrpr_part1.q | 1 - .../partition_pruning/plan/join1.q | 6 ----- .../partition_pruning/plan/join2.q | 6 ----- .../partition_pruning/plan/join3.q | 6 ----- .../plan/metadata_caching_pp.json | 7 ++++- .../partition_pruning/plan/unionall1.q | 1 - .../partition_pruning/plan/unionall2.q | 1 - .../partition_pruning/plan/view1.q | 2 -- .../partition_pruning/plan/view2.q | 2 -- .../partition_pruning/plan/view3.q | 2 -- .../partition_pruning/plan/view4.q | 2 -- .../partition_pruning/plan/view5.q | 2 -- .../partition_pruning/plan/view6.q | 6 ----- .../partition_pruning/plan/virtual_cols1.q | 1 - ...2.q => date_partition2.q_nondeterministic} | 0 ...n2.q => int_partition2.q_nondeterministic} | 0 ...n3.q => int_partition3.q_nondeterministic} | 0 .../metadata_caching/plan/mc1_autopartition.q | 2 -- .../plan/metadata_caching_small.json | 7 ++++- .../mc_parquet_date/generic/mixed1.q | 2 -- .../generic/mixed1_partitioned1.q.drill5002 | 2 -- .../parquet_date/mc_parquet_date/generic/q1.q | 3 --- .../parquet_date/mc_parquet_date/generic/q2.q | 2 -- .../parquet_date/mc_parquet_date/generic/q3.q | 2 -- .../parquet_date/mc_parquet_date/generic/q4.q | 2 -- .../parquet_date/mc_parquet_date/generic/q5.q | 2 -- .../parquet_date/mc_parquet_date/generic/q6.q | 2 -- .../parquet_date/mc_parquet_date/generic/q7.q | 2 -- .../parquet_date/mc_parquet_date/generic/q8.q | 2 -- .../mc_parquet_date/generic/spark1.q | 2 -- .../mc_parquet_date/generic/spark2.q | 2 -- .../mc_parquet_date/generic/spark3.q | 2 -- .../mc_parquet_date/generic/spark4.q | 2 -- .../mc_parquet_date/generic/spark5.q | 2 -- .../mc_parquet_date/generic/spark6.q | 2 -- .../mc_parquet_date/generic/spark7.q | 2 -- 152 files changed, 107 insertions(+), 205 deletions(-) create mode 100755 framework/resources/Datasources/metadata_caching/advanced_gen.ddl create mode 100755 framework/resources/Datasources/metadata_caching/advanced_gen.sh create mode 100644 framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.ddl create mode 100755 framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.sh rename framework/resources/Functional/metadata_caching/data/{mc1_addautopartitioned_files1.q => mc1_addautopartitioned_files1.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_addautopartitioned_files2.q => mc1_addautopartitioned_files2.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_adddir1.q => mc1_adddir1.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_adddir2.q => mc1_adddir2.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_adddir3.q => mc1_adddir3.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_adddir4.q => mc1_adddir4.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_addfiles1.q => mc1_addfiles1.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_removeautopartitioned_files1.q => mc1_removeautopartitioned_files1.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_removeautopartitioned_files2.q => mc1_removeautopartitioned_files2.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_removedir1.q => mc1_removedir1.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_removedir2.q => mc1_removedir2.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/data/{mc1_removedir3.q => mc1_removedir3.q_disabled} (100%) rename framework/resources/Functional/metadata_caching/partition_pruning/plan/{3level_sanity8.q => 3level_sanity8.q_nondeterministic} (81%) rename framework/resources/Functional/metadata_caching/plan/{date_partition2.q => date_partition2.q_nondeterministic} (100%) rename framework/resources/Functional/metadata_caching/plan/{int_partition2.q => int_partition2.q_nondeterministic} (100%) rename framework/resources/Functional/metadata_caching/plan/{int_partition3.q => int_partition3.q_nondeterministic} (100%) diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/data/metadata_caching.json b/framework/resources/Advanced/metadata_caching/partition_pruning/data/metadata_caching.json index d44b68977..68cbe4660 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/data/metadata_caching.json +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/data/metadata_caching.json @@ -18,5 +18,10 @@ } ], "datasources": [ + { + "mode": "gen", + "src": "Datasources/metadata_caching/advanced_gen.sh", + "dest": "" + } ] } diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q1.q b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q1.q index 0ed703139..78faa9e06 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q1.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q1.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 order by l_orderkey, l_extendedprice limit 10; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q2.q b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q2.q index 56d4f4a66..fd37ef7db 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q2.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q2.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey, l_extendedprice limit 10; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q3.q b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q3.q index c634ebe40..ec5026927 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q3.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q3.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) order by l_orderkey, l_extendedprice limit 10; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q4.q b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q4.q index 55c4c39a6..06a73968b 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/data/q4.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/data/q4.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q1.q b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q1.q index 806d54c82..d5d55a68a 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q1.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q1.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q2.q b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q2.q index 0e334451b..93a1de4b8 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q2.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q2.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q3.q b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q3.q index aaf3ba959..6cfd5cdf3 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q3.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q3.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5); diff --git a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q4.q b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q4.q index 841fdc378..064ce70f5 100644 --- a/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q4.q +++ b/framework/resources/Advanced/metadata_caching/partition_pruning/plan/q4.q @@ -1,2 +1 @@ -refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl b/framework/resources/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl index e6707a0ab..a9559c62d 100644 --- a/framework/resources/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl +++ b/framework/resources/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl @@ -7,3 +7,5 @@ create table `tpch_single_partition1/nation` partition by (n_regionkey) as selec create table `tpch_single_partition1/region` partition by (c1) as select r.*, case when r_regionkey < 3 then time '12:12:12.12' else time '14:13:12.00' end c1 from cp.`tpch/region.parquet` r; create table `tpch_single_partition1/customer` partition by (c_bool) as select c.*, case when c_mktsegment = 'MACHINERY' then true else false end as c_bool from cp.`tpch/customer.parquet` c; create table `tpch_single_partition1/drill4449` partition by (l_discount) as select * from cp.`tpch/lineitem.parquet`; + +refresh table metadata `tpch_single_partition1/drill4449`; diff --git a/framework/resources/Datasources/metadata_caching/advanced_gen.ddl b/framework/resources/Datasources/metadata_caching/advanced_gen.ddl new file mode 100755 index 000000000..8e56909dd --- /dev/null +++ b/framework/resources/Datasources/metadata_caching/advanced_gen.ddl @@ -0,0 +1 @@ +refresh table metadata dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem`; diff --git a/framework/resources/Datasources/metadata_caching/advanced_gen.sh b/framework/resources/Datasources/metadata_caching/advanced_gen.sh new file mode 100755 index 000000000..0a6b9109b --- /dev/null +++ b/framework/resources/Datasources/metadata_caching/advanced_gen.sh @@ -0,0 +1,13 @@ +#!/bin/sh +source conf/drillTestConfig.properties + +${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.$1;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/metadata_caching/advanced_gen.ddl + +# it seems that sqlline does not exit, if one of the queries failed. +if [ "$?" -eq 0 ] +then + exit 0 +else + echo "ERROR: create table script failed. Rerun create_tables_parquet.ddl to debug failures." + exit 1 +fi diff --git a/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.ddl b/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.ddl new file mode 100644 index 000000000..28f32babc --- /dev/null +++ b/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.ddl @@ -0,0 +1,10 @@ +refresh table metadata dfs.metadata_caching_pp.l_3level; +refresh table metadata dfs.metadata_caching_pp.c_1level; +refresh table metadata dfs.metadata_caching_pp.o_2level; +refresh table metadata dfs.metadata_caching_pp.ps_5level; +refresh table metadata dfs.metadata_caching_pp.s_1level; +refresh table metadata dfs.metadata_caching_pp.p_4level; +refresh table metadata dfs.`/drill/testdata/mc/nation`; +refresh table metadata dfs.metadata_caching.empty; +refresh table metadata dfs.`/drill/testdata/metadata_caching/nation`; +refresh table metadata dfs.metadata_caching.empty1; diff --git a/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.sh b/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.sh new file mode 100755 index 000000000..66c8e8af8 --- /dev/null +++ b/framework/resources/Datasources/metadata_caching/refresh_metadata_multilevel.sh @@ -0,0 +1,13 @@ +#!/bin/sh +source conf/drillTestConfig.properties + +${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.$1;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/metadata_caching/refresh_metadata_multilevel.ddl + +# it seems that sqlline does not exit, if one of the queries failed. +if [ "$?" -eq 0 ] +then + exit 0 +else + echo "ERROR: create table script failed. Rerun create_tables_parquet.ddl to debug failures." + exit 1 +fi diff --git a/framework/resources/Datasources/parquet_date/metadata_cache.ddl b/framework/resources/Datasources/parquet_date/metadata_cache.ddl index f0bc35ad5..0014ed857 100644 --- a/framework/resources/Datasources/parquet_date/metadata_cache.ddl +++ b/framework/resources/Datasources/parquet_date/metadata_cache.ddl @@ -14,3 +14,30 @@ refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata refresh table metadata dfs.`/drill/testdata/parquet_date/auto_partition/lineitem_single`; refresh table metadata dfs.`/drill/testdata/parquet_date/auto_partition/item_single`; refresh table metadata dfs.`/drill/testdata/parquet_date/auto_partition/item_multidate`; + + + + + +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/mixed1`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen1`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/mixed1_partitioned`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d1`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d2`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d3`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen2_lineitem`; +refresh table metadata dfs.`/drill/testdata/mc_parquet_date/fixeddate_lineitem`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/fewtypes_null_large`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/ctas_t1`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/ctas_t14`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/date_nulls`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/fewtypes_null`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.2_autogen/pre1.0lineitem_1.2mc`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/fewtypes_null_large`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/ctas_t1`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/ctas_t14`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/date_nulls`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/fewtypes_null`; +refresh table metadata dfs.`/drill/testdata/parquet_date/metadata_cache/metadata_cache1.6_autogen/pre1.0lineitem_1.2mc`; diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/data/drill4449.q b/framework/resources/Functional/ctas/ctas_auto_partition/general/data/drill4449.q index 64753666a..c0a0105e3 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/data/drill4449.q +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/data/drill4449.q @@ -1,7 +1,5 @@ -refresh table metadata `tpch_single_partition1/drill4449`; SELECT COUNT(*) FROM ( SELECT l_orderkey FROM `tpch_single_partition1/drill4449` WHERE l_discount < 0.05 UNION ALL SELECT l_orderkey FROM `tpch_single_partition1/drill4449` WHERE l_discount > 0.02 ); -select * from sys.options; diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill3947_7.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill3947_7.e_tsv index c99df4abe..ce055635b 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill3947_7.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill3947_7.e_tsv @@ -1,2 +1,2 @@ .*00-02.*Project.* -00-03.*Scan.*path=/drill/testdata/drill-3947/0_0_4540.parquet.*path=/drill/testdata/drill-3947/0_0_4539.parquet.*selectionRoot.*/drill/testdata/drill-3947.*numFiles=2.*columns.*`\*`.* +00-03.*Scan.*selectionRoot.*/drill/testdata/drill-3947.*numFiles=2.*columns.*`\*`.* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill4449.q b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill4449.q index 61517c658..42659c3e6 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill4449.q +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/drill4449.q @@ -1,7 +1,5 @@ -refresh table metadata `tpch_single_partition1/drill4449`; explain plan for SELECT COUNT(*) FROM ( SELECT l_orderkey FROM `tpch_single_partition1/drill4449` WHERE l_discount < 0.05 UNION ALL SELECT l_orderkey FROM `tpch_single_partition1/drill4449` WHERE l_discount > 0.02 ); -select * from sys.options; diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q10.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q10.e_tsv index 798034865..2f572acfd 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q10.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q10.e_tsv @@ -1,3 +1,3 @@ .* Filter.*OR\(AND\(=.*1997.*<>.*'jan'.*\).*AND\(>.*20000.*=.*1991\)\).* -Scan.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_9.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_2.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_8.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_12.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_4.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_75.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_73.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_76.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_1.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_79.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_81.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_82.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_74.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_84.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_83.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_6.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_80.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_5.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_7.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_11.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_78.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_3.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_10.parquet.*selectionRoot.*drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=23.*columns=\[`\*`\].* +Scan.*selectionRoot.*drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=23.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q11.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q11.e_tsv index 7b2b87c7c..d2e7f98ea 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q11.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q11.e_tsv @@ -1,3 +1,3 @@ .* Filter.*OR\(AND\(=.*1997.*<>.*'jan'\).*AND\(>.*20000.*<>.*1991.*\).*=.*'jan'\).* -Scan.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_43.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_27.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_22.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_47.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_69.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_71.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_38.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_36.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_25.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_48.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_75.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_73.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_46.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_29.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_76.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_33.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_77.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_41.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_34.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_13.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_64.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_51.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_50.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_65.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_32.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_66.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_17.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_61.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_79.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_20.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_68.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_44.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_53.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_81.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_55.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_35.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_28.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_54.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_82.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_14.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_21.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_31.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_19.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_57.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_39.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_16.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_52.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_23.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_63.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_62.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_42.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_67.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_49.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_74.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_18.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_30.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_58.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_60.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_37.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_45.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_84.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_83.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_56.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_59.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_24.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_26.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_80.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_5.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_15.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_72.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_70.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_78.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_40.parquet.*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=73.*columns=\[`\*`\].* +Scan.*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=73.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q3.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q3.e_tsv index 219beceb2..2ccc95336 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q3.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q3.e_tsv @@ -1,3 +1,3 @@ .* Filter.*OR\(=.*1993.*=.*1994.*AND.*\(.*>.*29700.*<.*15000.*=.*1995\)\).* -Scan.*path.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitempart/0_0_3.parquet.*path.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitempart/0_0_5.parquet.*path.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitempart/0_0_4.parquet.*selectionRoot.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitempart.*numFiles=3.*columns=\[`\*`\].* +Scan.*selectionRoot.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitempart.*numFiles=3.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q5.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q5.e_tsv index ae0cb049b..e83a2da6b 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q5.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q5.e_tsv @@ -1,3 +1,3 @@ .* Filter.*OR\(=.*1993.*AND\(=.*'jun'.*OR\(>.*25000.*<.*15000\)\)\).* -Scan.*path.*=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_43.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_27.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_36.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_25.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_29.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_33.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_34.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_32.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_79.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_55.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_35.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_28.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_31.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_19.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_67.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_30.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_26.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_7.parquet.*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=18.*columns=\[`\*`\].* +Scan.*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=18.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q6.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q6.e_tsv index ea3cb7e3c..c5e367f89 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q6.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q6.e_tsv @@ -1,3 +1,3 @@ .* Filter.*OR\(=.*1993.*=.*'jun'.*AND\(>.*25000.*=.*1995\)\).* -Scan.*drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_43.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_27.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_36.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_25.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_29.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_33.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_34.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_51.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_50.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_32.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_79.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_53.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_55.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_35.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_28.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_54.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_31.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_19.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_57.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_52.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_67.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_49.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_30.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_58.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_60.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_56.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_59.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_26.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_7.parquet.*selectionRoot=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=29.*columns=\[`\*`\].* +Scan.*selectionRoot=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=29.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q8.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q8.e_tsv index f3a3eac49..1de71f45b 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q8.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q8.e_tsv @@ -1,3 +1,3 @@ .* Filter.*AND\(OR\(=.*1993.*=.*'jun'\).*OR\(=.*1991.*=.*'aug'.*>.*5000\)\).* -Scan.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_43.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_27.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_36.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_25.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_29.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_33.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_34.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_32.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_79.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_55.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_35.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_28.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_31.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_19.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_67.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_30.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_26.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_7.parquet]].*selectionRoot=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=18.*columns=\[`\*`\].* +Scan.*selectionRoot=.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=18.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q9.e_tsv b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q9.e_tsv index 80d32147b..2aca449fd 100644 --- a/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q9.e_tsv +++ b/framework/resources/Functional/ctas/ctas_auto_partition/general/plan/q9.e_tsv @@ -1,2 +1,2 @@ .* -Scan.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_4.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_77.parquet.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring/0_0_31.parquet]].*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=3.*columns=\[`\*`\].* +Scan.*selectionRoot.*/drill/testdata/ctas_auto_partition/existing_partition_pruning/lineitem_hierarchical_intstring.*numFiles=3.*columns=\[`\*`\].* diff --git a/framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files1.q b/framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files1.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files1.q rename to framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files1.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files2.q b/framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files2.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files2.q rename to framework/resources/Functional/metadata_caching/data/mc1_addautopartitioned_files2.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_adddir1.q b/framework/resources/Functional/metadata_caching/data/mc1_adddir1.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_adddir1.q rename to framework/resources/Functional/metadata_caching/data/mc1_adddir1.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_adddir2.q b/framework/resources/Functional/metadata_caching/data/mc1_adddir2.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_adddir2.q rename to framework/resources/Functional/metadata_caching/data/mc1_adddir2.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_adddir3.q b/framework/resources/Functional/metadata_caching/data/mc1_adddir3.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_adddir3.q rename to framework/resources/Functional/metadata_caching/data/mc1_adddir3.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_adddir4.q b/framework/resources/Functional/metadata_caching/data/mc1_adddir4.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_adddir4.q rename to framework/resources/Functional/metadata_caching/data/mc1_adddir4.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_addfiles1.q b/framework/resources/Functional/metadata_caching/data/mc1_addfiles1.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_addfiles1.q rename to framework/resources/Functional/metadata_caching/data/mc1_addfiles1.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_autopartition.q b/framework/resources/Functional/metadata_caching/data/mc1_autopartition.q index ce4ad87e8..bb1071f8c 100644 --- a/framework/resources/Functional/metadata_caching/data/mc1_autopartition.q +++ b/framework/resources/Functional/metadata_caching/data/mc1_autopartition.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/metadata_caching/nation`; select * from dfs.`/drill/testdata/metadata_caching/nation` where n_regionkey=4; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/data/mc1_empty.q b/framework/resources/Functional/metadata_caching/data/mc1_empty.q index fa5d2deee..b3ce54c26 100644 --- a/framework/resources/Functional/metadata_caching/data/mc1_empty.q +++ b/framework/resources/Functional/metadata_caching/data/mc1_empty.q @@ -1,3 +1 @@ -refresh table metadata empty; select * from empty; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/data/mc1_empty1.q b/framework/resources/Functional/metadata_caching/data/mc1_empty1.q index e90ff0fb3..775e078b8 100644 --- a/framework/resources/Functional/metadata_caching/data/mc1_empty1.q +++ b/framework/resources/Functional/metadata_caching/data/mc1_empty1.q @@ -1,3 +1 @@ -refresh table metadata empty; select count(*) from empty; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/data/mc1_empty2.q b/framework/resources/Functional/metadata_caching/data/mc1_empty2.q index 3dbde1e8b..4ee8842fd 100644 --- a/framework/resources/Functional/metadata_caching/data/mc1_empty2.q +++ b/framework/resources/Functional/metadata_caching/data/mc1_empty2.q @@ -1,3 +1 @@ -refresh table metadata empty1; select * from empty1; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/data/mc1_empty3.q b/framework/resources/Functional/metadata_caching/data/mc1_empty3.q index fa3285c4e..9bcacd2b7 100644 --- a/framework/resources/Functional/metadata_caching/data/mc1_empty3.q +++ b/framework/resources/Functional/metadata_caching/data/mc1_empty3.q @@ -1,3 +1 @@ -refresh table metadata empty1; select count(*) from empty1; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files1.q b/framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files1.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files1.q rename to framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files1.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files2.q b/framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files2.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files2.q rename to framework/resources/Functional/metadata_caching/data/mc1_removeautopartitioned_files2.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_removedir1.q b/framework/resources/Functional/metadata_caching/data/mc1_removedir1.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_removedir1.q rename to framework/resources/Functional/metadata_caching/data/mc1_removedir1.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_removedir2.q b/framework/resources/Functional/metadata_caching/data/mc1_removedir2.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_removedir2.q rename to framework/resources/Functional/metadata_caching/data/mc1_removedir2.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/mc1_removedir3.q b/framework/resources/Functional/metadata_caching/data/mc1_removedir3.q_disabled similarity index 100% rename from framework/resources/Functional/metadata_caching/data/mc1_removedir3.q rename to framework/resources/Functional/metadata_caching/data/mc1_removedir3.q_disabled diff --git a/framework/resources/Functional/metadata_caching/data/metadata_caching_small.json b/framework/resources/Functional/metadata_caching/data/metadata_caching_small.json index 05669c8a6..298c51628 100644 --- a/framework/resources/Functional/metadata_caching/data/metadata_caching_small.json +++ b/framework/resources/Functional/metadata_caching/data/metadata_caching_small.json @@ -36,6 +36,16 @@ "mode": "gen", "src": "Datasources/metadata_caching/delete_toplevel_cache.sh", "dest": "" + }, + { + "mode": "gen", + "src": "Datasources/metadata_caching/delete_toplevel_cache.sh", + "dest": "" + }, + { + "mode": "gen", + "src": "Datasources/metadata_caching/refresh_metadata_multilevel.sh", + "dest": "" } ] } diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity1.q index e4930f243..fdf98979f 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata c_1level; select * from c_1level where dir0=1991 order by c_acctbal limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity2.q index 9580f7daf..439aa8365 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata c_1level; select * from c_1level where dir0=1991 and c_nationkey=15; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity3.q index 5a91ce537..6b997b096 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity3.q @@ -1,2 +1 @@ -refresh table metadata c_1level; select * from c_1level where dir0=1991 and (c_nationkey=15 or c_acctbal < -900); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity4.q index abe42467c..96af643e1 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/1level_sanity4.q @@ -1,2 +1 @@ -refresh table metadata c_1level; select * from c_1level where dir0=1991 or dir0=1992 order by c_acctbal limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity1.q index 51aa7adea..24745ec53 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata o_2level; select o_orderkey, dir0, dir1 from o_2level where cast(dir0 as int) = 1991 and dir1 = 'feb' order by o_orderkey limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity2.q index bea3d725d..e00b8deca 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata o_2level; select o_orderkey, dir0, dir1 from o_2level where cast(dir0 as int) = 1991 and dir1 = 'feb' and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity3.q index 033ecf89c..a14b695d5 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity3.q @@ -1,2 +1 @@ -refresh table metadata o_2level; select o_orderkey, dir0, dir1 from o_2level where dir0=1991 and (dir1 = 'feb' or dir1 = 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity4.q index 85154990d..5e0d4dcac 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity4.q @@ -1,2 +1 @@ -refresh table metadata o_2level; select o_orderkey, dir0, dir1 from o_2level where dir0=extract(year from date '1991-01-02') and (dir1 = 'feb' or dir1 = 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity5.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity5.q index 5a08649e3..d9d5bbcab 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/2level_sanity5.q @@ -1,2 +1 @@ -refresh table metadata o_2level; select o_orderkey, dir0, dir1 from o_2level where dir0=extract(year from date '1991-01-02') and dir1 IN( 'feb', 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity1.q index 89eb53261..d8adb8b91 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_orderkey, dir0, dir1, dir2 from l_3level where dir0=1 and dir1='one' and dir2 = date '2015-7-12'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity2.q index ce2b7374a..5abe1ac9b 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_orderkey from l_3level where dir0=1 and dir1='one' and dir2 IN ('2015-7-12', '2015-7-13') ; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity3.q index 4aa4bf77f..d4a639542 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity3.q @@ -1,3 +1,2 @@ -refresh table metadata l_3level; select l_orderkey from l_3level where dir0=1 and ((dir1='one' and dir2 IN ('2015-7-12', '2015-7-13')) or (dir1='two' and dir2='2015-8-12')) ; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity4.q index d7708dcfd..96526a11f 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity4.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and ( diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity5.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity5.q index 24509115b..2e0fb4e6c 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity5.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and dir2 IN ('2015-7-12', '2015-7-13', '2015-8-12') and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity6.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity6.q index e2f2ce71a..5784ebc2b 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity6.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and dir1 in ('one', 'three') and dir2 = '2015-7-12' and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity7.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity7.q index 3fd24cec9..323088338 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity7.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity7.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and dir1 in ('one', 'three') and (dir2 = '2015-7-12' or dir2 = '2015-7-13') and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity8.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity8.q index c4d880acb..77a43b49b 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity8.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity8.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and dir1='one' and dir2 = '2015-8-12' and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity9.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity9.q index 5ce835df2..431554d50 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity9.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/3level_sanity9.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_quantity from l_3level where dir0=1 and dir2 IN ('2015-7-12', '2015-7-13', '2015-8-12') or l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity1.q index 25f6810a3..13dec25f2 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata p_4level; select p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment from p_4level where dir0=1991 and dir1=1 and dir2=1 and dir3=1 and p_size < 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity2.q index d2c0a27f4..8e8ae4840 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/4level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata p_4level; select p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment from p_4level where dir0=1992 and dir1=2 and dir2=1 and dir3 IN (1,2) and p_size < 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity1.q index 73da61351..23a6a51d0 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata ps_5level; select ps_supplycost from ps_5level where dir0=2000 and dir1='q1' and dir2='jan' and dir3=1 and dir4=1.0 order by ps_partkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity2.q index 94fd0073b..d11a68029 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/5level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata ps_5level; select ps_supplycost from ps_5level where dir0=2000 and dir1='q1' and dir2='jan' and dir3=1 and dir4=1.0 or dir4=2.0 order by ps_partkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/agg1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/agg1.q index a916b0b8b..564e106fb 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/agg1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/agg1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter1.q index 73b998723..88de94798 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter2.q index 407665e60..cca54fdd9 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter2.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter3.q index dca54699f..2112284ed 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter3.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select * from l_3level where dir0 = 1 and dir1 = 'one' and ((dir2 = '2015-7-12' and l_discount > 0.05) or (dir2='2015-7-13' and l_discount > 0.07)); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter4.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter4.q index f7bef05e6..3f7ed67ff 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter4.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select * from l_3level where dir0 = 1 and dir1 = 'one' and dir2 = '2015-7-12' and (l_discount > 0.05 or l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter5.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter5.q index 8ba6e8ead..74beed7ac 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter5.q @@ -1,2 +1 @@ -refresh table metadata l_3level; select l_orderkey, dir0 from l_3level where dir0 = 1 and dir1 = 'one' and (dir2 = '2015-7-12' or l_discount > 0.05 or l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter6.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter6.q index f60e4b1dc..289119270 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/filter6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/filter6.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select l_orderkey, dir0 from l_3level where ( diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/intrpr_part1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/intrpr_part1.q index c3041436a..45f0d4324 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/intrpr_part1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/intrpr_part1.q @@ -1,2 +1 @@ -refresh table metadata s_1level; select * from s_1level where dir0 = SUBSTR('HAAAAABC', 6) and s_nationkey > 15; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/join1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/join1.q index 654b7ae82..4d9cf80f0 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/join1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/join1.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -27,6 +24,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/join2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/join2.q index c717b2166..df813ae82 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/join2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/join2.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -26,6 +23,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/join3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/join3.q index 592a361c2..ffa5c6630 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/join3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/join3.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -26,6 +23,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/metadata_caching_pp.json b/framework/resources/Functional/metadata_caching/partition_pruning/data/metadata_caching_pp.json index ccdc9e287..e4effed28 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/metadata_caching_pp.json +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/metadata_caching_pp.json @@ -21,6 +21,11 @@ "mode": "cp", "src": "Datasources/metadata_caching/data_pp/", "dest": "metadata_caching_pp/" - } + } , + { + "mode": "gen", + "src": "Datasources/metadata_caching/refresh_metadata_multilevel.sh", + "dest": "" + } ] } diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall1.q index f8c9246e9..bb5bff6d7 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select l_orderkey, dir0 from l_3level t1 where t1.dir0 = 1 and t1.dir1='one' and t1.dir2 = '2015-7-12' union all select l_orderkey, dir0 from l_3level t2 where t2.dir0 = 1 and t2.dir1='two' and t2.dir2 = '2015-8-12' and (t2.l_discount < 0.02 or t2.l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall2.q index db985b0bc..53220bbfd 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/unionall2.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; select l_orderkey, dir0 from `l_3level/1/one/2015-7-12` t1 union all select l_orderkey, dir0 from l_3level t2 where t2.dir0 = 1 and t2.dir1='two' and t2.dir2 = '2015-8-12' and (t2.l_discount < 0.02 or t2.l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view1.q index d7b09d233..e3f526478 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view1.q @@ -1,5 +1,3 @@ create or replace view ld1 as select dir0 num, substr(dir1, 1, 1) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; select num, let, `day` from ld1 where num=2 and let='t' and `day` = 12 limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view2.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view2.q index aabd13828..29cfcc4fe 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view2.q @@ -1,5 +1,3 @@ create or replace view ld2 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; select num, let, `day`, l_orderkey from ld2 where num=2 and let='tw' and `day` = 12 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view3.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view3.q index 0fd9dd12a..7a7eacc47 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view3.q @@ -1,5 +1,3 @@ create or replace view ld3 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; select num, let, `day`, l_orderkey from ld3 where num=2 and substring(let, 1, 1)='o' and `day` = 12 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view4.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view4.q index d94130df7..d4901dc39 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view4.q @@ -1,5 +1,3 @@ create or replace view ld4 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, extract(month from dir2) `month`, extract(year from dir2) `year`, l_orderkey, l_tax from l_3level; -refresh table metadata l_3level; select num, let, `day`, l_orderkey from ld4 where num=2 and substring(let, 1, 1)='o' and `day` = 12 and `year`=2015 and `month` = 9 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view5.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view5.q index f9d42b1a0..a73469b97 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view5.q @@ -1,5 +1,3 @@ create or replace view ld5 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, extract(month from dir2) `month`, extract(year from dir2) `year`, l_orderkey, l_tax from l_3level; -refresh table metadata l_3level; select num, let, `day`, l_orderkey from ld5 where num=2 and substring(let, 1, 1)='o' and `day` = 12 and `year`=2015 and `month` in (7,9) order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/view6.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/view6.q index 90e3f45e9..0de141804 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/view6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/view6.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; create or replace view ld6 as select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -29,6 +26,3 @@ order by limit 10; select * from ld6; select * from sys.version; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/data/virtual_cols1.q b/framework/resources/Functional/metadata_caching/partition_pruning/data/virtual_cols1.q index 9da470f6c..38200d7e3 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/data/virtual_cols1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/data/virtual_cols1.q @@ -1,2 +1 @@ -refresh table metadata s_1level; select filename, * from s_1level where dir0 = 'ABC' and s_nationkey > 8 and filename like '%1.parquet'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity1.q index 98b8b0a48..c4fee0b26 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata c_1level; explain plan for select * from c_1level where dir0=1991 order by c_acctbal limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity2.q index 6c13bd3bf..20eb8d67e 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata c_1level; explain plan for select * from c_1level where dir0=1991 and c_nationkey=15; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity3.q index 6870f858e..484d811e2 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity3.q @@ -1,2 +1 @@ -refresh table metadata c_1level; explain plan for select * from c_1level where dir0=1991 and (c_nationkey=15 or c_acctbal < -900); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity4.q index 0d1636cab..cc331e6ed 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/1level_sanity4.q @@ -1,2 +1 @@ -refresh table metadata c_1level; explain plan for select * from c_1level where dir0=1991 or dir0=1992 order by c_acctbal limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity1.q index 5ce89be05..fd1ef8ca0 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata o_2level; explain plan for select o_orderkey from o_2level where cast(dir0 as int) = 1991 and dir1 = 'feb' order by o_orderkey limit 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity2.q index 8298c7007..247072ff6 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata o_2level; explain plan for select o_orderkey from o_2level where cast(dir0 as int) = 1991 and dir1 = 'feb' and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity3.q index a1441ebe6..15a7302cd 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity3.q @@ -1,2 +1 @@ -refresh table metadata o_2level; explain plan for select o_orderkey from o_2level where dir0=1991 and (dir1 = 'feb' or dir1 = 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity4.q index 9202c6c25..1950248cd 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity4.q @@ -1,2 +1 @@ -refresh table metadata o_2level; explain plan for select o_orderkey from o_2level where dir0=extract(year from date '1991-01-02') and (dir1 = 'feb' or dir1 = 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity5.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity5.q index 3f73f14a0..4a4d6f213 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/2level_sanity5.q @@ -1,2 +1 @@ -refresh table metadata o_2level; explain plan for select o_orderkey from o_2level where dir0=extract(year from date '1991-01-02') and dir1 IN( 'feb', 'jan') and o_orderdate = date '1996-01-02'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity1.q index 34c1e0ffb..32c58ba09 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select o_orderkey from l_3level where dir0=1 and dir1='one' and dir2 = date '2015-7-12'; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity2.q index 4a0f053d6..e1020fd12 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select o_orderkey from l_3level where dir0=1 and dir1='one' and dir2 IN ('2015-7-12', '2015-7-13') ; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity3.q index de8e6d710..918f58beb 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity3.q @@ -1,3 +1,2 @@ -refresh table metadata l_3level; explain plan for select o_orderkey from l_3level where dir0=1 and ((dir1='one' and dir2 IN ('2015-7-12', '2015-7-13')) or (dir1='two' and dir2='2015-8-12')) ; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity4.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity4.q index cbca636d2..ab6f88f8d 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity4.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and ((dir1='one' and dir2 IN ('2015-7-12', '2015-7-13')) or (dir1='two' and dir2='2015-8-12')) and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity5.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity5.q index 52f0d9588..b8aa87668 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity5.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and dir2 IN ('2015-7-12', '2015-7-13', '2015-8-12') and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity6.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity6.q index be7f8ea77..903a05ff5 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity6.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and dir1 in ('one', 'three') and dir2 = '2015-7-12' and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity7.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity7.q index c9ff532d4..8d6da90e4 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity7.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity7.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and dir1 in ('one', 'three') and (dir2 = '2015-7-12' or dir2 = '2015-7-13') and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q_nondeterministic similarity index 81% rename from framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q rename to framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q_nondeterministic index a19ca2592..55d072779 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity8.q_nondeterministic @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and dir1='one' and dir2 = '2015-8-12' and l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity9.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity9.q index 84ddcde47..ad1e89c8e 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity9.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/3level_sanity9.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_quantity from l_3level where dir0=1 and dir2 IN ('2015-7-12', '2015-7-13', '2015-8-12') or l_discount=0.07 order by l_orderkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity1.q index 433b7bd92..a3b649798 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata p_4level; explain plan for select * from p_4level where dir0=1991 and dir1=1 and dir2=1 and dir3=1 and p_size < 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity2.q index 3ce4b7ca0..8495c0677 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/4level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata p_4level; explain plan for select * from p_4level where dir0=1992 and dir1=2 and dir2=1 and dir3 IN (1,2) and p_size < 2; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity1.q index 4b0233024..d6003a080 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity1.q @@ -1,2 +1 @@ -refresh table metadata ps_5level; explain plan for select * from ps_5level where dir0=2000 and dir1='q1' and dir2='jan' and dir3=1 and dir4=1.0 order by ps_partket limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity2.q index 8eaad1038..da860ca3b 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/5level_sanity2.q @@ -1,2 +1 @@ -refresh table metadata ps_5level; explain plan for select * from ps_5level where dir0=2000 and dir1='q1' and dir2='jan' and dir3=1 and dir4=1.0 or dir4=2.0 order by ps_partkey limit 10; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/agg1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/agg1.q index 28961189b..31d3cfc92 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/agg1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/agg1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/auto_part1.q.drill4828 b/framework/resources/Functional/metadata_caching/partition_pruning/plan/auto_part1.q.drill4828 index 552efa48c..430ede87d 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/auto_part1.q.drill4828 +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/auto_part1.q.drill4828 @@ -1,2 +1 @@ -refresh table metadata s_1level; explain plan for select * from s_1level where dir0 = 'ABC' and par = 1 and s_nationkey > 15; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter1.q index b6fdb2f32..5f047bfc4 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter2.q index 0468a1c5c..053fbd30d 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter2.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select sum(l_extendedprice * l_discount) as revenue from diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter3.q index 237c3914d..54e2fa98b 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter3.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select * from l_3level where dir0 = 1 and dir1 = 'one' and ((dir2 = '2015-7-12' and l_discount > 0.05) or (dir2='2015-7-13' and l_discount > 0.07)); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter4.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter4.q index b794f175f..1429dde83 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter4.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select * from l_3level where dir0 = 1 and dir1 = 'one' and dir2 = '2015-7-12' and (l_discount > 0.05 or l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter5.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter5.q index 86adeedd0..a55b8a913 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter5.q @@ -1,2 +1 @@ -refresh table metadata l_3level; explain plan for select l_orderkey, dir0 from l_3level where dir0 = 1 and dir1 = 'one' and (dir2 = '2015-7-12' or l_discount > 0.05 or l_discount > 0.07); diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter6.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter6.q index 07b883999..4282651d3 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/filter6.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select l_orderkey, dir0 from l_3level where ( diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/intrpr_part1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/intrpr_part1.q index 012b33be6..358ee0513 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/intrpr_part1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/intrpr_part1.q @@ -1,2 +1 @@ -refresh table metadata s_1level; explain plan for select * from s_1level where dir0 = SUBSTR('HAAAAABC', 6) and s_nationkey > 15; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join1.q index 06eea38a0..3263dc591 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join1.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; explain plan for select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -27,6 +24,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join2.q index 17c11a561..dce92baf6 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join2.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; explain plan for select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -26,6 +23,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join3.q index 551e7da2a..bc03d5456 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/join3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/join3.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; explain plan for select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -26,6 +23,3 @@ order by revenue desc, o.o_orderdate limit 10; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/metadata_caching_pp.json b/framework/resources/Functional/metadata_caching/partition_pruning/plan/metadata_caching_pp.json index fe687b40c..a42ff2524 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/metadata_caching_pp.json +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/metadata_caching_pp.json @@ -21,6 +21,11 @@ "mode": "cp", "src": "Datasources/metadata_caching/data_pp/", "dest": "metadata_caching_pp/" - } + }, + { + "mode": "gen", + "src": "Datasources/metadata_caching/refresh_metadata_multilevel.sh", + "dest": "" + } ] } diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall1.q index 05adb5f78..9f0b65538 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall1.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select l_orderkey, dir0 from l_3level t1 where t1.dir0 = 1 and t1.dir1='one' and t1.dir2 = '2015-7-12' union all diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall2.q index 6638a2cfb..4348d7c4f 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/unionall2.q @@ -1,4 +1,3 @@ -refresh table metadata l_3level; explain plan for select l_orderkey, dir0 from `l_3level/1/one/2015-7-12` t1 union all diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view1.q index b2f98d2bd..b45b2acc8 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view1.q @@ -1,5 +1,3 @@ create or replace view l1 as select dir0 num, substr(dir1, 1, 1) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; explain plan for select num, let, `day` from l1 where num=2 and let='t' and `day` = 12 limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view2.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view2.q index c7aac4c58..5b0b42ca9 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view2.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view2.q @@ -1,5 +1,3 @@ create or replace view l2 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; explain plan for select num, let, `day`, l_orderkey from l2 where num=2 and let='tw' and `day` = 12 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view3.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view3.q index 33a2ae838..edabf0973 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view3.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view3.q @@ -1,5 +1,3 @@ create or replace view l3 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, l_orderkey, l_partkey, l_suppkey, l_linenumber, l_quantity, l_extendedorice, l_discount, l_tax from l_3level; -refresh table metadata l_3level; explain plan for select num, let, `day`, l_orderkey from l3 where num=2 and substring(let, 1, 1)='o' and `day` = 12 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view4.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view4.q index 65bbc093a..ecb3e689d 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view4.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view4.q @@ -1,5 +1,3 @@ create or replace view l4 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, extract(month from dir2) `month`, extract(year from dir2) `year`, l_orderkey, l_tax from l_3level; -refresh table metadata l_3level; explain plan for select num, let, `day`, l_orderkey from l4 where num=2 and substring(let, 1, 1)='o' and `day` = 12 and `year`=2015 and `month` = 9 order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view5.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view5.q index 988aa7f31..a2948b3e7 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view5.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view5.q @@ -1,5 +1,3 @@ create or replace view l5 as select dir0 num, substr(dir1, 1, 2) let, extract(day from dir2) `day`, extract(month from dir2) `month`, extract(year from dir2) `year`, l_orderkey, l_tax from l_3level; -refresh table metadata l_3level; explain plan for select num, let, `day`, l_orderkey from l5 where num=2 and substring(let, 1, 1)='o' and `day` = 12 and `year`=2015 and `month` in (7,9) order by l_orderkey limit 10; select 1 from sys.version; -select 1 from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view6.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view6.q index e0b78ac9c..7e0864337 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/view6.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/view6.q @@ -1,6 +1,3 @@ -refresh table metadata l_3level; -refresh table metadata c_1level; -refresh table metadata o_2level; create or replace view v6 as select l.l_orderkey, sum(l.l_extendedprice * (1 - l.l_discount)) as revenue, @@ -29,6 +26,3 @@ order by limit 10; explain plan for select * from v6; select * from sys.version; -select * from sys.version; -select * from sys.version; -select * from sys.version; diff --git a/framework/resources/Functional/metadata_caching/partition_pruning/plan/virtual_cols1.q b/framework/resources/Functional/metadata_caching/partition_pruning/plan/virtual_cols1.q index d9c5b90f2..a7ce2afe5 100644 --- a/framework/resources/Functional/metadata_caching/partition_pruning/plan/virtual_cols1.q +++ b/framework/resources/Functional/metadata_caching/partition_pruning/plan/virtual_cols1.q @@ -1,2 +1 @@ -refresh table metadata s_1level; explain plan for select filename, * from s_1level where dir0 = 'ABC' and s_nationkey > 8 and filename like '%1.parquet'; diff --git a/framework/resources/Functional/metadata_caching/plan/date_partition2.q b/framework/resources/Functional/metadata_caching/plan/date_partition2.q_nondeterministic similarity index 100% rename from framework/resources/Functional/metadata_caching/plan/date_partition2.q rename to framework/resources/Functional/metadata_caching/plan/date_partition2.q_nondeterministic diff --git a/framework/resources/Functional/metadata_caching/plan/int_partition2.q b/framework/resources/Functional/metadata_caching/plan/int_partition2.q_nondeterministic similarity index 100% rename from framework/resources/Functional/metadata_caching/plan/int_partition2.q rename to framework/resources/Functional/metadata_caching/plan/int_partition2.q_nondeterministic diff --git a/framework/resources/Functional/metadata_caching/plan/int_partition3.q b/framework/resources/Functional/metadata_caching/plan/int_partition3.q_nondeterministic similarity index 100% rename from framework/resources/Functional/metadata_caching/plan/int_partition3.q rename to framework/resources/Functional/metadata_caching/plan/int_partition3.q_nondeterministic diff --git a/framework/resources/Functional/metadata_caching/plan/mc1_autopartition.q b/framework/resources/Functional/metadata_caching/plan/mc1_autopartition.q index c1aa07d01..987197917 100644 --- a/framework/resources/Functional/metadata_caching/plan/mc1_autopartition.q +++ b/framework/resources/Functional/metadata_caching/plan/mc1_autopartition.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc/nation`; explain plan for select * from dfs.`/drill/testdata/metadata_caching/nation` where n_regionkey=4; -select 1 from sys.options; diff --git a/framework/resources/Functional/metadata_caching/plan/metadata_caching_small.json b/framework/resources/Functional/metadata_caching/plan/metadata_caching_small.json index b119238ef..7ef45aa57 100644 --- a/framework/resources/Functional/metadata_caching/plan/metadata_caching_small.json +++ b/framework/resources/Functional/metadata_caching/plan/metadata_caching_small.json @@ -31,6 +31,11 @@ "mode": "gen", "src": "Datasources/metadata_caching/addremove_files.sh", "dest": "" - } + }, + { + "mode": "gen", + "src": "Datasources/metadata_caching/refresh_metadata_multilevel.sh", + "dest": "" + } ] } diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1.q index d72275c0a..460541856 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/mixed1`; select * from dfs.`/drill/testdata/mc_parquet_date/mixed1`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1_partitioned1.q.drill5002 b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1_partitioned1.q.drill5002 index 216eb94a2..59db3c24c 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1_partitioned1.q.drill5002 +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/mixed1_partitioned1.q.drill5002 @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/mixed1_partitioned`; select l_shipdate, `month`(l_shipdate) from dfs.`/drill/testdata/mc_parquet_date/mixed1_partitioned`; -select 1 from sys.version; diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q1.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q1.q index 75aeedca0..adbef7b42 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q1.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q1.q @@ -1,4 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; select * from dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; - -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q2.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q2.q index ffd757bfb..837898dc0 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q2.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q2.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; select EXPR$0, l_commitdate+1, date_add(l_receiptdate, 5) from dfs.`/drill/testdata/mc_parquet_date/lineitem_dates` where EXPR$0 > date '1998-11-10'; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q3.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q3.q index 154b3c5cd..0bf18c988 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q3.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q3.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; select d.EXPR$0 col1_date, d.l_commitdate, d.l_receiptdate from dfs.`/drill/testdata/mc_parquet_date/lineitem_dates` d inner join cp.`tpch/lineitem.parquet` cpl on d.EXPR$0 = cpl.l_shipdate where d.EXPR$0 > date '1998-11-10'; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q4.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q4.q index b2b430374..19ed1a31b 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q4.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q4.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; select d.EXPR$0 col1_date from dfs.`/drill/testdata/mc_parquet_date/lineitem_dates` d where d.EXPR$0 > date '1998-11-10' union select cpl.l_shipdate from cp.`tpch/lineitem.parquet` cpl where cpl.l_shipdate > date '1998-11-09'; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q5.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q5.q index 887627818..0feabac10 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q5.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q5.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen2_lineitem`; select l_shipdate from dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen2_lineitem` order by l_linenumber limit 100; -select 1 from sys.version; diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q6.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q6.q index ffd757bfb..837898dc0 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q6.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q6.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/lineitem_dates`; select EXPR$0, l_commitdate+1, date_add(l_receiptdate, 5) from dfs.`/drill/testdata/mc_parquet_date/lineitem_dates` where EXPR$0 > date '1998-11-10'; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q7.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q7.q index 391dea045..23d3537b2 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q7.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q7.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen1`; select * from dfs.`/drill/testdata/mc_parquet_date/dates_nodrillversion/drillgen1`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q8.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q8.q index 838c2c5d8..875c5da96 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q8.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/q8.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/fixeddate_lineitem`; select l_extendedprice, l_shipdate, l_commitdate from dfs.`/drill/testdata/mc_parquet_date/fixeddate_lineitem` order by l_extendedprice limit 10; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark1.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark1.q index 4197ad4dc..bc9080667 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark1.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark1.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d1`; select a,b,c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d1`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark2.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark2.q index 734a9098f..6ecc82f16 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark2.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark2.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d2`; select a,b,c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d2`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark3.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark3.q index 98b91c3d3..1b254a5b7 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark3.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark3.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d3`; select a,b,c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d3`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark4.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark4.q index 41e753cce..a62ef4c14 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark4.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark4.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; select a,b,c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark5.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark5.q index dfd81de31..c3b2615f7 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark5.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark5.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; select distinct c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark6.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark6.q index aa791f994..6edbb16ca 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark6.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark6.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; select distinct c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4` order by c nulls first limit 10; -select 1 from sys.version diff --git a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark7.q b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark7.q index c5db36643..e7dc33116 100644 --- a/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark7.q +++ b/framework/resources/Functional/parquet_storage/parquet_date/mc_parquet_date/generic/spark7.q @@ -1,3 +1 @@ -refresh table metadata dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4`; select a,b,c from dfs.`/drill/testdata/mc_parquet_date/spark_generated/d4` where c > date '2016-10-1' and c is not null; -select 1 from sys.version;