http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketcontext_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
index f95e0ae..652b377 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -288,6 +288,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -468,6 +469,7 @@ STAGE PLANS:
                   mode: hash
                   outputColumnNames: _col0
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     tag: -1
                     value expressions: _col0 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketcontext_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
index 031ce78..ee4532a 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -166,6 +166,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -337,6 +338,7 @@ STAGE PLANS:
                   mode: hash
                   outputColumnNames: _col0
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     tag: -1
                     value expressions: _col0 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketcontext_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
index bada9ce..e280b95 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -184,6 +184,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -408,6 +409,7 @@ STAGE PLANS:
                   mode: hash
                   outputColumnNames: _col0
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     tag: -1
                     value expressions: _col0 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketcontext_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
index f87ce5f..b44ae95 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -305,6 +305,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -533,6 +534,7 @@ STAGE PLANS:
                   mode: hash
                   outputColumnNames: _col0
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     tag: -1
                     value expressions: _col0 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketcontext_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
index daa6767..eee7b57 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -305,6 +305,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -533,6 +534,7 @@ STAGE PLANS:
                   mode: hash
                   outputColumnNames: _col0
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     tag: -1
                     value expressions: _col0 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
index b09ccbe..041f2d0 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
@@ -329,6 +329,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
index 1387aa5..5e9fbe4 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
@@ -347,6 +347,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -724,6 +725,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
index c5627fa..3a38d7b 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
@@ -263,6 +263,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -534,6 +535,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
index b07ad4f..c78b7a1 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
@@ -218,6 +218,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -547,6 +548,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -827,6 +829,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -1109,6 +1112,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
index 1b9eb47..7f96a23 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
@@ -126,15 +126,17 @@ TOK_QUERY
                value
       TOK_ORDERBY
          TOK_TABSORTCOLNAMEASC
-            .
-               TOK_TABLE_OR_COL
-                  a
-               key
+            TOK_NULLS_FIRST
+               .
+                  TOK_TABLE_OR_COL
+                     a
+                  key
          TOK_TABSORTCOLNAMEASC
-            .
-               TOK_TABLE_OR_COL
-                  b
-               value
+            TOK_NULLS_FIRST
+               .
+                  TOK_TABLE_OR_COL
+                     b
+                  value
       TOK_LIMIT
          1
 
@@ -245,6 +247,7 @@ STAGE PLANS:
                   Statistics: Num rows: 755 Data size: 3025 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int), _col1 (type: string)
+                    null sort order: aa
                     sort order: ++
                     Statistics: Num rows: 755 Data size: 3025 Basic stats: 
COMPLETE Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
index 48c7e39..804c882 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
@@ -229,6 +229,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -517,6 +518,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
index 8518b17..cc0672e 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
@@ -229,6 +229,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1
@@ -542,6 +543,7 @@ STAGE PLANS:
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
+                    null sort order: 
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out 
b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
index 7074ccb..f680a02 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
@@ -124,6 +124,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
+                null sort order: a
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
@@ -140,6 +141,7 @@ STAGE PLANS:
               Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
