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 2014/12/05 07:15:12 UTC
svn commit: r1643159 - in /hive/branches/spark: ./ hbase-handler/pom.xml
ql/src/test/queries/clientpositive/parquet_join.q
ql/src/test/results/clientpositive/parquet_join.q.out
Author: xuefu
Date: Fri Dec 5 06:15:11 2014
New Revision: 1643159
URL: http://svn.apache.org/viewvc?rev=1643159&view=rev
Log:
HIVE-9011: Fix parquet_join.q determinism (Jimmy via Xuefu)
Merged from trunk, r1643125
Modified:
hive/branches/spark/ (props changed)
hive/branches/spark/hbase-handler/pom.xml (props changed)
hive/branches/spark/ql/src/test/queries/clientpositive/parquet_join.q
hive/branches/spark/ql/src/test/results/clientpositive/parquet_join.q.out
Propchange: hive/branches/spark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 06:15:11 2014
@@ -2,4 +2,4 @@
/hive/branches/cbo:1605012-1627125
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
-/hive/trunk:1608589-1642369
+/hive/trunk:1608589-1642369,1643125
Propchange: hive/branches/spark/hbase-handler/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 06:15:11 2014
@@ -2,4 +2,4 @@
/hive/branches/cbo/hbase-handler/pom.xml:1605012-1627125
/hive/branches/tez/hbase-handler/pom.xml:1494760-1622766
/hive/branches/vectorization/hbase-handler/pom.xml:1466908-1527856
-/hive/trunk/hbase-handler/pom.xml:1494760-1537575,1608589-1633422,1633911,1634262,1634442,1634636,1634946,1636885,1636888,1637521,1641875,1642127,1642148
+/hive/trunk/hbase-handler/pom.xml:1494760-1537575,1608589-1633422,1633911,1634262,1634442,1634636,1634946,1636885,1636888,1637521,1641875,1642127,1642148,1643125
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/parquet_join.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/parquet_join.q?rev=1643159&r1=1643158&r2=1643159&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/parquet_join.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/parquet_join.q Fri Dec 5 06:15:11 2014
@@ -12,6 +12,8 @@ create table parquet_jointable1 stored a
create table parquet_jointable2 stored as parquet as select key,key+1,concat(value,"value") as myvalue from staging;
+-- SORT_QUERY_RESULTS
+
-- MR join
explain select p2.myvalue from parquet_jointable1 p1 join parquet_jointable2 p2 on p1.key=p2.key;
Modified: hive/branches/spark/ql/src/test/results/clientpositive/parquet_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/parquet_join.q.out?rev=1643159&r1=1643158&r2=1643159&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/parquet_join.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/parquet_join.q.out Fri Dec 5 06:15:11 2014
@@ -56,11 +56,15 @@ POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@staging
POSTHOOK: Output: database:default
POSTHOOK: Output: default@parquet_jointable2
-PREHOOK: query: -- MR join
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- MR join
explain select p2.myvalue from parquet_jointable1 p1 join parquet_jointable2 p2 on p1.key=p2.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- MR join
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- MR join
explain select p2.myvalue from parquet_jointable1 p1 join parquet_jointable2 p2 on p1.key=p2.key
POSTHOOK: type: QUERY