http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/tez_dml.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_dml.q.out 
b/ql/src/test/results/clientpositive/tez/tez_dml.q.out
index 4fe91f5..ae85292 100644
--- a/ql/src/test/results/clientpositive/tez/tez_dml.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_dml.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: -- CTAS
+-- SORT_QUERY_RESULTS
+
 EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS 
cnt FROM src GROUP BY value) f1 ORDER BY cnt
 PREHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: query: -- CTAS
+-- SORT_QUERY_RESULTS
+
 EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS 
cnt FROM src GROUP BY value) f1 ORDER BY cnt
 POSTHOOK: type: CREATETABLE_AS_SELECT
 STAGE DEPENDENCIES:
@@ -107,337 +111,337 @@ POSTHOOK: query: SELECT * FROM tmp_src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tmp_src
 #### A masked pattern was here ####
-val_490        1
-val_287        1
-val_286        1
-val_285        1
-val_284        1
-val_283        1
+val_0  3
+val_10 1
+val_100        2
+val_103        2
+val_104        2
+val_105        1
+val_11 1
+val_111        1
+val_113        2
 val_114        1
-val_487        1
-val_485        1
-val_28 1
-val_484        1
-val_181        1
-val_275        1
-val_274        1
-val_183        1
-val_483        1
-val_27 1
-val_266        1
-val_482        1
-val_263        1
-val_262        1
-val_260        1
-val_481        1
-val_258        1
-val_257        1
 val_116        1
-val_479        1
-val_252        1
-val_249        1
-val_248        1
-val_247        1
-val_244        1
-val_92 1
-val_241        1
-val_477        1
-val_475        1
-val_472        1
-val_470        1
-val_235        1
-val_47 1
-val_186        1
+val_118        2
+val_119        3
+val_12 2
+val_120        2
+val_125        2
 val_126        1
-val_228        1
-val_226        1
+val_128        3
+val_129        2
 val_131        1
-val_467        1
-val_222        1
 val_133        1
-val_82 1
-val_218        1
-val_80 1
-val_460        1
-val_214        1
-val_8  1
-val_78 1
-val_189        1
-val_457        1
-val_455        1
+val_134        2
 val_136        1
-val_202        1
-val_201        1
-val_453        1
-val_20 1
-val_2  1
-val_19 1
-val_452        1
-val_196        1
-val_449        1
-val_194        1
-val_190        1
-val_192        1
-val_448        1
-val_446        1
-val_444        1
-val_443        1
-val_44 1
-val_77 1
+val_137        2
+val_138        4
 val_143        1
-val_437        1
-val_436        1
-val_435        1
-val_432        1
 val_145        1
+val_146        2
+val_149        2
+val_15 2
 val_150        1
-val_43 1
-val_10 1
-val_427        1
-val_74 1
-val_421        1
-val_9  1
-val_419        1
-val_418        1
+val_152        2
 val_153        1
-val_105        1
-val_69 1
-val_411        1
-val_41 1
 val_155        1
-val_407        1
 val_156        1
-val_87 1
 val_157        1
-val_402        1
 val_158        1
-val_400        1
-val_4  1
-val_66 1
-val_65 1
 val_160        1
-val_64 1
-val_394        1
-val_393        1
-val_392        1
-val_389        1
-val_386        1
 val_162        1
-val_86 1
-val_379        1
-val_378        1
-val_377        1
-val_375        1
-val_374        1
-val_373        1
-val_57 1
 val_163        1
-val_368        1
-val_54 1
-val_366        1
-val_365        1
-val_364        1
-val_362        1
-val_360        1
-val_356        1
-val_53 1
-val_351        1
+val_164        2
+val_165        2
 val_166        1
+val_167        3
 val_168        1
-val_345        1
-val_85 1
-val_11 1
-val_341        1
-val_34 1
-val_339        1
-val_338        1
-val_336        1
-val_335        1
-val_111        1
-val_332        1
-val_497        1
-val_33 1
+val_169        4
 val_17 1
-val_496        1
-val_323        1
-val_495        1
-val_494        1
 val_170        1
-val_493        1
+val_172        2
+val_174        2
+val_175        2
+val_176        2
 val_177        1
-val_315        1
 val_178        1
-val_310        1
-val_96 1
-val_308        1
-val_491        1
-val_306        1
-val_305        1
-val_302        1
-val_30 1
-val_180        1
-val_296        1
-val_292        1
-val_291        1
-val_289        1
-val_98 2
-val_97 2
-val_95 2
-val_84 2
-val_83 2
-val_76 2
-val_72 2
-val_67 2
-val_58 2
-val_51 2
-val_492        2
-val_478        2
-val_463        2
-val_462        2
-val_459        2
-val_458        2
-val_439        2
-val_429        2
-val_424        2
-val_42 2
-val_414        2
-val_413        2
-val_404        2
-val_399        2
-val_397        2
-val_395        2
-val_382        2
-val_37 2
-val_367        2
-val_353        2
-val_344        2
-val_342        2
-val_333        2
-val_331        2
-val_325        2
-val_322        2
-val_321        2
-val_317        2
-val_309        2
-val_307        2
-val_288        2
-val_282        2
-val_281        2
-val_280        2
-val_278        2
-val_272        2
-val_265        2
-val_26 2
-val_256        2
-val_255        2
-val_242        2
-val_24 2
-val_239        2
-val_238        2
-val_237        2
-val_233        2
-val_229        2
-val_224        2
-val_223        2
-val_221        2
-val_219        2
-val_217        2
-val_216        2
-val_213        2
-val_209        2
-val_207        2
-val_205        2
-val_203        2
-val_200        2
-val_197        2
-val_195        2
-val_191        2
-val_18 2
 val_179        2
-val_176        2
-val_175        2
-val_174        2
-val_172        2
-val_165        2
-val_164        2
-val_152        2
-val_15 2
-val_149        2
-val_146        2
-val_137        2
-val_134        2
-val_129        2
-val_125        2
-val_120        2
-val_12 2
-val_118        2
-val_113        2
-val_104        2
-val_103        2
-val_100        2
-val_498        3
+val_18 2
+val_180        1
+val_181        1
+val_183        1
+val_186        1
+val_187        3
+val_189        1
+val_19 1
+val_190        1
+val_191        2
+val_192        1
+val_193        3
+val_194        1
+val_195        2
+val_196        1
+val_197        2
+val_199        3
+val_2  1
+val_20 1
+val_200        2
+val_201        1
+val_202        1
+val_203        2
+val_205        2
+val_207        2
+val_208        3
+val_209        2
+val_213        2
+val_214        1
+val_216        2
+val_217        2
+val_218        1
+val_219        2
+val_221        2
+val_222        1
+val_223        2
+val_224        2
+val_226        1
+val_228        1
+val_229        2
+val_230        5
+val_233        2
+val_235        1
+val_237        2
+val_238        2
+val_239        2
+val_24 2
+val_241        1
+val_242        2
+val_244        1
+val_247        1
+val_248        1
+val_249        1
+val_252        1
+val_255        2
+val_256        2
+val_257        1
+val_258        1
+val_26 2
+val_260        1
+val_262        1
+val_263        1
+val_265        2
+val_266        1
+val_27 1
+val_272        2
+val_273        3
+val_274        1
+val_275        1
+val_277        4
+val_278        2
+val_28 1
+val_280        2
+val_281        2
+val_282        2
+val_283        1
+val_284        1
+val_285        1
+val_286        1
+val_287        1
+val_288        2
+val_289        1
+val_291        1
+val_292        1
+val_296        1
+val_298        3
+val_30 1
+val_302        1
+val_305        1
+val_306        1
+val_307        2
+val_308        1
+val_309        2
+val_310        1
+val_311        3
+val_315        1
+val_316        3
+val_317        2
+val_318        3
+val_321        2
+val_322        2
+val_323        1
+val_325        2
+val_327        3
+val_33 1
+val_331        2
+val_332        1
+val_333        2
+val_335        1
+val_336        1
+val_338        1
+val_339        1
+val_34 1
+val_341        1
+val_342        2
+val_344        2
+val_345        1
+val_348        5
+val_35 3
+val_351        1
+val_353        2
+val_356        1
+val_360        1
+val_362        1
+val_364        1
+val_365        1
+val_366        1
+val_367        2
+val_368        1
 val_369        3
+val_37 2
+val_373        1
+val_374        1
+val_375        1
+val_377        1
+val_378        1
+val_379        1
+val_382        2
 val_384        3
+val_386        1
+val_389        1
+val_392        1
+val_393        1
+val_394        1
+val_395        2
 val_396        3
+val_397        2
+val_399        2
+val_4  1
+val_400        1
+val_401        5
+val_402        1
 val_403        3
+val_404        2
+val_406        4
+val_407        1
 val_409        3
+val_41 1
+val_411        1
+val_413        2
+val_414        2
 val_417        3
-val_5  3
+val_418        1
+val_419        1
+val_42 2
+val_421        1
+val_424        2
+val_427        1
+val_429        2
+val_43 1
 val_430        3
-val_70 3
-val_119        3
-val_0  3
 val_431        3
+val_432        1
+val_435        1
+val_436        1
+val_437        1
 val_438        3
-val_480        3
-val_193        3
-val_199        3
-val_208        3
-val_187        3
-val_273        3
-val_298        3
+val_439        2
+val_44 1
+val_443        1
+val_444        1
+val_446        1
+val_448        1
+val_449        1
+val_452        1
+val_453        1
 val_454        3
-val_311        3
-val_316        3
+val_455        1
+val_457        1
+val_458        2
+val_459        2
+val_460        1
+val_462        2
+val_463        2
 val_466        3
-val_90 3
-val_128        3
-val_318        3
-val_327        3
-val_167        3
-val_35 3
+val_467        1
 val_468        4
-val_489        4
-val_406        4
-val_169        4
-val_138        4
-val_277        4
 val_469        5
