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

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/pcr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pcr.q.out 
b/ql/src/test/results/clientpositive/pcr.q.out
index b8e8f1c..a465ee4 100644
--- a/ql/src/test/results/clientpositive/pcr.q.out
+++ b/ql/src/test/results/clientpositive/pcr.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
                 Statistics: Num rows: 13 Data size: 104 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 13 Data size: 104 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -274,7 +274,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
-                  null sort order: a
+                  null sort order: z
                   sort order: +
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -556,7 +556,7 @@ STAGE PLANS:
                 Statistics: Num rows: 13 Data size: 104 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 13 Data size: 104 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -754,7 +754,7 @@ STAGE PLANS:
                 Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                   tag: -1
@@ -954,7 +954,7 @@ STAGE PLANS:
                 Statistics: Num rows: 16 Data size: 128 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 16 Data size: 128 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1213,7 +1213,7 @@ STAGE PLANS:
                 Statistics: Num rows: 33 Data size: 264 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 33 Data size: 264 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1481,7 +1481,7 @@ STAGE PLANS:
                 Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
-                  null sort order: a
+                  null sort order: z
                   sort order: +
                   Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1662,7 +1662,7 @@ STAGE PLANS:
               Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int), _col1 (type: string)
-                null sort order: aa
+                null sort order: zz
                 sort order: ++
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 tag: -1
@@ -1883,7 +1883,7 @@ STAGE PLANS:
               Statistics: Num rows: 60 Data size: 480 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int), _col1 (type: string)
-                null sort order: aa
+                null sort order: zz
                 sort order: ++
                 Statistics: Num rows: 60 Data size: 480 Basic stats: COMPLETE 
Column stats: NONE
                 tag: -1
@@ -2179,7 +2179,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -2492,7 +2492,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2815,7 +2815,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2974,7 +2974,7 @@ STAGE PLANS:
                 Statistics: Num rows: 48 Data size: 384 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 48 Data size: 384 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -3303,7 +3303,7 @@ STAGE PLANS:
                 Statistics: Num rows: 30 Data size: 240 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 30 Data size: 240 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -4789,7 +4789,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string)
-                null sort order: a
+                null sort order: z
                 sort order: +
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 tag: -1
@@ -4929,7 +4929,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -5120,7 +5120,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/pcs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pcs.q.out 
b/ql/src/test/results/clientpositive/pcs.q.out
index 872fb27..82fc39b 100644
--- a/ql/src/test/results/clientpositive/pcs.q.out
+++ b/ql/src/test/results/clientpositive/pcs.q.out
@@ -112,7 +112,7 @@ STAGE PLANS:
                 Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1104,7 +1104,7 @@ STAGE PLANS:
                     Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: int), _col1 (type: 
string), '2008-04-08' (type: string)
-                      null sort order: aaa
+                      null sort order: zzz
                       sort order: +++
                       Statistics: Num rows: 2 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       tag: -1
@@ -1129,7 +1129,7 @@ STAGE PLANS:
                     Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: int), _col1 (type: 
string), '2008-04-08' (type: string)
-                      null sort order: aaa
+                      null sort order: zzz
                       sort order: +++
                       Statistics: Num rows: 2 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/perf/spark/query47.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query47.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query47.q.out
index ec18a70..d276030 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query47.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query47.q.out
@@ -486,7 +486,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST, _col2 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST, _col2 ASC NULLS LAST
                         partition by: _col4, _col3, _col5, _col6
                         raw input shape:
                         window functions:
@@ -614,7 +614,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col0 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col0 ASC NULLS LAST, _col1 ASC NULLS LAST
                         partition by: _col3, _col2, _col4, _col5
                         raw input shape:
                         window functions:
