MD-884: Changed storage plugin name from dfs to dfs_test

conf/plugin-templates/dfs-storage-plugin.template → conf/plugin-templates/dfs_test-storage-plugin.template

@@ -1,5 +1,5 @@
 {
-  "name" : "dfs",
+  "name" : "dfs_test",
   "config" : {
     "type" : "file",
     "enabled" : true,

framework/resources/Advanced/complextype/json/complex.json

@@ -9,7 +9,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.drillTestDirAdvancedComplexJson",
+            "schema": "dfs_test.drillTestDirAdvancedComplexJson",
             "output-format": "tsv",
             "expected-file": ".*.e",
             "verification-type": [

framework/resources/Advanced/data-shapes/wide-columns/5000/100000rows/parquet/widestrings.json

@@ -9,7 +9,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.wideStringsParquet5000Width100000rows",
+            "schema": "dfs_test.wideStringsParquet5000Width100000rows",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/json/json_storage/drill1816.q

@@ -1 +1 @@
-select data from dfs.`/drill/testdata/json_kvgenflatten/kvgen-complex-large.json`;
+select data from dfs_test.`/drill/testdata/json_kvgenflatten/kvgen-complex-large.json`;

framework/resources/Advanced/json/json_storage/jsonGenericGroup.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.drillTestDir",
+            "schema": "dfs_test.drillTestDir",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/metadata_caching/partition_pruning/data/metadata_caching.json

@@ -9,7 +9,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs",
+            "schema": "dfs_test",
             "output-format": "tsv",
             "expected-file": ".*.e",
             "verification-type": [

framework/resources/Advanced/metadata_caching/partition_pruning/data/q1.q

@@ -1 +1 @@
-select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 order by l_orderkey, l_extendedprice limit 10;
+select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 order by l_orderkey, l_extendedprice limit 10;

framework/resources/Advanced/metadata_caching/partition_pruning/data/q2.q

@@ -1 +1 @@
-select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey, l_extendedprice limit 10;
+select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey, l_extendedprice limit 10;

framework/resources/Advanced/metadata_caching/partition_pruning/data/q3.q

@@ -1 +1 @@
-select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) order by l_orderkey, l_extendedprice limit 10;
+select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) order by l_orderkey, l_extendedprice limit 10;

framework/resources/Advanced/metadata_caching/partition_pruning/data/q4.q

@@ -1 +1 @@
-select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10;
+select L_ORDERKEY, L_PARTKEY, L_SUPPKEY, L_LINENUMBER, L_QUANTITY, L_EXTENDEDPRICE, L_DISCOUNT, L_TAX, L_RETURNFLAG, L_LINESTATUS, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPINSTRUCT, L_SHIPMODE, L_COMMENT, dir0, dir1, dir2 from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10;

framework/resources/Advanced/metadata_caching/partition_pruning/plan/metadata_caching.json

@@ -9,7 +9,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs",
+            "schema": "dfs_test",
             "output-format": "tsv",
             "expected-file": ".*.e",
             "verification-type": [

framework/resources/Advanced/metadata_caching/partition_pruning/plan/q1.q

@@ -1 +1 @@
-explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15;
+explain plan for select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15;

framework/resources/Advanced/metadata_caching/partition_pruning/plan/q2.q

@@ -1 +1 @@
-explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey limit 10;
+explain plan for select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2=15 and l_discount=0.07 order by l_orderkey limit 10;

framework/resources/Advanced/metadata_caching/partition_pruning/plan/q3.q

@@ -1 +1 @@
-explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5);
+explain plan for select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5);

framework/resources/Advanced/metadata_caching/partition_pruning/plan/q4.q

@@ -1 +1 @@
-explain plan for select * from dfs.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10;
+explain plan for select * from dfs_test.`/drill/testdata/tpch100_dir_partitioned_50000files/lineitem` where dir0=2006 and dir1=12 and dir2 IN (15, 20, 1, 2, 5) and l_discount=0.07 order by l_orderkey limit 10;

framework/resources/Advanced/mondrian/mondrian.json

@@ -9,7 +9,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.drillTestDirMondrian",
+            "schema": "dfs_test.drillTestDirMondrian",
             "output-format": "tsv",
             "expected-file": ".*.e",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/hive-generated-parquet/hive0dot13_parquet/tpcds_sf1_hive0dot13.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds1_hive0dot13",
+            "schema": "dfs_test.tpcds1_hive0dot13",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/hive-generated-parquet/hive1_parquet/tpcds_sf1_hive1.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds1_hive1",
+            "schema": "dfs_test.tpcds1_hive1",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/hive-generated-parquet/hive1dot2_parquet/tpcds_sf1_hive1dot2.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds1_hive1dot2",
+            "schema": "dfs_test.tpcds1_hive1dot2",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/hive-generated-parquet/hive2dot1_parquet_withdate/tpcds.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds1_hive2dot1_withdate",
+            "schema": "dfs_test.tpcds1_hive2dot1_withdate",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/hive-generated-parquet/metadata_caching_hive1dot2_parquet_withdate/tpcds.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds1_hive1dot2_parquet_withdate",
+            "schema": "dfs_test.tpcds1_hive1dot2_parquet_withdate",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/original/json/tpcds_json_sf1.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf1_json_views",
+            "schema": "dfs_test.tpcds_sf1_json_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/original/not_supported/tpcds_parquet_sf1.json

@@ -7,7 +7,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf1_parquet_views",
+            "schema": "dfs_test.tpcds_sf1_parquet_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/original/parquet/tpcds_parquet_sf1.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf1_parquet_views",
+            "schema": "dfs_test.tpcds_sf1_parquet_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/original/parquet/tpcds_parquet_sf1.json_createTables

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_parquet_sf1_v",
+            "schema": "dfs_test.tpcds_parquet_sf1_v",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf1/original/text/tpcds_text_sf1.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf1_text_views",
+            "schema": "dfs_test.tpcds_sf1_text_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf100/original/tpcds_parquet_sf100.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf100_parquet_views",
+            "schema": "dfs_test.tpcds_sf100_parquet_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf100/sanity/tpcds_parquet_sf100.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf100_parquet_views",
+            "schema": "dfs_test.tpcds_sf100_parquet_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpcds/tpcds_sf100/variants/tpcds_parquet_sf100.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpcds_sf100_parquet_views",
+            "schema": "dfs_test.tpcds_sf100_parquet_views",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/original/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/original/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sanity/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sanity/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/smoke/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/smoke/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/datetime/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/datetime/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/math/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/math/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/strings/json/tpch_sf1_json.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_json",
+            "schema": "dfs_test.tpch_sf1_json",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf1/sql_functions/strings/parquet/tpch_sf1_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.sql",
-            "schema": "dfs.tpch_sf1_parquet",
+            "schema": "dfs_test.tpch_sf1_parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf100/limit0/limit0.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.drillTestDirTpch100Parquet",
+            "schema": "dfs_test.drillTestDirTpch100Parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Advanced/tpch/tpch_sf100/parquet/tpch_sf100_parquet.json

@@ -8,7 +8,7 @@
     "matrices": [
         {
             "query-file": ".*.q",
-            "schema": "dfs.drillTestDirTpch100Parquet",
+            "schema": "dfs_test.drillTestDirTpch100Parquet",
             "output-format": "tsv",
             "expected-file": ".*.e_tsv",
             "verification-type": [

framework/resources/Datasources/cross-sources/drill.ddl

@@ -18,7 +18,7 @@ TBLPROPERTIES ("serialization.null.format"="null");
 
 
 
-create table dfs.`cross-sources`.fewtypes as
+create table dfs_test.`cross-sources`.fewtypes as
 select
     makerequired(cast(int_col as int)) int_col,
     makerequired(cast(bigint_col as bigint)) bigint_col,

framework/resources/Datasources/ctas/create_tables.sh

@@ -10,7 +10,7 @@ fi
 
 hadoop fs -mkdir /drill/testdata/ctas/parquet 
 
-${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.ctas_parquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}"  --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_parquet.ddl
+${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.ctas_parquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}"  --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_parquet.ddl
 
 # TODO: it seems that sqlline does not exit, if one of the queries failed.
 if [ "$?" -eq 0 ]

framework/resources/Datasources/ctas/create_tables_complex_parquet.ddl

@@ -14,4 +14,4 @@ CREATE TABLE `complex.json` AS
          ooof, 
          ooos, 
          oooa 
-  FROM   dfs.`/drill/testdata/complex/json/complex.json`; 
+  FROM   dfs_test.`/drill/testdata/complex/json/complex.json`; 

framework/resources/Datasources/ctas/create_tables_complex_parquet.sh

@@ -10,7 +10,7 @@ fi
 hadoop fs -mkdir /drill/testdata/complex/parquet
 hadoop fs -chmod 777 /drill/testdata/complex/parquet
 
-${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.drillTestDirComplexParquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}"  --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_complex_parquet.ddl
+${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.drillTestDirComplexParquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}"  --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_complex_parquet.ddl
 
 # TODO: it seems that sqlline does not exit, if one of the queries failed.
 if [ "$?" -eq 0 ]