+                null sort order: a
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -601,6 +603,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: key (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: key (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
@@ -621,6 +624,7 @@ STAGE PLANS:
                 Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: key (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: key (type: string)
                   Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
index 655847e..bfdc3b6 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
@@ -124,6 +124,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Reduce Output Operator
                   key expressions: _col0 (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: double)
                   tag: -1
@@ -322,6 +323,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Reduce Output Operator
                   key expressions: _col0 (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: double)
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
index cb51f5b..96cf8fd 100644
--- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
@@ -121,6 +121,7 @@ STAGE PLANS:
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Reduce Output Operator
+                  null sort order: 
                   sort order: 
                   tag: -1
                   value expressions: _col0 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col2 (type: 
struct<columntype:string,min:double,max:double,countnulls:bigint,bitvector:string,numbitvectors:int>)
@@ -522,6 +523,7 @@ STAGE PLANS:
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Reduce Output Operator
+                  null sort order: 
                   sort order: 
                   tag: -1
                   value expressions: _col0 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col2 (type: 
struct<columntype:string,min:double,max:double,countnulls:bigint,bitvector:string,numbitvectors:int>)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/combine2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/combine2.q.out 
b/ql/src/test/results/clientpositive/combine2.q.out
index 2469f09..8c59816 100644
--- a/ql/src/test/results/clientpositive/combine2.q.out
+++ b/ql/src/test/results/clientpositive/combine2.q.out
@@ -195,6 +195,7 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
+                  null sort order: 
                   sort order: 
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out 
b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
index 57d8dca..dc2f869 100644
--- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
+++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
@@ -92,6 +92,7 @@ STAGE PLANS:
                 outputColumnNames: _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
+                  null sort order: 
                   sort order: 
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
@@ -106,6 +107,7 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
+                null sort order: 
                 sort order: 
                 Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
                 tag: 1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer12.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
index 615e47a..3d936e5 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
@@ -50,7 +50,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col0
+                  order by: _col0 ASC NULLS FIRST
                   partition by: _col0
                   raw input shape:
                   window functions:
@@ -135,7 +135,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col0
+                  order by: _col0 ASC NULLS FIRST
                   partition by: _col0
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas.q.out 
b/ql/src/test/results/clientpositive/ctas.q.out
index bf6db75..06003ee 100644
--- a/ql/src/test/results/clientpositive/ctas.q.out
+++ b/ql/src/test/results/clientpositive/ctas.q.out
@@ -718,11 +718,13 @@ TOK_CREATETABLE
                   value
          TOK_SORTBY
             TOK_TABSORTCOLNAMEASC
-               TOK_TABLE_OR_COL
-                  key
+               TOK_NULLS_FIRST
+                  TOK_TABLE_OR_COL
+                     key
             TOK_TABSORTCOLNAMEASC
-               TOK_TABLE_OR_COL
-                  value
+               TOK_NULLS_FIRST
+                  TOK_TABLE_OR_COL
+                     value
          TOK_LIMIT
             10
 
@@ -748,6 +750,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string), _col1 (type: string)
+                null sort order: aa
                 sort order: ++
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 tag: -1
@@ -837,6 +840,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: string)
+              null sort order: aa
               sort order: ++
               Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/ctas_colname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out 
b/ql/src/test/results/clientpositive/ctas_colname.q.out
index 435b9e0..7c86c66 100644
--- a/ql/src/test/results/clientpositive/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/ctas_colname.q.out
@@ -193,7 +193,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col1
+                  order by: _col1 ASC NULLS FIRST
                   partition by: _col0
                   raw input shape:
                   window functions:
@@ -354,7 +354,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col1
+                  order by: _col1 ASC NULLS FIRST
                   partition by: _col0
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out 
b/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
index fe55531..366bd7a 100644
--- a/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
@@ -49,6 +49,7 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
+                null sort order: 
                 sort order: 
                 Map-reduce partition columns: UDFToInteger(_col0) (type: int)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
index 7154ac7..b79095c 100644
--- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
@@ -137,6 +137,7 @@ STAGE PLANS:
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Reduce Output Operator
+                  null sort order: 
                   sort order: 
                   tag: -1
                   value expressions: _col0 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:string,numbitvectors:int>),
 _col2 (type: 
struct<columntype:string,min:double,max:double,countnulls:bigint,bitvector:string,numbitvectors:int>)

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out 
b/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
index d03bfe4..c5d695e 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
@@ -1155,7 +1155,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
 Compressed:            No                       
 Num Buckets:           4                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort_orc 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -1196,7 +1196,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
 Compressed:            No                       
 Num Buckets:           4                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: select count(*) from over1k_part_orc
