Repository: hive Updated Branches: refs/heads/master 0977d3bf4 -> e8a2c0087
HIVE-19516 : TestNegative merge_negative_5 and mm_concatenate are causing timeouts (Sergey Shelukhin, reviewed by Vineet Garg) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e8a2c008 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e8a2c008 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e8a2c008 Branch: refs/heads/master Commit: e8a2c00870e3168bb3e8aa19745d700138ce880b Parents: 0977d3b Author: sergey <ser...@apache.org> Authored: Fri May 18 17:55:32 2018 -0700 Committer: sergey <ser...@apache.org> Committed: Fri May 18 17:55:32 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hive/cli/control/CliConfigs.java | 2 - .../queries/clientnegative/merge_negative_5.q | 15 ----- .../queries/clientnegative/mm_concatenate.q | 9 --- .../clientnegative/merge_negative_5.q.out | 67 -------------------- .../results/clientnegative/mm_concatenate.q.out | 18 ------ 5 files changed, 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e8a2c008/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 ac609df..7063adb 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 @@ -371,8 +371,6 @@ public class CliConfigs { excludesFrom(testConfigProps, "minimr.query.negative.files"); excludesFrom(testConfigProps, "spark.only.query.negative.files"); excludeQuery("authorization_uri_import.q"); - excludeQuery("merge_negative_5.q"); // Disabled in HIVE-19509 - excludeQuery("mm_concatenate.q"); // Disabled in HIVE-19509 setResultsDir("ql/src/test/results/clientnegative"); setLogDir("itests/qtest/target/qfile-results/clientnegative"); http://git-wip-us.apache.org/repos/asf/hive/blob/e8a2c008/ql/src/test/queries/clientnegative/merge_negative_5.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientnegative/merge_negative_5.q b/ql/src/test/queries/clientnegative/merge_negative_5.q deleted file mode 100644 index 93d00a0..0000000 --- a/ql/src/test/queries/clientnegative/merge_negative_5.q +++ /dev/null @@ -1,15 +0,0 @@ ---! qt:dataset:srcpart -set hive.mapred.mode=nonstrict; -set hive.support.concurrency=true; -set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; -set hive.exec.dynamic.partition.mode=nonstrict; -set hive.vectorized.execution.enabled=false; -set hive.explain.user=false; -set hive.merge.cardinality.check=true; - -drop table if exists srcpart_acid; -CREATE TABLE srcpart_acid (key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) stored as ORC TBLPROPERTIES ('transactional'='true', 'transactional_properties'='default'); -insert into srcpart_acid PARTITION (ds, hr) select * from srcpart; -insert into srcpart_acid PARTITION (ds, hr) select * from srcpart; - -alter table srcpart_acid partition(ds='2008-04-08',hr=='11') concatenate; http://git-wip-us.apache.org/repos/asf/hive/blob/e8a2c008/ql/src/test/queries/clientnegative/mm_concatenate.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientnegative/mm_concatenate.q b/ql/src/test/queries/clientnegative/mm_concatenate.q deleted file mode 100644 index c825258..0000000 --- a/ql/src/test/queries/clientnegative/mm_concatenate.q +++ /dev/null @@ -1,9 +0,0 @@ ---! qt:dataset:src -set hive.support.concurrency=true; -set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - -create table concat_mm (id int) stored as orc tblproperties("transactional"="true", "transactional_properties"="insert_only"); - -insert into table concat_mm select key from src limit 10; - -alter table concat_mm concatenate; http://git-wip-us.apache.org/repos/asf/hive/blob/e8a2c008/ql/src/test/results/clientnegative/merge_negative_5.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/merge_negative_5.q.out b/ql/src/test/results/clientnegative/merge_negative_5.q.out deleted file mode 100644 index 56a21a0..0000000 --- a/ql/src/test/results/clientnegative/merge_negative_5.q.out +++ /dev/null @@ -1,67 +0,0 @@ -PREHOOK: query: drop table if exists srcpart_acid -PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table if exists srcpart_acid -POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE srcpart_acid (key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) stored as ORC TBLPROPERTIES ('transactional'='true', 'transactional_properties'='default') -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@srcpart_acid -POSTHOOK: query: CREATE TABLE srcpart_acid (key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) stored as ORC TBLPROPERTIES ('transactional'='true', 'transactional_properties'='default') -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@srcpart_acid -PREHOOK: query: insert into srcpart_acid PARTITION (ds, hr) select * from srcpart -PREHOOK: type: QUERY -PREHOOK: Input: default@srcpart -PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 -PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 -PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 -PREHOOK: Output: default@srcpart_acid -POSTHOOK: query: insert into srcpart_acid PARTITION (ds, hr) select * from srcpart -POSTHOOK: type: QUERY -POSTHOOK: Input: default@srcpart -POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 -POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 -POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=12 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12 -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: insert into srcpart_acid PARTITION (ds, hr) select * from srcpart -PREHOOK: type: QUERY -PREHOOK: Input: default@srcpart -PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 -PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 -PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 -PREHOOK: Output: default@srcpart_acid -POSTHOOK: query: insert into srcpart_acid PARTITION (ds, hr) select * from srcpart -POSTHOOK: type: QUERY -POSTHOOK: Input: default@srcpart -POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 -POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 -POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=11 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-08/hr=12 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=11 -POSTHOOK: Output: default@srcpart_acid@ds=2008-04-09/hr=12 -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] -POSTHOOK: Lineage: srcpart_acid PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: Concatenate/Merge can not be performed on transactional tables http://git-wip-us.apache.org/repos/asf/hive/blob/e8a2c008/ql/src/test/results/clientnegative/mm_concatenate.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/mm_concatenate.q.out b/ql/src/test/results/clientnegative/mm_concatenate.q.out deleted file mode 100644 index 5c004b9..0000000 --- a/ql/src/test/results/clientnegative/mm_concatenate.q.out +++ /dev/null @@ -1,18 +0,0 @@ -PREHOOK: query: create table concat_mm (id int) stored as orc tblproperties("transactional"="true", "transactional_properties"="insert_only") -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@concat_mm -POSTHOOK: query: create table concat_mm (id int) stored as orc tblproperties("transactional"="true", "transactional_properties"="insert_only") -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@concat_mm -PREHOOK: query: insert into table concat_mm select key from src limit 10 -PREHOOK: type: QUERY -PREHOOK: Input: default@src -PREHOOK: Output: default@concat_mm -POSTHOOK: query: insert into table concat_mm select key from src limit 10 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@src -POSTHOOK: Output: default@concat_mm -POSTHOOK: Lineage: concat_mm.id EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: Merge is not supported for MM tables