@@ -703,7 +703,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col0 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col0 ASC NULLS LAST, _col1 ASC NULLS LAST
                         partition by: _col3, _col2, _col4, _col5
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/perf/spark/query49.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query49.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query49.q.out
index 7145ada..cc0ace2 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query49.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query49.q.out
@@ -483,7 +483,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:
@@ -520,7 +520,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:
@@ -638,7 +638,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:
@@ -675,7 +675,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:
@@ -762,7 +762,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col1 AS decimal(15,4)) / CAST( _col2 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:
@@ -799,7 +799,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS FIRST
+                        order by: (CAST( _col4 AS decimal(15,4)) / CAST( _col5 
AS decimal(15,4))) ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/perf/spark/query51.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query51.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query51.q.out
index 2d18e77..00c180c 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query51.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query51.q.out
@@ -242,7 +242,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         partition by: _col0
                         raw input shape:
                         window functions:
@@ -294,7 +294,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: CASE WHEN (_col4 is not null) THEN (_col4) 
ELSE (_col1) END ASC NULLS FIRST
+                        order by: CASE WHEN (_col4 is not null) THEN (_col4) 
ELSE (_col1) END ASC NULLS LAST
                         partition by: CASE WHEN (_col3 is not null) THEN 
(_col3) ELSE (_col0) END
                         raw input shape:
                         window functions:
@@ -358,7 +358,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         partition by: _col0
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/perf/spark/query57.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query57.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query57.q.out
index 3ed57e1..5637e39 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query57.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query57.q.out
@@ -480,7 +480,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST, _col2 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST, _col2 ASC NULLS LAST
                         partition by: _col5, _col4, _col3
                         raw input shape:
                         window functions:
@@ -620,7 +620,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col0 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col0 ASC NULLS LAST, _col1 ASC NULLS LAST
                         partition by: _col4, _col3, _col2
                         raw input shape:
                         window functions:
@@ -697,7 +697,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col0 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col0 ASC NULLS LAST, _col1 ASC NULLS LAST
                         partition by: _col4, _col3, _col2
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/perf/tez/query51.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query51.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query51.q.out
index 8a0802e..e0c24a2 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query51.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query51.q.out
@@ -114,7 +114,7 @@ Stage-0
                 Filter Operator [FIL_58] (rows=116159124 width=88)
                   predicate:(max_window_0 > max_window_1)
                   PTF Operator [PTF_45] (rows=348477374 width=88)
-                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"CASE WHEN (_col4 
is not null) THEN (_col4) ELSE (_col1) END ASC NULLS FIRST","partition 
by:":"CASE WHEN (_col3 is not null) THEN (_col3) ELSE (_col0) END"}]
+                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"CASE WHEN (_col4 
is not null) THEN (_col4) ELSE (_col1) END ASC NULLS LAST","partition 
by:":"CASE WHEN (_col3 is not null) THEN (_col3) ELSE (_col0) END"}]
                     Select Operator [SEL_44] (rows=348477374 width=88)
                       Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                     <-Reducer 4 [SIMPLE_EDGE]
@@ -128,7 +128,7 @@ Stage-0
                             Select Operator [SEL_17] (rows=316797606 width=88)
                               Output:["_col0","_col1","_col2"]
                               PTF Operator [PTF_16] (rows=316797606 width=88)
-                                Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
FIRST","partition by:":"_col0"}]
+                                Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
LAST","partition by:":"_col0"}]
                                 Group By Operator [GBY_12] (rows=316797606 
width=88)
                                   
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1
                                 <-Reducer 2 [SIMPLE_EDGE]
@@ -162,7 +162,7 @@ Stage-0
                             Select Operator [SEL_37] (rows=79201469 width=135)
                               Output:["_col0","_col1","_col2"]
                               PTF Operator [PTF_36] (rows=79201469 width=135)
-                                Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
FIRST","partition by:":"_col0"}]
+                                Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
LAST","partition by:":"_col0"}]
                                 Group By Operator [GBY_32] (rows=79201469 
width=135)
                                   
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1
                                 <-Reducer 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/pointlookup2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pointlookup2.q.out 
b/ql/src/test/results/clientpositive/pointlookup2.q.out
index 43c46ef..a8c27d9 100644
--- a/ql/src/test/results/clientpositive/pointlookup2.q.out
+++ b/ql/src/test/results/clientpositive/pointlookup2.q.out
@@ -124,7 +124,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -432,7 +432,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -715,7 +715,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -1039,7 +1039,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col4 (type: int), _col5 (type: string), _col2 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 20 Data size: 540 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -1416,7 +1416,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: string), _col3 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 30 Data size: 810 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -1697,7 +1697,7 @@ STAGE PLANS:
                 Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -2005,7 +2005,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2288,7 +2288,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int)
