Skip to content

Commit 39585d4

Browse files
author
Prasad Subramanya
committed
Change storage plugin name from dfs to dfs_test in Datasources
1 parent 2f293f5 commit 39585d4

File tree

87 files changed

+385
-385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+385
-385
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TBLPROPERTIES ("serialization.null.format"="null");
1818

1919

2020

21-
create table dfs.`cross-sources`.fewtypes as
21+
create table dfs_test.`cross-sources`.fewtypes as
2222
select
2323
makerequired(cast(int_col as int)) int_col,
2424
makerequired(cast(bigint_col as bigint)) bigint_col,

‎framework/resources/Datasources/ctas/create_tables.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010

1111
hadoop fs -mkdir /drill/testdata/ctas/parquet
1212

13-
${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
13+
${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
1414

1515
# TODO: it seems that sqlline does not exit, if one of the queries failed.
1616
if [ "$?" -eq 0 ]

‎framework/resources/Datasources/ctas/create_tables_complex_parquet.ddl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ CREATE TABLE `complex.json` AS
1414
ooof,
1515
ooos,
1616
oooa
17-
FROM dfs.`/drill/testdata/complex/json/complex.json`;
17+
FROM dfs_test.`/drill/testdata/complex/json/complex.json`;

‎framework/resources/Datasources/ctas/create_tables_complex_parquet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010
hadoop fs -mkdir /drill/testdata/complex/parquet
1111
hadoop fs -chmod 777 /drill/testdata/complex/parquet
1212

13-
${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
13+
${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
1414

1515
# TODO: it seems that sqlline does not exit, if one of the queries failed.
1616
if [ "$?" -eq 0 ]

‎framework/resources/Datasources/ctas/create_tables_parquet.ddl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ select j1.c_varchar,
66
j1.c_date,
77
j2.c_date
88
from
9-
dfs.`ctas`.`j1` inner join dfs.`ctas`.`j2` ON (j1.c_timestamp = j2.c_timestamp and j1.c_date between '1960-01-03' and '1960-01-15' )
9+
dfs_test.`ctas`.`j1` inner join dfs_test.`ctas`.`j2` ON (j1.c_timestamp = j2.c_timestamp and j1.c_date between '1960-01-03' and '1960-01-15' )
1010
where
1111
j1.c_bigint IS NOT DISTINCT FROM j2.c_bigint
1212
and j1.c_timestamp IS NOT NULL
@@ -17,7 +17,7 @@ select
1717
j1.c_bigint,
1818
coalesce(j3.c_bigint, -1000)
1919
from
20-
dfs.`ctas`.`j1` left outer join dfs.`ctas`.`j3` ON (j1.c_time = j3.c_time)
20+
dfs_test.`ctas`.`j1` left outer join dfs_test.`ctas`.`j3` ON (j1.c_time = j3.c_time)
2121
where
2222
j1.c_boolean IS NULL
2323
and j1.d9 > 0
@@ -26,13 +26,13 @@ where
2626
create table ctas_t3 as
2727
select j4.c_varchar || j2.c_varchar as c1
2828
from
29-
dfs.`ctas`.`j4` right outer join dfs.`ctas`.`j2` on (j2.c_integer = j4.c_integer)
29+
dfs_test.`ctas`.`j4` right outer join dfs_test.`ctas`.`j2` on (j2.c_integer = j4.c_integer)
3030
;
3131

3232
create table ctas_t4 as
3333
select concat(j4.c_varchar, j2.c_varchar) as c1
3434
from
35-
dfs.`ctas`.`j4` right outer join dfs.`ctas`.`j2` on (j2.c_integer = j4.c_integer)
35+
dfs_test.`ctas`.`j4` right outer join dfs_test.`ctas`.`j2` on (j2.c_integer = j4.c_integer)
3636
;
3737

3838
create table ctas_t5(count_star, max_j1_c_int, min_j2_c_int, avg_j1_c_int, avg_j2_c_int) as
@@ -43,20 +43,20 @@ select
4343
avg(j1.c_integer),
4444
avg(j2.c_integer)
4545
from
46-
dfs.`ctas`.`j1` full outer join dfs.`ctas`.`j2` on (j1.c_date = j2.c_date)
46+
dfs_test.`ctas`.`j1` full outer join dfs_test.`ctas`.`j2` on (j1.c_date = j2.c_date)
4747
where
4848
j1.c_boolean is false
4949
;
5050

51-
/* create table ctas_t6(c1,c2,c3,c4,c5) as select c_integer, c_bigint, c_date, c_time, c_varchar from dfs.`ctas`.`j4` where c_bigint is null; */
51+
/* create table ctas_t6(c1,c2,c3,c4,c5) as select c_integer, c_bigint, c_date, c_time, c_varchar from dfs_test.`ctas`.`j4` where c_bigint is null; */
5252

53-
create table ctas_t8(c1) as select distinct c_integer from ( select c_integer from dfs.`ctas`.`j1` union all select c_integer from dfs.`ctas`.`j2`) as xyz;
53+
create table ctas_t8(c1) as select distinct c_integer from ( select c_integer from dfs_test.`ctas`.`j1` union all select c_integer from dfs_test.`ctas`.`j2`) as xyz;
5454

5555
create table ctas_t9 as
5656
select c_integer as c1,
5757
count(c_date) as c2
5858
from
59-
dfs.`ctas`.`j1`
59+
dfs_test.`ctas`.`j1`
6060
group by
6161
c_integer
6262
order by
@@ -68,7 +68,7 @@ select
6868
count(distinct c_integer),
6969
sum(c_integer)
7070
from
71-
dfs.`ctas`.`j1`
71+
dfs_test.`ctas`.`j1`
7272
group by
7373
c_date
7474
order by
@@ -84,7 +84,7 @@ from
8484
d9,
8585
c_date,
8686
c_timestamp
87-
from dfs.`ctas`.`j3`
87+
from dfs_test.`ctas`.`j3`
8888
) as sq
8989
group by
9090
c_date
@@ -98,7 +98,7 @@ select
9898
sum(c_bigint) ,
9999
count(c_date)
100100
from
101-
dfs.`ctas`.`j4`
101+
dfs_test.`ctas`.`j4`
102102
group by
103103
c_boolean,
104104
c_timestamp
@@ -117,7 +117,7 @@ from
117117
c_date,
118118
c_varchar
119119
from
120-
dfs.`ctas`.`j1`
120+
dfs_test.`ctas`.`j1`
121121
) as sq
122122
group by
123123
c_varchar;
@@ -127,7 +127,7 @@ select
127127
c_date,
128128
count(distinct c_time)
129129
from
130-
dfs.`ctas`.`j4`
130+
dfs_test.`ctas`.`j4`
131131
group by
132132
c_date
133133
order by
@@ -139,7 +139,7 @@ select
139139
count(distinct c_varchar) as count_distinct_2,
140140
count(distinct c_time) as count_distinct_3
141141
from
142-
dfs.`ctas`.`j1`
142+
dfs_test.`ctas`.`j1`
143143
group by
144144
c_time
145145
;

‎framework/resources/Datasources/ctas_auto_partition/ctas_existing_partition_pruning.ddl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
create table `existing_partition_pruning/lineitempart` partition by (dir0) as select * from dfs.`/drill/testdata/partition_pruning/dfs/lineitempart`;
2-
create table `existing_partition_pruning/lineitem` partition by (dir0) as select * from dfs.`/drill/testdata/partition_pruning/dfs/lineitem`;
3-
create table `existing_partition_pruning/lineitem_hierarchical_intstring` partition by (dir0, dir1) as select * from dfs.`/drill/testdata/partition_pruning/hive/text/lineitem_hierarchical_intstring`;
4-
create table `existing_partition_pruning/ordersjson` partition by (dir0) as select * from dfs.`/drill/testdata/partition_pruning/dfs/ordersjson`;
5-
create table `existing_partition_pruning/orders` partition by (dir0) as select * from dfs.`/drill/testdata/partition_pruning/dfs/orders`;
1+
create table `existing_partition_pruning/lineitempart` partition by (dir0) as select * from dfs_test.`/drill/testdata/partition_pruning/dfs/lineitempart`;
2+
create table `existing_partition_pruning/lineitem` partition by (dir0) as select * from dfs_test.`/drill/testdata/partition_pruning/dfs/lineitem`;
3+
create table `existing_partition_pruning/lineitem_hierarchical_intstring` partition by (dir0, dir1) as select * from dfs_test.`/drill/testdata/partition_pruning/hive/text/lineitem_hierarchical_intstring`;
4+
create table `existing_partition_pruning/ordersjson` partition by (dir0) as select * from dfs_test.`/drill/testdata/partition_pruning/dfs/ordersjson`;
5+
create table `existing_partition_pruning/orders` partition by (dir0) as select * from dfs_test.`/drill/testdata/partition_pruning/dfs/orders`;

‎framework/resources/Datasources/ctas_auto_partition/ctas_existing_partition_pruning.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hadoop fs -mkdir /drill/testdata/ctas_auto_partition
55
hadoop fs -rmr /drill/testdata/ctas_auto_partition/existing_partition_pruning
66
hadoop fs -mkdir /drill/testdata/ctas_auto_partition/existing_partition_pruning
77

8-
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_existing_partition_pruning.ddl
8+
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_existing_partition_pruning.ddl
99

1010
# it seems that sqlline does not exit, if one of the queries failed.
1111
if [ "$?" -eq 0 ]

‎framework/resources/Datasources/ctas_auto_partition/ctas_tpch_multiple_partitions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hadoop fs -mkdir /drill/testdata/ctas_auto_partition
55
hadoop fs -rmr /drill/testdata/ctas_auto_partition/tpch_multiple_partitions
66
hadoop fs -mkdir /drill/testdata/ctas_auto_partition/tpch_multiple_partitions
77

8-
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_tpch_multiple_partitions.ddl
8+
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_tpch_multiple_partitions.ddl
99

1010
# it seems that sqlline does not exit, if one of the queries failed.
1111
if [ "$?" -eq 0 ]

‎framework/resources/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hadoop fs -mkdir /drill/testdata/ctas_auto_partition
55
hadoop fs -rmr /drill/testdata/ctas_auto_partition/tpch_single_partition1
66
hadoop fs -mkdir /drill/testdata/ctas_auto_partition/tpch_single_partition1
77

8-
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl
8+
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/ctas_tpch_single_partition1.ddl
99

1010
# it seems that sqlline does not exit, if one of the queries failed.
1111
if [ "$?" -eq 0 ]

‎framework/resources/Datasources/ctas_auto_partition/setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ hadoop fs -mkdir /drill/testdata/ctas_auto_partition
55
hadoop fs -rmr /drill/testdata/ctas_auto_partition/tpch_single_partition
66
hadoop fs -mkdir /drill/testdata/ctas_auto_partition/tpch_single_partition
77

8-
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/create_tables.ddl
8+
${DRILL_HOME}/bin/sqlline -n ${USERNAME} -p ${PASSWORD} -u "jdbc:drill:schema=dfs_test.ctasAutoPartition;drillbit=${DRILL_STORAGE_PLUGIN_SERVER}" --run=${DRILL_TEST_DATA_DIR}/Datasources/ctas_auto_partition/create_tables.ddl
99

1010
# it seems that sqlline does not exit, if one of the queries failed.
1111
if [ "$?" -eq 0 ]

0 commit comments

Comments
 (0)