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.
diff --git a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_files.ddl b/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_files.ddl
index 222e973..732119d 100644
--- a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_files.ddl
+++ b/framework/resources/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`;
\ No newline at end of file
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_files`;
\ No newline at end of file
diff --git a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_folders.ddl b/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_folders.ddl
index 7ec48fb..7b30802 100644
--- a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_partitioned_by_folders.ddl
+++ b/framework/resources/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`;
\ No newline at end of file
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`;
\ No newline at end of file
diff --git a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_without_partitioning.ddl b/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_without_partitioning.ddl
index 6f59a1a..cca87a4 100644
--- a/framework/resources/Datasources/parquet_storage/DRILL-6118/DRILL_6118_parquet_without_partitioning.ddl
+++ b/framework/resources/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`;
\ No newline at end of file
+from dfs.drillTestDir.`filter/pushdown/DRILL_6118_parquet_without_partitioning`;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.plan
index 7f971d1..31c9b42 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql
index 04cb95d..cf60735 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql.explain
index c00768c..8d6e47a 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_eq_false.sql.explain
+++ b/framework/resources/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.plan
+++ b/framework/resources/Functional/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql
index 8f470a0..eb99760 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false and c3 is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql.explain
index a8b5954..acafc7c 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_false_and_is_not_null.sql.explain
+++ b/framework/resources/Functional/filter/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 = false and c3 is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.plan
index d9b9ad0..6cbd057 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql
index 55030e0..47092c7 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql.explain
index 5769fda..6e8cb7b 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_null.sql.explain
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.plan
index 7f971d1..31c9b42 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql
index 7e87cf6..8bfd4b0 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql.explain
index d8d8fd3..987c0f9 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_not_true.sql.explain
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql
index 09618ae..d2aec5e 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql
+++ b/framework/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql.explain
index 85fce56..4fe1c2f 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_null.sql.explain
+++ b/framework/resources/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql
index 21fd6a5..98f8998 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql
+++ b/framework/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql.explain
index 8741b84..82d7c13 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_is_true.sql.explain
+++ b/framework/resources/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where c2 is true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql
index 60c97d1..e3945ed 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql.explain
index a1b55e8..3f82719 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_eq_false.sql.explain
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql
index d58a876..91e3366 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 is false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql.explain
index 0c9df6d..a988af3 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false.sql.explain
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 is false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.plan
+++ b/framework/resources/Functional/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql
index b3000c7..e454fa6 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false or c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql.explain
index 7310dce..e5b8337 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_false_or_is_null.sql.explain
+++ b/framework/resources/Functional/filter/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c2 = false or c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.plan b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.plan
index d9b9ad0..6cbd057 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql
index 8841680..5a7e4b5 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql.explain b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql.explain
index 92c1384..50be50b 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6174_filter_push_down_not_is_null.sql.explain
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+explain plan for select c1, c2, c3 from `filter/pushdown/DRILL_6174_test_data` where not c3 is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_id_where_str_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_id_where_str_is_null.sql
index 3942800..d63ccd0 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_id_where_str_is_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select count(id) from `filter/pushdown/DRILL_6603_test_data` where str is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_star_where_str_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_star_where_str_is_null.sql
index bf190bf..f7f905c 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_count_star_where_str_is_null.sql
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+select count(*) from `filter/pushdown/DRILL_6603_test_data` where str is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_not_str_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_not_str_is_null.sql
index d208b99..910ed18 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_not_str_is_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select id from `filter/pushdown/DRILL_6603_test_data` where not str is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_str_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_str_is_null.sql
index fdd2f41..3acd223 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_id_where_str_is_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select id from `filter/pushdown/DRILL_6603_test_data` where str is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_not_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_not_null.sql
index dab4541..bfadb1b 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_not_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6603_test_data` where str is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null.sql
index 0b451da..ff66c96 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null.sql
+++ b/framework/resources/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;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6603_test_data` where str is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null_combined_filter.sql b/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null_combined_filter.sql
index 8061aaa..5286621 100644
--- a/framework/resources/Functional/filter/pushdown/boolean_null/DRILL_6603_select_star_where_str_is_null_combined_filter.sql
+++ b/framework/resources/Functional/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;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6603_test_data` where str is null and id < 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/boolean_null/data.json b/framework/resources/Functional/filter/pushdown/boolean_null/data.json
index c4c970b..6517308 100644
--- 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
index 13bc9a0..896daf0 100644
--- 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/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql
index 5a955c1..eb2a0ea 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql.explain
index ba4779e..53c42a7 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_date.sql.explain
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql
index 49e6847..5363868 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql.explain
index 10d29cf..69a46e0 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_timestamp.sql.explain
+++ b/framework/resources/Functional/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.plan
index a780c7f..3dd6e4c 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql
index da1cc0f..46df954 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql.explain
index 7a0112c..5815052 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_date_varchar.sql.explain
+++ b/framework/resources/Functional/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.plan
index 7f971d1..31c9b42 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql
index de89ef5..53659e4 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql.explain
index dea83f4..a1e1f3d 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_time.sql.explain
+++ b/framework/resources/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);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.plan
index 7f971d1..31c9b42 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.plan
+++ b/framework/resources/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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql
index ad0e280..4cf7e59 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_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 c6 between cast(time '01:34:23' as varchar) and cast(time '03:08:47' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql.explain
index 72e97ec..a052488 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_varchar.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_time_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 c6 between cast(time '01:34:23' as varchar) and cast(time '03:08:47' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql
index 7d69eaf..12e48bc 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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(timestamp '2017-01-02 01:02:55' as date);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql.explain
index df282ed..2233f18 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_date.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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(timestamp '2017-01-02 01:02:55' as date);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql
index b133811..693c3d9 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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 c5 < cast(timestamp '2017-01-03 01:34:23' as timestamp);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql.explain
index 2862802..bda72f9 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_timestamp.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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 c5 < cast(timestamp '2017-01-03 01:34:23' as timestamp);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql
index 137ba51..f3dc567 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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 c4 = cast(timestamp '2017-01-02 01:02:55' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql.explain
index aaa99d4..e6e4672 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_varchar.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_timestamp_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(timestamp '2017-01-02 01:02:55' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.plan
index 6292354..1bfd952 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql
index e737066..cba801c 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('2017-01-04' as date);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql.explain
index 70f6b06..256186b 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_date.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('2017-01-04' as date);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.plan
index d9b9ad0..6cbd057 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql
index b6ebbea..8651750 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('11:32:15' as time);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql.explain
index 2036eca..3dac256 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_time.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('11:32:15' as time);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.plan
index aceb7ce..b66eb0d 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*/parquet_storage/DRILL_6174/DRILL_6174_test_data/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6174_test_data/d2/0_0_0.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql
index 30578a1..8d038b0 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('2017-01-08 04:11:43' as timestamp);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql.explain
index de088a0..03bfa61 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_timestamp.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_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('2017-01-08 04:11:43' as timestamp);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql
index 219d3f7..ec36c87 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql
@@ -1,3 +1,3 @@
 select distinct 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('2017-01-17 08:30:55' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql.explain
index 05d59de..fb630cc 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_ex_varchar_varchar.sql.explain
@@ -1,4 +1,4 @@
 explain plan for
 select distinct 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('2017-01-17 08:30:55' as varchar);
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.plan b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.plan
index e7df74c..2ed6098 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.plan
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_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
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql
index c742c74..d093429 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_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 > date '2017-01-19';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql.explain b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql.explain
index e556318..7de729b 100644
--- a/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_date_timestamp.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/cast/DRILL_6174_filter_push_down_cast_im_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 > date '2017-01-19';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/cast/data.json b/framework/resources/Functional/filter/pushdown/cast/data.json
index aefe8fb..e4b42d9 100644
--- a/framework/resources/Functional/filter/pushdown/cast/data.json
+++ b/framework/resources/Functional/filter/pushdown/cast/data.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/framework/resources/Functional/filter/pushdown/cast/plan.json b/framework/resources/Functional/filter/pushdown/cast/plan.json
index 5966d5a..9185d0f 100644
--- a/framework/resources/Functional/filter/pushdown/cast/plan.json
+++ b/framework/resources/Functional/filter/pushdown/cast/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/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.plan
index 05bed23..dff01b6 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql
index ac3e984..e486a27 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_array[0] between 200 and 400;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_array[0] between 200 and 400;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql.explain
index 89bcb90..0f155ac 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_array[0] between 200 and 400;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_array[0] between 200 and 400;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql
index aba1298..8e57fa1 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_array[3] is not null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_array[3] is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql.explain
index 9bc66dc..2c3067d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_array[3] is not null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_array[3] is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.plan
index 50eae70..e332d31 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql
index 5be4d74..3b0c7fc 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_array[2] >= 1489860699000;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_array[2] >= 1489860699000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql.explain
index 8af1335..b1febe9 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[2].nested_complex_field.nested_array[2] >= 1489860699000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql
index 0a31864..b445cd3 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_array[2] is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_array[2] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql.explain
index 801f51f..0cb4c45 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_array[2] is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_array[2] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.plan
index 958dadb..e4a0a5d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql
index 2942878..5724e74 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_field > 200;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_field > 200;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql.explain
index 775d99e..a229f3e 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_field > 200;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_complex_field.nested_field > 200;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.plan
index e32322f..4ab6a87 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql
index aa38bd2..c35bf01 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_field is not null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_complex_field.nested_field is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql.explain
index 9805522..57b864f 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_complex_field_nested_field_null_values.sql.explain
@@ -1,2 +1,2 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[0].nested_complex_field.nested_field is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.plan
index 05bed23..dff01b6 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql
index 8ab5429..1ed8143 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_field is not true;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_field is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql.explain
index 155730c..f36cda7 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_field is not true;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[1].nested_field is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql
index 6409f29..4af5bcf 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql.explain
index 849de09..6ca3161 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_field_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.plan
index 50eae70..e332d31 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql
index 1fa8434..f4d9df9 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql
@@ -1,2 +1,2 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[2].nested_list_of_complex_fields[1].nested_array[0] between 1330 and 1340;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql.explain
index 818696e..db2f93f 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[2].nested_list_of_complex_fields[1].nested_array[0] between 1330 and 1340;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql
index e73ddb4..f25c3e6 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_array[2] is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_array[2] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql.explain
index 3046b23..8162490 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_array_null_values.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_array[2] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.plan
index 958dadb..e4a0a5d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql
index c20de22..baaf2f2 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_list_of_complex_fields[1].nested_field is false;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[2].nested_list_of_complex_fields[1].nested_field is false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql.explain
index 660339b..dbabd45 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[2].nested_list_of_complex_fields[1].nested_field is false;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql
index fa85e77..b99a869 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql.explain
index ed10e50..ff7f58d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_list_of_complex_fields_nested_list_of_complex_fields_nested_field_null_values.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.list_of_complex_fields[0].nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.plan
index 05bed23..dff01b6 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql
index 8b8b09c..27dc846 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_array[3] is not true;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_array[3] is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql.explain
index effbad5..7c85e23 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_array[3] is not true;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_array[3] is not true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql
index 202d718..47efe0f 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where not t.complex_field.nested_array[3] is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where not t.complex_field.nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql.explain
index eded8cf..7239289 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where not t.complex_field.nested_array[3] is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where not t.complex_field.nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.plan
index 68ce3ac..dea55d4 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql
index b9b4e0b..89a5778 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is true;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql.explain
index 1971104..1ca6eb7 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is true;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is true;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql
index 1de923a..1fdde3d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql.explain
index d6284d8..eb53182 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.plan
index 958dadb..e4a0a5d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql
index b9a64c4..a74dc4a 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field > 1483223487000;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field > 1483223487000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql.explain
index 6cfc579..6e545cc 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field > 1483223487000;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field > 1483223487000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.plan
index 50eae70..e332d31 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql
index ef25cdf..813658e 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql.explain
index 15bb3c4..ca217a0 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_complex_field_nested_field_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_complex_field.nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.plan
index 17caae1..320dd97 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql
index e5c7779..a5f5e4d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_field = 111;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_field = 111;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql.explain
index c7313e1..f58885f 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_field = 111;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_field = 111;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.plan
index 50eae70..e332d31 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql
index 7eb160d..94cfbae 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_field is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql.explain
index 46b6c16..468be5f 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_field_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_field is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.plan
index 50eae70..e332d31 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql
index ef9239c..773875d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[2].nested_array[2] > 1136;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[2].nested_array[2] > 1136;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql.explain
index ceb12ec..4ac0fc4 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[2].nested_array[2] > 1136;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[2].nested_array[2] > 1136;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql
index a0dbc8d..9288426 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[1].nested_array[3] is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[1].nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql.explain
index 3484729..4c96980 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[1].nested_array[3] is null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[1].nested_array[3] is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.plan
index 958dadb..e4a0a5d 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql
index c2ea8ac..c41430a 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[0].nested_field > 1484311774000;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.complex_field.nested_list_of_complex_fields[0].nested_field > 1484311774000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql.explain
index 1e30326..ae4474c 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field.sql.explain
@@ -1,2 +1,2 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t
 where t.complex_field.nested_list_of_complex_fields[0].nested_field > 1484311774000;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.plan
index e32322f..4ab6a87 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql
index 8882cf1..466bb05 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where not t.complex_field.nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where not t.complex_field.nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql.explain
index 1fbbb65..8d4d514 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_nested_list_of_complex_fields_nested_field_null_values.sql.explain
@@ -1,2 +1,2 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t
 where not t.complex_field.nested_list_of_complex_fields[0].nested_field is null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.plan
index 05bed23..dff01b6 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql
index fba7b55..d530e61 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.top_level_array[2] >= 20;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.top_level_array[2] >= 20;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql.explain
index 1e0c402..d077a95 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.top_level_array[2] >= 20;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.top_level_array[2] >= 20;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.plan b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.plan
index 9af284a..d4b41d8 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.plan
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.plan
@@ -1,6 +1,6 @@
 Scan
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
-path=maprfs://.*parquet_storage/DRILL_6259/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d3/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d2/DRILL_6259_test_data.parquet
+path=maprfs://.*filter/pushdown/DRILL_6259_test_data/d1/DRILL_6259_test_data.parquet
 numFiles=3
 numRowGroups=3
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql
index a7e9b15..9e8eff5 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.top_level_array[2] is not null;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6259_test_data` t where t.top_level_array[2] is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql.explain b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql.explain
index 23775e3..7671e66 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/DRILL_6259_filter_push_down_top_level_array_null_values.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_6259/DRILL_6259_test_data` t where t.top_level_array[2] is not null;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6259_test_data` t where t.top_level_array[2] is not null;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/data.json b/framework/resources/Functional/filter/pushdown/complex_fields/data.json
index a61c493..1a2e39c 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/data.json
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/data.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_6259/DRILL_6259_test_data",
-      "dest": "parquet_storage/DRILL_6259/DRILL_6259_test_data"
+      "dest": "filter/pushdown/DRILL_6259_test_data"
     }
   ]
 }
diff --git a/framework/resources/Functional/filter/pushdown/complex_fields/plan.json b/framework/resources/Functional/filter/pushdown/complex_fields/plan.json
index 37bc171..87cdc2e 100644
--- a/framework/resources/Functional/filter/pushdown/complex_fields/plan.json
+++ b/framework/resources/Functional/filter/pushdown/complex_fields/plan.json
@@ -19,27 +19,8 @@
   "datasources": [
     {
       "mode": "cp",
-      "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_data_source.csv",
-      "dest": "parquet_storage/DRILL_6118/DRILL_6118_data_source.csv"
-    },
-    {
-      "mode": "cp",
-      "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_complex.parquet",
-      "dest": "parquet_storage/DRILL_6118/DRILL_6118_complex.parquet"
-    },
-    {
-      "mode": "gen",
-      "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_execute_ddl.sh"
-    },
-    {
-      "mode": "cp",
-      "src": "Datasources/parquet_storage/DRILL_6174/DRILL_6174_test_data",
-      "dest": "parquet_storage/DRILL_6174/DRILL_6174_test_data"
-    },
-    {
-      "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_6259/DRILL_6259_test_data",
-      "dest": "parquet_storage/DRILL_6259/DRILL_6259_test_data"
+      "dest": "filter/pushdown/DRILL_6259_test_data"
     }
   ]
 }
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.e_tsv b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.e_tsv
new file mode 100644
index 0000000..61fde7e
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.e_tsv
@@ -0,0 +1,5 @@
+1	Partition_one	-30	null	2017-12-30	0.456	22:55:55.230	null
+2	Partition_one	-29	true	2017-12-31	1.457	22:55:55	2015-12-31 22:56:54.0
+3	Partition_one	null	true	null	2.458	22:55:54.770	2016-01-01 22:57:53.0
+4	Partition_one	-27	true	null	3.459	22:55:54.540	2016-01-02 22:58:52.0
+5	Partition_one	-26	true	2018-01-03	4.46	22:55:54.310	2016-01-03 22:59:51.0
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.plan b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.plan
new file mode 100644
index 0000000..9f6b520
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.plan
@@ -0,0 +1,2 @@
+(?s)\A((?!Filter).)*\Z
+Scan.*numFiles=1.*numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql
new file mode 100644
index 0000000..bb6c222
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql
@@ -0,0 +1 @@
+select * from `filter/pushdown/DRILL_3855_test_data/0_0_1.parquet` where float_col < 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql.explain b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql.explain
new file mode 100644
index 0000000..c8d6b50
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_filter_pruning_single_row_group.sql.explain
@@ -0,0 +1 @@
+explain plan for select * from `filter/pushdown/0_0_1.parquet` where float_col < 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.e_tsv b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.e_tsv
new file mode 100644
index 0000000..73d7742
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.e_tsv
@@ -0,0 +1,4 @@
+8	Partition_two	2	false	2016-02-29	null	22:58:54.310	2016-01-06 23:02:48.0
+7	Partition_two	1	false	2016-02-28	null	22:57:54.310	2016-01-05 23:01:49.0
+6	Partition_two	0	false	2016-02-27	null	22:56:54.310	2016-01-04 23:00:50.0
+9	Partition_two	3	null	2016-03-01	3.159	22:59:54.310	2016-01-07 23:03:47.0
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.plan b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.plan
new file mode 100644
index 0000000..803c048
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.plan
@@ -0,0 +1,2 @@
+Filter.*\(condition=\[<\(/\(\$1, 2\), 2\)\]\)
+Scan.*numFiles=1.*numRowGroups=1.*columns=\[`\*\*`, `int_col`\]
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql
new file mode 100644
index 0000000..305cdfa
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql
@@ -0,0 +1 @@
+select * from `filter/pushdown/DRILL_3855_test_data` where int_col between 0 and 5 and int_col/2 < 2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql.explain b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql.explain
new file mode 100644
index 0000000..1154b16
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_expression_in_filter.sql.explain
@@ -0,0 +1 @@
+explain plan for select * from `filter/pushdown/2 < 2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.e_tsv b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.e_tsv
new file mode 100644
index 0000000..dbb58f9
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.e_tsv
@@ -0,0 +1 @@
+9	Partition_two	3	null	2016-03-01	3.159	22:59:54.310	2016-01-07 23:03:47.0
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.plan b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.plan
new file mode 100644
index 0000000..57fef48
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.plan
@@ -0,0 +1,2 @@
+Filter.*\(condition=\[LIKE\(\$1, '3'\)\]\)
+Scan.*numFiles=1.*numRowGroups=1.*columns=\[`\*\*`, `int_col`\]
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql
new file mode 100644
index 0000000..2fd4fd4
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql
@@ -0,0 +1 @@
+select * from `filter/pushdown/DRILL_3855_test_data` where int_col between 0 and 5 and int_col like '3';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql.explain b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql.explain
new file mode 100644
index 0000000..869ae1f
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/DRILL_6865_no_filter_pruning_like.sql.explain
@@ -0,0 +1 @@
+explain plan for select * from `filter/pushdown/DRILL_3855_test_data` where int_col between 0 and 5 and int_col like '3';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/data.json b/framework/resources/Functional/filter/pushdown/filter_pruning/data.json
new file mode 100644
index 0000000..212447e
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/data.json
@@ -0,0 +1,27 @@
+{
+  "testId": "filter_pushdown_filter_pruning",
+  "type": "group",
+  "description": "Filter pushdown tests: these tests verify the query result where the filter pruning is taking place",
+  "categories": [
+    "functional"
+  ],
+  "matrices": [
+    {
+      "query-file": ".*.sql",
+      "schema": "dfs.drillTestDir",
+      "output-format": "tsv",
+      "expected-file": ".*.e_tsv",
+      "verification-type": [
+        "in-memory"
+      ]
+    }
+  ],
+  "datasources": [
+    {
+      "mode": "cp",
+      "src": "Datasources/parquet_storage/DRILL_3855/DRILL_3855_test_data",
+      "dest": "filter/pushdown/DRILL_3855_test_data"
+    }
+  ]
+}
+
diff --git a/framework/resources/Functional/filter/pushdown/filter_pruning/plan.json b/framework/resources/Functional/filter/pushdown/filter_pruning/plan.json
new file mode 100755
index 0000000..21041f7
--- /dev/null
+++ b/framework/resources/Functional/filter/pushdown/filter_pruning/plan.json
@@ -0,0 +1,26 @@
+{
+  "testId": "filter_pushdown_filter_pruning_plan",
+  "type": "group",
+  "description": "Filter pushdown tests: these tests verify the query plan for the filter pruning",
+  "categories": [
+    "functional"
+  ],
+  "matrices": [
+    {
+      "query-file": ".*.sql",
+      "schema": "dfs.drillTestDir",
+      "output-format": "tsv",
+      "expected-file": ".*.e_tsv",
+      "verification-type": [
+        "regex-no-order"
+      ]
+    }
+  ],
+  "datasources": [
+    {
+      "mode": "cp",
+      "src": "Datasources/parquet_storage/DRILL_3855/DRILL_3855_test_data",
+      "dest": "filter/pushdown/DRILL_3855_test_data"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/data.json b/framework/resources/Functional/filter/pushdown/item_star_operator/data.json
index 2d16cb1..0a4ab09 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/data.json
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/data.json
@@ -20,7 +20,12 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_data_source.csv",
-      "dest": "parquet_storage/DRILL_6118/DRILL_6118_data_source.csv"
+      "dest": "filter/pushdown/DRILL_6118_data_source.csv"
+    },
+    {
+      "mode": "cp",
+      "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_complex.parquet",
+      "dest": "filter/pushdown/DRILL_6118_complex.parquet"
     },
     {
       "mode": "gen",
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.plan
index f18b9b5..d62c33f 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
 numFiles=2,
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql
index e099a98..11b7bc7 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql
@@ -1,2 +1,2 @@
-with DRILL_6118_parquet_partitioned_by_folders_cte as (select * from `DRILL_6118_parquet_partitioned_by_folders`)
+with DRILL_6118_parquet_partitioned_by_folders_cte as (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)
 select * from DRILL_6118_parquet_partitioned_by_folders_cte where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql.explain
index df59d44..d8897a5 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_cte.sql.explain
@@ -1,2 +1,2 @@
-explain plan for with DRILL_6118_parquet_partitioned_by_folders_cte as (select * from `DRILL_6118_parquet_partitioned_by_folders`)
+explain plan for with DRILL_6118_parquet_partitioned_by_folders_cte as (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)
 select * from DRILL_6118_parquet_partitioned_by_folders_cte where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.plan
index 72f3ff2..b870af6 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql
index 1e899db..77f5297 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql
@@ -1 +1 @@
-select * from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1>2;
\ No newline at end of file
+select * from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql.explain
index 6d132dd..5153d1e 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_subqueries.sql.explain
@@ -1 +1 @@
-explain plan for select * from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1>2;
\ No newline at end of file
+explain plan for select * from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.plan
index 72f3ff2..b870af6 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql
index 2d2d5c7..0161e47 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql
@@ -1 +1 @@
-select * from `DRILL_6118_parquet_partitioned_by_folders_view` where c1>2;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders_view` where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql.explain
index 89d521b..4e01bf9 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_filter_push_down_with_view.sql.explain
@@ -1 +1 @@
-explain plan for select * from `DRILL_6118_parquet_partitioned_by_folders_view` where c1>2;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders_view` where c1>2;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql
index 436893c..a92c007 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql
@@ -1 +1 @@
-select c3 from (select * from `parquet_storage/DRILL_6118/DRILL_6118_complex.parquet`) t where t.c1.values_list[3]=15;
\ No newline at end of file
+select c3 from (select * from `filter/pushdown/DRILL_6118_complex.parquet`) t where t.c1.values_list[3]=15;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql.explain
index 11f3b5e..1742831 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_filter.sql.explain
@@ -1 +1 @@
-explain plan for select c3 from (select * from `parquet_storage/DRILL_6118/DRILL_6118_complex.parquet`) t where t.c1.values_list[3]=15;
\ No newline at end of file
+explain plan for select c3 from (select * from `filter/pushdown/DRILL_6118_complex.parquet`) t where t.c1.values_list[3]=15;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql
index 569bf18..1394f00 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql
@@ -1 +1 @@
-select t.c1.values_list[3] from (select * from `parquet_storage/DRILL_6118/DRILL_6118_complex.parquet`) t where c2='value_4_6';
\ No newline at end of file
+select t.c1.values_list[3] from (select * from `filter/pushdown/DRILL_6118_complex.parquet`) t where c2='value_4_6';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql.explain
index 3a49a85..1a4fa83 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_complex_project.sql.explain
@@ -1 +1 @@
-explain plan for select t.c1.values_list[3] from (select * from `parquet_storage/DRILL_6118/DRILL_6118_complex.parquet`) t where c2='value_4_6';
\ No newline at end of file
+explain plan for select t.c1.values_list[3] from (select * from `filter/pushdown/DRILL_6118_complex.parquet`) t where c2='value_4_6';
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql
index 1054acb..ba90cec 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql
@@ -1 +1 @@
-select distinct c1 from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1*2<5;
\ No newline at end of file
+select distinct c1 from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1*2<5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql.explain
index 5276a11..1ae7cc0 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_filter.sql.explain
@@ -1 +1 @@
-explain plan for select distinct c1 from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1*2<5;
\ No newline at end of file
+explain plan for select distinct c1 from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1*2<5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql
index 3245b6f..e4ee3a7 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql
@@ -1 +1 @@
-select distinct c1+2 from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1>3;
\ No newline at end of file
+select distinct c1+2 from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1>3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql.explain
index 7179b22..ba1760c 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_expression_in_project.sql.explain
@@ -1 +1 @@
-explain plan for select distinct c1+2 from (select * from `DRILL_6118_parquet_partitioned_by_folders`) where c1>3;
\ No newline at end of file
+explain plan for select distinct c1+2 from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`) where c1>3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql
index c958a2d..9bd112c 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql
@@ -1,2 +1,2 @@
-with DRILL_6118_parquet_without_partitioning_cte as (select * from `DRILL_6118_parquet_without_partitioning`)
+with DRILL_6118_parquet_without_partitioning_cte as (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`)
 select c3 from DRILL_6118_parquet_without_partitioning_cte where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql.explain
index 9a2a872..6b836a1 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_cte.sql.explain
@@ -1,2 +1,2 @@
-explain plan for with DRILL_6118_parquet_without_partitioning_cte as (select * from `DRILL_6118_parquet_without_partitioning`)
+explain plan for with DRILL_6118_parquet_without_partitioning_cte as (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`)
 select c3 from DRILL_6118_parquet_without_partitioning_cte where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql
index 1d2b0a4..02b3f8d 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql
@@ -1 +1 @@
-select c3 from (select * from `DRILL_6118_parquet_without_partitioning`) where c1<3;
\ No newline at end of file
+select c3 from (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`) where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql.explain
index 676b42e..52c77ec 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_subqueries.sql.explain
@@ -1 +1 @@
-explain plan for select c3 from (select * from `DRILL_6118_parquet_without_partitioning`) where c1<3;
\ No newline at end of file
+explain plan for select c3 from (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`) where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql
index 09b723b..a4c3794 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql
@@ -1 +1 @@
-select c3 from `DRILL_6118_parquet_without_partitioning_view` where c1<3;
\ No newline at end of file
+select c3 from `filter/pushdown/DRILL_6118_parquet_without_partitioning_view` where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql.explain
index 7794f35..9c21346 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6118_project_push_into_scan_with_view.sql.explain
@@ -1 +1 @@
-explain plan for select c3 from `DRILL_6118_parquet_without_partitioning_view` where c1<3;
\ No newline at end of file
+explain plan for select c3 from `filter/pushdown/DRILL_6118_parquet_without_partitioning_view` where c1<3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.plan
index a61b21f..b02aaf7 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d2/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d2/0_0_0.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql
index 4552037..71ea371 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql
@@ -1 +1 @@
-select * from (select * from (select * from `DRILL_6118_parquet_partitioned_by_folders`)) where c1 < 3;
\ No newline at end of file
+select * from (select * from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)) where c1 < 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql.explain
index 836ca7b..64c4adc 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries.sql.explain
@@ -1 +1 @@
-explain plan for select * from (select * from (select * from `DRILL_6118_parquet_partitioned_by_folders`)) where c1 < 3;
\ No newline at end of file
+explain plan for select * from (select * from (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)) where c1 < 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.plan
index f537f90..4bad5ef 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.plan
@@ -1,4 +1,4 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
 numFiles=1
 numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql
index ba0b7c1..d4b3b4c 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql
@@ -1,2 +1,2 @@
-with t as (select * from `DRILL_6118_parquet_partitioned_by_folders_view`)
+with t as (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders_view`)
 select * from (select * from (select * from t)) where c1 = 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql.explain
index 676b9c2..6f7b75b 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_cte_view.sql.explain
@@ -1,3 +1,3 @@
 explain plan for
-with t as (select * from `DRILL_6118_parquet_partitioned_by_folders_view`)
+with t as (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders_view`)
 select * from (select * from (select * from t)) where c1 = 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.plan
index 72f3ff2..b870af6 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.plan
@@ -1,5 +1,5 @@
 Scan
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
-path=.*/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d1/0_0_0.parquet
+path=.*/filter/pushdown/DRILL_6118_parquet_partitioned_by_folders/d3/0_0_0.parquet
 numFiles=2
 numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql
index 96a25ab..7cf1fa9 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql
@@ -3,5 +3,5 @@
     (select * from
       (select * from
         (select * from
-          (select * from `DRILL_6118_parquet_partitioned_by_folders`)))))
+          (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)))))
 where c1 between 3 and 4;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql.explain
index 0d7146e..8baeb4e 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_filter_push_down_nested_subqueries_more_layers.sql.explain
@@ -4,5 +4,5 @@
     (select * from
       (select * from
         (select * from
-          (select * from `DRILL_6118_parquet_partitioned_by_folders`)))))
+          (select * from `filter/pushdown/DRILL_6118_parquet_partitioned_by_folders`)))))
 where c1 between 3 and 4;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.plan b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.plan
index 1c0860c..6e4663c 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.plan
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.plan
@@ -1,3 +1,3 @@
 Scan
-path=maprfs://.*/DRILL_6118_parquet_without_partitioning
+path=maprfs://.*/filter/pushdown/DRILL_6118_parquet_without_partitioning
 columns=\[`c3`, `c1`\]
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql
index be5716e..cd9bf11 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql
@@ -1 +1 @@
-select c3 from (select * from (select * from `DRILL_6118_parquet_without_partitioning`)) where c1 = 3;
\ No newline at end of file
+select c3 from (select * from (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`)) where c1 = 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql.explain b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql.explain
index 83aa94e..992e860 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/drill_6199_project_push_into_scan_nested_subqueries.sql.explain
@@ -1 +1 @@
-explain plan for select c3 from (select * from (select * from `DRILL_6118_parquet_without_partitioning`)) where c1 = 3;
\ No newline at end of file
+explain plan for select c3 from (select * from (select * from `filter/pushdown/DRILL_6118_parquet_without_partitioning`)) where c1 = 3;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/item_star_operator/plan.json b/framework/resources/Functional/filter/pushdown/item_star_operator/plan.json
index 57c2152..9af22e6 100644
--- a/framework/resources/Functional/filter/pushdown/item_star_operator/plan.json
+++ b/framework/resources/Functional/filter/pushdown/item_star_operator/plan.json
@@ -20,12 +20,16 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_data_source.csv",
-      "dest": "parquet_storage/DRILL_6118/DRILL_6118_data_source.csv"
+      "dest": "filter/pushdown/DRILL_6118_data_source.csv"
     },
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_complex.parquet",
-      "dest": "parquet_storage/DRILL_6118/DRILL_6118_complex.parquet"
+      "dest": "filter/pushdown/DRILL_6118_complex.parquet"
+    },
+    {
+      "mode": "gen",
+      "src": "Datasources/parquet_storage/DRILL-6118/DRILL_6118_execute_ddl.sh"
     }
   ]
 }
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql
index bf7b963..8a5e149 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t where t.nested_group.date_col < date '2017-01-01' order by id limit 5;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` t where t.nested_group.date_col < date '2017-01-01' order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql.explain
index bce912d..81cccb8 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_complex_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t where t.nested_group.date_col < date '2017-01-01' order by id limit 5;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` t where t.nested_group.date_col < date '2017-01-01' order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql
index 00a9af1..72fc100 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where date_col < '2017-01-01' order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where date_col < '2017-01-01' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql.explain
index 917c1bb..d5cdbd5 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_date_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where date_col < '2017-01-01' order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where date_col < '2017-01-01' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql
index a8ed72f..3b1e6ed 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where id between 101 and 200 order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where id between 101 and 200 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql.explain
index a5c9269..54fcb5c 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_id.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where id between 101 and 200 order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where id between 101 and 200 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql
index 8cdbb73..7573f30 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql
@@ -1 +1 @@
-select * from (select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet`) where id <= 100 order by id limit 5;
\ No newline at end of file
+select * from (select * from `filter/pushdown/DRILL_5796_test_data.parquet`) where id <= 100 order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql.explain
index 73388ed..b248a75 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_item_star.sql.explain
@@ -1 +1 @@
-explain plan for select * from (select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet`) where id <= 100 order by id limit 5;
\ No newline at end of file
+explain plan for select * from (select * from `filter/pushdown/DRILL_5796_test_data.parquet`) where id <= 100 order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql
index 75077a8..14a7343 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t1 left join `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.date_col > date '2017-01-01' and t1.date_col < '2017-04-01' order by t1.id limit 5;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` t1 left join `filter/pushdown/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.date_col > date '2017-01-01' and t1.date_col < '2017-04-01' order by t1.id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql.explain
index 4280e1e..ed9120c 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_join.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t1 left join `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.date_col > date '2017-01-01' and t1.date_col < '2017-04-01' order by t1.id limit 5;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` t1 left join `filter/pushdown/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.date_col > date '2017-01-01' and t1.date_col < '2017-04-01' order by t1.id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql
index 8c526d2..211b7d6 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where time_col > '22:30:03' order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where time_col > '22:30:03' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql.explain
index 313339e..7372f79 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_time_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where time_col > '22:30:03' order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where time_col > '22:30:03' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql
index 7ade509..2ea0a67 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where ts_col > '2016-01-09 00:00:45' order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where ts_col > '2016-01-09 00:00:45' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql.explain
index 4132170..76aecde 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_timestamp_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where ts_col > '2016-01-09 00:00:45' order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where ts_col > '2016-01-09 00:00:45' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql
index 6c6564b..bbfb6e6 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where part_col = 'Partition_three' order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where part_col = 'Partition_three' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql.explain
index 39b90bc..11c7f09 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_filter_pruning_varchar_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where part_col = 'Partition_three' order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where part_col = 'Partition_three' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql
index 7423dbe..b6ff18f 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where bool_col is false order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where bool_col is false order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql.explain
index 812d0f9..2e84d26 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_bool_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where bool_col is false order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where bool_col is false order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql
index adc1e7c..d44bc56 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t where t.nested_group.int_col[2] < 0 order by id limit 5;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` t where t.nested_group.int_col[2] < 0 order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql.explain
index 2fb918d..2b5c624 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_complex_field.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t where t.nested_group.int_col[2] < 0 order by id limit 5;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` t where t.nested_group.int_col[2] < 0 order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql
index 0870a7d..bbfb437 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where date_col between date '2017-03-01' and date '2017-03-03' order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where date_col between date '2017-03-01' and date '2017-03-03' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql.explain
index 16e0c04..c2511f8 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_date_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where date_col between date '2017-03-01' and date '2017-03-03' order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where date_col between date '2017-03-01' and date '2017-03-03' order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql
index 0cb22e3..36fd6be 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where not float_col > 0.1 order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where not float_col > 0.1 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql.explain
index 65cc2f2..52419a7 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_float_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where not float_col > 0.1 order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where not float_col > 0.1 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql
index 4027f5b..539e227 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where int_col[1] < 0 order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where int_col[1] < 0 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql.explain
index 528b58e..dd0e5d0 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_int_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where int_col[1] < 0 order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where int_col[1] < 0 order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql
index a34954f..c5839e5 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql
@@ -1 +1 @@
-select * from (select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet`) where bool_col is null order by id limit 5;
\ No newline at end of file
+select * from (select * from `filter/pushdown/DRILL_5796_test_data.parquet`) where bool_col is null order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql.explain
index 1ae0183..e8a6693 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_item_star.sql.explain
@@ -1 +1 @@
-explain plan for select * from (select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet`) where bool_col is null order by id limit 5;
\ No newline at end of file
+explain plan for select * from (select * from `filter/pushdown/DRILL_5796_test_data.parquet`) where bool_col is null order by id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql
index b15bc8f..4287079 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t1 left join `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.float_col < 0 order by t1.id limit 5;
\ No newline at end of file
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` t1 left join `filter/pushdown/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.float_col < 0 order by t1.id limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql.explain
index ec02912..be818d6 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_join.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t1 left join `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.float_col < 0;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` t1 left join `filter/pushdown/DRILL_5796_test_data.parquet` t2 on t1.id = t2.int_col[0] where t1.float_col < 0;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql
index a19179a..77da0c4 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where not time_col < '22:01:00' and ts_col is not null order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where not time_col < '22:01:00' and ts_col is not null order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql.explain
index f6311cd..4b117dc 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_time_col.sql.explain
@@ -1 +1 @@
-explain  plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where not time_col < '22:01:00' and ts_col is not null order by id limit 5;
+explain  plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where not time_col < '22:01:00' and ts_col is not null order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql
index a3c3e03..8517374 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql
@@ -1 +1 @@
-select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where ts_col in ('2016-01-09 23:05:45', '2016-01-13 23:09:41', '2016-01-01 22:57:53') order by id limit 5;
+select * from `filter/pushdown/DRILL_5796_test_data.parquet` where ts_col in ('2016-01-09 23:05:45', '2016-01-13 23:09:41', '2016-01-01 22:57:53') order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql.explain
index ccaaa0e..6479463 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_no_filter_pruning_timestamp_col.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` where ts_col in ('2016-01-09 23:05:45', '2016-01-13 23:09:41', '2016-01-01 22:57:53') order by id limit 5;
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` where ts_col in ('2016-01-09 23:05:45', '2016-01-13 23:09:41', '2016-01-01 22:57:53') order by id limit 5;
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_0.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_0.sql.explain
index bf6b1da..f3db1aa 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_0.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_0.sql.explain
@@ -1 +1 @@
-explain plan for select int_col[2] from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` limit 0;
\ No newline at end of file
+explain plan for select int_col[2] from `filter/pushdown/DRILL_5796_test_data.parquet` limit 0;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_100.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_100.sql.explain
index d38cf71..3b5e48a 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_100.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_100.sql.explain
@@ -1 +1 @@
-explain plan for select t.nested_group.int_col[0] from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t limit 100;
\ No newline at end of file
+explain plan for select t.nested_group.int_col[0] from `filter/pushdown/DRILL_5796_test_data.parquet` t limit 100;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_101.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_101.sql.explain
index 6f6c315..6b1cdd0 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_101.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_101.sql.explain
@@ -1 +1 @@
-explain plan for select t.nested_group.float_col from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` t limit 101;
\ No newline at end of file
+explain plan for select t.nested_group.float_col from `filter/pushdown/DRILL_5796_test_data.parquet` t limit 101;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_5.sql.explain b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_5.sql.explain
index bb43206..4ad60f8 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_5.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/DRILL_5796_push_limit_5.sql.explain
@@ -1 +1 @@
-explain plan for select * from `parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet` limit 5;
\ No newline at end of file
+explain plan for select * from `filter/pushdown/DRILL_5796_test_data.parquet` limit 5;
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups.json b/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups.json
index e5b5958..694cee5 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups.json
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet",
-      "dest": "parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet"
+      "dest": "filter/pushdown/DRILL_5796_test_data.parquet"
     }
   ]
 }
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups_plan.json b/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups_plan.json
index 9878e73..8a0286d 100644
--- a/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups_plan.json
+++ b/framework/resources/Functional/filter/pushdown/multiple_row_groups/multiple_row_groups_plan.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet",
-      "dest": "parquet_storage/DRILL_5796/DRILL_5796_test_data.parquet"
+      "dest": "filter/pushdown/DRILL_5796_test_data.parquet"
     }
   ]
 }
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.plan b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.plan
index 2e32726..7949850 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.plan
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.plan
@@ -1,5 +1,5 @@
 .*UnionAll
 .*UnionAll
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_1.parquet.*numFiles=1.*numRowGroups=1
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_[12].parquet.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_[12].parquet.*numFiles=2.*numRowGroups=2
\ No newline at end of file
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_1.parquet.*numFiles=1.*numRowGroups=1
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_[12].parquet.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_[12].parquet.*numFiles=2.*numRowGroups=2
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql
index c0552d7..b45af2d 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql
@@ -1,14 +1,14 @@
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_two', 'Partition_three')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two', 'Partition_three'))
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql.explain b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql.explain
index 7b19b68..a386593 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_multiple_union_filter_pushdown.sql.explain
@@ -1,15 +1,15 @@
 explain plan for
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_two', 'Partition_three')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two', 'Partition_three'))
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.plan b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.plan
index 7ba4277..e0b8ea8 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.plan
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.plan
@@ -1,3 +1,3 @@
 .*UnionAll
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1.*columns=\[`part_col`, `id`, `int_col`\]
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1.*columns=\[`part_col`, `id`, `int_col`\]
\ No newline at end of file
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1.*columns=\[`part_col`, `id`, `int_col`\]
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1.*columns=\[`part_col`, `id`, `int_col`\]
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql
index 32379a3..a13a0dc 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql
@@ -1,10 +1,10 @@
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_one' or part_col = 'Partition_two'
  union all
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_two' or part_col = 'Partition_three')
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql.explain b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql.explain
index f68faca..4133b61 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_all_filter_pushdown.sql.explain
@@ -1,11 +1,11 @@
 explain plan for
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_one' or part_col = 'Partition_two'
  union all
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_two' or part_col = 'Partition_three')
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.plan b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.plan
index 7ffa96b..7a1ac89 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.plan
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.plan
@@ -1,5 +1,5 @@
 .*UnionAll
 .*UnionAll
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_1.parquet.*numFiles=1.*numRowGroups=1
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
\ No newline at end of file
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_1.parquet.*numFiles=1.*numRowGroups=1
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_2.parquet.*numFiles=1.*numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql
index 4eb859b..6b2d20f 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql
@@ -1,14 +1,14 @@
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_two', 'Partition_three')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where float_col > 10)
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql.explain b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql.explain
index bc0784c..ab1ad6a 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_empty_data_filter_pushdown.sql.explain
@@ -1,15 +1,15 @@
 explain plan for
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_one', 'Partition_two')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col in ('Partition_two', 'Partition_three')
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where float_col > 10)
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.plan b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.plan
index f987941..1139811 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.plan
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.plan
@@ -1,3 +1,3 @@
 .*UnionAll
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1
-.*Scan.*path=.*/parquet_storage/DRILL_3855/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1
\ No newline at end of file
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1
+.*Scan.*path=.*/filter/pushdown/DRILL_3855_test_data/0_0_3.parquet.*numFiles=1.*numRowGroups=1
\ No newline at end of file
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql
index fe7448a..063c3fb 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql
@@ -1,10 +1,10 @@
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_one' or part_col = 'Partition_two'
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_two' or part_col = 'Partition_three')
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql.explain b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql.explain
index 6fb887e..fbbca4c 100644
--- a/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql.explain
+++ b/framework/resources/Functional/filter/pushdown/union/DRILL_3855_union_filter_pushdown.sql.explain
@@ -1,11 +1,11 @@
 explain plan for
 with t as
 (select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_one' or part_col = 'Partition_two'
  union
  select id, part_col, int_col, bool_col, date_col, float_col, time_col, ts_col
- from `parquet_storage/DRILL_3855/DRILL_3855_test_data`
+ from `filter/pushdown/DRILL_3855_test_data`
  where part_col = 'Partition_two' or part_col = 'Partition_three')
 select id
 from t
diff --git a/framework/resources/Functional/filter/pushdown/union/data.json b/framework/resources/Functional/filter/pushdown/union/data.json
index f9e9bfd..5e55ab9 100644
--- a/framework/resources/Functional/filter/pushdown/union/data.json
+++ b/framework/resources/Functional/filter/pushdown/union/data.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_3855/DRILL_3855_test_data",
-      "dest": "parquet_storage/DRILL_3855/DRILL_3855_test_data"
+      "dest": "filter/pushdown/DRILL_3855_test_data"
     }
   ]
 }
diff --git a/framework/resources/Functional/filter/pushdown/union/plan.json b/framework/resources/Functional/filter/pushdown/union/plan.json
index 6af6764..8c8eb4d 100755
--- a/framework/resources/Functional/filter/pushdown/union/plan.json
+++ b/framework/resources/Functional/filter/pushdown/union/plan.json
@@ -20,7 +20,7 @@
     {
       "mode": "cp",
       "src": "Datasources/parquet_storage/DRILL_3855/DRILL_3855_test_data",
-      "dest": "parquet_storage/DRILL_3855/DRILL_3855_test_data"
+      "dest": "filter/pushdown/DRILL_3855_test_data"
     }
   ]
 }