Repository: hive Updated Branches: refs/heads/master 4d2c45644 -> a3f16cfec
HIVE-14527: Schema evolution tests are not running in TestCliDriver (Prasanth Jayachandran reviewed by Matt McCline, Siddharth Seth) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a3f16cfe Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a3f16cfe Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a3f16cfe Branch: refs/heads/master Commit: a3f16cfec155f93ada85ce1fea32112351db22ac Parents: 4d2c456 Author: Prasanth Jayachandran <[email protected]> Authored: Tue Aug 16 14:10:50 2016 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Tue Aug 16 14:10:50 2016 -0700 ---------------------------------------------------------------------- .../test/resources/testconfiguration.properties | 56 ++++++++++---------- .../hadoop/hive/cli/control/CliConfigs.java | 2 + 2 files changed, 30 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a3f16cfe/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- 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,\ http://git-wip-us.apache.org/repos/asf/hive/blob/a3f16cfe/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java ---------------------------------------------------------------------- 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 class CliConfigs { 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");