-val_401        5
-val_230        5
-val_348        5
-PREHOOK: query: -- dyn partitions
-CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@tmp_src_part
-POSTHOOK: query: -- dyn partitions
-CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@tmp_src_part
-PREHOOK: query: EXPLAIN INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * 
FROM tmp_src
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * 
FROM tmp_src
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
-
-STAGE PLANS:
-  Stage: Stage-1
+val_47 1
+val_470        1
+val_472        1
+val_475        1
+val_477        1
+val_478        2
+val_479        1
+val_480        3
+val_481        1
+val_482        1
+val_483        1
+val_484        1
+val_485        1
+val_487        1
+val_489        4
+val_490        1
+val_491        1
+val_492        2
+val_493        1
+val_494        1
+val_495        1
+val_496        1
+val_497        1
+val_498        3
+val_5  3
+val_51 2
+val_53 1
+val_54 1
+val_57 1
+val_58 2
+val_64 1
+val_65 1
+val_66 1
+val_67 2
+val_69 1
+val_70 3
+val_72 2
+val_74 1
+val_76 2
+val_77 1
+val_78 1
+val_8  1
+val_80 1
+val_82 1
+val_83 2
+val_84 2
+val_85 1
+val_86 1
+val_87 1
+val_9  1
+val_90 3
+val_92 1
+val_95 2
+val_96 1
+val_97 2
+val_98 2
+PREHOOK: query: -- dyn partitions
+CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_src_part
+POSTHOOK: query: -- dyn partitions
+CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@tmp_src_part
+PREHOOK: query: EXPLAIN INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * 
FROM tmp_src
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * 
FROM tmp_src
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-2 depends on stages: Stage-1
+  Stage-0 depends on stages: Stage-2
+  Stage-3 depends on stages: Stage-0
+
+STAGE PLANS:
+  Stage: Stage-1
     Tez
 #### A masked pattern was here ####
       Vertices:
@@ -512,315 +516,315 @@ POSTHOOK: Input: default@tmp_src_part@d=3
 POSTHOOK: Input: default@tmp_src_part@d=4
 POSTHOOK: Input: default@tmp_src_part@d=5
 #### A masked pattern was here ####
-val_490        1
-val_287        1
-val_286        1
-val_285        1
-val_284        1
-val_283        1
+val_0  3
+val_10 1
+val_100        2
+val_103        2
+val_104        2
+val_105        1
+val_11 1
+val_111        1
+val_113        2
 val_114        1
-val_487        1
-val_485        1
-val_28 1
-val_484        1
-val_181        1
-val_275        1
-val_274        1
-val_183        1
-val_483        1
-val_27 1
-val_266        1
-val_482        1
-val_263        1
-val_262        1
-val_260        1
-val_481        1
-val_258        1
-val_257        1
 val_116        1
-val_479        1
-val_252        1
-val_249        1
-val_248        1
-val_247        1
-val_244        1
-val_92 1
-val_241        1
-val_477        1
-val_475        1
-val_472        1
-val_470        1
-val_235        1
-val_47 1
-val_186        1
+val_118        2
+val_119        3
+val_12 2
+val_120        2
+val_125        2
 val_126        1
-val_228        1
-val_226        1
+val_128        3
+val_129        2
 val_131        1
-val_467        1
-val_222        1
 val_133        1
-val_82 1
-val_218        1
-val_80 1
-val_460        1
-val_214        1
-val_8  1
-val_78 1
-val_189        1
-val_457        1
-val_455        1
+val_134        2
 val_136        1
-val_202        1
-val_201        1
-val_453        1
-val_20 1
-val_2  1
-val_19 1
-val_452        1
-val_196        1
-val_449        1
-val_194        1
-val_190        1
-val_192        1
-val_448        1
-val_446        1
-val_444        1
-val_443        1
-val_44 1
-val_77 1
+val_137        2
+val_138        4
 val_143        1
-val_437        1
-val_436        1
-val_435        1
-val_432        1
 val_145        1
+val_146        2
+val_149        2
+val_15 2
 val_150        1
-val_43 1
-val_10 1
-val_427        1
-val_74 1
-val_421        1
-val_9  1
-val_419        1
-val_418        1
+val_152        2
 val_153        1
-val_105        1
-val_69 1
-val_411        1
-val_41 1
 val_155        1
-val_407        1
 val_156        1
-val_87 1
 val_157        1
-val_402        1
 val_158        1
-val_400        1
-val_4  1
-val_66 1
-val_65 1
 val_160        1
-val_64 1
-val_394        1
-val_393        1
-val_392        1
-val_389        1
-val_386        1
 val_162        1
-val_86 1
-val_379        1
-val_378        1
-val_377        1
-val_375        1
-val_374        1
-val_373        1
-val_57 1
 val_163        1
-val_368        1
-val_54 1
-val_366        1
-val_365        1
-val_364        1
-val_362        1
-val_360        1
-val_356        1
-val_53 1
-val_351        1
+val_164        2
+val_165        2
 val_166        1
+val_167        3
 val_168        1
-val_345        1
-val_85 1
-val_11 1
-val_341        1
-val_34 1
-val_339        1
-val_338        1
-val_336        1
-val_335        1
-val_111        1
-val_332        1
-val_497        1
-val_33 1
+val_169        4
 val_17 1
-val_496        1
-val_323        1
-val_495        1
-val_494        1
 val_170        1
-val_493        1
+val_172        2
+val_174        2
+val_175        2
+val_176        2
 val_177        1
-val_315        1
 val_178        1
-val_310        1
-val_96 1
-val_308        1
-val_491        1
-val_306        1
-val_305        1
-val_302        1
-val_30 1
+val_179        2
+val_18 2
 val_180        1
-val_296        1
-val_292        1
-val_291        1
+val_181        1
+val_183        1
+val_186        1
+val_187        3
+val_189        1
+val_19 1
+val_190        1
+val_191        2
+val_192        1
+val_193        3
+val_194        1
+val_195        2
+val_196        1
+val_197        2
+val_199        3
+val_2  1
+val_20 1
+val_200        2
+val_201        1
+val_202        1
+val_203        2
+val_205        2
+val_207        2
+val_208        3
+val_209        2
+val_213        2
+val_214        1
+val_216        2
+val_217        2
+val_218        1
+val_219        2
+val_221        2
+val_222        1
+val_223        2
+val_224        2
+val_226        1
+val_228        1
+val_229        2
+val_230        5
+val_233        2
+val_235        1
+val_237        2
+val_238        2
+val_239        2
+val_24 2
+val_241        1
+val_242        2
+val_244        1
+val_247        1
+val_248        1
+val_249        1
+val_252        1
+val_255        2
+val_256        2
+val_257        1
+val_258        1
+val_26 2
+val_260        1
+val_262        1
+val_263        1
+val_265        2
+val_266        1
+val_27 1
+val_272        2
+val_273        3
+val_274        1
+val_275        1
+val_277        4
+val_278        2
+val_28 1
+val_280        2
+val_281        2
+val_282        2
+val_283        1
+val_284        1
+val_285        1
+val_286        1
+val_287        1
+val_288        2
 val_289        1
-val_98 2
-val_97 2
-val_95 2
-val_84 2
-val_83 2
-val_76 2
-val_72 2
-val_67 2
-val_58 2
-val_51 2
-val_492        2
-val_478        2
-val_463        2
-val_462        2
-val_459        2
-val_458        2
-val_439        2
-val_429        2
-val_424        2
-val_42 2
-val_414        2
-val_413        2
-val_404        2
-val_399        2
-val_397        2
-val_395        2
-val_382        2
-val_37 2
-val_367        2
-val_353        2
-val_344        2
-val_342        2
-val_333        2
-val_331        2
-val_325        2
-val_322        2
-val_321        2
-val_317        2
-val_309        2
+val_291        1
+val_292        1
+val_296        1
+val_298        3
+val_30 1
+val_302        1
+val_305        1
+val_306        1
 val_307        2
-val_288        2
-val_282        2
-val_281        2
-val_280        2
-val_278        2
-val_272        2
-val_265        2
-val_26 2
-val_256        2
-val_255        2
-val_242        2
-val_24 2
-val_239        2
-val_238        2
-val_237        2
-val_233        2
-val_229        2
-val_224        2
-val_223        2
-val_221        2
-val_219        2
-val_217        2
-val_216        2
-val_213        2
-val_209        2
-val_207        2
-val_205        2
-val_203        2
-val_200        2
-val_197        2
-val_195        2
-val_191        2
-val_18 2
-val_179        2
-val_176        2
-val_175        2
-val_174        2
-val_172        2
-val_165        2
-val_164        2
-val_152        2
-val_15 2
-val_149        2
-val_146        2
-val_137        2
-val_134        2
-val_129        2
-val_125        2
-val_120        2
-val_12 2
-val_118        2
-val_113        2
-val_104        2
-val_103        2
-val_100        2
-val_498        3
+val_308        1
+val_309        2
+val_310        1
+val_311        3
+val_315        1
+val_316        3
+val_317        2
+val_318        3
+val_321        2
+val_322        2
+val_323        1
+val_325        2
+val_327        3
+val_33 1
+val_331        2
+val_332        1
+val_333        2
+val_335        1
+val_336        1
+val_338        1
+val_339        1
+val_34 1
+val_341        1
+val_342        2
+val_344        2
+val_345        1
+val_348        5
+val_35 3
+val_351        1
+val_353        2
+val_356        1
+val_360        1
+val_362        1
+val_364        1
+val_365        1
+val_366        1
+val_367        2
+val_368        1
 val_369        3
+val_37 2
+val_373        1
+val_374        1
+val_375        1
+val_377        1
+val_378        1
+val_379        1
+val_382        2
 val_384        3
+val_386        1
+val_389        1
+val_392        1
+val_393        1
+val_394        1
+val_395        2
 val_396        3
+val_397        2
+val_399        2
+val_4  1
+val_400        1
+val_401        5
+val_402        1
 val_403        3
+val_404        2
+val_406        4
+val_407        1
 val_409        3
+val_41 1
+val_411        1
+val_413        2
+val_414        2
 val_417        3
-val_5  3
+val_418        1
+val_419        1
+val_42 2
+val_421        1
+val_424        2
+val_427        1
+val_429        2
+val_43 1
 val_430        3
-val_70 3
-val_119        3
-val_0  3
 val_431        3
+val_432        1
+val_435        1
+val_436        1
+val_437        1
 val_438        3
-val_480        3
-val_193        3
-val_199        3
-val_208        3
-val_187        3
-val_273        3
-val_298        3
+val_439        2
+val_44 1
+val_443        1
+val_444        1
+val_446        1
+val_448        1
+val_449        1
+val_452        1
+val_453        1
 val_454        3
-val_311        3
-val_316        3
+val_455        1
+val_457        1
+val_458        2
+val_459        2
+val_460        1
+val_462        2
+val_463        2
 val_466        3
-val_90 3
-val_128        3
-val_318        3
-val_327        3
-val_167        3
-val_35 3
+val_467        1
 val_468        4
-val_489        4
-val_406        4
-val_169        4
-val_138        4
-val_277        4
 val_469        5
-val_401        5
-val_230        5
-val_348        5
+val_47 1
+val_470        1
+val_472        1
+val_475        1
+val_477        1
+val_478        2
+val_479        1
+val_480        3
+val_481        1
+val_482        1
+val_483        1
+val_484        1
+val_485        1
+val_487        1
+val_489        4
+val_490        1
+val_491        1
+val_492        2
+val_493        1
+val_494        1
+val_495        1
+val_496        1
+val_497        1
+val_498        3
+val_5  3
+val_51 2
+val_53 1
+val_54 1
+val_57 1
+val_58 2
+val_64 1
+val_65 1
+val_66 1
+val_67 2
+val_69 1
+val_70 3
+val_72 2
+val_74 1
+val_76 2
+val_77 1
+val_78 1
+val_8  1
+val_80 1
+val_82 1
+val_83 2
+val_84 2
+val_85 1
+val_86 1
+val_87 1
+val_9  1
+val_90 3
+val_92 1
+val_95 2
+val_96 1
+val_97 2
+val_98 2
 PREHOOK: query: -- multi insert
 CREATE TABLE even (c int, d string)
 PREHOOK: type: CREATETABLE
@@ -953,253 +957,253 @@ POSTHOOK: query: SELECT * FROM even
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@even
 #### A masked pattern was here ####
-238    val_238
-86     val_86
-278    val_278
-98     val_98
-484    val_484
-150    val_150
-224    val_224
-66     val_66
+0      val_0
+0      val_0
+0      val_0
+10     val_10
+100    val_100
+100    val_100
+104    val_104
+104    val_104
+114    val_114
+116    val_116
+118    val_118
+118    val_118
+12     val_12
+12     val_12
+120    val_120
+120    val_120
+126    val_126
+128    val_128
 128    val_128
+128    val_128
+134    val_134
+134    val_134
+136    val_136
+138    val_138
+138    val_138
+138    val_138
+138    val_138
 146    val_146
-406    val_406
-374    val_374
+146    val_146
+150    val_150
 152    val_152
-82     val_82
+152    val_152
+156    val_156
+158    val_158
+160    val_160
+162    val_162
+164    val_164
+164    val_164
 166    val_166
-430    val_430
-252    val_252
-292    val_292
-338    val_338
-446    val_446
-394    val_394
-482    val_482
+168    val_168
+170    val_170
+172    val_172
+172    val_172
 174    val_174
-494    val_494
-466    val_466
-208    val_208
 174    val_174
-396    val_396
-162    val_162
-266    val_266
-342    val_342
-0      val_0
-128    val_128
-316    val_316
-302    val_302
-438    val_438
-170    val_170
-20     val_20
-378    val_378
-92     val_92
-72     val_72
-4      val_4
-280    val_280
-208    val_208
-356    val_356
-382    val_382
-498    val_498
-386    val_386
-192    val_192
-286    val_286
 176    val_176
-54     val_54
-138    val_138
-216    val_216
-430    val_430
-278    val_278
 176    val_176
-318    val_318
-332    val_332
+178    val_178
+18     val_18
+18     val_18
 180    val_180
-284    val_284
-12     val_12
+186    val_186
+190    val_190
+192    val_192
+194    val_194
+196    val_196
+2      val_2
+20     val_20
+200    val_200
+200    val_200
+202    val_202
+208    val_208
+208    val_208
+208    val_208
+214    val_214
+216    val_216
+216    val_216
+218    val_218
+222    val_222
+224    val_224
+224    val_224
+226    val_226
+228    val_228
 230    val_230
-260    val_260
-404    val_404
-384    val_384
-272    val_272
-138    val_138
-84     val_84
-348    val_348
-466    val_466
-58     val_58
-8      val_8
 230    val_230
-208    val_208
-348    val_348
+230    val_230
+230    val_230
+230    val_230
+238    val_238
+238    val_238
 24     val_24
-172    val_172
-42     val_42
-158    val_158
-496    val_496
-0      val_0
-322    val_322
-468    val_468
-454    val_454
-100    val_100
-298    val_298
-418    val_418
-96     val_96
+24     val_24
+242    val_242
+242    val_242
+244    val_244
+248    val_248
+252    val_252
+256    val_256
+256    val_256
+258    val_258
 26     val_26
-230    val_230
-120    val_120
-404    val_404
-436    val_436
-156    val_156
-468    val_468
-308    val_308
-196    val_196
-288    val_288
-98     val_98
+26     val_26
+260    val_260
+262    val_262
+266    val_266
+272    val_272
+272    val_272
+274    val_274
+278    val_278
+278    val_278
+28     val_28
+280    val_280
+280    val_280
 282    val_282
-318    val_318
-318    val_318
-470    val_470
-316    val_316
-0      val_0
-490    val_490
-364    val_364
-118    val_118
-134    val_134
 282    val_282
-138    val_138
-238    val_238
-118    val_118
-72     val_72
-90     val_90
-10     val_10
+284    val_284
+286    val_286
+288    val_288
+288    val_288
+292    val_292
+296    val_296
+298    val_298
+298    val_298
+298    val_298
+30     val_30
+302    val_302
 306    val_306
-224    val_224
-242    val_242
-392    val_392
-272    val_272
-242    val_242
-452    val_452
-226    val_226
-402    val_402
-396    val_396
-58     val_58
+308    val_308
+310    val_310
+316    val_316
+316    val_316
+316    val_316
+318    val_318
+318    val_318
+318    val_318
+322    val_322
+322    val_322
+332    val_332
 336    val_336
-168    val_168
+338    val_338
 34     val_34
-472    val_472
-322    val_322
-498    val_498
-160    val_160
-42     val_42
-430    val_430
-458    val_458
-78     val_78
-76     val_76
-492    val_492
-218    val_218
-228    val_228
-138    val_138
-30     val_30
-64     val_64
-468    val_468
-76     val_76
-74     val_74
 342    val_342
-230    val_230
-368    val_368
-296    val_296
-216    val_216
+342    val_342
 344    val_344
-274    val_274
-116    val_116
-256    val_256
-70     val_70
-480    val_480
-288    val_288
-244    val_244
-438    val_438
-128    val_128
-432    val_432
-202    val_202
-316    val_316
-280    val_280
-2      val_2
-80     val_80
-44     val_44
-104    val_104
-466    val_466
+344    val_344
+348    val_348
+348    val_348
+348    val_348
+348    val_348
+348    val_348
+356    val_356
+360    val_360
+362    val_362
+364    val_364
 366    val_366
+368    val_368
+374    val_374
+378    val_378
+382    val_382
+382    val_382
+384    val_384
+384    val_384
+384    val_384
+386    val_386
+392    val_392
+394    val_394
+396    val_396
+396    val_396
+396    val_396
+4      val_4
+400    val_400
+402    val_402
+404    val_404
+404    val_404
 406    val_406
-190    val_190
 406    val_406
-114    val_114
-258    val_258
-90     val_90
-262    val_262
-348    val_348
+406    val_406
+406    val_406
+414    val_414
+414    val_414
+418    val_418
+42     val_42
+42     val_42
 424    val_424
-12     val_12
-396    val_396
-164    val_164
-454    val_454
-478    val_478
-298    val_298
-164    val_164
 424    val_424
-382    val_382
-70     val_70
-480    val_480
-24     val_24
-104    val_104
-70     val_70
+430    val_430
+430    val_430
+430    val_430
+432    val_432
+436    val_436
 438    val_438
-414    val_414
-200    val_200
-360    val_360
-248    val_248
+438    val_438
+438    val_438
+44     val_44
 444    val_444
-120    val_120
-230    val_230
-478    val_478
-178    val_178
-468    val_468
-310    val_310
+446    val_446
+448    val_448
+452    val_452
+454    val_454
+454    val_454
+454    val_454
+458    val_458
+458    val_458
 460    val_460
-480    val_480
-136    val_136
-172    val_172
-214    val_214
 462    val_462
-406    val_406
-454    val_454
-384    val_384
-256    val_256
-26     val_26
-134    val_134
-384    val_384
-18     val_18
 462    val_462
+466    val_466
+466    val_466
+466    val_466
+468    val_468
+468    val_468
+468    val_468
+468    val_468
+470    val_470
+472    val_472
+478    val_478
+478    val_478
+480    val_480
+480    val_480
+480    val_480
+482    val_482
+484    val_484
+490    val_490
 492    val_492
-100    val_100
-298    val_298
+492    val_492
+494    val_494
+496    val_496
 498    val_498
-146    val_146
-458    val_458
-362    val_362
-186    val_186
-348    val_348
-18     val_18
-344    val_344
+498    val_498
+498    val_498
+54     val_54
+58     val_58
+58     val_58
+64     val_64
+66     val_66
+70     val_70
+70     val_70
+70     val_70
+72     val_72
+72     val_72
+74     val_74
+76     val_76
+76     val_76
+78     val_78
+8      val_8
+80     val_80
+82     val_82
 84     val_84
