diff --git a/data/scripts/q_test_init_for_minimr.sql b/data/scripts/q_test_init_for_minimr.sql new file mode 100644 index 0000000..ab2e1d7 --- /dev/null +++ b/data/scripts/q_test_init_for_minimr.sql @@ -0,0 +1,48 @@ +-- +-- Table src +-- +DROP TABLE IF EXISTS src; + +CREATE TABLE src (key STRING COMMENT 'default', value STRING COMMENT 'default') STORED AS TEXTFILE; + +LOAD DATA LOCAL INPATH "${hiveconf:test.data.dir}/kv1.txt" INTO TABLE src; + +-- +-- Table srcpart +-- +DROP TABLE IF EXISTS srcpart; + +CREATE TABLE srcpart (key STRING COMMENT 'default', value STRING COMMENT 'default') +PARTITIONED BY (ds STRING, hr STRING) +STORED AS TEXTFILE; + +LOAD DATA LOCAL INPATH "${hiveconf:test.data.dir}/kv1.txt" +OVERWRITE INTO TABLE srcpart PARTITION (ds="2008-04-08", hr="11"); + +LOAD DATA LOCAL INPATH "${hiveconf:test.data.dir}/kv1.txt" +OVERWRITE INTO TABLE srcpart PARTITION (ds="2008-04-08", hr="12"); + +LOAD DATA LOCAL INPATH "${hiveconf:test.data.dir}/kv1.txt" +OVERWRITE INTO TABLE srcpart PARTITION (ds="2008-04-09", hr="11"); + +LOAD DATA LOCAL INPATH "${hiveconf:test.data.dir}/kv1.txt" +OVERWRITE INTO TABLE srcpart PARTITION (ds="2008-04-09", hr="12"); + +-- +-- Table part +-- +drop table if exists part; + +CREATE TABLE part( + p_partkey INT, + p_name STRING, + p_mfgr STRING, + p_brand STRING, + p_type STRING, + p_size INT, + p_container STRING, + p_retailprice DOUBLE, + p_comment STRING +); + +LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part; diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index dfde5e2..696ef15 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -34,7 +34,6 @@ minimr.query.files=auto_sortmerge_join_16.q,\ load_hdfs_file_with_space_in_the_name.q,\ non_native_window_udf.q, \ orc_merge_diff_fs.q,\ - optrstat_groupby.q,\ parallel_orderby.q,\ quotedid_smb.q,\ reduce_deduplicate.q,\ @@ -45,8 +44,6 @@ minimr.query.files=auto_sortmerge_join_16.q,\ scriptfile1.q,\ scriptfile1_win.q,\ skewjoin_onesideskew.q,\ - stats_counter.q,\ - stats_counter_partitioned.q,\ table_nonprintable.q,\ temp_table_external.q,\ truncate_column_buckets.q,\ @@ -248,8 +245,6 @@ minillap.shared.query.files=acid_globallimit.q,\ selectDistinctStar.q,\ select_dummy_source.q,\ skewjoin.q,\ - stats_counter.q,\ - stats_counter_partitioned.q,\ stats_noscan_1.q,\ stats_only_null.q,\ subquery_exists.q,\ @@ -1332,7 +1327,6 @@ miniSparkOnYarn.query.files=auto_sortmerge_join_16.q,\ list_bucket_dml_10.q,\ load_fs2.q,\ load_hdfs_file_with_space_in_the_name.q,\ - optrstat_groupby.q,\ orc_merge1.q,\ orc_merge2.q,\ orc_merge3.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 319a205..1a3583d 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 @@ -97,7 +97,7 @@ public MinimrCliConfig() { setResultsDir("ql/src/test/results/clientpositive"); setLogDir("itests/qtest/target/qfile-results/clientpositive"); - setInitScript("q_test_init.sql"); + setInitScript("q_test_init_for_minimr.sql"); setCleanupScript("q_test_cleanup.sql"); setHiveConfDir("");