@@ -2129,7 +2129,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort2_orc 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -2170,7 +2170,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: explain select * from over1k_part_buck_sort2_orc
@@ -2339,7 +2339,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort2_orc 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -2380,7 +2380,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: explain select * from over1k_part_buck_sort2_orc

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out 
b/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
index 857d609..9a222b1 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
@@ -1060,7 +1060,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           4                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -1101,7 +1101,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           4                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: select count(*) from over1k_part
@@ -2027,7 +2027,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort2 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -2068,7 +2068,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: select * from over1k_part_buck_sort2
@@ -2170,7 +2170,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: desc formatted over1k_part_buck_sort2 
partition(t="__HIVE_DEFAULT_PARTITION__")
@@ -2211,7 +2211,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [si]                     
-Sort Columns:          [Order(col:f, order:1)]  
+Sort Columns:          [Order(col:f, order:1, nullOrder:0)]     
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: select * from over1k_part_buck_sort2

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index d173e01..ecf9861 100644
--- 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++ 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -594,6 +594,7 @@ STAGE PLANS:
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: UDFToDouble(_col0) (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
@@ -614,6 +615,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: UDFToDouble(_col0) (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
index c2cc46e..d46aaea 100644
--- 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
+++ 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
@@ -114,6 +114,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
@@ -134,6 +135,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/explain_logical.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out 
b/ql/src/test/results/clientpositive/explain_logical.q.out
index 59bd9e9..bf35cd5 100644
--- a/ql/src/test/results/clientpositive/explain_logical.q.out
+++ b/ql/src/test/results/clientpositive/explain_logical.q.out
@@ -793,10 +793,11 @@ TOK_QUERY
                value
       TOK_ORDERBY
          TOK_TABSORTCOLNAMEASC
-            .
-               TOK_TABLE_OR_COL
-                  s1
-               key
+            TOK_NULLS_FIRST
+               .
+                  TOK_TABLE_OR_COL
+                     s1
+                  key
 
 
 LOGICAL PLAN:

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out 
b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
index 8ccd129..018fd5d 100644
--- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
@@ -157,6 +157,7 @@ STAGE PLANS:
                 Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 25 Data size: 211 Basic stats: 
COMPLETE Column stats: NONE
@@ -176,6 +177,7 @@ STAGE PLANS:
                 Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 25 Data size: 211 Basic stats: 
COMPLETE Column stats: NONE
@@ -267,6 +269,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col3 (type: string)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col3 (type: string)
               Statistics: Num rows: 27 Data size: 232 Basic stats: COMPLETE 
Column stats: NONE
@@ -287,6 +290,7 @@ STAGE PLANS:
                 Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 25 Data size: 211 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
index d7b83a1..e5ae828 100644
--- a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
@@ -122,6 +122,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
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
@@ -138,6 +139,7 @@ STAGE PLANS:
               Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string)
+                null sort order: a
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -591,6 +593,7 @@ STAGE PLANS:
               Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string)
+                null sort order: a
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -607,6 +610,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
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
@@ -1068,6 +1072,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
@@ -1088,6 +1093,7 @@ STAGE PLANS:
                 Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
@@ -1442,6 +1448,7 @@ STAGE PLANS:
                 Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
@@ -1462,6 +1469,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
index 0324836..5cd9737 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
@@ -101,7 +101,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col3
+                  order by: _col3 ASC NULLS FIRST
                   partition by: _col0
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out 
b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
index 9f779d0..556995c 100644
--- a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
+++ b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
@@ -120,6 +120,7 @@ STAGE PLANS:
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string)
+                  null sort order: aa
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
index 6d78aca..393e6fa 100644
--- a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
@@ -137,6 +137,7 @@ STAGE PLANS:
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string)
+                  null sort order: aaa
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_ppr.q.out 
b/ql/src/test/results/clientpositive/groupby_ppr.q.out
index 035f315..2e160b3 100644
--- a/ql/src/test/results/clientpositive/groupby_ppr.q.out
+++ b/ql/src/test/results/clientpositive/groupby_ppr.q.out
@@ -114,6 +114,7 @@ STAGE PLANS:
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string), _col1 (type: string)
+                null sort order: aa
                 sort order: ++
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
index a7aba12..93fbc0e 100644
--- a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
@@ -131,6 +131,7 @@ STAGE PLANS:
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string)
+                null sort order: aaa
                 sort order: +++
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_resolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_resolution.q.out 
b/ql/src/test/results/clientpositive/groupby_resolution.q.out
index 83fc576..76b5238 100644
--- a/ql/src/test/results/clientpositive/groupby_resolution.q.out
+++ b/ql/src/test/results/clientpositive/groupby_resolution.q.out
@@ -681,7 +681,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col1
+                  order by: _col1 ASC NULLS FIRST
                   partition by: 0
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
index 07c9553..3552a86 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
@@ -468,6 +468,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string)
+                  null sort order: aa
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -1874,6 +1875,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), 1 (type: int), _col2 
(type: string)
+                  null sort order: aaa
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), 1 (type: 
int), _col2 (type: string)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2095,6 +2097,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: double)
+                  null sort order: aa
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2362,6 +2365,7 @@ STAGE PLANS:
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: double)
+                      null sort order: a
                       sort order: +
                       Map-reduce partition columns: _col0 (type: double)
                       Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -3135,6 +3139,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -3774,6 +3779,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -3800,6 +3806,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -4086,6 +4093,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
