diff --git build-common.xml build-common.xml index f10f340..eee4197 100644 --- build-common.xml +++ build-common.xml @@ -406,9 +406,11 @@ + + @@ -438,6 +440,7 @@ + diff --git build.properties build.properties index bdbb2fc..70b8a12 100644 --- build.properties +++ build.properties @@ -29,7 +29,7 @@ javac.args.warnings= hadoop-0.20.version=0.20.2 hadoop-0.20S.version=1.1.2 -hadoop-0.23.version=2.0.0-alpha +hadoop-0.23.version=2.0.3-alpha hadoop.version=${hadoop-0.20.version} hadoop.security.version=${hadoop-0.20S.version} # Used to determine which set of Hadoop artifacts we depend on. diff --git ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q index 51b86b7..d86ecd5 100644 --- ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q +++ ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'nosuchschema://nosuchauthority/ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q index 28bc36f..5f32231 100644 --- ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q +++ ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q index 8f61381..d7204dc 100644 --- ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q +++ ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q @@ -14,7 +14,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q index d3f7b49..6cd7eda 100644 --- ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q +++ ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q index e08155f..7f3f577 100644 --- ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q +++ ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q index 6ea722a..d3ec9ff 100644 --- ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q +++ ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q index 5cb4dd9..1cc691f 100644 --- ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q +++ ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q index ad17486..27830ad 100644 --- ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q +++ ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q index 45ae707..d85048a 100644 --- ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q +++ ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q index 2b762c7..84b3786 100644 --- ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q +++ ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q index ee29a57..eaf9c57 100644 --- ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q +++ ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q index 27d07ff..092fd77 100644 --- ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q +++ ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_13_nonnative_import.q ql/src/test/queries/clientnegative/exim_13_nonnative_import.q index f7c410d..05de3d7 100644 --- ql/src/test/queries/clientnegative/exim_13_nonnative_import.q +++ ql/src/test/queries/clientnegative/exim_13_nonnative_import.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_14_nonpart_part.q ql/src/test/queries/clientnegative/exim_14_nonpart_part.q index e1b5910..dc194ca 100644 --- ql/src/test/queries/clientnegative/exim_14_nonpart_part.q +++ ql/src/test/queries/clientnegative/exim_14_nonpart_part.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_15_part_nonpart.q ql/src/test/queries/clientnegative/exim_15_part_nonpart.q index 1e09356..e233707 100644 --- ql/src/test/queries/clientnegative/exim_15_part_nonpart.q +++ ql/src/test/queries/clientnegative/exim_15_part_nonpart.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department partition (dep_org="hr"); -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q index 83e94dc..a10788e 100644 --- ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q +++ ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department partition (dep_org="hr"); -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q index f394543..cc4a56c 100644 --- ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q +++ ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q @@ -14,7 +14,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q index 8c1b315..140e3bb 100644 --- ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q +++ ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q @@ -14,7 +14,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientnegative/exim_19_external_over_existing.q ql/src/test/queries/clientnegative/exim_19_external_over_existing.q index 9c94f98..048befe 100644 --- ql/src/test/queries/clientnegative/exim_19_external_over_existing.q +++ ql/src/test/queries/clientnegative/exim_19_external_over_existing.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q index 7c12294..89cbb9e 100644 --- ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q +++ ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; @@ -13,7 +13,7 @@ drop table exim_department; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_department; create table exim_department ( dep_id int comment "department id") diff --git ql/src/test/queries/clientnegative/exim_21_part_managed_external.q ql/src/test/queries/clientnegative/exim_21_part_managed_external.q index d6a212f..0cbfc85 100644 --- ql/src/test/queries/clientnegative/exim_21_part_managed_external.q +++ ql/src/test/queries/clientnegative/exim_21_part_managed_external.q @@ -14,7 +14,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientnegative/exim_22_export_authfail.q ql/src/test/queries/clientnegative/exim_22_export_authfail.q index 66e006c..d9ab0cf 100644 --- ql/src/test/queries/clientnegative/exim_22_export_authfail.q +++ ql/src/test/queries/clientnegative/exim_22_export_authfail.q @@ -5,7 +5,7 @@ create table exim_department ( dep_id int) stored as textfile; set hive.security.authorization.enabled=true; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; diff --git ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q index 7571436..2dbd534 100644 --- ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q +++ ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q @@ -3,7 +3,7 @@ set hive.test.mode.prefix=; create table exim_department ( dep_id int) stored as textfile; load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q index e4898a4..ccbcee3 100644 --- ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q +++ ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q @@ -9,7 +9,7 @@ create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q index 974b63d..50bfe00 100644 --- ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q +++ ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q @@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_department,exim_employee; create table exim_department ( dep_id int) stored as textfile; load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/database_drop.q ql/src/test/queries/clientpositive/database_drop.q index 3a5d294..4e17c7a 100644 --- ql/src/test/queries/clientpositive/database_drop.q +++ ql/src/test/queries/clientpositive/database_drop.q @@ -8,9 +8,9 @@ CREATE DATABASE db5; SHOW DATABASES; USE db5; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp; dfs -rmr ${system:test.tmp.dir}/dbcascade; -dfs -mkdir ${system:test.tmp.dir}/dbcascade; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade; -- add a table, index and view CREATE TABLE temp_tbl (id INT, name STRING); @@ -19,8 +19,8 @@ CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl; CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD; ALTER INDEX idx1 ON temp_tbl REBUILD; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp_tbl2; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2; -- add a table, index and view with a different storage location CREATE TABLE temp_tbl2 (id INT, name STRING) LOCATION 'file:${system:test.tmp.dir}/dbcascade/temp_tbl2'; LOAD DATA LOCAL INPATH '../data/files/kv1.txt' into table temp_tbl2; @@ -36,8 +36,8 @@ CREATE INDEX idx3 ON TABLE part_tab(id) AS 'COMPACT' with DEFERRED REBUILD; ALTER INDEX idx3 ON part_tab PARTITION (ds='2008-04-09') REBUILD; ALTER INDEX idx3 ON part_tab PARTITION (ds='2009-04-09') REBUILD; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab2; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab2_idx4; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2_idx4; -- add a partitioned table, index and view with a different storage location CREATE TABLE part_tab2 (id INT, name STRING) PARTITIONED BY (ds string) LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab2'; @@ -49,9 +49,9 @@ ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2008-04-09') REBUILD; ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2009-04-09') REBUILD; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3_p1; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3_idx5; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_p1; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_idx5; -- add a partitioned table, index and view with a different storage location CREATE TABLE part_tab3 (id INT, name STRING) PARTITIONED BY (ds string) LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab3'; @@ -65,7 +65,7 @@ ALTER INDEX idx5 ON part_tab3 PARTITION (ds='2009-04-09') REBUILD; -dfs -mkdir ${system:test.tmp.dir}/dbcascade/extab1; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/extab1; dfs -touchz ${system:test.tmp.dir}/dbcascade/extab1/file1.txt; -- add an external table CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT diff --git ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q index d4ef0da..7fa96b6 100644 --- ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q +++ ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q @@ -5,7 +5,7 @@ set hive.test.mode.nosamplelist=exim_department,exim_employee; create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_01_nonpart.q ql/src/test/queries/clientpositive/exim_01_nonpart.q index 0c2e168..9920e77 100644 --- ql/src/test/queries/clientpositive/exim_01_nonpart.q +++ ql/src/test/queries/clientpositive/exim_01_nonpart.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_02_00_part_empty.q ql/src/test/queries/clientpositive/exim_02_00_part_empty.q index 2d4eabd..4017c83 100644 --- ql/src/test/queries/clientpositive/exim_02_00_part_empty.q +++ ql/src/test/queries/clientpositive/exim_02_00_part_empty.q @@ -7,7 +7,7 @@ create table exim_employee ( emp_id int comment "employee id") partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_02_part.q ql/src/test/queries/clientpositive/exim_02_part.q index 02086fa..21138f0 100644 --- ql/src/test/queries/clientpositive/exim_02_part.q +++ ql/src/test/queries/clientpositive/exim_02_part.q @@ -9,7 +9,7 @@ create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q index e203574..5f6bdee 100644 --- ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q +++ ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_04_all_part.q ql/src/test/queries/clientpositive/exim_04_all_part.q index fa6cc24..69c6faa 100644 --- ql/src/test/queries/clientpositive/exim_04_all_part.q +++ ql/src/test/queries/clientpositive/exim_04_all_part.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_04_evolved_parts.q ql/src/test/queries/clientpositive/exim_04_evolved_parts.q index ae1ed6f..cdc02fa 100644 --- ql/src/test/queries/clientpositive/exim_04_evolved_parts.q +++ ql/src/test/queries/clientpositive/exim_04_evolved_parts.q @@ -19,7 +19,7 @@ alter table exim_employee set fileformat outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat"; alter table exim_employee add partition (emp_country='in', emp_state='ka'); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_05_some_part.q ql/src/test/queries/clientpositive/exim_05_some_part.q index 254901f..50a5946 100644 --- ql/src/test/queries/clientpositive/exim_05_some_part.q +++ ql/src/test/queries/clientpositive/exim_05_some_part.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee partition (emp_state="ka") to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_06_one_part.q ql/src/test/queries/clientpositive/exim_06_one_part.q index e6010eb..5136090 100644 --- ql/src/test/queries/clientpositive/exim_06_one_part.q +++ ql/src/test/queries/clientpositive/exim_06_one_part.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee partition (emp_country="in",emp_state="ka") to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q index aa8d739..5b9d4dd 100644 --- ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q +++ ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q index 759b0eb..173f156 100644 --- ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q +++ ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q index 293ea91..178b766 100644 --- ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q +++ ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_10_external_managed.q ql/src/test/queries/clientpositive/exim_10_external_managed.q index 75254a2..413f2aa 100644 --- ql/src/test/queries/clientpositive/exim_10_external_managed.q +++ ql/src/test/queries/clientpositive/exim_10_external_managed.q @@ -2,14 +2,14 @@ set hive.test.mode=true; set hive.test.mode.prefix=; set hive.test.mode.nosamplelist=exim_department,exim_employee; -dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_department; create external table exim_department ( dep_id int comment "department id") stored as textfile location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_11_managed_external.q ql/src/test/queries/clientpositive/exim_11_managed_external.q index b53bc0a..f3b2896 100644 --- ql/src/test/queries/clientpositive/exim_11_managed_external.q +++ ql/src/test/queries/clientpositive/exim_11_managed_external.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_12_external_location.q ql/src/test/queries/clientpositive/exim_12_external_location.q index 314956a..37d0634 100644 --- ql/src/test/queries/clientpositive/exim_12_external_location.q +++ ql/src/test/queries/clientpositive/exim_12_external_location.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; @@ -14,7 +14,7 @@ drop table exim_department; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_department; import external table exim_department from 'ql/test/data/exports/exim_department' diff --git ql/src/test/queries/clientpositive/exim_13_managed_location.q ql/src/test/queries/clientpositive/exim_13_managed_location.q index 2436369..fb5058b 100644 --- ql/src/test/queries/clientpositive/exim_13_managed_location.q +++ ql/src/test/queries/clientpositive/exim_13_managed_location.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; @@ -14,7 +14,7 @@ drop table exim_department; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_department; import table exim_department from 'ql/test/data/exports/exim_department' diff --git ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q index d227eb3..031b6bd 100644 --- ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q +++ ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q @@ -6,7 +6,7 @@ create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; @@ -14,7 +14,7 @@ drop table exim_department; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_department; create table exim_department ( dep_id int comment "department id") diff --git ql/src/test/queries/clientpositive/exim_15_external_part.q ql/src/test/queries/clientpositive/exim_15_external_part.q index a4778df..ff088c7 100644 --- ql/src/test/queries/clientpositive/exim_15_external_part.q +++ ql/src/test/queries/clientpositive/exim_15_external_part.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -23,7 +23,7 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; create external table exim_employee ( emp_id int comment "employee id") diff --git ql/src/test/queries/clientpositive/exim_16_part_external.q ql/src/test/queries/clientpositive/exim_16_part_external.q index e02ad5d..6f4ee7a 100644 --- ql/src/test/queries/clientpositive/exim_16_part_external.q +++ ql/src/test/queries/clientpositive/exim_16_part_external.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -23,9 +23,9 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; -dfs -mkdir ../build/ql/test/data/tablestore2/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore2/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore2/exim_employee; create external table exim_employee ( emp_id int comment "employee id") diff --git ql/src/test/queries/clientpositive/exim_17_part_managed.q ql/src/test/queries/clientpositive/exim_17_part_managed.q index ce2df6d..56ec152 100644 --- ql/src/test/queries/clientpositive/exim_17_part_managed.q +++ ql/src/test/queries/clientpositive/exim_17_part_managed.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -23,7 +23,7 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; create table exim_employee ( emp_id int comment "employee id") diff --git ql/src/test/queries/clientpositive/exim_18_part_external.q ql/src/test/queries/clientpositive/exim_18_part_external.q index 9d094e5..7aa1297 100644 --- ql/src/test/queries/clientpositive/exim_18_part_external.q +++ ql/src/test/queries/clientpositive/exim_18_part_external.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q index 1193b95..cb9f8ef 100644 --- ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q +++ ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q @@ -11,7 +11,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn"); load data local inpath "../data/files/test2.dat" into table exim_employee partition (emp_country="in", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -19,7 +19,7 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; import external table exim_employee diff --git ql/src/test/queries/clientpositive/exim_19_part_external_location.q ql/src/test/queries/clientpositive/exim_19_part_external_location.q index e8cab5a..bdbd19d 100644 --- ql/src/test/queries/clientpositive/exim_19_part_external_location.q +++ ql/src/test/queries/clientpositive/exim_19_part_external_location.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -23,7 +23,7 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; import external table exim_employee partition (emp_country="us", emp_state="tn") diff --git ql/src/test/queries/clientpositive/exim_20_part_managed_location.q ql/src/test/queries/clientpositive/exim_20_part_managed_location.q index 385dcba..eb44961 100644 --- ql/src/test/queries/clientpositive/exim_20_part_managed_location.q +++ ql/src/test/queries/clientpositive/exim_20_part_managed_location.q @@ -15,7 +15,7 @@ load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; @@ -23,7 +23,7 @@ drop table exim_employee; create database importer; use importer; -dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp; dfs -rmr ../build/ql/test/data/tablestore/exim_employee; import table exim_employee partition (emp_country="us", emp_state="tn") diff --git ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q index e61f388..822ed70 100644 --- ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q +++ ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q @@ -7,7 +7,7 @@ load data local inpath "../data/files/test.dat" into table exim_department; set hive.security.authorization.enabled=true; grant Select on table exim_department to user hive_test_user; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; diff --git ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q index 74d1391..440d08d 100644 --- ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q +++ ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q @@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_department,exim_employee; create table exim_department ( dep_id int) stored as textfile; load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q index f0e5a68..30fc343 100644 --- ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q +++ ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q @@ -9,7 +9,7 @@ create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna"); load data local inpath "../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn"); -dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp; dfs -rmr ../build/ql/test/data/exports/exim_employee; export table exim_employee to 'ql/test/data/exports/exim_employee'; drop table exim_employee; diff --git ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q index eb981fe..2dc5af6 100644 --- ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q +++ ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q @@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_department,exim_employee; create table exim_department ( dep_id int) stored as textfile; load data local inpath "../data/files/test.dat" into table exim_department; -dfs -mkdir ../build/ql/test/data/exports/exim_department/test; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/test; dfs -rmr ../build/ql/test/data/exports/exim_department; export table exim_department to 'ql/test/data/exports/exim_department'; drop table exim_department; diff --git ql/src/test/queries/clientpositive/insertexternal1.q ql/src/test/queries/clientpositive/insertexternal1.q index 52b0680..9004a0c 100644 --- ql/src/test/queries/clientpositive/insertexternal1.q +++ ql/src/test/queries/clientpositive/insertexternal1.q @@ -2,9 +2,9 @@ create table texternal(key string, val string) partitioned by (insertdate string); -dfs -mkdir ${system:test.tmp.dir}/texternal/temp; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/texternal/temp; dfs -rmr ${system:test.tmp.dir}/texternal; -dfs -mkdir ${system:test.tmp.dir}/texternal/2008-01-01; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/texternal/2008-01-01; alter table texternal add partition (insertdate='2008-01-01') location 'pfile://${system:test.tmp.dir}/texternal/2008-01-01'; from src insert overwrite table texternal partition (insertdate='2008-01-01') select *; diff --git ql/src/test/queries/clientpositive/metadata_export_drop.q ql/src/test/queries/clientpositive/metadata_export_drop.q index e971884..41be152 100644 --- ql/src/test/queries/clientpositive/metadata_export_drop.q +++ ql/src/test/queries/clientpositive/metadata_export_drop.q @@ -1,5 +1,5 @@ create table tmp_meta_export_listener_drop_test (foo string); -dfs -mkdir ../build/ql/test/data/exports/HIVE-3427; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/HIVE-3427; set hive.metastore.pre.event.listeners=org.apache.hadoop.hive.ql.parse.MetaDataExportListener; set hive.metadata.export.location=../build/ql/test/data/exports/HIVE-3427; set hive.move.exported.metadata.to.trash=false; diff --git ql/src/test/queries/clientpositive/multi_insert.q ql/src/test/queries/clientpositive/multi_insert.q index c8e6050..718211b 100644 --- ql/src/test/queries/clientpositive/multi_insert.q +++ ql/src/test/queries/clientpositive/multi_insert.q @@ -196,7 +196,7 @@ select * from src_multi2 order by key, value; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -dfs -mkdir ${system:test.tmp.dir}/hive_test/multiins_local/temp; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/hive_test/multiins_local/temp; dfs -rmr ${system:test.tmp.dir}/hive_test/multiins_local; explain diff --git ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q index 4ac55b8..e30992b 100644 --- ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q +++ ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q @@ -196,7 +196,7 @@ select * from src_multi2 order by key, value; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -dfs -mkdir ${system:test.tmp.dir}/hive_test/multiins_local/temp; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/hive_test/multiins_local/temp; dfs -rmr ${system:test.tmp.dir}/hive_test/multiins_local; explain diff --git ql/src/test/queries/clientpositive/rename_external_partition_location.q ql/src/test/queries/clientpositive/rename_external_partition_location.q index a49a425..faebd55 100644 --- ql/src/test/queries/clientpositive/rename_external_partition_location.q +++ ql/src/test/queries/clientpositive/rename_external_partition_location.q @@ -1,5 +1,5 @@ -dfs -mkdir ${system:test.tmp.dir}/ex_table; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/ex_table; CREATE EXTERNAL TABLE ex_table ( key INT, value STRING) PARTITIONED BY (part STRING) diff --git ql/src/test/queries/clientpositive/repair.q ql/src/test/queries/clientpositive/repair.q index 2720d1f..8d04d3e 100644 --- ql/src/test/queries/clientpositive/repair.q +++ ql/src/test/queries/clientpositive/repair.q @@ -2,8 +2,8 @@ CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING); MSCK TABLE repairtable; -dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; -dfs -mkdir ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a; +dfs ${system:test.dfs.mkdir} ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a; dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile; MSCK TABLE repairtable; diff --git ql/src/test/queries/clientpositive/schemeAuthority.q ql/src/test/queries/clientpositive/schemeAuthority.q index 22d6c37..c0e18c5 100644 --- ql/src/test/queries/clientpositive/schemeAuthority.q +++ ql/src/test/queries/clientpositive/schemeAuthority.q @@ -1,5 +1,5 @@ -dfs -mkdir file:///tmp/test; -dfs -mkdir hdfs:///tmp/test; +dfs ${system:test.dfs.mkdir} file:///tmp/test; +dfs ${system:test.dfs.mkdir} hdfs:///tmp/test; create external table dynPart (key string) partitioned by (value string) row format delimited fields terminated by '\\t' stored as textfile; insert overwrite local directory "/tmp/test" select key from src where (key = 10) order by key; diff --git ql/src/test/queries/clientpositive/stats_noscan_2.q ql/src/test/queries/clientpositive/stats_noscan_2.q index a1bdc60..c934fb2 100644 --- ql/src/test/queries/clientpositive/stats_noscan_2.q +++ ql/src/test/queries/clientpositive/stats_noscan_2.q @@ -12,7 +12,7 @@ drop table anaylyze_external; -- 2 test partition -- prepare data create table texternal(key string, val string) partitioned by (insertdate string); -dfs -mkdir ${system:test.tmp.dir}/texternal/2008-01-01; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/texternal/2008-01-01; alter table texternal add partition (insertdate='2008-01-01') location 'pfile://${system:test.tmp.dir}/texternal/2008-01-01'; from src insert overwrite table texternal partition (insertdate='2008-01-01') select *; select count(*) from texternal where insertdate='2008-01-01';