-28     val_28
-448    val_448
-152    val_152
-348    val_348
-194    val_194
-414    val_414
-222    val_222
-126    val_126
+84     val_84
+86     val_86
 90     val_90
-400    val_400
-200    val_200
+90     val_90
+90     val_90
+92     val_92
+96     val_96
+98     val_98
+98     val_98
 PREHOOK: query: SELECT * FROM odd
 PREHOOK: type: QUERY
 PREHOOK: Input: default@odd
@@ -1208,258 +1212,258 @@ POSTHOOK: query: SELECT * FROM odd
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@odd
 #### A masked pattern was here ####
-311    val_311
-27     val_27
-165    val_165
-409    val_409
-255    val_255
-265    val_265
-193    val_193
-401    val_401
-273    val_273
-369    val_369
-213    val_213
-429    val_429
-469    val_469
+103    val_103
+103    val_103
+105    val_105
+11     val_11
+111    val_111
+113    val_113
+113    val_113
+119    val_119
+119    val_119
+119    val_119
+125    val_125
+125    val_125
+129    val_129
+129    val_129
+131    val_131
+133    val_133
+137    val_137
+137    val_137
+143    val_143
 145    val_145
-495    val_495
-37     val_37
-327    val_327
-281    val_281
-277    val_277
-209    val_209
+149    val_149
+149    val_149
+15     val_15
 15     val_15
-403    val_403
-417    val_417
-219    val_219
-287    val_287
 153    val_153
-193    val_193
-459    val_459
-237    val_237
-413    val_413
-207    val_207
-199    val_199
-399    val_399
-247    val_247
-417    val_417
-489    val_489
-377    val_377
-397    val_397
-309    val_309
-365    val_365
-439    val_439
-367    val_367
-325    val_325
-167    val_167
-195    val_195
-475    val_475
-17     val_17
-113    val_113
 155    val_155
-203    val_203
-339    val_339
-455    val_455
-311    val_311
-57     val_57
-205    val_205
-149    val_149
-345    val_345
-129    val_129
-489    val_489
 157    val_157
-221    val_221
-111    val_111
-47     val_47
-35     val_35
-427    val_427
-277    val_277
-399    val_399
-169    val_169
-125    val_125
-437    val_437
-469    val_469
-187    val_187
-459    val_459
-51     val_51
-103    val_103
-239    val_239
-213    val_213
-289    val_289
-221    val_221
-65     val_65
-311    val_311
-275    val_275
-137    val_137
-241    val_241
-83     val_83
-333    val_333
-181    val_181
-67     val_67
-489    val_489
-353    val_353
-373    val_373
-217    val_217
-411    val_411
-463    val_463
-431    val_431
-179    val_179
-129    val_129
-119    val_119
-197    val_197
-393    val_393
-199    val_199
-191    val_191
+163    val_163
 165    val_165
-327    val_327
-205    val_205
-131    val_131
-51     val_51
-43     val_43
-469    val_469
-95     val_95
-481    val_481
-457    val_457
-197    val_197
-187    val_187
-409    val_409
-137    val_137
-369    val_369
+165    val_165
+167    val_167
+167    val_167
+167    val_167
 169    val_169
-413    val_413
-85     val_85
-77     val_77
-87     val_87
+169    val_169
+169    val_169
+169    val_169
+17     val_17
+175    val_175
+175    val_175
+177    val_177
 179    val_179
-395    val_395
-419    val_419
-15     val_15
-307    val_307
+179    val_179
+181    val_181
+183    val_183
+187    val_187
+187    val_187
+187    val_187
+189    val_189
 19     val_19
-435    val_435
-277    val_277
-273    val_273
-309    val_309
-389    val_389
-327    val_327
-369    val_369
-331    val_331
-401    val_401
-177    val_177
-5      val_5
-497    val_497
-317    val_317
-395    val_395
-35     val_35
-95     val_95
-11     val_11
-229    val_229
-233    val_233
-143    val_143
-195    val_195
-321    val_321
-119    val_119
-489    val_489
-41     val_41
-223    val_223
-149    val_149
-449    val_449
-453    val_453
+191    val_191
+191    val_191
+193    val_193
+193    val_193
+193    val_193
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+199    val_199
+199    val_199
+199    val_199
+201    val_201
+203    val_203
+203    val_203
+205    val_205
+205    val_205
+207    val_207
+207    val_207
 209    val_209
-69     val_69
-33     val_33
-103    val_103
-113    val_113
-367    val_367
-167    val_167
+209    val_209
+213    val_213
+213    val_213
+217    val_217
+217    val_217
 219    val_219
-239    val_239
-485    val_485
+219    val_219
+221    val_221
+221    val_221
+223    val_223
 223    val_223
-263    val_263
-487    val_487
-401    val_401
-191    val_191
-5      val_5
-467    val_467
 229    val_229
-469    val_469
-463    val_463
-35     val_35
-283    val_283
-331    val_331
+229    val_229
+233    val_233
+233    val_233
 235    val_235
-193    val_193
-321    val_321
-335    val_335
-175    val_175
-403    val_403
-483    val_483
-53     val_53
-105    val_105
+237    val_237
+237    val_237
+239    val_239
+239    val_239
+241    val_241
+247    val_247
+249    val_249
+255    val_255
+255    val_255
 257    val_257
-409    val_409
-401    val_401
-203    val_203
-201    val_201
-217    val_217
-431    val_431
-125    val_125
-431    val_431
-187    val_187
-5      val_5
-397    val_397
+263    val_263
+265    val_265
+265    val_265
+27     val_27
+273    val_273
+273    val_273
+273    val_273
+275    val_275
+277    val_277
+277    val_277
+277    val_277
+277    val_277
+281    val_281
+281    val_281
+283    val_283
+285    val_285
+287    val_287
+289    val_289
 291    val_291
-351    val_351
-255    val_255
-163    val_163
-119    val_119
-491    val_491
-237    val_237
-439    val_439
-479    val_479
 305    val_305
-417    val_417
-199    val_199
-429    val_429
-169    val_169
-443    val_443
+307    val_307
+307    val_307
+309    val_309
+309    val_309
+311    val_311
+311    val_311
+311    val_311
+315    val_315
+317    val_317
+317    val_317
+321    val_321
+321    val_321
 323    val_323
 325    val_325
-277    val_277
-317    val_317
+325    val_325
+327    val_327
+327    val_327
+327    val_327
+33     val_33
+331    val_331
+331    val_331
 333    val_333
-493    val_493
-207    val_207
-249    val_249
-265    val_265
-83     val_83
+333    val_333
+335    val_335
+339    val_339
+341    val_341
+345    val_345
+35     val_35
+35     val_35
+35     val_35
+351    val_351
 353    val_353
-233    val_233
-133    val_133
-175    val_175
-189    val_189
+353    val_353
+365    val_365
+367    val_367
+367    val_367
+369    val_369
+369    val_369
+369    val_369
+37     val_37
+37     val_37
+373    val_373
 375    val_375
+377    val_377
+379    val_379
+389    val_389
+393    val_393
+395    val_395
+395    val_395
+397    val_397
+397    val_397
+399    val_399
+399    val_399
 401    val_401
-421    val_421
+401    val_401
+401    val_401
+401    val_401
+401    val_401
+403    val_403
+403    val_403
+403    val_403
 407    val_407
+409    val_409
+409    val_409
+409    val_409
+41     val_41
+411    val_411
+413    val_413
+413    val_413
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+427    val_427
+429    val_429
+429    val_429
+43     val_43
+431    val_431
+431    val_431
+431    val_431
+435    val_435
+437    val_437
+439    val_439
+439    val_439
+443    val_443
+449    val_449
+453    val_453
+455    val_455
+457    val_457
+459    val_459
+459    val_459
+463    val_463
+463    val_463
+467    val_467
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+47     val_47
+475    val_475
+477    val_477
+479    val_479
+481    val_481
+483    val_483
+485    val_485
+487    val_487
+489    val_489
+489    val_489
+489    val_489
+489    val_489
+491    val_491
+493    val_493
+495    val_495
+497    val_497
+5      val_5
+5      val_5
+5      val_5
+51     val_51
+51     val_51
+53     val_53
+57     val_57
+65     val_65
 67     val_67
-379    val_379
+67     val_67
+69     val_69
+77     val_77
+83     val_83
+83     val_83
+85     val_85
+87     val_87
 9      val_9
-341    val_341
-285    val_285
-167    val_167
-273    val_273
-183    val_183
-281    val_281
+95     val_95
+95     val_95
 97     val_97
-469    val_469
-315    val_315
-37     val_37
-307    val_307
-477    val_477
-169    val_169
-403    val_403
 97     val_97
 PREHOOK: query: -- create empty table
 CREATE TABLE empty STORED AS orc AS SELECT * FROM tmp_src_part WHERE d = -1000

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out 
b/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
index e782c73..59c8df4 100644
--- a/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
@@ -1,8 +1,12 @@
-PREHOOK: query: create table orc_src (key string, value string) STORED AS ORC
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table orc_src (key string, value string) STORED AS ORC
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_src
-POSTHOOK: query: create table orc_src (key string, value string) STORED AS ORC
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table orc_src (key string, value string) STORED AS ORC
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_src
@@ -327,72 +331,143 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 0      468
 10     20
+100    144
 103    144
+104    144
 105    20
+11     20
+111    20
+113    144
+114    20
 116    20
+118    144
+119    468
+12     144
 120    144
 125    144
+126    20
+128    468
 129    144
 131    20
+133    20
 134    144
 136    20
+137    144
+138    1088
 143    20
 145    20
+146    144
 149    144
+15     144
 150    20
+152    144
+153    20
 155    20
+156    20
 157    20
 158    20
 160    20
+162    20
 163    20
 164    144
+165    144
 166    20
