svn commit: r1653769 [11/14] - in /hive/branches/spark: ./ beeline/src/java/org/apache/hive/beeline/ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/ common/src/java/org/apache/hadoop/hive/conf/ data/scripts/ dev-...

[sz...@apache.org]

Modified: hive/branches/spark/ql/src/test/results/clientpositive/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/semijoin.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/semijoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/semijoin.q.out Thu Jan 22 05:05:05 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
@@ -19,6 +23,7 @@ POSTHOOK: Input: default@t1
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -26,7 +31,6 @@ POSTHOOK: Input: default@t1
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: create table t2 as select cast(2*key as int) key, value from t1
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -48,14 +52,14 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
 16	val_8
 18	val_9
 20	val_10
+4	val_2
+8	val_4
 PREHOOK: query: create table t3 as select * from (select * from t1 union all select * from t2) b
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -82,7 +86,14 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
+10	val_5
+10	val_5
+10	val_5
+16	val_8
+18	val_9
 2	val_2
+20	val_10
 4	val_2
 4	val_4
 5	val_5
@@ -91,13 +102,6 @@ POSTHOOK: Input: default@t3
 8	val_4
 8	val_8
 9	val_9
-10	val_10
-10	val_5
-10	val_5
-10	val_5
-16	val_8
-18	val_9
-20	val_10
 PREHOOK: query: create table t4 (key int, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -215,9 +219,9 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 4	val_4
 8	val_8
-10	val_10
 PREHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
@@ -319,11 +323,11 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
@@ -937,11 +941,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 #### A masked pattern was here ####
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
@@ -1038,6 +1042,10 @@ POSTHOOK: Input: default@t3
 0
 0
 0
+10
+10
+10
+10
 2
 4
 4
@@ -1047,10 +1055,6 @@ POSTHOOK: Input: default@t3
 8
 8
 9
-10
-10
-10
-10
 PREHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
@@ -1281,11 +1285,11 @@ POSTHOOK: Input: default@t3
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
-4	val_4	4	val_2
-8	val_8	8	val_4
 10	val_10	10	val_5
 10	val_10	10	val_5
 10	val_10	10	val_5
+4	val_4	4	val_2
+8	val_8	8	val_4
 PREHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
@@ -1389,6 +1393,7 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -1396,7 +1401,6 @@ POSTHOOK: Input: default@t3
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
@@ -1522,14 +1526,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1651,14 +1655,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1762,9 +1766,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1783,14 +1784,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1894,9 +1898,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1915,14 +1916,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
@@ -2044,10 +2048,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2055,6 +2055,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
@@ -2158,11 +2162,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2181,14 +2180,19 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
@@ -2292,9 +2296,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2313,15 +2314,6 @@ NULL
 0
 0
 0
-2
-4
-4
-5
-5
-5
-8
-8
-9
 10
 10
 10
@@ -2334,6 +2326,18 @@ NULL
 10
 10
 10
+2
+4
+4
+5
+5
+5
+8
+8
+9
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
@@ -2487,10 +2491,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2504,6 +2504,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100

Modified: hive/branches/spark/ql/src/test/results/clientpositive/show_functions.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/show_functions.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/show_functions.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/show_functions.q.out Thu Jan 22 05:05:05 2015
@@ -21,6 +21,7 @@ POSTHOOK: type: SHOWFUNCTIONS
 ^
 abs
 acos
+add_months
 and
 array
 array_contains
@@ -86,6 +87,7 @@ if
 in
 in_file
 index
+initcap
 inline
 instr
 isnotnull
@@ -93,6 +95,7 @@ isnull
 java_method
 json_tuple
 lag
+last_day
 last_value
 lcase
 lead

Modified: hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out Thu Jan 22 05:05:05 2015
@@ -277,6 +277,1959 @@ POSTHOOK: Input: default@test_table2@ds=
 POSTHOOK: Output: default@test_table3@ds=1
 POSTHOOK: Lineage: test_table3 PARTITION(ds=1).key SIMPLE [(test_table1)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value SIMPLE [(test_table2)b.FieldSchema(name:value, type:string, comment:null), ]
+PREHOOK: query: SELECT * FROM test_table1 ORDER BY key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1
+PREHOOK: Input: default@test_table1@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM test_table1 ORDER BY key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1
+POSTHOOK: Input: default@test_table1@ds=1
+#### A masked pattern was here ####
+0	val_0	1
+0	val_0	1
+0	val_0	1
+2	val_2	1
+4	val_4	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+8	val_8	1
+9	val_9	1
+10	val_10	1
+11	val_11	1
+12	val_12	1
+12	val_12	1
+15	val_15	1
+15	val_15	1
+17	val_17	1
+18	val_18	1
+18	val_18	1
+19	val_19	1
+20	val_20	1
+24	val_24	1
+24	val_24	1
+26	val_26	1
+26	val_26	1
+27	val_27	1
+28	val_28	1
+30	val_30	1
+33	val_33	1
+34	val_34	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+37	val_37	1
+37	val_37	1
+41	val_41	1
+42	val_42	1
+42	val_42	1
+43	val_43	1
+44	val_44	1
+47	val_47	1
+51	val_51	1
+51	val_51	1
+53	val_53	1
+54	val_54	1
+57	val_57	1
+58	val_58	1
+58	val_58	1
+64	val_64	1
+65	val_65	1
+66	val_66	1
+67	val_67	1
+67	val_67	1
+69	val_69	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+72	val_72	1
+72	val_72	1
+74	val_74	1
+76	val_76	1
+76	val_76	1
+77	val_77	1
+78	val_78	1
+80	val_80	1
+82	val_82	1
+83	val_83	1
+83	val_83	1
+84	val_84	1
+84	val_84	1
+85	val_85	1
+86	val_86	1
+87	val_87	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+92	val_92	1
+95	val_95	1
+95	val_95	1
+96	val_96	1
+97	val_97	1
+97	val_97	1
+98	val_98	1
+98	val_98	1
+100	val_100	1
+100	val_100	1
+103	val_103	1
+103	val_103	1
+104	val_104	1
+104	val_104	1
+105	val_105	1
+111	val_111	1
+113	val_113	1
+113	val_113	1
+114	val_114	1
+116	val_116	1
+118	val_118	1
+118	val_118	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+120	val_120	1
+120	val_120	1
+125	val_125	1
+125	val_125	1
+126	val_126	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+129	val_129	1
+129	val_129	1
+131	val_131	1
+133	val_133	1
+134	val_134	1
+134	val_134	1
+136	val_136	1
+137	val_137	1
+137	val_137	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+143	val_143	1
+145	val_145	1
+146	val_146	1
+146	val_146	1
+149	val_149	1
+149	val_149	1
+150	val_150	1
+152	val_152	1
+152	val_152	1
+153	val_153	1
+155	val_155	1
+156	val_156	1
+157	val_157	1
+158	val_158	1
+160	val_160	1
+162	val_162	1
+163	val_163	1
+164	val_164	1
+164	val_164	1
+165	val_165	1
+165	val_165	1
+166	val_166	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+168	val_168	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+170	val_170	1
+172	val_172	1
+172	val_172	1
+174	val_174	1
+174	val_174	1
+175	val_175	1
+175	val_175	1
+176	val_176	1
+176	val_176	1
+177	val_177	1
+178	val_178	1
+179	val_179	1
+179	val_179	1
+180	val_180	1
+181	val_181	1
+183	val_183	1
+186	val_186	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+189	val_189	1
+190	val_190	1
+191	val_191	1
+191	val_191	1
+192	val_192	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+194	val_194	1
+195	val_195	1
+195	val_195	1
+196	val_196	1
+197	val_197	1
+197	val_197	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+200	val_200	1
+200	val_200	1
+201	val_201	1
+202	val_202	1
+203	val_203	1
+203	val_203	1
+205	val_205	1
+205	val_205	1
+207	val_207	1
+207	val_207	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+209	val_209	1
+209	val_209	1
+213	val_213	1
+213	val_213	1
+214	val_214	1
+216	val_216	1
+216	val_216	1
+217	val_217	1
+217	val_217	1
+218	val_218	1
+219	val_219	1
+219	val_219	1
+221	val_221	1
+221	val_221	1
+222	val_222	1
+223	val_223	1
+223	val_223	1
+224	val_224	1
+224	val_224	1
+226	val_226	1
+228	val_228	1
+229	val_229	1
+229	val_229	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+233	val_233	1
+233	val_233	1
+235	val_235	1
+237	val_237	1
+237	val_237	1
+238	val_238	1
+238	val_238	1
+239	val_239	1
+239	val_239	1
+241	val_241	1
+242	val_242	1
+242	val_242	1
+244	val_244	1
+247	val_247	1
+248	val_248	1
+249	val_249	1
+252	val_252	1
+255	val_255	1
+255	val_255	1
+256	val_256	1
+256	val_256	1
+257	val_257	1
+258	val_258	1
+260	val_260	1
+262	val_262	1
+263	val_263	1
+265	val_265	1
+265	val_265	1
+266	val_266	1
+272	val_272	1
+272	val_272	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+274	val_274	1
+275	val_275	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+278	val_278	1
+278	val_278	1
+280	val_280	1
+280	val_280	1
+281	val_281	1
+281	val_281	1
+282	val_282	1
+282	val_282	1
+283	val_283	1
+284	val_284	1
+285	val_285	1
+286	val_286	1
+287	val_287	1
+288	val_288	1
+288	val_288	1
+289	val_289	1
+291	val_291	1
+292	val_292	1
+296	val_296	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+302	val_302	1
+305	val_305	1
+306	val_306	1
+307	val_307	1
+307	val_307	1
+308	val_308	1
+309	val_309	1
+309	val_309	1
+310	val_310	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+315	val_315	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+317	val_317	1
+317	val_317	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+321	val_321	1
+321	val_321	1
+322	val_322	1
+322	val_322	1
+323	val_323	1
+325	val_325	1
+325	val_325	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+331	val_331	1
+331	val_331	1
+332	val_332	1
+333	val_333	1
+333	val_333	1
+335	val_335	1
+336	val_336	1
+338	val_338	1
+339	val_339	1
+341	val_341	1
+342	val_342	1
+342	val_342	1
+344	val_344	1
+344	val_344	1
+345	val_345	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+351	val_351	1
+353	val_353	1
+353	val_353	1
+356	val_356	1
+360	val_360	1
+362	val_362	1
+364	val_364	1
+365	val_365	1
+366	val_366	1
+367	val_367	1
+367	val_367	1
+368	val_368	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+373	val_373	1
+374	val_374	1
+375	val_375	1
+377	val_377	1
+378	val_378	1
+379	val_379	1
+382	val_382	1
+382	val_382	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+386	val_386	1
+389	val_389	1
+392	val_392	1
+393	val_393	1
+394	val_394	1
+395	val_395	1
+395	val_395	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+397	val_397	1
+397	val_397	1
+399	val_399	1
+399	val_399	1
+400	val_400	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+402	val_402	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+404	val_404	1
+404	val_404	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+407	val_407	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+411	val_411	1
+413	val_413	1
+413	val_413	1
+414	val_414	1
+414	val_414	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+418	val_418	1
+419	val_419	1
+421	val_421	1
+424	val_424	1
+424	val_424	1
+427	val_427	1
+429	val_429	1
+429	val_429	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+432	val_432	1
+435	val_435	1
+436	val_436	1
+437	val_437	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+439	val_439	1
+439	val_439	1
+443	val_443	1
+444	val_444	1
+446	val_446	1
+448	val_448	1
+449	val_449	1
+452	val_452	1
+453	val_453	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+455	val_455	1
+457	val_457	1
+458	val_458	1
+458	val_458	1
+459	val_459	1
+459	val_459	1
+460	val_460	1
+462	val_462	1
+462	val_462	1
+463	val_463	1
+463	val_463	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+467	val_467	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+470	val_470	1
+472	val_472	1
+475	val_475	1
+477	val_477	1
+478	val_478	1
+478	val_478	1
+479	val_479	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+481	val_481	1
+482	val_482	1
+483	val_483	1
+484	val_484	1
+485	val_485	1
+487	val_487	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+490	val_490	1
+491	val_491	1
+492	val_492	1
+492	val_492	1
+493	val_493	1
+494	val_494	1
+495	val_495	1
+496	val_496	1
+497	val_497	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+PREHOOK: query: SELECT * FROM test_table3 ORDER BY key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM test_table3 ORDER BY key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+0	val_0	1
+2	val_2	1
+4	val_4	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+5	val_5	1
+8	val_8	1
+9	val_9	1
+10	val_10	1
+11	val_11	1
+12	val_12	1
+12	val_12	1
+12	val_12	1
+12	val_12	1
+15	val_15	1
+15	val_15	1
+15	val_15	1
+15	val_15	1
+17	val_17	1
+18	val_18	1
+18	val_18	1
+18	val_18	1
+18	val_18	1
+19	val_19	1
+20	val_20	1
+24	val_24	1
+24	val_24	1
+24	val_24	1
+24	val_24	1
+26	val_26	1
+26	val_26	1
+26	val_26	1
+26	val_26	1
+27	val_27	1
+28	val_28	1
+30	val_30	1
+33	val_33	1
+34	val_34	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+35	val_35	1
+37	val_37	1
+37	val_37	1
+37	val_37	1
+37	val_37	1
+41	val_41	1
+42	val_42	1
+42	val_42	1
+42	val_42	1
+42	val_42	1
+43	val_43	1
+44	val_44	1
+47	val_47	1
+51	val_51	1
+51	val_51	1
+51	val_51	1
+51	val_51	1
+53	val_53	1
+54	val_54	1
+57	val_57	1
+58	val_58	1
+58	val_58	1
+58	val_58	1
+58	val_58	1
+64	val_64	1
+65	val_65	1
+66	val_66	1
+67	val_67	1
+67	val_67	1
+67	val_67	1
+67	val_67	1
+69	val_69	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+70	val_70	1
+72	val_72	1
+72	val_72	1
+72	val_72	1
+72	val_72	1
+74	val_74	1
+76	val_76	1
+76	val_76	1
+76	val_76	1
+76	val_76	1
+77	val_77	1
+78	val_78	1
+80	val_80	1
+82	val_82	1
+83	val_83	1
+83	val_83	1
+83	val_83	1
+83	val_83	1
+84	val_84	1
+84	val_84	1
+84	val_84	1
+84	val_84	1
+85	val_85	1
+86	val_86	1
+87	val_87	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+90	val_90	1
+92	val_92	1
+95	val_95	1
+95	val_95	1
+95	val_95	1
+95	val_95	1
+96	val_96	1
+97	val_97	1
+97	val_97	1
+97	val_97	1
+97	val_97	1
+98	val_98	1
+98	val_98	1
+98	val_98	1
+98	val_98	1
+100	val_100	1
+100	val_100	1
+100	val_100	1
+100	val_100	1
+103	val_103	1
+103	val_103	1
+103	val_103	1
+103	val_103	1
+104	val_104	1
+104	val_104	1
+104	val_104	1
+104	val_104	1
+105	val_105	1
+111	val_111	1
+113	val_113	1
+113	val_113	1
+113	val_113	1
+113	val_113	1
+114	val_114	1
+116	val_116	1
+118	val_118	1
+118	val_118	1
+118	val_118	1
+118	val_118	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+119	val_119	1
+120	val_120	1
+120	val_120	1
+120	val_120	1
+120	val_120	1
+125	val_125	1
+125	val_125	1
+125	val_125	1
+125	val_125	1
+126	val_126	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+128	val_128	1
+129	val_129	1
+129	val_129	1
+129	val_129	1
+129	val_129	1
+131	val_131	1
+133	val_133	1
+134	val_134	1
+134	val_134	1
+134	val_134	1
+134	val_134	1
+136	val_136	1
+137	val_137	1
+137	val_137	1
+137	val_137	1
+137	val_137	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+138	val_138	1
+143	val_143	1
+145	val_145	1
+146	val_146	1
+146	val_146	1
+146	val_146	1
+146	val_146	1
+149	val_149	1
+149	val_149	1
+149	val_149	1
+149	val_149	1
+150	val_150	1
+152	val_152	1
+152	val_152	1
+152	val_152	1
+152	val_152	1
+153	val_153	1
+155	val_155	1
+156	val_156	1
+157	val_157	1
+158	val_158	1
+160	val_160	1
+162	val_162	1
+163	val_163	1
+164	val_164	1
+164	val_164	1
+164	val_164	1
+164	val_164	1
+165	val_165	1
+165	val_165	1
+165	val_165	1
+165	val_165	1
+166	val_166	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+167	val_167	1
+168	val_168	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+169	val_169	1
+170	val_170	1
+172	val_172	1
+172	val_172	1
+172	val_172	1
+172	val_172	1
+174	val_174	1
+174	val_174	1
+174	val_174	1
+174	val_174	1
+175	val_175	1
+175	val_175	1
+175	val_175	1
+175	val_175	1
+176	val_176	1
+176	val_176	1
+176	val_176	1
+176	val_176	1
+177	val_177	1
+178	val_178	1
+179	val_179	1
+179	val_179	1
+179	val_179	1
+179	val_179	1
+180	val_180	1
+181	val_181	1
+183	val_183	1
+186	val_186	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+187	val_187	1
+189	val_189	1
+190	val_190	1
+191	val_191	1
+191	val_191	1
+191	val_191	1
+191	val_191	1
+192	val_192	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+194	val_194	1
+195	val_195	1
+195	val_195	1
+195	val_195	1
+195	val_195	1
+196	val_196	1
+197	val_197	1
+197	val_197	1
+197	val_197	1
+197	val_197	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+199	val_199	1
+200	val_200	1
+200	val_200	1
+200	val_200	1
+200	val_200	1
+201	val_201	1
+202	val_202	1
+203	val_203	1
+203	val_203	1
+203	val_203	1
+203	val_203	1
+205	val_205	1
+205	val_205	1
+205	val_205	1
+205	val_205	1
+207	val_207	1
+207	val_207	1
+207	val_207	1
+207	val_207	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+208	val_208	1
+209	val_209	1
+209	val_209	1
+209	val_209	1
+209	val_209	1
+213	val_213	1
+213	val_213	1
+213	val_213	1
+213	val_213	1
+214	val_214	1
+216	val_216	1
+216	val_216	1
+216	val_216	1
+216	val_216	1
+217	val_217	1
+217	val_217	1
+217	val_217	1
+217	val_217	1
+218	val_218	1
+219	val_219	1
+219	val_219	1
+219	val_219	1
+219	val_219	1
+221	val_221	1
+221	val_221	1
+221	val_221	1
+221	val_221	1
+222	val_222	1
+223	val_223	1
+223	val_223	1
+223	val_223	1
+223	val_223	1
+224	val_224	1
+224	val_224	1
+224	val_224	1
+224	val_224	1
+226	val_226	1
+228	val_228	1
+229	val_229	1
+229	val_229	1
+229	val_229	1
+229	val_229	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+230	val_230	1
+233	val_233	1
+233	val_233	1
+233	val_233	1
+233	val_233	1
+235	val_235	1
+237	val_237	1
+237	val_237	1
+237	val_237	1
+237	val_237	1
+238	val_238	1
+238	val_238	1
+238	val_238	1
+238	val_238	1
+239	val_239	1
+239	val_239	1
+239	val_239	1
+239	val_239	1
+241	val_241	1
+242	val_242	1
+242	val_242	1
+242	val_242	1
+242	val_242	1
+244	val_244	1
+247	val_247	1
+248	val_248	1
+249	val_249	1
+252	val_252	1
+255	val_255	1
+255	val_255	1
+255	val_255	1
+255	val_255	1
+256	val_256	1
+256	val_256	1
+256	val_256	1
+256	val_256	1
+257	val_257	1
+258	val_258	1
+260	val_260	1
+262	val_262	1
+263	val_263	1
+265	val_265	1
+265	val_265	1
+265	val_265	1
+265	val_265	1
+266	val_266	1
+272	val_272	1
+272	val_272	1
+272	val_272	1
+272	val_272	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+274	val_274	1
+275	val_275	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+277	val_277	1
+278	val_278	1
+278	val_278	1
+278	val_278	1
+278	val_278	1
+280	val_280	1
+280	val_280	1
+280	val_280	1
+280	val_280	1
+281	val_281	1
+281	val_281	1
+281	val_281	1
+281	val_281	1
+282	val_282	1
+282	val_282	1
+282	val_282	1
+282	val_282	1
+283	val_283	1
+284	val_284	1
+285	val_285	1
+286	val_286	1
+287	val_287	1
+288	val_288	1
+288	val_288	1
+288	val_288	1
+288	val_288	1
+289	val_289	1
+291	val_291	1
+292	val_292	1
+296	val_296	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+298	val_298	1
+302	val_302	1
+305	val_305	1
+306	val_306	1
+307	val_307	1
+307	val_307	1
+307	val_307	1
+307	val_307	1
+308	val_308	1
+309	val_309	1
+309	val_309	1
+309	val_309	1
+309	val_309	1
+310	val_310	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+311	val_311	1
+315	val_315	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+316	val_316	1
+317	val_317	1
+317	val_317	1
+317	val_317	1
+317	val_317	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+318	val_318	1
+321	val_321	1
+321	val_321	1
+321	val_321	1
+321	val_321	1
+322	val_322	1
+322	val_322	1
+322	val_322	1
+322	val_322	1
+323	val_323	1
+325	val_325	1
+325	val_325	1
+325	val_325	1
+325	val_325	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+327	val_327	1
+331	val_331	1
+331	val_331	1
+331	val_331	1
+331	val_331	1
+332	val_332	1
+333	val_333	1
+333	val_333	1
+333	val_333	1
+333	val_333	1
+335	val_335	1
+336	val_336	1
+338	val_338	1
+339	val_339	1
+341	val_341	1
+342	val_342	1
+342	val_342	1
+342	val_342	1
+342	val_342	1
+344	val_344	1
+344	val_344	1
+344	val_344	1
+344	val_344	1
+345	val_345	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+348	val_348	1
+351	val_351	1
+353	val_353	1
+353	val_353	1
+353	val_353	1
+353	val_353	1
+356	val_356	1
+360	val_360	1
+362	val_362	1
+364	val_364	1
+365	val_365	1
+366	val_366	1
+367	val_367	1
+367	val_367	1
+367	val_367	1
+367	val_367	1
+368	val_368	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+373	val_373	1
+374	val_374	1
+375	val_375	1
+377	val_377	1
+378	val_378	1
+379	val_379	1
+382	val_382	1
+382	val_382	1
+382	val_382	1
+382	val_382	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+384	val_384	1
+386	val_386	1
+389	val_389	1
+392	val_392	1
+393	val_393	1
+394	val_394	1
+395	val_395	1
+395	val_395	1
+395	val_395	1
+395	val_395	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+396	val_396	1
+397	val_397	1
+397	val_397	1
+397	val_397	1
+397	val_397	1
+399	val_399	1
+399	val_399	1
+399	val_399	1
+399	val_399	1
+400	val_400	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+402	val_402	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+403	val_403	1
+404	val_404	1
+404	val_404	1
+404	val_404	1
+404	val_404	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+406	val_406	1
+407	val_407	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+409	val_409	1
+411	val_411	1
+413	val_413	1
+413	val_413	1
+413	val_413	1
+413	val_413	1
+414	val_414	1
+414	val_414	1
+414	val_414	1
+414	val_414	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+418	val_418	1
+419	val_419	1
+421	val_421	1
+424	val_424	1
+424	val_424	1
+424	val_424	1
+424	val_424	1
+427	val_427	1
+429	val_429	1
+429	val_429	1
+429	val_429	1
+429	val_429	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+430	val_430	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+431	val_431	1
+432	val_432	1
+435	val_435	1
+436	val_436	1
+437	val_437	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+438	val_438	1
+439	val_439	1
+439	val_439	1
+439	val_439	1
+439	val_439	1
+443	val_443	1
+444	val_444	1
+446	val_446	1
+448	val_448	1
+449	val_449	1
+452	val_452	1
+453	val_453	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+454	val_454	1
+455	val_455	1
+457	val_457	1
+458	val_458	1
+458	val_458	1
+458	val_458	1
+458	val_458	1
+459	val_459	1
+459	val_459	1
+459	val_459	1
+459	val_459	1
+460	val_460	1
+462	val_462	1
+462	val_462	1
+462	val_462	1
+462	val_462	1
+463	val_463	1
+463	val_463	1
+463	val_463	1
+463	val_463	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+466	val_466	1
+467	val_467	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+468	val_468	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+469	val_469	1
+470	val_470	1
+472	val_472	1
+475	val_475	1
+477	val_477	1
+478	val_478	1
+478	val_478	1
+478	val_478	1
+478	val_478	1
+479	val_479	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+480	val_480	1
+481	val_481	1
+482	val_482	1
+483	val_483	1
+484	val_484	1
+485	val_485	1
+487	val_487	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+489	val_489	1
+490	val_490	1
+491	val_491	1
+492	val_492	1
+492	val_492	1
+492	val_492	1
+492	val_492	1
+493	val_493	1
+494	val_494	1
+495	val_495	1
+496	val_496	1
+497	val_497	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+498	val_498	1
+PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16)
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16)
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  
+TOK_QUERY
+   TOK_FROM
+      TOK_TABREF
+         TOK_TABNAME
+            test_table1
+         TOK_TABLEBUCKETSAMPLE
+            2
+            16
+   TOK_INSERT
+      TOK_DESTINATION
+         TOK_DIR
+            TOK_TMP_FILE
+      TOK_SELECT
+         TOK_SELEXPR
+            TOK_ALLCOLREF
+
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: test_table1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            GatherStats: false
+            Filter Operator
+              isSamplingPred: true
+              predicate: (((hash(key) & 2147483647) % 16) = 1) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+              Select Operator
+                expressions: key (type: int), value (type: string), ds (type: string)
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+                  Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        columns _col0,_col1,_col2
+                        columns.types int:string:string
+                        escape.delim \
+                        hive.serialization.extend.nesting.levels true
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  TotalFiles: 1
+                  GatherStats: false
+                  MultiFileSpray: false
+      Path -> Alias:
+#### A masked pattern was here ####
+      Path -> Partition:
+#### A masked pattern was here ####
+          Partition
+            base file name: 000001_0
+            input format: org.apache.hadoop.mapred.TextInputFormat
+            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+            partition values:
+              ds 1
+            properties:
+              COLUMN_STATS_ACCURATE true
+              bucket_count 16
+              bucket_field_name key
+              columns key,value
+              columns.comments 
+              columns.types int:string
+#### A masked pattern was here ####
+              name default.test_table1
+              numFiles 16
+              numRows 500
+              partition_columns ds
+              partition_columns.types string
+              rawDataSize 5312
+              serialization.ddl struct test_table1 { i32 key, string value}
+              serialization.format 1
+              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              totalSize 5812
+#### A masked pattern was here ####
+            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+          
+              input format: org.apache.hadoop.mapred.TextInputFormat
+              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              properties:
+                SORTBUCKETCOLSPREFIX TRUE
+                bucket_count 16
+                bucket_field_name key
+                columns key,value
+                columns.comments 
+                columns.types int:string
+#### A masked pattern was here ####
+                name default.test_table1
+                partition_columns ds
+                partition_columns.types string
+                serialization.ddl struct test_table1 { i32 key, string value}
+                serialization.format 1
+                serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              name: default.test_table1
+            name: default.test_table1
+      Truncated Path -> Alias:
+        /test_table1/ds=1/000001_0 [test_table1]
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16)
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN EXTENDED SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16)
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  
+TOK_QUERY
+   TOK_FROM
+      TOK_TABREF
+         TOK_TABNAME
+            test_table3
+         TOK_TABLEBUCKETSAMPLE
+            2
+            16
+   TOK_INSERT
+      TOK_DESTINATION
+         TOK_DIR
+            TOK_TMP_FILE
+      TOK_SELECT
+         TOK_SELEXPR
+            TOK_ALLCOLREF
+
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: test_table3
+            Statistics: Num rows: 1028 Data size: 10968 Basic stats: COMPLETE Column stats: NONE
+            GatherStats: false
+            Filter Operator
+              isSamplingPred: true
+              predicate: (((hash(key) & 2147483647) % 16) = 1) (type: boolean)
+              Statistics: Num rows: 514 Data size: 5484 Basic stats: COMPLETE Column stats: NONE
+              Select Operator
+                expressions: key (type: int), value (type: string), ds (type: string)
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 514 Data size: 5484 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 1
+                  Statistics: Num rows: 514 Data size: 5484 Basic stats: COMPLETE Column stats: NONE
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        columns _col0,_col1,_col2
+                        columns.types int:string:string
+                        escape.delim \
+                        hive.serialization.extend.nesting.levels true
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  TotalFiles: 1
+                  GatherStats: false
+                  MultiFileSpray: false
+      Path -> Alias:
+#### A masked pattern was here ####
+      Path -> Partition:
+#### A masked pattern was here ####
+          Partition
+            base file name: (ds%3D1)000001_0
+            input format: org.apache.hadoop.mapred.TextInputFormat
+            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+            partition values:
+              ds 1
+            properties:
+              COLUMN_STATS_ACCURATE true
+              bucket_count 16
+              bucket_field_name key
+              columns key,value
+              columns.comments 
+              columns.types int:string
+#### A masked pattern was here ####
+              name default.test_table3
+              numFiles 16
+              numRows 1028
+              partition_columns ds
+              partition_columns.types string
+              rawDataSize 10968
+              serialization.ddl struct test_table3 { i32 key, string value}
+              serialization.format 1
+              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              totalSize 11996
+#### A masked pattern was here ####
+            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+          
+              input format: org.apache.hadoop.mapred.TextInputFormat
+              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              properties:
+                bucket_count 16
+                bucket_field_name key
+                columns key,value
+                columns.comments 
+                columns.types int:string
+#### A masked pattern was here ####
+                name default.test_table3
+                partition_columns ds
+                partition_columns.types string
+                serialization.ddl struct test_table3 { i32 key, string value}
+                serialization.format 1
+                serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+#### A masked pattern was here ####
+              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              name: default.test_table3
+            name: default.test_table3
+      Truncated Path -> Alias:
+        /test_table3/ds=1/(ds%3D1)000001_0 [test_table3]
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1
+PREHOOK: Input: default@test_table1@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1
+POSTHOOK: Input: default@test_table1@ds=1
+#### A masked pattern was here ####
+17	val_17	1
+33	val_33	1
+65	val_65	1
+97	val_97	1
+97	val_97	1
+113	val_113	1
+113	val_113	1
+129	val_129	1
+129	val_129	1
+145	val_145	1
+177	val_177	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+209	val_209	1
+209	val_209	1
+241	val_241	1
+257	val_257	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+289	val_289	1
+305	val_305	1
+321	val_321	1
+321	val_321	1
+353	val_353	1
+353	val_353	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+449	val_449	1
+481	val_481	1
+497	val_497	1
+PREHOOK: query: SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+17	val_17	1
+33	val_33	1
+65	val_65	1
+97	val_97	1
+97	val_97	1
+97	val_97	1
+97	val_97	1
+113	val_113	1
+113	val_113	1
+113	val_113	1
+113	val_113	1
+129	val_129	1
+129	val_129	1
+129	val_129	1
+129	val_129	1
+145	val_145	1
+177	val_177	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+193	val_193	1
+209	val_209	1
+209	val_209	1
+209	val_209	1
+209	val_209	1
+241	val_241	1
+257	val_257	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+273	val_273	1
+289	val_289	1
+305	val_305	1
+321	val_321	1
+321	val_321	1
+321	val_321	1
+321	val_321	1
+353	val_353	1
+353	val_353	1
+353	val_353	1
+353	val_353	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+369	val_369	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+401	val_401	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+417	val_417	1
+449	val_449	1
+481	val_481	1
+497	val_497	1
 PREHOOK: query: -- Join data from a sampled bucket to verify the data is bucketed
 SELECT COUNT(*) FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
 PREHOOK: type: QUERY

