You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2015/06/09 03:57:31 UTC
[23/50] [abbrv] hive git commit: HIVE-10887 : TestCliDriver tests
ordering issues with Mac and CentOS (Hari Subramaniyan,
reviewed by Thejas Nair)
HIVE-10887 : TestCliDriver tests ordering issues with Mac and CentOS (Hari Subramaniyan, reviewed by Thejas Nair)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b4f57d88
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b4f57d88
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b4f57d88
Branch: refs/heads/spark
Commit: b4f57d8885a85a8d977fa48fa756c5c2b1cd2be7
Parents: 0910083
Author: Hari Subramaniyan <ha...@apache.org>
Authored: Wed Jun 3 13:30:50 2015 -0700
Committer: Hari Subramaniyan <ha...@apache.org>
Committed: Wed Jun 3 13:30:50 2015 -0700
----------------------------------------------------------------------
.../queries/clientpositive/unionDistinct_2.q | 2 +
.../update_after_multiple_inserts.q | 2 +
.../clientpositive/tez/unionDistinct_2.q.out | 38 ++++++++++--------
.../tez/update_after_multiple_inserts.q.out | 12 ++++--
.../clientpositive/unionDistinct_2.q.out | 42 +++++++++++---------
.../update_after_multiple_inserts.q.out | 12 ++++--
6 files changed, 64 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/queries/clientpositive/unionDistinct_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unionDistinct_2.q b/ql/src/test/queries/clientpositive/unionDistinct_2.q
index ab78128..324bf68 100644
--- a/ql/src/test/queries/clientpositive/unionDistinct_2.q
+++ b/ql/src/test/queries/clientpositive/unionDistinct_2.q
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
CREATE TABLE u1 as select key, value from src order by key limit 5;
CREATE TABLE u2 as select key, value from src order by key limit 3;
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q b/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
index 6ef209f..eb8e5a1 100644
--- a/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
+++ b/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
@@ -3,6 +3,8 @@ set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
set hive.enforce.bucketing=true;
+-- SORT_QUERY_RESULTS
+
create table acid_uami(i int,
de decimal(5,2),
vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true');
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
index 1ba78b7..6d59369 100644
--- a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
@@ -1,9 +1,13 @@
-PREHOOK: query: CREATE TABLE u1 as select key, value from src order by key limit 5
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE u1 as select key, value from src order by key limit 5
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
PREHOOK: Output: database:default
PREHOOK: Output: default@u1
-POSTHOOK: query: CREATE TABLE u1 as select key, value from src order by key limit 5
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE u1 as select key, value from src order by key limit 5
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
@@ -60,11 +64,11 @@ POSTHOOK: query: select * from u3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@u3
#### A masked pattern was here ####
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -94,16 +98,16 @@ POSTHOOK: Input: default@u3
0 val_0
0 val_0
0 val_0
-10 val_10
-100 val_100
0 val_0
0 val_0
0 val_0
-98 val_98
-98 val_98
+10 val_10
+100 val_100
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -133,11 +137,11 @@ POSTHOOK: Input: default@u3
0 val_0
10 val_10
100 val_100
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -167,11 +171,11 @@ POSTHOOK: Input: default@u3
0 val_0
10 val_10
100 val_100
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -504,9 +508,9 @@ POSTHOOK: Input: default@u2
POSTHOOK: Input: default@v
#### A masked pattern was here ####
0 val_0
+0 val_0
10 val_10
100 val_100
-0 val_0
PREHOOK: query: select distinct * from
(
select key, value from u1
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out b/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
index a2ad3af..d536fe9 100644
--- a/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
+++ b/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
@@ -1,10 +1,14 @@
-PREHOOK: query: create table acid_uami(i int,
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table acid_uami(i int,
de decimal(5,2),
vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@acid_uami
-POSTHOOK: query: create table acid_uami(i int,
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table acid_uami(i int,
de decimal(5,2),
vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
POSTHOOK: type: CREATETABLE
@@ -50,8 +54,8 @@ POSTHOOK: Input: default@acid_uami
#### A masked pattern was here ####
1 109.23 mary had a little lamb
10 119.23 and everywhere that mary went
-65530 823.19 the lamb was sure to go
6553 923.19 its fleece was white as snow
+65530 823.19 the lamb was sure to go
PREHOOK: query: update acid_uami set de = 3.14 where de = 109.23 or de = 119.23
PREHOOK: type: QUERY
PREHOOK: Input: default@acid_uami
@@ -70,5 +74,5 @@ POSTHOOK: Input: default@acid_uami
#### A masked pattern was here ####
1 3.14 mary had a little lamb
10 3.14 and everywhere that mary went
-65530 823.19 the lamb was sure to go
6553 923.19 its fleece was white as snow
+65530 823.19 the lamb was sure to go
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/results/clientpositive/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/unionDistinct_2.q.out
index 66df734..6d59369 100644
--- a/ql/src/test/results/clientpositive/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/unionDistinct_2.q.out
@@ -1,9 +1,13 @@
-PREHOOK: query: CREATE TABLE u1 as select key, value from src order by key limit 5
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE u1 as select key, value from src order by key limit 5
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
PREHOOK: Output: database:default
PREHOOK: Output: default@u1
-POSTHOOK: query: CREATE TABLE u1 as select key, value from src order by key limit 5
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE u1 as select key, value from src order by key limit 5
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
@@ -60,11 +64,11 @@ POSTHOOK: query: select * from u3
POSTHOOK: type: QUERY
POSTHOOK: Input: default@u3
#### A masked pattern was here ####
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -91,19 +95,19 @@ POSTHOOK: Input: default@u1
POSTHOOK: Input: default@u2
POSTHOOK: Input: default@u3
#### A masked pattern was here ####
-98 val_98
-98 val_98
-97 val_97
-97 val_97
-96 val_96
0 val_0
0 val_0
0 val_0
-10 val_10
-100 val_100
0 val_0
0 val_0
0 val_0
+10 val_10
+100 val_100
+96 val_96
+97 val_97
+97 val_97
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -133,11 +137,11 @@ POSTHOOK: Input: default@u3
0 val_0
10 val_10
100 val_100
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -167,11 +171,11 @@ POSTHOOK: Input: default@u3
0 val_0
10 val_10
100 val_100
-98 val_98
-98 val_98
+96 val_96
97 val_97
97 val_97
-96 val_96
+98 val_98
+98 val_98
PREHOOK: query: select key, value from
(
select key, value from u1
@@ -504,9 +508,9 @@ POSTHOOK: Input: default@u2
POSTHOOK: Input: default@v
#### A masked pattern was here ####
0 val_0
+0 val_0
10 val_10
100 val_100
-0 val_0
PREHOOK: query: select distinct * from
(
select key, value from u1
http://git-wip-us.apache.org/repos/asf/hive/blob/b4f57d88/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out b/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
index a2ad3af..d536fe9 100644
--- a/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
+++ b/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
@@ -1,10 +1,14 @@
-PREHOOK: query: create table acid_uami(i int,
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table acid_uami(i int,
de decimal(5,2),
vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@acid_uami
-POSTHOOK: query: create table acid_uami(i int,
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table acid_uami(i int,
de decimal(5,2),
vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true')
POSTHOOK: type: CREATETABLE
@@ -50,8 +54,8 @@ POSTHOOK: Input: default@acid_uami
#### A masked pattern was here ####
1 109.23 mary had a little lamb
10 119.23 and everywhere that mary went
-65530 823.19 the lamb was sure to go
6553 923.19 its fleece was white as snow
+65530 823.19 the lamb was sure to go
PREHOOK: query: update acid_uami set de = 3.14 where de = 109.23 or de = 119.23
PREHOOK: type: QUERY
PREHOOK: Input: default@acid_uami
@@ -70,5 +74,5 @@ POSTHOOK: Input: default@acid_uami
#### A masked pattern was here ####
1 3.14 mary had a little lamb
10 3.14 and everywhere that mary went
-65530 823.19 the lamb was sure to go
6553 923.19 its fleece was white as snow
+65530 823.19 the lamb was sure to go