+167    468
+168    20
+169    1088
 17     20
 170    20
 172    144
+174    144
+175    144
+176    144
+177    20
+178    20
+179    144
+18     144
 180    20
+181    20
 183    20
+186    20
+187    468
 189    20
 19     20
 190    20
 191    144
+192    20
 193    468
+194    20
 195    144
 196    20
+197    144
+199    468
+2      20
 20     20
+200    144
+201    20
+202    20
+203    144
 205    144
 207    144
+208    468
 209    144
 213    144
+214    20
 216    144
 217    144
+218    20
+219    144
+221    144
+222    20
 223    144
 224    144
+226    20
 228    20
 229    144
+230    2100
 233    144
 235    20
+237    144
 238    144
 239    144
 24     144
 241    20
+242    144
 244    20
 247    20
 248    20
+249    20
+252    20
 255    144
+256    144
+257    20
 258    20
 26     144
 260    20
+262    20
 263    20
 265    144
 266    20
+27     20
 272    144
 273    468
 274    20
+275    20
+277    1088
+278    144
 28     20
+280    144
 281    144
+282    144
+283    20
+284    20
+285    20
 286    20
+287    20
+288    144
+289    20
 291    20
+292    20
 296    20
 298    468
 30     20
@@ -402,28 +477,46 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 307    144
 308    20
 309    144
+310    20
+311    468
 315    20
 316    468
 317    144
 318    468
 321    144
+322    144
+323    20
 325    144
+327    468
 33     20
 331    144
 332    20
+333    144
 335    20
+336    20
+338    20
 339    20
+34     20
+341    20
 342    144
+344    144
 345    20
+348    2100
+35     468
+351    20
 353    144
 356    20
 360    20
+362    20
+364    20
+365    20
 366    20
 367    144
 368    20
 369    468
 37     144
 373    20
+374    20
 375    20
 377    20
 378    20
@@ -432,40 +525,81 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 384    468
 386    20
 389    20
+392    20
+393    20
 394    20
 395    144
 396    468
+397    144
 399    144
+4      20
 400    20
 401    2100
 402    20
+403    468
+404    144
 406    1088
 407    20
+409    468
 41     20
+411    20
 413    144
 414    144
+417    468
+418    20
+419    20
 42     144
+421    20
+424    144
+427    20
+429    144
+43     20
 430    468
 431    468
+432    20
+435    20
 436    20
+437    20
+438    468
+439    144
 44     20
+443    20
+444    20
 446    20
 448    20
 449    20
 452    20
+453    20
+454    468
+455    20
+457    20
+458    144
 459    144
+460    20
 462    144
+463    144
 466    468
 467    20
 468    1088
+469    2100
 47     20
+470    20
 472    20
+475    20
+477    20
+478    144
+479    20
 480    468
+481    20
 482    20
+483    20
 484    20
 485    20
 487    20
+489    1088
 490    20
+491    20
+492    144
 493    20
 494    20
 495    20
@@ -474,164 +608,34 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 498    468
 5      468
 51     144
+53     20
 54     20
 57     20
 58     144
+64     20
 65     20
 66     20
+67     144
 69     20
 70     468
+72     144
 74     20
+76     144
 77     20
 78     20
 8      20
 80     20
+82     20
+83     144
 84     144
 85     20
+86     20
 87     20
 9      20
+90     468
 92     20
 95     144
 96     20