+                    null sort order: aa
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: NONE
@@ -4194,6 +4202,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -4204,6 +4213,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
@@ -4406,6 +4416,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_sort_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_6.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_6.q.out
index 9738c15..844a2a4 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_6.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_6.q.out
@@ -87,6 +87,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
@@ -256,6 +257,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
@@ -424,6 +426,7 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
index fdc114c..73fca7c 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
@@ -469,6 +469,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string)
+                  null sort order: aa
                   sort order: ++
                   Map-reduce partition columns: rand() (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -561,6 +562,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: string)
+              null sort order: aa
               sort order: ++
               Map-reduce partition columns: _col0 (type: string), _col1 (type: 
string)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -1940,6 +1942,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), 1 (type: int), _col2 
(type: string)
+                  null sort order: aaa
                   sort order: +++
                   Map-reduce partition columns: rand() (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2032,6 +2035,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string), 1 (type: int), _col2 
(type: string)
+              null sort order: aaa
               sort order: +++
               Map-reduce partition columns: _col0 (type: string), 1 (type: 
int), _col2 (type: string)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2226,6 +2230,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: double)
+                  null sort order: aa
                   sort order: ++
                   Map-reduce partition columns: rand() (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2318,6 +2323,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: double)
+              null sort order: aa
               sort order: ++
               Map-reduce partition columns: _col0 (type: string), _col1 (type: 
double)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -2558,6 +2564,7 @@ STAGE PLANS:
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: double)
+                      null sort order: a
                       sort order: +
                       Map-reduce partition columns: rand() (type: double)
                       Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -2650,6 +2657,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: double)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col0 (type: double)
               Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
@@ -3396,6 +3404,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: double)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: rand() (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -3488,6 +3497,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: double)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col0 (type: double)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -4099,6 +4109,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -4125,6 +4136,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -4412,6 +4424,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
+                    null sort order: aa
                     sort order: ++
                     Map-reduce partition columns: rand() (type: double)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: NONE
@@ -4504,6 +4517,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: string)
+              null sort order: aa
               sort order: ++
               Map-reduce partition columns: _col0 (type: string), _col1 (type: 
string)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -4584,6 +4598,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
+                    null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -4594,6 +4609,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
@@ -4797,6 +4813,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
+                  null sort order: a
                   sort order: +
                   Map-reduce partition columns: rand() (type: double)
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
@@ -4889,6 +4906,7 @@ STAGE PLANS:
             GatherStats: false
             Reduce Output Operator
               key expressions: _col0 (type: string)
+              null sort order: a
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/index_skewtable.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_skewtable.q.out 
b/ql/src/test/results/clientpositive/index_skewtable.q.out
index 972789d..45e6834 100644
--- a/ql/src/test/results/clientpositive/index_skewtable.q.out
+++ b/ql/src/test/results/clientpositive/index_skewtable.q.out
@@ -57,7 +57,7 @@ OutputFormat:         
org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           -1                       
 Bucket Columns:        []                       
-Sort Columns:          [Order(col:value, order:1)]      
+Sort Columns:          [Order(col:value, order:1, nullOrder:0)]         
 PREHOOK: query: ALTER INDEX kv_index ON kv REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
 PREHOOK: Input: default@kv

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
index 182dd3a..709ca10 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
@@ -62,7 +62,7 @@ OutputFormat:         
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by where a key isn't selected, should not be 
bucketed or sorted
@@ -168,7 +168,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test join with two keys, should be bucketed and sorted by 
join keys
@@ -221,7 +221,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value]             
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1)]    
 
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test join with two keys and only one selected, should not 
be bucketed or sorted
@@ -327,7 +327,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test join on three tables on different keys, should be 
bucketed and sorted by latter key
@@ -380,7 +380,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test distribute by, should only be bucketed by key
@@ -486,7 +486,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           -1                       
 Bucket Columns:        []                       
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test sort by desc, should be sorted by key
@@ -539,7 +539,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           -1                       
 Bucket Columns:        []                       