Modified: hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out Thu Jan 22 05:05:05 2015
@@ -71,7 +71,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 26 Data size: 104 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: b
@@ -82,7 +82,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -154,7 +154,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: d
@@ -165,7 +165,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/sort.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/sort.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/sort.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/sort.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
 Warning: Map Join MAPJOIN[12][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: explain 
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: explain 
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby2.q.out Thu Jan 22 05:05:05 2015
@@ -87,11 +87,15 @@ POSTHOOK: Output: default@dest_g2
 POSTHOOK: Lineage: dest_g2.c1 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.c2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT dest_g2.* FROM dest_g2
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_g2
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest_g2.* FROM dest_g2
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_g2
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out Thu Jan 22 05:05:05 2015
@@ -62,8 +62,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2
@@ -241,8 +242,9 @@ STAGE PLANS:
                 aggregations: count(DISTINCT KEY._col2:0._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2
+                outputColumnNames: _col0, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1
@@ -334,8 +336,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2
@@ -423,8 +426,9 @@ STAGE PLANS:
                 aggregations: count(DISTINCT KEY._col2:0._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: complete
-                outputColumnNames: _col0, _col1, _col2
+                outputColumnNames: _col0, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1
@@ -562,8 +566,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2
@@ -596,8 +601,9 @@ STAGE PLANS:
                 aggregations: sum(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out Thu Jan 22 05:05:05 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest_g3(ke
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest_g3
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out Thu Jan 22 05:05:05 2015
@@ -62,8 +62,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2
@@ -145,8 +146,9 @@ STAGE PLANS:
                 aggregations: count(DISTINCT KEY._col2:0._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2
+                outputColumnNames: _col0, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1
@@ -238,8 +240,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2
@@ -321,8 +324,9 @@ STAGE PLANS:
                 aggregations: count(DISTINCT KEY._col2:0._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: complete
-                outputColumnNames: _col0, _col1, _col2
+                outputColumnNames: _col0, _col2
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1
@@ -460,8 +464,9 @@ STAGE PLANS:
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2
@@ -494,8 +499,9 @@ STAGE PLANS:
                 aggregations: sum(VALUE._col0)
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
                 mode: final
-                outputColumnNames: _col0, _col1, _col2, _col3
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                pruneGroupingSetId: true
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
                   outputColumnNames: _col0, _col1, _col2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input14.q.out Thu Jan 22 05:05:05 2015
@@ -111,11 +111,15 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input17.q.out Thu Jan 22 05:05:05 2015
@@ -108,15 +108,18 @@ POSTHOOK: Input: default@src_thrift
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-NULL	NULL
 -1461153966	{"myint":49,"mystring":"343","underscore_int":7}
 -1952710705	{"myint":25,"mystring":"125","underscore_int":5}
 -734328905	{"myint":16,"mystring":"64","underscore_int":4}
@@ -127,3 +130,4 @@ NULL	NULL
 336964422	{"myint":81,"mystring":"729","underscore_int":9}
 465985201	{"myint":1,"mystring":"1","underscore_int":1}
 477111225	{"myint":9,"mystring":"27","underscore_int":3}
+NULL	NULL

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input18.q.out Thu Jan 22 05:05:05 2015
@@ -111,11 +111,15 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/input_part2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/input_part2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/input_part2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/input_part2.q.out Thu Jan 22 05:05:05 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest2(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest2
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
@@ -401,13 +405,6 @@ POSTHOOK: Input: default@dest1
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
-2	val_2	12	2008-04-08
-4	val_4	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-8	val_8	12	2008-04-08
-9	val_9	12	2008-04-08
 10	val_10	12	2008-04-08
 11	val_11	12	2008-04-08
 12	val_12	12	2008-04-08
@@ -418,6 +415,7 @@ POSTHOOK: Input: default@dest1
 18	val_18	12	2008-04-08
 18	val_18	12	2008-04-08
 19	val_19	12	2008-04-08
+2	val_2	12	2008-04-08
 20	val_20	12	2008-04-08
 24	val_24	12	2008-04-08
 24	val_24	12	2008-04-08
@@ -433,12 +431,16 @@ POSTHOOK: Input: default@dest1
 35	val_35	12	2008-04-08
 37	val_37	12	2008-04-08
 37	val_37	12	2008-04-08
+4	val_4	12	2008-04-08
 41	val_41	12	2008-04-08
 42	val_42	12	2008-04-08
 42	val_42	12	2008-04-08
 43	val_43	12	2008-04-08
 44	val_44	12	2008-04-08
 47	val_47	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
 51	val_51	12	2008-04-08
 51	val_51	12	2008-04-08
 53	val_53	12	2008-04-08
@@ -462,6 +464,7 @@ POSTHOOK: Input: default@dest1
 76	val_76	12	2008-04-08
 77	val_77	12	2008-04-08
 78	val_78	12	2008-04-08
+8	val_8	12	2008-04-08
 80	val_80	12	2008-04-08
 82	val_82	12	2008-04-08
 83	val_83	12	2008-04-08
@@ -471,6 +474,7 @@ POSTHOOK: Input: default@dest1
 85	val_85	12	2008-04-08
 86	val_86	12	2008-04-08
 87	val_87	12	2008-04-08
+9	val_9	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
@@ -493,13 +497,6 @@ POSTHOOK: Input: default@dest2
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
-2	val_2	12	2008-04-09
-4	val_4	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-8	val_8	12	2008-04-09
-9	val_9	12	2008-04-09
 10	val_10	12	2008-04-09
 11	val_11	12	2008-04-09
 12	val_12	12	2008-04-09
@@ -510,6 +507,7 @@ POSTHOOK: Input: default@dest2
 18	val_18	12	2008-04-09
 18	val_18	12	2008-04-09
 19	val_19	12	2008-04-09
+2	val_2	12	2008-04-09
 20	val_20	12	2008-04-09
 24	val_24	12	2008-04-09
 24	val_24	12	2008-04-09
@@ -525,12 +523,16 @@ POSTHOOK: Input: default@dest2
 35	val_35	12	2008-04-09
 37	val_37	12	2008-04-09
 37	val_37	12	2008-04-09
+4	val_4	12	2008-04-09
 41	val_41	12	2008-04-09
 42	val_42	12	2008-04-09
 42	val_42	12	2008-04-09
 43	val_43	12	2008-04-09
 44	val_44	12	2008-04-09
 47	val_47	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
 51	val_51	12	2008-04-09
 51	val_51	12	2008-04-09
 53	val_53	12	2008-04-09
@@ -554,6 +556,7 @@ POSTHOOK: Input: default@dest2
 76	val_76	12	2008-04-09
 77	val_77	12	2008-04-09
 78	val_78	12	2008-04-09
+8	val_8	12	2008-04-09
 80	val_80	12	2008-04-09
 82	val_82	12	2008-04-09
 83	val_83	12	2008-04-09
@@ -563,6 +566,7 @@ POSTHOOK: Input: default@dest2
 85	val_85	12	2008-04-09
 86	val_86	12	2008-04-09
 87	val_87	12	2008-04-09
+9	val_9	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out Thu Jan 22 05:05:05 2015
@@ -1,5 +1,6 @@
 Warning: Shuffle Join JOIN[8][tables = [src1, src2]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 
@@ -10,6 +11,7 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
 POSTHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out Thu Jan 22 05:05:05 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -11,7 +13,9 @@ PREHOOK: query: EXPLAIN
  ) b 
  ON (a.key = b.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -164,7 +168,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL		7
 0	3	NULL	NULL
 10	1	NULL	NULL
 100	2	NULL	NULL
@@ -474,3 +477,4 @@ NULL	NULL		7
 96	1	NULL	NULL
 97	2	NULL	NULL
 98	2	98	1
+NULL	NULL		7

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
@@ -111,6 +115,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -601,64 +663,6 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9
 PREHOOK: query: EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
@@ -772,6 +776,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -1262,61 +1324,3 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
 Warning: Shuffle Join JOIN[4][tables = [src1, src2]] in Work 'Reducer 2' is a cross product
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out Thu Jan 22 05:05:05 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -21,7 +23,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out Thu Jan 22 05:05:05 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -26,7 +28,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (