You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/08 22:17:54 UTC
[37/50] [abbrv] hive git commit: HIVE-14671 : merge master into
hive-14535 (Wei Zheng)
http://git-wip-us.apache.org/repos/asf/hive/blob/1ceaf357/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index e409a36,cbfb33a..42cb5a6
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@@ -509,11 -509,11 +509,19 @@@ Stage-
Conditional Operator
Stage-1
Map 1 vectorized
++<<<<<<< HEAD
+ File Output Operator [FS_8]
+ table:{"name:":"default.orc_merge5"}
+ Select Operator [SEL_7] (rows=306 width=268)
+ Output:["_col0","_col1","_col2","_col3","_col4"]
+ Filter Operator [FIL_6] (rows=306 width=268)
++=======
+ File Output Operator [FS_3]
+ table:{"name:":"default.orc_merge5"}
+ Select Operator [SEL_2] (rows=306 width=268)
+ Output:["_col0","_col1","_col2","_col3","_col4"]
+ Filter Operator [FIL_4] (rows=306 width=268)
++>>>>>>> master
predicate:(userid <= 13)
TableScan [TS_0] (rows=919 width=268)
default@orc_merge5,orc_merge5,Tbl:COMPLETE,Col:NONE,Output:["userid","string1","subtype","decimal1","ts"]