diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 1cc7de1..2c86807 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -478,6 +478,33 @@ minillap.shared.query.files=bucket_map_join_tez1.q,\ orc_ppd_schema_evol_2a.q,\ orc_ppd_schema_evol_2b.q,\ orc_ppd_schema_evol_3a.q,\ + schema_evol_stats.q,\ + schema_evol_orc_acid_mapwork_part.q,\ + schema_evol_orc_acid_mapwork_table.q,\ + schema_evol_orc_acidvec_mapwork_part.q,\ + schema_evol_orc_acidvec_mapwork_table.q,\ + schema_evol_orc_nonvec_fetchwork_part.q,\ + schema_evol_orc_nonvec_fetchwork_table.q,\ + schema_evol_orc_nonvec_mapwork_part.q,\ + schema_evol_orc_nonvec_mapwork_part_all_complex.q,\ + schema_evol_orc_nonvec_mapwork_part_all_primitive.q,\ + schema_evol_orc_nonvec_mapwork_table.q,\ + schema_evol_orc_vec_mapwork_part.q,\ + schema_evol_orc_vec_mapwork_part_all_complex.q,\ + schema_evol_orc_vec_mapwork_part_all_primitive.q,\ + schema_evol_orc_vec_mapwork_table.q,\ + schema_evol_text_nonvec_mapwork_part.q,\ + schema_evol_text_nonvec_mapwork_part_all_complex.q,\ + schema_evol_text_nonvec_mapwork_part_all_primitive.q,\ + schema_evol_text_nonvec_mapwork_table.q,\ + schema_evol_text_vec_mapwork_part.q,\ + schema_evol_text_vec_mapwork_part_all_complex.q,\ + schema_evol_text_vec_mapwork_part_all_primitive.q,\ + schema_evol_text_vec_mapwork_table.q,\ + schema_evol_text_vecrow_mapwork_part.q,\ + schema_evol_text_vecrow_mapwork_part_all_complex.q,\ + schema_evol_text_vecrow_mapwork_part_all_primitive.q,\ + schema_evol_text_vecrow_mapwork_table.q,\ tez_bmj_schema_evolution.q,\ tez_dml.q,\ tez_fsstat.q,\ @@ -514,34 +541,7 @@ minillap.query.files=llap_udf.q,\ orc_llap.q,\ orc_llap_counters.q,\ orc_llap_counters1.q,\ - orc_llap_nonvector.q,\ - schema_evol_stats.q,\ - schema_evol_orc_acid_mapwork_part.q,\ - schema_evol_orc_acid_mapwork_table.q,\ - schema_evol_orc_acidvec_mapwork_part.q,\ - schema_evol_orc_acidvec_mapwork_table.q,\ - schema_evol_orc_nonvec_fetchwork_part.q,\ - schema_evol_orc_nonvec_fetchwork_table.q,\ - schema_evol_orc_nonvec_mapwork_part.q,\ - schema_evol_orc_nonvec_mapwork_part_all_complex.q,\ - schema_evol_orc_nonvec_mapwork_part_all_primitive.q,\ - schema_evol_orc_nonvec_mapwork_table.q,\ - schema_evol_orc_vec_mapwork_part.q,\ - schema_evol_orc_vec_mapwork_part_all_complex.q,\ - schema_evol_orc_vec_mapwork_part_all_primitive.q,\ - schema_evol_orc_vec_mapwork_table.q,\ - schema_evol_text_nonvec_mapwork_part.q,\ - schema_evol_text_nonvec_mapwork_part_all_complex.q,\ - schema_evol_text_nonvec_mapwork_part_all_primitive.q,\ - schema_evol_text_nonvec_mapwork_table.q,\ - schema_evol_text_vec_mapwork_part.q,\ - schema_evol_text_vec_mapwork_part_all_complex.q,\ - schema_evol_text_vec_mapwork_part_all_primitive.q,\ - schema_evol_text_vec_mapwork_table.q,\ - schema_evol_text_vecrow_mapwork_part.q,\ - schema_evol_text_vecrow_mapwork_part_all_complex.q,\ - schema_evol_text_vecrow_mapwork_part_all_primitive.q,\ - schema_evol_text_vecrow_mapwork_table.q + orc_llap_nonvector.q encrypted.query.files=encryption_join_unencrypted_tbl.q,\ diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index 2c82e99..319a205 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -116,6 +116,8 @@ public MiniTezCliConfig() { includesFrom(testConfigProps, "minitez.query.files"); includesFrom(testConfigProps, "minitez.query.files.shared"); + excludesFrom(testConfigProps, "minillap.query.files"); + excludesFrom(testConfigProps, "minillap.shared.query.files"); setResultsDir("ql/src/test/results/clientpositive/tez"); setLogDir("itests/qtest/target/qfile-results/clientpositive");