-              null sort order: a
+              null sort order: z
               sort order: +
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2604,7 +2604,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col4 (type: int), _col5 (type: string), _col2 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 10 Data size: 270 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2973,7 +2973,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: string), _col3 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 8 Data size: 216 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/pointlookup3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pointlookup3.q.out 
b/ql/src/test/results/clientpositive/pointlookup3.q.out
index c635f39..242bfe9 100644
--- a/ql/src/test/results/clientpositive/pointlookup3.q.out
+++ b/ql/src/test/results/clientpositive/pointlookup3.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string)
-                  null sort order: aaaa
+                  null sort order: zzzz
                   sort order: ++++
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -262,7 +262,7 @@ STAGE PLANS:
                 Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                   tag: -1
@@ -523,7 +523,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col3 (type: int), _col4 (type: string)
-              null sort order: aa
+              null sort order: zz
               sort order: ++
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -808,7 +808,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col3 (type: int), _col4 (type: string)
-              null sort order: aa
+              null sort order: zz
               sort order: ++
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -1135,7 +1135,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col4 (type: int), _col5 (type: string), _col2 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 1200 Data size: 20400 Basic stats: 
COMPLETE Column stats: NONE
               tag: -1
@@ -1464,7 +1464,7 @@ STAGE PLANS:
                 Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string)
-                  null sort order: aaaa
+                  null sort order: zzzz
                   sort order: ++++
                   Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1643,7 +1643,7 @@ STAGE PLANS:
                 Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string)
-                  null sort order: aaa
+                  null sort order: zzz
                   sort order: +++
                   Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
                   tag: -1
@@ -1904,7 +1904,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col3 (type: int), _col4 (type: string)
-              null sort order: aa
+              null sort order: zz
               sort order: ++
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2189,7 +2189,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col3 (type: int), _col4 (type: string)
-              null sort order: aa
+              null sort order: zz
               sort order: ++
               Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
@@ -2508,7 +2508,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col4 (type: int), _col5 (type: string), _col2 
(type: string)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 300 Data size: 5100 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/pointlookup4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pointlookup4.q.out 
b/ql/src/test/results/clientpositive/pointlookup4.q.out
index 627c983..423eec0 100644
--- a/ql/src/test/results/clientpositive/pointlookup4.q.out
+++ b/ql/src/test/results/clientpositive/pointlookup4.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string)
-                  null sort order: aaaa
+                  null sort order: zzzz
                   sort order: ++++
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -276,7 +276,7 @@ STAGE PLANS:
                 Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string)
-                  null sort order: aaaa
+                  null sort order: zzzz
                   sort order: ++++
                   Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/ppd_vc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_vc.q.out 
b/ql/src/test/results/clientpositive/ppd_vc.q.out
index 34890f2..c42cd11 100644
--- a/ql/src/test/results/clientpositive/ppd_vc.q.out
+++ b/ql/src/test/results/clientpositive/ppd_vc.q.out
@@ -673,7 +673,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col2 (type: string), _col3 (type: string), 
_col4 (type: bigint)
-              null sort order: aaa
+              null sort order: zzz
               sort order: +++
               Statistics: Num rows: 732 Data size: 7782 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/ptf_matchpath.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ptf_matchpath.q.out 
b/ql/src/test/results/clientpositive/ptf_matchpath.q.out
index c597114..6f1876d 100644
--- a/ql/src/test/results/clientpositive/ptf_matchpath.q.out
+++ b/ql/src/test/results/clientpositive/ptf_matchpath.q.out
@@ -88,7 +88,7 @@ STAGE PLANS:
                   input alias: ptf_1
                   arguments: 'LATE.LATE+', 'LATE', (_col5 > 15.0), 
'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, 
tpath[0].day_of_month as tpath'
                   name: matchpath
-                  order by: _col2 ASC NULLS FIRST, _col3 ASC NULLS FIRST, 
_col4 ASC NULLS FIRST
+                  order by: _col2 ASC NULLS LAST, _col3 ASC NULLS LAST, _col4 
ASC NULLS LAST
                   output shape: tpath: int
                   partition by: _col6
                   raw input shape:
@@ -206,7 +206,7 @@ STAGE PLANS:
                   input alias: ptf_1
                   arguments: 'LATE.LATE+', 'LATE', (_col5 > 15.0), 