-100    144
-104    144
-11     20
-111    20
-113    144
-114    20
-118    144
-119    468
-12     144
-126    20
-128    468
-133    20
-137    144
-138    1088
-146    144
-15     144
-152    144
-153    20
-156    20
-162    20
-165    144
-167    468
-168    20
-169    1088
-174    144
-175    144
-176    144
-177    20
-178    20
-179    144
-18     144
-181    20
-186    20
-187    468
-192    20
-194    20
-197    144
-199    468
-2      20
-200    144
-201    20
-202    20
-203    144
-208    468
-214    20
-218    20
-219    144
-221    144
-222    20
-226    20
-230    2100
-237    144
-242    144
-249    20
-252    20
-256    144
-257    20
-262    20
-27     20
-275    20
-277    1088
-278    144
-280    144
-282    144
-283    20
-284    20
-285    20
-287    20
-288    144
-289    20
-292    20
-310    20
-311    468
-322    144
-323    20
-327    468
-333    144
-336    20
-338    20
-34     20
-341    20
-344    144
-348    2100
-35     468
-351    20
-362    20
-364    20
-365    20
-374    20
-392    20
-393    20
-397    144
-4      20
-403    468
-404    144
-409    468
-411    20
-417    468
-418    20
-419    20
-421    20
-424    144
-427    20
-429    144
-43     20
-432    20
-435    20
-437    20
-438    468
-439    144
-443    20
-444    20
-453    20
-454    468
-455    20
-457    20
-458    144
-460    20
-463    144
-469    2100
-470    20
-475    20
-477    20
-478    144
-479    20
-481    20
-483    20
-489    1088
-491    20
-492    144
-53     20
-64     20
-67     144
-72     144
-76     144
-82     20
-83     144
-86     20
-90     468
 97     144
 98     144
 PREHOOK: query: select key, count(*) from (select x.key as key, y.value as 
value from

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out 
b/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
index 668f75b..31f7275 100644
--- a/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
@@ -1,10 +1,8 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
-
 explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 PREHOOK: type: QUERY
 POSTHOOK: query: -- SORT_QUERY_RESULTS
-
 explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/tez_multi_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_multi_union.q.out 
b/ql/src/test/results/clientpositive/tez/tez_multi_union.q.out
index a649431..fbc1c2f 100644
--- a/ql/src/test/results/clientpositive/tez/tez_multi_union.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_multi_union.q.out
@@ -1,4 +1,5 @@
-PREHOOK: query: select key from
+PREHOOK: query: -- SORT_QUERY_RESULTS
+select key from
 (
 select key from src
 union all
@@ -9,7 +10,8 @@ select key from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: select key from
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+select key from
 (
 select key from src
 union all
@@ -21,811 +23,811 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0
+0
+0
+0
+10
 10
 100
+100
+100
+103
+103
 103
 104
+104
+104
 105
+105
+11
 11
 111
+111
+113
 113
+113
+114
 114
 116
+116
+118
 118
+118
+119
 119
+119
+119
+12
+12
 12
 120
+120
+120
+125
+125
 125
 126
+126
+128
+128
+128
 128
 129
+129
+129
 131
+131
+133
 133
 134
+134
+134
 136
+136
+137
 137
+137
+138
+138
+138
 138
+138
+143
 143
 145
+145
+146
 146
+146
+149
 149
+149
+15
 15
+15
+150
 150
 152
+152
+152
 153
+153
+155
 155
 156
+156
+157
 157
 158
+158
+160
 160
 162
+162
+163
 163
 164
+164
+164
+165
+165
 165
 166
+166
+167
+167
+167
 167
 168
+168
+169
+169
+169
 169
+169
+17
 17
 170
+170
+172
 172
+172
+174
 174
+174
+175
 175
+175
+176
 176
+176
+177
 177
 178
+178
+179
 179
+179
+18
 18
+18
+180
 180
 181
+181
+183
 183
 186
+186
+187
+187
+187
 187
 189
+189
+19
 19
 190
+190
+191
 191
+191
+192
 192
 193
+193
+193
+193
+194
 194
 195
+195
+195
 196
+196
+197
 197
+197
+199
+199
+199
 199
 2
+2
+20
 20
 200
+200
+200
 201
+201
+202
 202
 203
+203
+203
+205
+205
 205
 207
+207
+207
+208
+208
 208
+208
+209
 209
+209
+213
 213
+213
+214
 214
 216
+216
+216
+217
+217
 217
 218
+218
+219
 219
+219
+221
 221
+221
+222
 222
 223
+223
+223
+224
+224
 224
 226
+226
+228
 228
 229
+229
+229
+230
+230
+230
+230
 230
+230
+233
 233
+233
+235
 235
 237
+237
+237
+238
+238
 238
 239
+239
+239
+24
+24
 24
 241
+241
+242
 242
+242
+244
 244
 247
+247
+248
 248
 249
+249
+252
 252
 255
+255
+255
+256
+256
 256
 257
+257
+258
 258
 26
+26
+26
 260
+260
+262
 262
 263
+263
+265
 265
+265
+266
 266
 27
+27
+272
 272
+272
+273
+273
+273
 273
 274
+274
+275
 275
 277
+277
+277
+277
+277
+278
+278
 278
 28
+28
+280
 280
+280
+281
 281
+281
+282
 282
+282
+283
 283
 284
+284
+285
 285
 286
+286
+287
 287
 288
+288
+288
 289
+289
+291
 291
 292
+292
+296
 296
 298
+298
+298
+298
+30
 30
 302
+302
+305
 305
 306
+306
+307
 307
+307
+308
 308
 309
+309
+309
 310
+310
+311
+311
+311
 311
 315
+315
+316
 316
+316
+316
+317
+317
 317
 318
+318
+318
+318
+321
 321
+321
+322
 322
+322
+323
 323
 325
+325
+325
+327
+327
 327
+327
+33
 33
 331
+331
+331
 332
+332
+333
 333
+333
+335
 335
 336
+336
+338
 338
 339
+339
+34
 34
 341
+341
+342
 342
+342
+344
 344
+344
+345
 345
 348
+348
+348
+348
+348
+348
+35
+35
+35
 35
 351
+351
+353
 353
+353
+356
 356
 360
+360
+362
 362
 364
+364
+365
 365
 366
+366
+367
 367
+367
+368
 368
 369
+369
+369
+369
+37
 37
+37
+373
 373
 374
+374
+375
 375
 377
+377
+378
 378
 379
+379
+382
 382
+382
+384
+384
+384
 384
 386
+386
+389
 389
 392
+392
+393
 393
 394
+394
+395
 395
+395
+396
+396
+396
 396
 397
+397
+397
+399
+399
 399
 4
+4
+400
 400
 401
+401
+401
+401
+401
+401
+402
 402
 403
+403
+403
+403
+404
 404
+404
+406
+406
+406
 406
+406
+407
 407
 409
+409
+409
+409
+41
 41
 411
+411
+413
 413
+413
+414
 414
+414
+417
+417
+417
 417
 418
+418
+419
 419
 42
+42
+42
 421
+421
+424
 424
+424
+427
 427
 429
+429
+429
 43
+43
+430
+430
+430
 430
 431
+431
+431
+431
+432
 432
 435
+435
+436
 436
 437
+437
+438
 438
+438
+438
+439
+439
 439
 44
+44
+443
 443
 444
+444
+446
 446
 448
+448
+449
 449
 452
+452
+453
 453
 454
+454
+454
+454
+455
 455
 457
+457
+458
 458
+458
+459
 459
+459
+460
 460
 462
+462
+462
 463
+463
+463
+466
+466
 466
+466
+467
 467
 468
+468
+468
+468
+468
+469
+469
 469
+469
+469
+469
+47
 47
 470
+470
+472
 472
 475
+475
+477
 477
 478
+478
+478
 479
+479
+480
+480
+480
 480
 481
+481
+482
 482
 483
+483
+484
 484
 485
+485
+487
 487
 489
+489
+489
+489
+489
 490
+490
+491
 491
 492
+492
+492
 493
+493
+494
 494
 495
+495
+496
 496
 497
+497
+498
+498
+498
 498
 5
+5
+5
+5
+51
 51
+51
+53
 53
 54
+54
+57
 57
 58
+58
+58
 64
+64
+65
 65
 66
+66
+67
 67
+67
+69
 69
 70
+70
+70
+70
+72
 72
+72
+74
 74
 76
+76
+76
 77
+77
+78
 78
 8
+8
+80
 80
 82
+82
+83
 83
+83
+84
 84
+84
+85
 85
 86
+86
+87
 87
 9
+9
+90
+90
+90
 90
 92
+92
+95
 95
+95
+96
 96
 97
+97
+97
 98
-238
-86
-311
-27
-165
-409
-255
-278
 98
-484
-265
-193
-401
-150
-273
-224
-369
-66
-128
-213
-146
-406
-429
-374
-152
-469
-145
-495
-37
-327
-281
-277
-209
-15
-82
-403
-166
-417
-430
-252
-292
-219
-287
-153
-193
-338
-446
-459
-394
-237
-482
-174
-413
-494
-207
-199
-466
-208
-174
-399
-396
-247
-417
-489
-162
-377
-397
-309
-365
-266
-439
-342
-367
-325
-167
-195
-475
-17
-113
-155
-203
-339
-0
-455
-128
-311
-316
-57
-302
-205
-149
-438
-345
-129
-170
-20
-489
-157
-378
-221
-92
-111
-47
-72
-4
-280
-35
-427
-277
-208
-356
-399
-169
-382
-498
-125
-386
-437
-469
-192
-286
-187
-176
-54
-459
-51
-138
-103
-239
-213
-216
-430
-278
-176
-289
-221
-65
-318
-332
-311
-275
-137
-241
-83
-333
-180
-284
-12
-230
-181
-67
-260
-404
-384
-489
-353
-373
-272
-138
-217
-84
-348
-466
-58
-8
-411
-230
-208
-348
-24
-463
-431
-179
-172
-42
-129
-158
-119
-496
-0
-322
-197
-468
-393
-454
-100
-298
-199
-191
-418
-96
-26
-165
-327
-230
-205
-120
-131
-51
-404
-43
-436
-156
-469
-468
-308
-95
-196
-288
-481
-457
 98
-282
-197
-187
-318
-318
-409
-470
-137
-369
-316
-169
-413
-85
-77
-0
-490
-87
-364
-179
-118
-134
-395
-282
-138
-238
-419
-15
-118
-72
-90
-307
-19
-435
-10
-277
-273
-306
-224
-309
-389
-327
-242
-369
-392
-272
-331
-401
-242
-452
-177
-226
-5
-497
-402
-396
-317
-395
-58
-35
-336
-95
-11
-168
-34
-229
-233
-143
-472
-322
-498
-160
-195
-42
-321
-430
-119
-489
-458
-78
-76
-41
-223
-492
-149
-449
-218
-228
-138
-453
-30
-209
-64
-468
-76
-74
-342
-69
-230
-33
-368
-103
-296
-113
-216
-367
-344
-167
-274
-219
-239
-485
-116
-223
-256
-263
-70
-487
-480
-401
-288
-191
-5
-244
-438
-128
-467
-432
-202
-316
-229
-469
-463
-280
-2
-35
-283
-331
-235
-80
-44
-193
-321
-335
-104
-466
-366
-175
-403
-483
-53
-105
-257
-406
-409
-190
-406
-401
-114
-258
-90
-203
-262
-348
-424
-12
-396
-201
-217
-164
-431
-454
-478
-298
-125
-431
-164
-424
-187
-382
-5
-70
-397
-480
-291
-24
-351
-255
-104
-70
-163
-438
-119
-414
-200
-491
-237
-439
-360
-248
-479
-305
-417
-199
-444
-120
-429
-169
-443
-323
-325
-277
-230
-478
-178
-468
-310
-317
-333
-493
-460
-207
-249
-265
-480
-83
-136
-353
-172
-214
-462
-233
-406
-133
-175
-189
-454
-375
-401
-421
-407
-384
-256
-26
-134
-67
-384
-379
-18
-462
-492
-100
-298
-9
-341
-498
-146
-458
-362
-186
-285
-348
-167
-18
-273
-183
-281
-344
-97
-469
-315
-84
-28
-37
-448
-152
-348
-307
-194
-414
-477
-222
-126
-90
-169
-403
-400
-200
-97

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/tez_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_schema_evolution.q.out 
b/ql/src/test/results/clientpositive/tez/tez_schema_evolution.q.out
index 6316268..548035d 100644
--- a/ql/src/test/results/clientpositive/tez/tez_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_schema_evolution.q.out
@@ -1,16 +1,20 @@
-PREHOOK: query: create table test (key int, value string) partitioned by (p 
int) stored as textfile
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table test (key int, value string) partitioned by (p int) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@test
-POSTHOOK: query: create table test (key int, value string) partitioned by (p 
int) stored as textfile
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table test (key int, value string) partitioned by (p int) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@test
-PREHOOK: query: insert into table test partition (p=1) select * from src limit 
10
+PREHOOK: query: insert into table test partition (p=1) select * from src order 
by key limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test@p=1
-POSTHOOK: query: insert into table test partition (p=1) select * from src 
limit 10
+POSTHOOK: query: insert into table test partition (p=1) select * from src 
order by key limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test@p=1
@@ -24,11 +28,11 @@ POSTHOOK: query: alter table test set fileformat orc
 POSTHOOK: type: ALTERTABLE_FILEFORMAT
 POSTHOOK: Input: default@test
 POSTHOOK: Output: default@test
-PREHOOK: query: insert into table test partition (p=2) select * from src limit 
10
+PREHOOK: query: insert into table test partition (p=2) select * from src order 
by key limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test@p=2
-POSTHOOK: query: insert into table test partition (p=2) select * from src 
limit 10
+POSTHOOK: query: insert into table test partition (p=2) select * from src 
order by key limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test@p=2
@@ -48,75 +52,63 @@ p                           int
 # col_name             data_type               comment             
                 
 p                      int                                         
-PREHOOK: query: select * from test where p=1 and key > 0
+PREHOOK: query: select * from test where p=1 and key > 0 order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test
 PREHOOK: Input: default@test@p=1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from test where p=1 and key > 0
+POSTHOOK: query: select * from test where p=1 and key > 0 order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test
 POSTHOOK: Input: default@test@p=1
 #### A masked pattern was here ####
-484    val_484 1
-98     val_98  1
-278    val_278 1
-255    val_255 1
-409    val_409 1
-165    val_165 1
-27     val_27  1
-311    val_311 1
-86     val_86  1
-238    val_238 1
-PREHOOK: query: select * from test where p=2 and key > 0
+10     val_10  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
+PREHOOK: query: select * from test where p=2 and key > 0 order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test
 PREHOOK: Input: default@test@p=2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from test where p=2 and key > 0
+POSTHOOK: query: select * from test where p=2 and key > 0 order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test
 POSTHOOK: Input: default@test@p=2
 #### A masked pattern was here ####
-484    val_484 2
-98     val_98  2
-278    val_278 2
-255    val_255 2
-409    val_409 2
-165    val_165 2
-27     val_27  2
-311    val_311 2
-86     val_86  2
-238    val_238 2
-PREHOOK: query: select * from test where key > 0
+10     val_10  2
+100    val_100 2
+100    val_100 2
+103    val_103 2
+103    val_103 2
+104    val_104 2
+104    val_104 2
+PREHOOK: query: select * from test where key > 0 order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test
 PREHOOK: Input: default@test@p=1
 PREHOOK: Input: default@test@p=2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from test where key > 0
+POSTHOOK: query: select * from test where key > 0 order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test
 POSTHOOK: Input: default@test@p=1
 POSTHOOK: Input: default@test@p=2
 #### A masked pattern was here ####
-484    val_484 1
-98     val_98  1
-278    val_278 1
-255    val_255 1
-409    val_409 1
-165    val_165 1
-27     val_27  1
-311    val_311 1
-86     val_86  1
-238    val_238 1
-484    val_484 2
-98     val_98  2
-278    val_278 2
-255    val_255 2
-409    val_409 2
-165    val_165 2
-27     val_27  2
-311    val_311 2
-86     val_86  2
-238    val_238 2
+10     val_10  1
+10     val_10  2
+100    val_100 1
+100    val_100 1
+100    val_100 2
+100    val_100 2
+103    val_103 1
+103    val_103 1
+103    val_103 2
+103    val_103 2
+104    val_104 1
+104    val_104 1
+104    val_104 2
+104    val_104 2

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out 
b/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
index 286e2ed..4ee1e2e 100644
--- a/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
@@ -6,21 +6,21 @@ POSTHOOK: query: create table acid_uap(a int, b varchar(128)) 
partitioned by (ds
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@acid_uap
-PREHOOK: query: insert into table acid_uap partition (ds='today') select cint, 
cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint 
< 0 order by cint limit 10
+PREHOOK: query: insert into table acid_uap partition (ds='today') select cint, 
cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not null 
and cint < 0 order by cint, cs limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@acid_uap@ds=today
-POSTHOOK: query: insert into table acid_uap partition (ds='today') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint < 0 order by cint limit 10
+POSTHOOK: query: insert into table acid_uap partition (ds='today') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint < 0 order by cint, cs limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acid_uap@ds=today
 POSTHOOK: Lineage: acid_uap PARTITION(ds=today).a SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acid_uap PARTITION(ds=today).b EXPRESSION 
[(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, 
comment:null), ]
-PREHOOK: query: insert into table acid_uap partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint > 10 order by cint limit 10
+PREHOOK: query: insert into table acid_uap partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint > 10 order by cint, cs limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@acid_uap@ds=tomorrow
-POSTHOOK: query: insert into table acid_uap partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint > 10 order by cint limit 10
+POSTHOOK: query: insert into table acid_uap partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint > 10 order by cint, cs limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acid_uap@ds=tomorrow
@@ -53,11 +53,11 @@ POSTHOOK: Input: default@acid_uap@ds=tomorrow
 762    BLoMwUJ51ns6pd  tomorrow
 762    a10E76jX35YwquKCTA      tomorrow
 762    q5y2Vy1 tomorrow
+6981   NULL    tomorrow
 6981   1FNNhmiFLGw425NA13g     tomorrow
+6981   4KhrrQ0nJ7bMNTvhSCA     tomorrow
 6981   K630vaVf        tomorrow
-6981   YdG61y00526u5   tomorrow
-6981   a3EhVU6Wuy7ycJ7wY7h2gv  tomorrow
-6981   o4lvY20511w0EOX3P3I82p63        tomorrow
+6981   Y5x3JuI3M8jngv5N        tomorrow
 PREHOOK: query: update acid_uap set b = 'fred'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uap

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out 
b/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
index fef0dc0..1834e83 100644
--- a/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
@@ -6,21 +6,21 @@ POSTHOOK: query: create table acid_uwp(a int, b varchar(128)) 
partitioned by (ds
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@acid_uwp
-PREHOOK: query: insert into table acid_uwp partition (ds='today') select cint, 
cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint 
< 0 order by cint limit 10
+PREHOOK: query: insert into table acid_uwp partition (ds='today') select cint, 
cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not null 
and cint < 0 order by cint, cs limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@acid_uwp@ds=today
-POSTHOOK: query: insert into table acid_uwp partition (ds='today') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint < 0 order by cint limit 10
+POSTHOOK: query: insert into table acid_uwp partition (ds='today') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint < 0 order by cint, cs limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acid_uwp@ds=today
 POSTHOOK: Lineage: acid_uwp PARTITION(ds=today).a SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acid_uwp PARTITION(ds=today).b EXPRESSION 
[(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, 
comment:null), ]
-PREHOOK: query: insert into table acid_uwp partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint > 100 order by cint limit 10
+PREHOOK: query: insert into table acid_uwp partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint > 100 order by cint, cs limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@acid_uwp@ds=tomorrow
-POSTHOOK: query: insert into table acid_uwp partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null 
and cint > 100 order by cint limit 10
+POSTHOOK: query: insert into table acid_uwp partition (ds='tomorrow') select 
cint, cast(cstring1 as varchar(128)) as cs from alltypesorc where cint is not 
null and cint > 100 order by cint, cs limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@acid_uwp@ds=tomorrow
@@ -53,11 +53,11 @@ POSTHOOK: Input: default@acid_uwp@ds=tomorrow
 762    BLoMwUJ51ns6pd  tomorrow
 762    a10E76jX35YwquKCTA      tomorrow
 762    q5y2Vy1 tomorrow
+6981   NULL    tomorrow
 6981   1FNNhmiFLGw425NA13g     tomorrow
+6981   4KhrrQ0nJ7bMNTvhSCA     tomorrow
 6981   K630vaVf        tomorrow
-6981   YdG61y00526u5   tomorrow
-6981   a3EhVU6Wuy7ycJ7wY7h2gv  tomorrow
-6981   o4lvY20511w0EOX3P3I82p63        tomorrow
+6981   Y5x3JuI3M8jngv5N        tomorrow
 PREHOOK: query: update acid_uwp set b = 'fred' where b = 'k17Am8uPHWk02cEf1jet'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uwp
@@ -99,8 +99,8 @@ POSTHOOK: Input: default@acid_uwp@ds=tomorrow
 762    BLoMwUJ51ns6pd  tomorrow
 762    a10E76jX35YwquKCTA      tomorrow
 762    q5y2Vy1 tomorrow
+6981   NULL    tomorrow
 6981   1FNNhmiFLGw425NA13g     tomorrow
+6981   4KhrrQ0nJ7bMNTvhSCA     tomorrow
 6981   K630vaVf        tomorrow
-6981   YdG61y00526u5   tomorrow
-6981   a3EhVU6Wuy7ycJ7wY7h2gv  tomorrow
-6981   o4lvY20511w0EOX3P3I82p63        tomorrow
+6981   Y5x3JuI3M8jngv5N        tomorrow

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out 
b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
index eca2cbc..972404b 100644
--- a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
@@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE 
[(over1k)over1k.FieldSchema(name:s, type:s
 POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, 
type:smallint, comment:null), ]
 POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, 
type:tinyint, comment:null), ]
 POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, 
type:timestamp, comment:null), ]
-PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY i LIMIT 20
+PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY t, si, i LIMIT 20
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY i LIMIT 20
+POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY t, si, i LIMIT 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -122,14 +122,14 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10
                     Statistics: Num rows: 1049 Data size: 311170 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col2 (type: int)
-                      sort order: +
+                      key expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col2 (type: int)
+                      sort order: +++
                       Statistics: Num rows: 1049 Data size: 311170 Basic 
stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), 
_col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 
(type: decimal(4,2)), _col10 (type: binary)
+                      value expressions: _col3 (type: bigint), _col4 (type: 
float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), 
_col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: 
smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), 
VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: 
boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), 
VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary)
+                expressions: KEY.reducesinkkey0 (type: tinyint), 
KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), 
VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: 
double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 
(type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
                 Statistics: Num rows: 1049 Data size: 311170 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
@@ -149,48 +149,48 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY i LIMIT 20
+PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY t, si, i LIMIT 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1korc
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY i LIMIT 20
+POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY t, si, i LIMIT 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1korc
 #### A masked pattern was here ####
-108    301     65536   4294967357      90.05   17.59   true    ethan johnson   
2013-03-01 09:11:58.703271      75.7    undecided
-118    497     65536   4294967381      50.32   12.72   false   david nixon     
2013-03-01 09:11:58.703285      83.48   values clariffication
-18     280     65536   4294967320      32.92   45.94   false   holly white     
2013-03-01 09:11:58.703086      58.86   topology
-69     489     65536   4294967404      33.52   17.99   false   oscar ichabod   
2013-03-01 09:11:58.703247      32.68   topology
-27     405     65536   4294967508      82.24   29.41   true    oscar ovid      
2013-03-01 09:11:58.703166      16.85   biology
-42     495     65536   4294967431      43.57   46.81   false   tom johnson     
2013-03-01 09:11:58.703245      62.25   american history
+NULL   374     65560   4294967516      65.43   22.48   true    oscar quirinius 
2013-03-01 09:11:58.703316      16.86   mathematics
 NULL   409     65536   4294967490      46.97   25.92   false   fred miller     
2013-03-01 09:11:58.703116      33.45   history
-59     431     65537   4294967326      11.34   2.9     true    oscar robinson  
2013-03-01 09:11:58.703161      81.04   zync studies
-63     458     65537   4294967463      21.94   49.71   true    fred van buren  
2013-03-01 09:11:58.703278      99.34   wind surfing
-121    355     65537   4294967437      85.9    10.99   true    calvin brown    
2013-03-01 09:11:58.703254      4.49    yard duty
-72     267     65537   4294967460      55.2    42.89   false   oscar carson    
2013-03-01 09:11:58.703153      51.91   topology
-22     264     65537   4294967419      8.07    10.71   false   david xylophone 
2013-03-01 09:11:58.703136      11.87   undecided
-101    283     65538   4294967527      84.03   27.29   true    yuri brown      
2013-03-01 09:11:58.703306      44.24   biology
-109    376     65538   4294967453      59.61   35.62   true    priscilla 
xylophone     2013-03-01 09:11:58.703286      9.53    study skills
-83     353     65538   4294967339      0.08    23.91   true    holly thompson  
2013-03-01 09:11:58.703157      30.27   quiet hour
-29     331     65539   4294967420      73.18   28.96   true    ethan brown     
2013-03-01 09:11:58.703094      58.85   zync studies
-70     430     65539   4294967534      18.89   43.84   true    tom carson      
2013-03-01 09:11:58.703182      21.93   joggying
-120    331     65539   4294967324      88.02   40.94   true    holly nixon     
2013-03-01 09:11:58.703262      96.64   yard duty
-71     298     65540   4294967510      91.63   9.6     false   gabriella 
zipper        2013-03-01 09:11:58.70314       68.14   geology
-114    385     65541   4294967458      73.48   34.97   true    oscar quirinius 
2013-03-01 09:11:58.703143      72.33   xylophone band
+NULL   473     65720   4294967324      80.74   40.6    false   holly falkner   
2013-03-01 09:11:58.703111      18.8    mathematics
+-3     275     65622   4294967302      71.78   8.49    false   wendy robinson  
2013-03-01 09:11:58.703294      95.39   undecided
+-3     344     65733   4294967363      0.56    11.96   true    rachel thompson 
2013-03-01 09:11:58.703276      88.46   wind surfing
+-3     376     65548   4294967431      96.78   43.23   false   fred ellison    
2013-03-01 09:11:58.703233      75.39   education
+-3     438     65618   4294967398      62.39   4.62    false   victor 
xylophone        2013-03-01 09:11:58.703135      88.38   values clariffication
+-3     458     65696   4294967418      45.24   8.49    false   irene ellison   
2013-03-01 09:11:58.703092      54.02   american history
+-3     467     65575   4294967437      81.64   23.53   true    tom hernandez   
2013-03-01 09:11:58.703188      32.85   study skills
+-2     261     65603   4294967332      39.18   28.98   false   fred polk       
2013-03-01 09:11:58.70331       69.26   opthamology
+-2     269     65681   4294967544      99.24   28.19   false   rachel falkner  
2013-03-01 09:11:58.703089      41.57   quiet hour
+-2     288     65658   4294967383      53.78   19.92   false   holly nixon     
2013-03-01 09:11:58.703224      42.93   industrial engineering
+-2     304     65629   4294967386      84.38   33.49   false   zach garcia     
2013-03-01 09:11:58.703264      56.99   chemistry
+-2     340     65627   4294967533      76.52   21.91   true    quinn laertes   
2013-03-01 09:11:58.703178      93.29   xylophone band
+-2     427     65666   4294967465      19.69   33.24   true    bob xylophone   
2013-03-01 09:11:58.703219      32.73   joggying
+-2     429     65664   4294967441      45.19   40.43   false   wendy king      
2013-03-01 09:11:58.703265      11.46   industrial engineering
+-2     461     65648   4294967425      58.52   24.85   false   rachel thompson 
2013-03-01 09:11:58.703318      85.62   zync studies
+-1     268     65778   4294967418      56.33   44.73   true    calvin falkner  
2013-03-01 09:11:58.70322       7.37    history
+-1     281     65643   4294967323      15.1    45.0    false   irene nixon     
2013-03-01 09:11:58.703223      80.96   undecided
+-1     300     65663   4294967343      71.26   34.62   true    calvin ovid     
2013-03-01 09:11:58.703262      78.56   study skills
 PREHOOK: query: SELECT SUM(HASH(*))
-FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) 
as q
+FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, 
si, i) as q
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1korc
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT SUM(HASH(*))
-FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) 
as q
+FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, 
si, i) as q
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1korc
 #### A masked pattern was here ####
 -17045922556
-PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY i LIMIT 20
+PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY t, si, i LIMIT 20
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY i LIMIT 20
+POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM 
over1korc ORDER BY t, si, i LIMIT 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -213,15 +213,15 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10
                     Statistics: Num rows: 1049 Data size: 311170 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col2 (type: int)
-                      sort order: +
+                      key expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col2 (type: int)
+                      sort order: +++
                       Statistics: Num rows: 1049 Data size: 311170 Basic 
stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), 
_col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 
(type: decimal(4,2)), _col10 (type: binary)
+                      value expressions: _col3 (type: bigint), _col4 (type: 
float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), 
_col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary)
             Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: 
smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), 
VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: 
boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), 
VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary)
+                expressions: KEY.reducesinkkey0 (type: tinyint), 
KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), 
VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: 
double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 
(type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
                 Statistics: Num rows: 1049 Data size: 311170 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
@@ -242,41 +242,41 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY i LIMIT 20
+PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY t, si, i LIMIT 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1korc
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY i LIMIT 20
+POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc 
ORDER BY t, si, i LIMIT 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1korc
 #### A masked pattern was here ####
-108    301     65536   4294967357      90.05   17.59   true    ethan johnson   
2013-03-01 09:11:58.703271      75.7    undecided
-118    497     65536   4294967381      50.32   12.72   false   david nixon     
2013-03-01 09:11:58.703285      83.48   values clariffication
-18     280     65536   4294967320      32.92   45.94   false   holly white     
2013-03-01 09:11:58.703086      58.86   topology
-69     489     65536   4294967404      33.52   17.99   false   oscar ichabod   
2013-03-01 09:11:58.703247      32.68   topology
-27     405     65536   4294967508      82.24   29.41   true    oscar ovid      
2013-03-01 09:11:58.703166      16.85   biology
-42     495     65536   4294967431      43.57   46.81   false   tom johnson     
2013-03-01 09:11:58.703245      62.25   american history
+NULL   374     65560   4294967516      65.43   22.48   true    oscar quirinius 
2013-03-01 09:11:58.703316      16.86   mathematics
 NULL   409     65536   4294967490      46.97   25.92   false   fred miller     
2013-03-01 09:11:58.703116      33.45   history
-59     431     65537   4294967326      11.34   2.9     true    oscar robinson  
2013-03-01 09:11:58.703161      81.04   zync studies
-63     458     65537   4294967463      21.94   49.71   true    fred van buren  
2013-03-01 09:11:58.703278      99.34   wind surfing
-121    355     65537   4294967437      85.9    10.99   true    calvin brown    
2013-03-01 09:11:58.703254      4.49    yard duty
-72     267     65537   4294967460      55.2    42.89   false   oscar carson    
2013-03-01 09:11:58.703153      51.91   topology
-22     264     65537   4294967419      8.07    10.71   false   david xylophone 
2013-03-01 09:11:58.703136      11.87   undecided
-101    283     65538   4294967527      84.03   27.29   true    yuri brown      
2013-03-01 09:11:58.703306      44.24   biology
-109    376     65538   4294967453      59.61   35.62   true    priscilla 
xylophone     2013-03-01 09:11:58.703286      9.53    study skills
-83     353     65538   4294967339      0.08    23.91   true    holly thompson  
2013-03-01 09:11:58.703157      30.27   quiet hour
-29     331     65539   4294967420      73.18   28.96   true    ethan brown     
2013-03-01 09:11:58.703094      58.85   zync studies
-70     430     65539   4294967534      18.89   43.84   true    tom carson      
2013-03-01 09:11:58.703182      21.93   joggying
-120    331     65539   4294967324      88.02   40.94   true    holly nixon     
2013-03-01 09:11:58.703262      96.64   yard duty
-71     298     65540   4294967510      91.63   9.6     false   gabriella 
zipper        2013-03-01 09:11:58.70314       68.14   geology
-114    385     65541   4294967458      73.48   34.97   true    oscar quirinius 
2013-03-01 09:11:58.703143      72.33   xylophone band
+NULL   473     65720   4294967324      80.74   40.6    false   holly falkner   
2013-03-01 09:11:58.703111      18.8    mathematics
+-3     275     65622   4294967302      71.78   8.49    false   wendy robinson  
2013-03-01 09:11:58.703294      95.39   undecided
+-3     344     65733   4294967363      0.56    11.96   true    rachel thompson 
2013-03-01 09:11:58.703276      88.46   wind surfing
+-3     376     65548   4294967431      96.78   43.23   false   fred ellison    
2013-03-01 09:11:58.703233      75.39   education
+-3     438     65618   4294967398      62.39   4.62    false   victor 
xylophone        2013-03-01 09:11:58.703135      88.38   values clariffication
+-3     458     65696   4294967418      45.24   8.49    false   irene ellison   
2013-03-01 09:11:58.703092      54.02   american history
+-3     467     65575   4294967437      81.64   23.53   true    tom hernandez   
2013-03-01 09:11:58.703188      32.85   study skills
+-2     261     65603   4294967332      39.18   28.98   false   fred polk       
2013-03-01 09:11:58.70331       69.26   opthamology
+-2     269     65681   4294967544      99.24   28.19   false   rachel falkner  
2013-03-01 09:11:58.703089      41.57   quiet hour
+-2     288     65658   4294967383      53.78   19.92   false   holly nixon     
2013-03-01 09:11:58.703224      42.93   industrial engineering
+-2     304     65629   4294967386      84.38   33.49   false   zach garcia     
2013-03-01 09:11:58.703264      56.99   chemistry
+-2     340     65627   4294967533      76.52   21.91   true    quinn laertes   
2013-03-01 09:11:58.703178      93.29   xylophone band
+-2     427     65666   4294967465      19.69   33.24   true    bob xylophone   
2013-03-01 09:11:58.703219      32.73   joggying
+-2     429     65664   4294967441      45.19   40.43   false   wendy king      
2013-03-01 09:11:58.703265      11.46   industrial engineering
+-2     461     65648   4294967425      58.52   24.85   false   rachel thompson 
2013-03-01 09:11:58.703318      85.62   zync studies
+-1     268     65778   4294967418      56.33   44.73   true    calvin falkner  
2013-03-01 09:11:58.70322       7.37    history
+-1     281     65643   4294967323      15.1    45.0    false   irene nixon     
2013-03-01 09:11:58.703223      80.96   undecided
+-1     300     65663   4294967343      71.26   34.62   true    calvin ovid     
2013-03-01 09:11:58.703262      78.56   study skills
 PREHOOK: query: SELECT SUM(HASH(*))
-FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) 
as q
+FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, 
si, i) as q
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1korc
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT SUM(HASH(*))
-FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) 
as q
+FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, 
si, i) as q
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1korc
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/7a02f726/ql/src/test/results/clientpositive/tez/vector_null_projection.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/vector_null_projection.q.out 
b/ql/src/test/results/clientpositive/tez/vector_null_projection.q.out
index 6af333d..88587e9 100644
--- a/ql/src/test/results/clientpositive/tez/vector_null_projection.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_null_projection.q.out
@@ -1,8 +1,12 @@
-PREHOOK: query: create table a(s string) stored as orc
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table a(s string) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@a
-POSTHOOK: query: create table a(s string) stored as orc
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table a(s string) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@a

Reply via email to