Author: xuefu
Date: Mon Oct 27 03:34:05 2014
New Revision: 1634442
URL: http://svn.apache.org/r1634442
Log:
HIVE-8601: Fix auto_sortmerge_join_16 determinism (Szehon via Xuefu)
Modified:
hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_16.q.out
Modified: hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q?rev=1634442&r1=1634441&r2=1634442&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q Mon
Oct 27 03:34:05 2014
@@ -8,6 +8,8 @@ set hive.auto.convert.sortmerge.join=tru
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
+-- SORT_QUERY_RESULTS
+
CREATE TABLE stage_bucket_big
(
key BIGINT,
Modified:
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out?rev=1634442&r1=1634441&r2=1634442&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out
Mon Oct 27 03:34:05 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: CREATE TABLE stage_bucket_big
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE stage_bucket_big
(
key BIGINT,
value STRING
@@ -7,7 +9,9 @@ PARTITIONED BY (file_tag STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_big
-POSTHOOK: query: CREATE TABLE stage_bucket_big
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE stage_bucket_big
(
key BIGINT,
value STRING
@@ -236,12 +240,6 @@ POSTHOOK: Input: default@bucket_small@pr
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
-374 val_374 val_374 day1 1
-374 val_374 val_374 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
@@ -250,3 +248,9 @@ POSTHOOK: Input: default@bucket_small@pr
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+374 val_374 val_374 day1 1
+374 val_374 val_374 day1 1
Modified:
hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_16.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_16.q.out?rev=1634442&r1=1634441&r2=1634442&view=diff
==============================================================================
---
hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_16.q.out
(original)
+++
hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_16.q.out
Mon Oct 27 03:34:05 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: CREATE TABLE stage_bucket_big
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE stage_bucket_big
(
key BIGINT,
value STRING
@@ -7,7 +9,9 @@ PARTITIONED BY (file_tag STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_big
-POSTHOOK: query: CREATE TABLE stage_bucket_big
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE stage_bucket_big
(
key BIGINT,
value STRING
@@ -236,12 +240,6 @@ POSTHOOK: Input: default@bucket_small@pr
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
-374 val_374 val_374 day1 1
-374 val_374 val_374 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
-172 val_172 val_172 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
@@ -250,3 +248,9 @@ POSTHOOK: Input: default@bucket_small@pr
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
+374 val_374 val_374 day1 1
+374 val_374 val_374 day1 1