-Sort Columns:          [Order(col:key, order:0)]        
+Sort Columns:          [Order(col:key, order:0, nullOrder:1)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test cluster by, should be bucketed and sorted by key
@@ -592,7 +592,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test distribute by and sort by different keys, should be 
bucketed by one key sorted by the other
@@ -645,7 +645,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:value, order:1)]      
+Sort Columns:          [Order(col:value, order:1, nullOrder:0)]         
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test join in simple subquery, should be bucketed and sorted 
on key
@@ -698,7 +698,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test join in simple subquery renaming key column, should be 
bucketed and sorted on key
@@ -751,7 +751,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in simple subquery, should be bucketed and 
sorted on key
@@ -804,7 +804,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in simple subquery renaming key column, 
should be bucketed and sorted on key
@@ -857,7 +857,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery with where outside, should still 
be bucketed and sorted on key
@@ -910,7 +910,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery with expression on value, should 
still be bucketed and sorted on key
@@ -963,7 +963,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery with lateral view outside, should 
still be bucketed and sorted
@@ -1016,7 +1016,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery with another group by outside, 
should be bucketed and sorted by the
@@ -1071,7 +1071,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [value]                  
-Sort Columns:          [Order(col:value, order:1)]      
+Sort Columns:          [Order(col:value, order:1, nullOrder:0)]         
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery with select on outside reordering 
the columns, should be bucketed and
@@ -1126,7 +1126,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [value]                  
-Sort Columns:          [Order(col:value, order:1)]      
+Sort Columns:          [Order(col:value, order:1, nullOrder:0)]         
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery followed by distribute by, should 
only be bucketed by the distribute key
@@ -1179,7 +1179,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery followed by sort by, should only 
be sorted by the sort key
@@ -1232,7 +1232,7 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test group by in subquery followed by transform script, 
should not be bucketed or sorted
@@ -1338,6 +1338,6 @@ OutputFormat:             
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value]             
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1)]    
 
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out
index 33d795b..6db9428 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out
@@ -64,7 +64,7 @@ OutputFormat:         
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           3                        
 Bucket Columns:        [value]                  
-Sort Columns:          [Order(col:value, order:1)]      
+Sort Columns:          [Order(col:value, order:1, nullOrder:0)]         
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- If the count(*) from sampling the buckets matches the 
count(*) from each file, the table is

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
index 2f7e538..e5626a4 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
@@ -123,6 +123,6 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
index 7e3b48f..5f983c7 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
@@ -302,7 +302,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: DESCRIBE FORMATTED test_table PARTITION (ds='2008-04-08', 
hr='12')
@@ -342,7 +342,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key]                    
-Sort Columns:          [Order(col:key, order:1)]        
+Sort Columns:          [Order(col:key, order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: CREATE TABLE srcpart_merge_dp LIKE srcpart

http://git-wip-us.apache.org/repos/asf/hive/blob/9350b693/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
index ebfce60..90a71ae 100644
--- 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
+++ 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
@@ -144,7 +144,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value]             
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1)]    
 
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test rollup, should be bucketed and sorted on key, value, 
grouping_key
@@ -203,7 +203,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value, grouping_key]       
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1), 
Order(col:grouping_key, order:1)]   
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0), Order(col:grouping_key, order:1, nullOrder:0)]    
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test cube, should not be bucketed or sorted because its 
missing the grouping ID
@@ -328,7 +328,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value]             
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1)]    
 
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test cube, should be bucketed and sorted on key, value, 
grouping_key
@@ -387,7 +387,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value, grouping_key]       
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1), 
Order(col:grouping_key, order:1)]   
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0), Order(col:grouping_key, order:1, nullOrder:0)]    
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test grouping sets, should not be bucketed or sorted 
because its missing the grouping ID
@@ -512,7 +512,7 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value]             
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1)]    
 
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0)]   
 Storage Desc Params:            
        serialization.format    1                   
 PREHOOK: query: -- Test grouping sets, should be bucketed and sorted on key, 
value, grouping_key
@@ -571,6 +571,6 @@ OutputFormat:               
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 Compressed:            No                       
 Num Buckets:           1                        
 Bucket Columns:        [key, value, grouping_key]       
-Sort Columns:          [Order(col:key, order:1), Order(col:value, order:1), 
Order(col:grouping_key, order:1)]   
+Sort Columns:          [Order(col:key, order:1, nullOrder:0), Order(col:value, 
order:1, nullOrder:0), Order(col:grouping_key, order:1, nullOrder:0)]    
 Storage Desc Params:            
        serialization.format    1                   

Reply via email to