Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name" : "dfs",
"name" : "dfs_test",
"config" : {
"type" : "file",
"enabled" : true,
Expand Down
2 changes: 1 addition & 1 deletion framework/resources/Advanced/complextype/json/complex.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.drillTestDirAdvancedComplexJson",
"schema": "dfs_test.drillTestDirAdvancedComplexJson",
"output-format": "tsv",
"expected-file": ".*.e",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.wideStringsParquet5000Width100000rows",
"schema": "dfs_test.wideStringsParquet5000Width100000rows",
"output-format": "tsv",
"expected-file": ".*.e_tsv",
"verification-type": [
Expand Down
2 changes: 1 addition & 1 deletion framework/resources/Advanced/json/json_storage/drill1816.q
Original file line number Diff line number Diff line change
@@ -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`;
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.drillTestDir",
"schema": "dfs_test.drillTestDir",
"output-format": "tsv",
"expected-file": ".*.e_tsv",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs",
"schema": "dfs_test",
"output-format": "tsv",
"expected-file": ".*.e",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs",
"schema": "dfs_test",
"output-format": "tsv",
"expected-file": ".*.e",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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);
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion framework/resources/Advanced/mondrian/mondrian.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.drillTestDirMondrian",
"schema": "dfs_test.drillTestDirMondrian",
"output-format": "tsv",
"expected-file": ".*.e",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.drillTestDirTpch100Parquet",
"schema": "dfs_test.drillTestDirTpch100Parquet",
"output-format": "tsv",
"expected-file": ".*.e_tsv",
"verification-type": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"matrices": [
{
"query-file": ".*.q",
"schema": "dfs.drillTestDirTpch100Parquet",
"schema": "dfs_test.drillTestDirTpch100Parquet",
"output-format": "tsv",
"expected-file": ".*.e_tsv",
"verification-type": [
Expand Down
2 changes: 1 addition & 1 deletion framework/resources/Datasources/cross-sources/drill.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions framework/resources/Datasources/ctas/create_tables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ hadoop fs -mkdir /drill/testdata/ctas/parquet

if [ -z "$PASSWORD" ]
then
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -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} -u "jdbc:drill:schema=dfs_test.ctas_parquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_parquet.ddl
else
${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
fi

# TODO: it seems that sqlline does not exit, if one of the queries failed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ hadoop fs -chmod 777 /drill/testdata/complex/parquet

if [ -z "$PASSWORD" ]
then
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -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} -u "jdbc:drill:schema=dfs_test.drillTestDirComplexParquet;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas/create_tables_complex_parquet.ddl
else
${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
fi

# TODO: it seems that sqlline does not exit, if one of the queries failed.
Expand Down
Loading