DRILL-6865: Added tests to verify the bug fix. (#524)

Cases covered: 1. Filter pruning shouldn't work if at least one filter cannot be pruned ('like' operator or expression on a column). 2. Filter pruning should work in case of single parquet file with single row group.
mapr · Dec 27, 2018 · d1b32d9 · d1b32d9
1 parent f781bc4
commit d1b32d9
Show file tree

Hide file tree

Showing 268 changed files with 416 additions and 351 deletions.
diff --git a/...ources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_files.ddl b/...ources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_files.ddl
@@ -1,8 +1,8 @@
-create table if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_files` (c1, c2, c3, c4, c5)
+create table if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_files` (c1, c2, c3, c4, c5)
 partition by (c1) as
 select cast(columns[0] as int) c1, columns[1] c2, columns[2] c3, columns[3] c4, columns[4] c5
-from dfs.drillTestDir.`parquet_storage/DRILL_6118/DRILL_6118_data_source.csv`;
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_data_source.csv`;
 
-create view if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_files_view` as
+create view if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_files_view` as
 select *
-from dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_files`;
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_files`;
diff --git a/...rces/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_folders.ddl b/...rces/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_folders.ddl
@@ -1,16 +1,16 @@
-create table if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_folders/d1` (c1, c2, c3, c4, c5)
+create table if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1` (c1, c2, c3, c4, c5)
 as select cast(columns[0] as int) c1, columns[1] c2, columns[2] c3, columns[3] c4, columns[4] c5
-from dfs.drillTestDir.`parquet_storage/DRILL_6118/DRILL_6118_data_source.csv`
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_data_source.csv`
 where columns[0] in (1, 3);
-create table if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_folders/d2` (c1, c2, c3, c4, c5)
+create table if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d2` (c1, c2, c3, c4, c5)
 as select cast(columns[0] as int) c1, columns[1] c2, columns[2] c3, columns[3] c4, columns[4] c5
-from dfs.drillTestDir.`parquet_storage/DRILL_6118/DRILL_6118_data_source.csv`
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_data_source.csv`
 where columns[0]=2;
-create table if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_folders/d3` (c1, c2, c3, c4, c5)
+create table if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d3` (c1, c2, c3, c4, c5)
 as select cast(columns[0] as int) c1, columns[1] c2, columns[2] c3, columns[3] c4, columns[4] c5
-from dfs.drillTestDir.`parquet_storage/DRILL_6118/DRILL_6118_data_source.csv`
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_data_source.csv`
 where columns[0]>3;
 
-create view if not exists dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_folders_view` as
+create view if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders_view` as
 select *
-from dfs.drillTestDir.`DRILL_6118_parquet_partitioned_by_folders`;
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`;
diff --git a/...ources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_without_partitioning.ddl b/...ources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_without_partitioning.ddl
@@ -1,7 +1,7 @@
-create table if not exists dfs.drillTestDir.`DRILL_6118_parquet_without_partitioning` (c1, c2, c3, c4, c5)
+create table if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_without_partitioning` (c1, c2, c3, c4, c5)
 as select cast(columns[0] as int) c1, columns[1] c2, columns[2] c3, columns[3] c4, columns[4] c5
-from dfs.drillTestDir.`parquet_storage/DRILL_6118/DRILL_6118_data_source.csv`;
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_data_source.csv`;
 
-create view if not exists dfs.drillTestDir.`DRILL_6118_parquet_without_partitioning_view` as
+create view if not exists dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_without_partitioning_view` as
 select *
-from dfs.drillTestDir.`DRILL_6118_parquet_without_partitioning`;
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_without_partitioning`;
diff --git a/...sources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.plan b/...sources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql b/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 = false;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false;
diff --git a/.../Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql.explain b/.../Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 = false;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false;
diff --git a/...al/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.plan b/...al/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
 numFiles=1
 numRowGroups=1
diff --git a/...nal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql b/...nal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 = false and c3 is not null;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false and c3 is not null;
diff --git a/...er/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql.explain b/...er/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 = false and c3 is not null;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false and c3 is not null;
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.plan b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql b/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c3 is not null;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is not null;
diff --git a/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql.explain b/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c3 is not null;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is not null;
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.plan b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql b/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 is not true;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is not true;
diff --git a/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql.explain b/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 is not true;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is not true;
diff --git a/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.plan b/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql b/...resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c3 is null;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is null;
diff --git a/...s/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql.explain b/...s/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c3 is null;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is null;
diff --git a/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.plan b/...esources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql b/...resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 is true;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is true;
diff --git a/...s/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql.explain b/...s/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where c2 is true;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is true;
diff --git a/...ces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.plan b/...ces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 = false;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false;
diff --git a/...ctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql.explain b/...ctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 = false;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false;
diff --git a/...ces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.plan b/...ces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 is false;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 is false;
diff --git a/...ctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql.explain b/...ctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 is false;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 is false;
diff --git a/...nal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.plan b/...nal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...onal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql b/...onal/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 = false or c3 is null;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false or c3 is null;
diff --git a/...ter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql.explain b/...ter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c2 = false or c3 is null;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false or c3 is null;
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.plan b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql b/...urces/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql
@@ -1 +1 @@
-select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c3 is null;
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c3 is null;
diff --git a/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql.explain b/...nctional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql.explain
@@ -1 +1 @@
-explain plan for select c1, c2, c3 from `parquet_storage/DRILL_6174/DRILL_6174_test_data` where not c3 is null;
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c3 is null;
diff --git a/.../Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_id_where_str_is_null.sql b/.../Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_id_where_str_is_null.sql
@@ -1 +1 @@
-select count(id) from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is null;
+select count(id) from `filter/pushdown/DRILL_6603_test_data` where str is null;
diff --git a/...unctional/filter/pushdown/boolean_null/DRILL_6603_select_count_star_where_str_is_null.sql b/...unctional/filter/pushdown/boolean_null/DRILL_6603_select_count_star_where_str_is_null.sql
@@ -1 +1 @@
-select count(*) from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is null;
+select count(*) from `filter/pushdown/DRILL_6603_test_data` where str is null;
diff --git a/...es/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_not_str_is_null.sql b/...es/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_not_str_is_null.sql
@@ -1 +1 @@
-select id from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where not str is null;
+select id from `filter/pushdown/DRILL_6603_test_data` where not str is null;
diff --git a/...ources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_str_is_null.sql b/...ources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_str_is_null.sql
@@ -1 +1 @@
-select id from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is null;
+select id from `filter/pushdown/DRILL_6603_test_data` where str is null;
diff --git a/.../Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_not_null.sql b/.../Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_not_null.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is not null;
+select * from `filter/pushdown/DRILL_6603_test_data` where str is not null;
diff --git a/...rces/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null.sql b/...rces/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is null;
+select * from `filter/pushdown/DRILL_6603_test_data` where str is null;
diff --git a/...filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null_combined_filter.sql b/...filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null_combined_filter.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6603/DRILL_6603_test_data` where str is null and id < 5;
+select * from `filter/pushdown/DRILL_6603_test_data` where str is null and id < 5;
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/data.json b/framework/resources/Functional/filter/pushdown/boolean_null/data.json
@@ -20,12 +20,12 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_6174/DRILL_6174_test_data",
-      "dest": "parquet_storage/DRILL_6174/DRILL_6174_test_data"
+      "dest": "filter/pushdown/DRILL_6174_test_data"
     },
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_6603/DRILL_6603_test_data",
-      "dest": "parquet_storage/DRILL_6603/DRILL_6603_test_data"
+      "dest": "filter/pushdown/DRILL_6603_test_data"
     }
   ]
 }

diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/plan.json b/framework/resources/Functional/filter/pushdown/boolean_null/plan.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_6174/DRILL_6174_test_data",
-      "dest": "parquet_storage/DRILL_6174/DRILL_6174_test_data"
+      "dest": "filter/pushdown/DRILL_6174_test_data"
     }
   ]
 }
diff --git a/...ources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.plan b/...ources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
 numFiles=1
 numRowGroups=1
diff --git a/...sources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql b/...sources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql
@@ -1,3 +1,3 @@
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c5 < cast(date '2017-01-05' as date);
diff --git a/...Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql.explain b/...Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql.explain
@@ -1,4 +1,4 @@
 explain plan for
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c5 < cast(date '2017-01-05' as date);
diff --git a/...s/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.plan b/...s/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...es/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql b/...es/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql
@@ -1,3 +1,3 @@
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c4 > cast(date '2017-01-19' as timestamp);
diff --git a/...ional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql.explain b/...ional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql.explain
@@ -1,4 +1,4 @@
 explain plan for
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c4 > cast(date '2017-01-19' as timestamp);
diff --git a/...ces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.plan b/...ces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d3/0_0_0.parquet
 numFiles=1
 numRowGroups=1
diff --git a/...rces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql b/...rces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql
@@ -1,3 +1,3 @@
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c5 > cast(date '2017-01-19' as varchar);
diff --git a/...ctional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql.explain b/...ctional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql.explain
@@ -1,4 +1,4 @@
 explain plan for
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c5 > cast(date '2017-01-19' as varchar);
diff --git a/...ources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.plan b/...ources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
diff --git a/...sources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql b/...sources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql
@@ -1,3 +1,3 @@
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c6 = cast(time '03:08:47' as time);
diff --git a/...Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql.explain b/...Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql.explain
@@ -1,4 +1,4 @@
 explain plan for
 select cast(c4 as varchar), cast(c5 as varchar), cast(c6 as varchar)
-from `parquet_storage/DRILL_6174/DRILL_6174_test_data`
+from `filter/pushdown/DRILL_6174_test_data`
 where c6 = cast(time '03:08:47' as time);
diff --git a/...ces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.plan b/...ces/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d1/0_0_0.parquet
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2