You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/10/10 22:23:49 UTC
[3/4] hive git commit: HIVE-15212 : merge branch into master - fix
some tests (Sergey Shelukhin)
HIVE-15212 : merge branch into master - fix some tests (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/98c5b637
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/98c5b637
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/98c5b637
Branch: refs/heads/hive-14535
Commit: 98c5b637df2df2ee8ada89a2862ce928ee074ebc
Parents: ae4ac4b
Author: sergey <se...@apache.org>
Authored: Tue Oct 10 15:21:27 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Tue Oct 10 15:21:27 2017 -0700
----------------------------------------------------------------------
.../test/resources/testconfiguration.properties | 3 +-
.../queries/clientnegative/mm_bucket_convert.q | 18 ---------
ql/src/test/queries/clientnegative/mm_convert.q | 10 +++++
.../clientnegative/mm_bucket_convert.q.out | 41 --------------------
.../results/clientnegative/mm_convert.q.out | 17 ++++++++
ql/src/test/results/clientpositive/mm_all.q.out | 13 +------
6 files changed, 31 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index a72f66d..2fa5abd 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -34,7 +34,8 @@ disabled.query.files=ql_rewrite_gbtoidx.q,\
ql_rewrite_gbtoidx_cbo_2.q,\
rcfile_merge1.q,\
smb_mapjoin_8.q,\
- stats_filemetadata.q
+ stats_filemetadata.q,\
+ mm_exim.q
# NOTE: Add tests to minitez only if it is very
# specific to tez and cannot be added to minillap.
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/queries/clientnegative/mm_bucket_convert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mm_bucket_convert.q b/ql/src/test/queries/clientnegative/mm_bucket_convert.q
deleted file mode 100644
index 2ded047..0000000
--- a/ql/src/test/queries/clientnegative/mm_bucket_convert.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.explain.user=false;
-set hive.fetch.task.conversion=none;
-set hive.exec.dynamic.partition.mode=nonstrict;
-
-drop table bucket0_mm;
-drop table bucket1_mm;
-create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only");
-create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only");
-
-set hive.strict.checks.bucketing=false;
-alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional');
-set hive.strict.checks.bucketing=true;
-alter table bucket1_mm unset tblproperties('transactional_properties', 'transactional');
-
-
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/queries/clientnegative/mm_convert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mm_convert.q b/ql/src/test/queries/clientnegative/mm_convert.q
new file mode 100644
index 0000000..acbf4bb
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/mm_convert.q
@@ -0,0 +1,10 @@
+set hive.mapred.mode=nonstrict;
+set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+set hive.exec.dynamic.partition.mode=nonstrict;
+
+drop table convert_mm;
+create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only");
+alter table convert_mm unset tblproperties('transactional_properties', 'transactional');
+
+
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/mm_bucket_convert.q.out b/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
deleted file mode 100644
index b732d3e..0000000
--- a/ql/src/test/results/clientnegative/mm_bucket_convert.q.out
+++ /dev/null
@@ -1,41 +0,0 @@
-PREHOOK: query: drop table bucket0_mm
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table bucket0_mm
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: drop table bucket1_mm
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table bucket1_mm
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only")
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket0_mm
-POSTHOOK: query: create table bucket0_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only")
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket0_mm
-PREHOOK: query: create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only")
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket1_mm
-POSTHOOK: query: create table bucket1_mm(key int, id int) clustered by (key) into 2 buckets
- tblproperties("transactional"="true", "transactional_properties"="insert_only")
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket1_mm
-PREHOOK: query: alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional')
-PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@bucket0_mm
-PREHOOK: Output: default@bucket0_mm
-POSTHOOK: query: alter table bucket0_mm unset tblproperties('transactional_properties', 'transactional')
-POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@bucket0_mm
-POSTHOOK: Output: default@bucket0_mm
-PREHOOK: query: alter table bucket1_mm unset tblproperties('transactional_properties', 'transactional')
-PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@bucket1_mm
-PREHOOK: Output: default@bucket1_mm
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Converting bucketed tables from MM is not supported by default; copying files from multiple MM directories may potentially break the buckets. You can set hive.strict.checks.bucketing to false for this query if you want to force the conversion.
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientnegative/mm_convert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/mm_convert.q.out b/ql/src/test/results/clientnegative/mm_convert.q.out
new file mode 100644
index 0000000..496f8b5
--- /dev/null
+++ b/ql/src/test/results/clientnegative/mm_convert.q.out
@@ -0,0 +1,17 @@
+PREHOOK: query: drop table convert_mm
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table convert_mm
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only")
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@convert_mm
+POSTHOOK: query: create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only")
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@convert_mm
+PREHOOK: query: alter table convert_mm unset tblproperties('transactional_properties', 'transactional')
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: default@convert_mm
+PREHOOK: Output: default@convert_mm
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Cannot convert an ACID table to non-ACID
http://git-wip-us.apache.org/repos/asf/hive/blob/98c5b637/ql/src/test/results/clientpositive/mm_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mm_all.q.out b/ql/src/test/results/clientpositive/mm_all.q.out
index fa9e4a7..c943f01 100644
--- a/ql/src/test/results/clientpositive/mm_all.q.out
+++ b/ql/src/test/results/clientpositive/mm_all.q.out
@@ -88,10 +88,7 @@ STAGE PLANS:
Conditional Operator
Stage: Stage-4
- Move Operator
- files:
- hdfs directory: true
-#### A masked pattern was here ####
+ Dependency Collection
Stage: Stage-0
Move Operator
@@ -125,10 +122,7 @@ STAGE PLANS:
input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
Stage: Stage-6
- Move Operator
- files:
- hdfs directory: true
-#### A masked pattern was here ####
+ Dependency Collection
PREHOOK: query: insert into table part_mm partition(key_mm=455) select key from intermediate
PREHOOK: type: QUERY
@@ -1792,7 +1786,6 @@ POSTHOOK: query: desc formatted stats_mm
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_mm
# col_name data_type comment
-
key int
# Detailed Table Information
@@ -1843,7 +1836,6 @@ POSTHOOK: query: desc formatted stats_mm
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats_mm
# col_name data_type comment
-
key int
# Detailed Table Information
@@ -1902,7 +1894,6 @@ POSTHOOK: query: desc formatted stats2_mm
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@stats2_mm
# col_name data_type comment
-
_c0 array<string>
# Detailed Table Information