'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, 
tpath[0].day_of_month as tpath'
                   name: matchpath
-                  order by: _col6 ASC NULLS FIRST, _col2 ASC NULLS FIRST, 
_col3 ASC NULLS FIRST, _col4 ASC NULLS FIRST
+                  order by: _col6 ASC NULLS LAST, _col2 ASC NULLS LAST, _col3 
ASC NULLS LAST, _col4 ASC NULLS LAST
                   output shape: tpath: int
                   partition by: 0
                   raw input shape:
@@ -321,7 +321,7 @@ STAGE PLANS:
                   input alias: ptf_1
                   arguments: 'LATE.LATE+', 'LATE', (_col5 > 15.0), 
'origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, 
tpath[0].day_of_month as tpath'
                   name: matchpath
-                  order by: _col6 ASC NULLS FIRST, _col2 ASC NULLS FIRST, 
_col3 ASC NULLS FIRST, _col4 ASC NULLS FIRST
+                  order by: _col6 ASC NULLS LAST, _col2 ASC NULLS LAST, _col3 
ASC NULLS LAST, _col4 ASC NULLS LAST
                   output shape: tpath: int
                   partition by: 0
                   raw input shape:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/push_or.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/push_or.q.out 
b/ql/src/test/results/clientpositive/push_or.q.out
index 4cc32d0..4a88e9d 100644
--- a/ql/src/test/results/clientpositive/push_or.q.out
+++ b/ql/src/test/results/clientpositive/push_or.q.out
@@ -60,7 +60,7 @@ STAGE PLANS:
                 Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col2 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 40 Data size: 320 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/quotedid_basic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/quotedid_basic.q.out 
b/ql/src/test/results/clientpositive/quotedid_basic.q.out
index 6c8aa59..0b51cb3 100644
--- a/ql/src/test/results/clientpositive/quotedid_basic.q.out
+++ b/ql/src/test/results/clientpositive/quotedid_basic.q.out
@@ -212,7 +212,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col1 ASC NULLS FIRST
+                  order by: _col1 ASC NULLS LAST
                   partition by: '1'
                   raw input shape:
                   window functions:
@@ -316,7 +316,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col1 ASC NULLS FIRST
+                  order by: _col1 ASC NULLS LAST
                   partition by: '1'
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/sample6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample6.q.out 
b/ql/src/test/results/clientpositive/sample6.q.out
index a6a6f2c..e93e096 100644
--- a/ql/src/test/results/clientpositive/sample6.q.out
+++ b/ql/src/test/results/clientpositive/sample6.q.out
@@ -729,7 +729,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1136,7 +1136,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -1766,7 +1766,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -2278,7 +2278,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -2730,7 +2730,7 @@ STAGE PLANS:
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -3108,7 +3108,7 @@ STAGE PLANS:
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -3377,7 +3377,7 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: string)
-                  null sort order: aa
+                  null sort order: zz
                   sort order: ++
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/semijoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/semijoin2.q.out 
b/ql/src/test/results/clientpositive/semijoin2.q.out
index 0e65993..3cb38fc 100644
--- a/ql/src/test/results/clientpositive/semijoin2.q.out
+++ b/ql/src/test/results/clientpositive/semijoin2.q.out
@@ -155,7 +155,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: (_col98 + _col16) ASC NULLS FIRST, floor(_col21) 
DESC NULLS LAST
+                  order by: (_col98 + _col16) ASC NULLS LAST, floor(_col21) 
DESC NULLS LAST
                   partition by: (_col98 + _col16)
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/semijoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/semijoin4.q.out 
b/ql/src/test/results/clientpositive/semijoin4.q.out
index 135fcfe..ff7492f 100644
--- a/ql/src/test/results/clientpositive/semijoin4.q.out
+++ b/ql/src/test/results/clientpositive/semijoin4.q.out
@@ -167,7 +167,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: (UDFToShort(UDFToByte(-92)) + _col1) ASC NULLS 
FIRST, floor(_col3) DESC NULLS LAST
+                  order by: (UDFToShort(UDFToByte(-92)) + _col1) ASC NULLS 
LAST, floor(_col3) DESC NULLS LAST
                   partition by: (UDFToShort(UDFToByte(-92)) + _col1)
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/semijoin5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/semijoin5.q.out 
b/ql/src/test/results/clientpositive/semijoin5.q.out
index 8c94715..eca10dc 100644
--- a/ql/src/test/results/clientpositive/semijoin5.q.out
+++ b/ql/src/test/results/clientpositive/semijoin5.q.out
@@ -163,7 +163,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: (_col7 + UDFToInteger(_col5)) ASC NULLS FIRST, 
floor(_col3) DESC NULLS LAST
+                  order by: (_col7 + UDFToInteger(_col5)) ASC NULLS LAST, 
floor(_col3) DESC NULLS LAST
                   partition by: (_col7 + UDFToInteger(_col5))
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/serde_regex.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/serde_regex.q.out 
b/ql/src/test/results/clientpositive/serde_regex.q.out
index 5a19ec9..bf10555 100644
--- a/ql/src/test/results/clientpositive/serde_regex.q.out
+++ b/ql/src/test/results/clientpositive/serde_regex.q.out
@@ -200,7 +200,6 @@ POSTHOOK: query: SELECT key, value FROM serde_regex1 ORDER 
BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@serde_regex1
 #### A masked pattern was here ####
-NULL   0
 -1234567890.123456789000000000 -1234567890
 -4400.000000000000000000       4400
 -1255.490000000000000000       -1255
@@ -238,6 +237,7 @@ NULL        0
 125.200000000000000000 125
 200.000000000000000000 200
 1234567890.123456780000000000  1234567890
+NULL   0
 PREHOOK: query: DROP TABLE serde_regex1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@serde_regex1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out 
b/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out
index 2e44e09..87f891e 100644
--- a/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out
@@ -302,14 +302,14 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n67
 POSTHOOK: Input: default@t2_n40
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 2      12      2       22
 3      13      3       13
 8      18      8       18
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15
 PREHOOK: query: EXPLAIN
 SELECT count(1) FROM T1_n67 a JOIN T2_n40 b ON a.key = b.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out 
b/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out
index 4277c3e..a055dc2 100644
--- a/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out
@@ -334,14 +334,14 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n151
 POSTHOOK: Input: default@t2_n88
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 2      12      2       22
 3      13      3       13
 8      18      8       18
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15
 PREHOOK: query: EXPLAIN
 SELECT count(1) FROM T1_n151 a JOIN T2_n88 b ON a.key = b.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out 
b/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out
index ee1310c..9fcb384 100644
--- a/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out
@@ -325,8 +325,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n25
 POSTHOOK: Input: default@t2_n16
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 1      11      NULL    NULL
 2      12      2       22
 3      13      3       13
@@ -335,3 +333,5 @@ NULL        NULL    5       15
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out 
b/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
index e213e7f..a257c83 100644
--- a/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
@@ -302,14 +302,14 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n57
 POSTHOOK: Input: default@t2_n35
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 2      12      2       22
 3      13      3       13
 8      18      8       18
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15
 PREHOOK: query: create table DEST1_n58(key1 STRING, val1 STRING, key2 STRING, 
val2 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -630,11 +630,11 @@ ORDER BY key1, key2, val1, val2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1_n58
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 2      12      2       22
 3      13      3       13
 8      18      8       18
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoinopt1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt1.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt1.q.out
index 02bb87e..9832eb9 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt1.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt1.q.out
@@ -348,14 +348,14 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n101
 POSTHOOK: Input: default@t2_n64
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 2      12      2       22
 3      13      3       13
 8      18      8       18
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15
 PREHOOK: query: EXPLAIN
 SELECT count(1) FROM T1_n101 a JOIN T2_n64 b ON a.key = b.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/skewjoinopt3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt3.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt3.q.out
index 1dd9486..5fec2a2 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt3.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt3.q.out
@@ -348,8 +348,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n12
 POSTHOOK: Input: default@t2_n7
 #### A masked pattern was here ####
-NULL   NULL    4       14
-NULL   NULL    5       15
 1      11      NULL    NULL
 2      12      2       22
 3      13      3       13
@@ -358,3 +356,5 @@ NULL        NULL    5       15
 8      18      8       18
 8      28      8       18
 8      28      8       18
+NULL   NULL    4       14
+NULL   NULL    5       15

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
index 2dd921f..7caa2ee 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
@@ -96,7 +96,7 @@ STAGE PLANS:
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
-                    null sort order: a
+                    null sort order: z
                     sort order: +
                     tag: -1
                     TopN: 10
@@ -275,7 +275,7 @@ STAGE PLANS:
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
-                    null sort order: a
+                    null sort order: z
                     sort order: +
                     Statistics: Num rows: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out 
b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
index 3680e81..6de364a 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
@@ -2203,7 +2203,6 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: my_fact
-                  filterExpr: ((fiscal_year = '2015') and 
(UDFToDouble(accounting_period) = 10.0D) and join_col is not null) (type: 
boolean)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   GatherStats: false
                   Filter Operator
@@ -2231,17 +2230,16 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: my_dim
-                  filterExpr: ((filter_col) IN ('VAL1', 'VAL2') and join_col 
is not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 692 Basic stats: COMPLETE 
Column stats: NONE
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
                     predicate: ((filter_col) IN ('VAL1', 'VAL2') and join_col 
is not null) (type: boolean)
-                    Statistics: Num rows: 4 Data size: 692 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 346 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: join_col (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 4 Data size: 692 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 346 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -2252,17 +2250,17 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Position of Big Table: 1
-                        Statistics: Num rows: 4 Data size: 761 Basic stats: 
PARTIAL Column stats: NONE
+                        Statistics: Num rows: 2 Data size: 380 Basic stats: 
PARTIAL Column stats: NONE
                         Select Operator
                           expressions: _col0 (type: string), _col4 (type: 
string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
-                          Statistics: Num rows: 4 Data size: 761 Basic stats: 
PARTIAL Column stats: NONE
+                          Statistics: Num rows: 2 Data size: 380 Basic stats: 
PARTIAL Column stats: NONE
                           File Output Operator
                             compressed: false
                             GlobalTableId: 0
 #### A masked pattern was here ####
                             NumFilesPerFileSink: 1
-                            Statistics: Num rows: 4 Data size: 761 Basic 
stats: PARTIAL Column stats: NONE
+                            Statistics: Num rows: 2 Data size: 380 Basic 
stats: PARTIAL Column stats: NONE
 #### A masked pattern was here ####
                             table:
                                 input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out 
b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
index 059a5fa..73eafdd 100644
--- a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
@@ -189,7 +189,7 @@ STAGE PLANS:
                         Statistics: Num rows: 75 Data size: 30250 Basic stats: 
PARTIAL Column stats: NONE
                         Reduce Output Operator
                           key expressions: _col0 (type: int), _col1 (type: 
string)
-                          null sort order: aa
+                          null sort order: zz
                           sort order: ++
                           Statistics: Num rows: 75 Data size: 30250 Basic 
stats: PARTIAL Column stats: NONE
                           tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark 
b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark
index dbb2460..06457f0 100644
--- a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark
+++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark
@@ -186,7 +186,7 @@ STAGE PLANS:
                         Statistics: Num rows: 75 Data size: 30250 Basic stats: 
PARTIAL Column stats: NONE
                         Reduce Output Operator
                           key expressions: _col0 (type: int), _col1 (type: 
string)
-                          null sort order: aa
+                          null sort order: zz
                           sort order: ++
                           Statistics: Num rows: 75 Data size: 30250 Basic 
stats: PARTIAL Column stats: NONE
                           tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/spark/cbo_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cbo_limit.q.out 
b/ql/src/test/results/clientpositive/spark/cbo_limit.q.out
index c582578..a5e36d2 100644
--- a/ql/src/test/results/clientpositive/spark/cbo_limit.q.out
+++ b/ql/src/test/results/clientpositive/spark/cbo_limit.q.out
@@ -8,7 +8,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    NULL
+1      4       2
 PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as 
x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by 
y, x order by x,y limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -19,7 +19,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    1
+5.0    2       3
 PREHOOK: query: select key from(select key from (select key from cbo_t1 limit 
5)cbo_t2  limit 5)cbo_t3  limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -45,8 +45,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL
-NULL   NULL
+1      1
+1      1
 1      1
 1      1
 1      1

Reply via email to