You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/07/09 11:07:43 UTC

svn commit: r1501145 [10/13] - in /hive/branches/vectorization: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/apache/hive/beeline/src/test/ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/metri...

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out Tue Jul  9 09:07:35 2013
@@ -358,13 +358,13 @@ POSTHOOK: Lineage: list_bucketing_dynami
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 1000
-PREHOOK: query: select key, value from srcpart where ds='2008-04-08' and key = "103" and value ="val_103"
+PREHOOK: query: select key, value from srcpart where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from srcpart where ds='2008-04-08' and key = "103" and value ="val_103"
+POSTHOOK: query: select key, value from srcpart where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -379,17 +379,17 @@ POSTHOOK: Lineage: list_bucketing_dynami
 103	val_103
 103	val_103
 PREHOOK: query: explain extended
-select key, value from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103"
+select key, value, ds, hr from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value, ds, hr
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
-select key, value from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103"
+select key, value, ds, hr from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value, ds, hr
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME list_bucketing_dynamic_part))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_WHERE (and (and (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= (TOK_TABLE_OR_COL key) "103")) (= (TOK_TABLE_OR_COL value) "val_103")))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME list_bucketing_dynamic_part))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value)) (TOK_SELEXPR (TOK_TABLE_OR_COL ds)) (TOK_SELEXPR (TOK_TABLE_OR_COL hr))) (TOK_WHERE (and (and (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= (TOK_TABLE_OR_COL key) "103")) (= (TOK_TABLE_OR_COL value) "val_103"))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL ds)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL hr)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -414,24 +414,32 @@ STAGE PLANS:
                       type: string
                       expr: value
                       type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1
-                        columns.types string:string
-                        escape.delim \
-                        serialization.format 1
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col2
+                        type: string
+                        expr: _col3
+                        type: string
+                  sort order: ++++
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col2
+                        type: string
+                        expr: _col3
+                        type: string
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -528,6 +536,26 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.list_bucketing_dynamic_part
             name: default.list_bucketing_dynamic_part
+      Reduce Operator Tree:
+        Extract
+          File Output Operator
+            compressed: false
+            GlobalTableId: 0
+#### A masked pattern was here ####
+            NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+            table:
+                input format: org.apache.hadoop.mapred.TextInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                properties:
+                  columns _col0,_col1,_col2,_col3
+                  columns.types string:string:string:string
+                  escape.delim \
+                  hive.serialization.extend.nesting.levels true
+                  serialization.format 1
+            TotalFiles: 1
+            GatherStats: false
+            MultiFileSpray: false
       Truncated Path -> Alias:
         /list_bucketing_dynamic_part/ds=2008-04-08/hr=11/key=103/value=val_103 [list_bucketing_dynamic_part]
         /list_bucketing_dynamic_part/ds=2008-04-08/hr=12/key=103/value=val_103 [list_bucketing_dynamic_part]
@@ -537,13 +565,13 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: select key, value from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103"
+PREHOOK: query: select key, value, ds, hr from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value, ds, hr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@list_bucketing_dynamic_part
 PREHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=11
 PREHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103"
+POSTHOOK: query: select key, value, ds, hr from list_bucketing_dynamic_part where ds='2008-04-08' and key = "103" and value ="val_103" ORDER BY key, value, ds, hr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@list_bucketing_dynamic_part
 POSTHOOK: Input: default@list_bucketing_dynamic_part@ds=2008-04-08/hr=11
@@ -553,10 +581,10 @@ POSTHOOK: Lineage: list_bucketing_dynami
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_dynamic_part PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-103	val_103
-103	val_103
-103	val_103
-103	val_103
+103	val_103	2008-04-08	11
+103	val_103	2008-04-08	11
+103	val_103	2008-04-08	12
+103	val_103	2008-04-08	12
 PREHOOK: query: -- clean up resources
 drop table list_bucketing_dynamic_part
 PREHOOK: type: DROPTABLE

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out Tue Jul  9 09:07:35 2013
@@ -981,6 +981,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out Tue Jul  9 09:07:35 2013
@@ -929,6 +929,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out Tue Jul  9 09:07:35 2013
@@ -564,6 +564,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out Tue Jul  9 09:07:35 2013
@@ -738,17 +738,17 @@ POSTHOOK: Lineage: list_bucketing_static
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 1000
 PREHOOK: query: explain extended
-select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484'
+select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
-select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484'
+select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME list_bucketing_static_part))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (and (and (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= (TOK_TABLE_OR_COL hr) '11')) (= (TOK_TABLE_OR_COL key) '484')) (= (TOK_TABLE_OR_COL value) 'val_484')))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME list_bucketing_static_part))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (and (and (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= (TOK_TABLE_OR_COL hr) '11')) (= (TOK_TABLE_OR_COL key) '484')) (= (TOK_TABLE_OR_COL value) 'val_484'))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL ds)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL hr)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -778,23 +778,27 @@ STAGE PLANS:
                       expr: hr
                       type: string
                 outputColumnNames: _col0, _col1, _col2, _col3
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1,_col2,_col3
-                        columns.types string:string:string:string
-                        escape.delim \
-                        serialization.format 1
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col2
+                        type: string
+                        expr: _col3
+                        type: string
+                  sort order: ++++
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col2
+                        type: string
+                        expr: _col3
+                        type: string
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -845,6 +849,26 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
               name: default.list_bucketing_static_part
             name: default.list_bucketing_static_part
+      Reduce Operator Tree:
+        Extract
+          File Output Operator
+            compressed: false
+            GlobalTableId: 0
+#### A masked pattern was here ####
+            NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+            table:
+                input format: org.apache.hadoop.mapred.TextInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                properties:
+                  columns _col0,_col1,_col2,_col3
+                  columns.types string:string:string:string
+                  escape.delim \
+                  hive.serialization.extend.nesting.levels true
+                  serialization.format 1
+            TotalFiles: 1
+            GatherStats: false
+            MultiFileSpray: false
       Truncated Path -> Alias:
         /list_bucketing_static_part/ds=2008-04-08/hr=11/key=484 [list_bucketing_static_part]
 
@@ -853,12 +877,12 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484'
+PREHOOK: query: select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@list_bucketing_static_part
 PREHOOK: Input: default@list_bucketing_static_part@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-POSTHOOK: query: select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484'
+POSTHOOK: query: select * from list_bucketing_static_part where ds = '2008-04-08' and  hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@list_bucketing_static_part
 POSTHOOK: Input: default@list_bucketing_static_part@ds=2008-04-08/hr=11
@@ -869,13 +893,13 @@ POSTHOOK: Lineage: list_bucketing_static
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 484	val_484	2008-04-08	11
 484	val_484	2008-04-08	11
-PREHOOK: query: select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484'
+PREHOOK: query: select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484'
+POSTHOOK: query: select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -885,8 +909,8 @@ POSTHOOK: Lineage: list_bucketing_static
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: list_bucketing_static_part PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-484	val_484	2008-04-08	12
 484	val_484	2008-04-08	11
+484	val_484	2008-04-08	12
 PREHOOK: query: -- clean up
 drop table list_bucketing_static_part
 PREHOOK: type: DROPTABLE

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out Tue Jul  9 09:07:35 2013
@@ -156,6 +156,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -283,6 +284,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -409,6 +411,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -535,6 +538,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out Tue Jul  9 09:07:35 2013
@@ -156,6 +156,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -328,6 +329,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -458,6 +460,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out Tue Jul  9 09:07:35 2013
@@ -302,6 +302,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -496,6 +497,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -583,6 +585,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -720,6 +723,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3
                         columns.types string:string:string:string
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out Tue Jul  9 09:07:35 2013
@@ -150,12 +150,12 @@ Skewed Values:      	[[484]]            
 #### A masked pattern was here ####
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
 PREHOOK: Input: default@fact_daily@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
 POSTHOOK: Input: default@fact_daily@ds=1
@@ -212,6 +212,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types int
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -328,6 +329,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types int
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -440,6 +442,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types int
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out Tue Jul  9 09:07:35 2013
@@ -166,12 +166,12 @@ Skewed Values:      	[[484]]            
 #### A masked pattern was here ####
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x, y
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
 PREHOOK: Input: default@fact_daily@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x, y
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
 POSTHOOK: Input: default@fact_daily@ds=1
@@ -232,6 +232,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types int
                         escape.delim \
+                        hive.serialization.extend.nesting.levels true
                         serialization.format 1
                   TotalFiles: 1
                   GatherStats: false
@@ -304,18 +305,18 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=
 484
 PREHOOK: query: -- The second subquery
 -- explain plan shows which directory selected: Truncated Path -> Alias
-explain extended select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484
+explain extended select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484 ORDER BY x1, y1
 PREHOOK: type: QUERY
 POSTHOOK: query: -- The second subquery
 -- explain plan shows which directory selected: Truncated Path -> Alias
-explain extended select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484
+explain extended select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484 ORDER BY x1, y1
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=1).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=1).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=2).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=2).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME fact_daily))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x) x1) (TOK_SELEXPR (TOK_TABLE_OR_COL y) y1)) (TOK_WHERE (= (TOK_TABLE_OR_COL ds) '1')))) subq)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x1)) (TOK_SELEXPR (TOK_TABLE_OR_COL y1))) (TOK_WHERE (= (TOK_TABLE_OR_COL x1) 484))))
+  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME fact_daily))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x) x1) (TOK_SELEXPR (TOK_TABLE_OR_COL y) y1)) (TOK_WHERE (= (TOK_TABLE_OR_COL ds) '1')))) subq)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x1)) (TOK_SELEXPR (TOK_TABLE_OR_COL y1))) (TOK_WHERE (= (TOK_TABLE_OR_COL x1) 484)) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL x1)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL y1)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -341,23 +342,19 @@ STAGE PLANS:
                       expr: y
                       type: string
                 outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1
-                        columns.types int:string
-                        escape.delim \
-                        serialization.format 1
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: string
+                  sort order: ++
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: int
+                        expr: _col1
+                        type: string
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -399,6 +396,26 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.fact_daily
             name: default.fact_daily
+      Reduce Operator Tree:
+        Extract
+          File Output Operator
+            compressed: false
+            GlobalTableId: 0
+#### A masked pattern was here ####
+            NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+            table:
+                input format: org.apache.hadoop.mapred.TextInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                properties:
+                  columns _col0,_col1
+                  columns.types int:string
+                  escape.delim \
+                  hive.serialization.extend.nesting.levels true
+                  serialization.format 1
+            TotalFiles: 1
+            GatherStats: false
+            MultiFileSpray: false
       Truncated Path -> Alias:
         /fact_tz/ds=1/x=484 [subq:fact_daily]
 
@@ -406,14 +423,15 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
+
 PREHOOK: query: -- List Bucketing Query
-select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484
+select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484 ORDER BY x1, y1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
 PREHOOK: Input: default@fact_daily@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- List Bucketing Query
-select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484
+select x1, y1 from(select x as x1, y as y1 from fact_daily where ds ='1') subq where x1 = 484 ORDER BY x1, y1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
 POSTHOOK: Input: default@fact_daily@ds=1
@@ -552,6 +570,7 @@ STAGE PLANS:
                     columns _col0,_col1
                     columns.types string:bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -710,6 +729,7 @@ STAGE PLANS:
                     columns _col0,_col1
                     columns.types int:bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out Tue Jul  9 09:07:35 2013
@@ -216,12 +216,12 @@ Skewed Values:      	[[484], [238]]     
 #### A masked pattern was here ####
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+PREHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x, y, z
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
 PREHOOK: Input: default@fact_daily@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1'
+POSTHOOK: query: SELECT * FROM fact_daily WHERE ds='1' ORDER BY x, y, z
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
 POSTHOOK: Input: default@fact_daily@ds=1
@@ -235,19 +235,19 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).z SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-484	val_484	val_484	1
 86	val_86	val_86	1
-278	val_278	val_278	1
-278	val_278	val_278	1
 238	val_238	val_238	1
 238	val_238	val_238	1
+278	val_278	val_278	1
+278	val_278	val_278	1
+484	val_484	val_484	1
 PREHOOK: query: -- pruner  pick up right directory
 -- explain plan shows which directory selected: Truncated Path -> Alias
-explain extended SELECT x FROM fact_daily WHERE ds='1' and not (x = 86)
+explain extended SELECT x FROM fact_daily WHERE ds='1' and not (x = 86) ORDER BY x
 PREHOOK: type: QUERY
 POSTHOOK: query: -- pruner  pick up right directory
 -- explain plan shows which directory selected: Truncated Path -> Alias
-explain extended SELECT x FROM fact_daily WHERE ds='1' and not (x = 86)
+explain extended SELECT x FROM fact_daily WHERE ds='1' and not (x = 86) ORDER BY x
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=1).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=1).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
@@ -259,7 +259,7 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).z SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME fact_daily))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL ds) '1') (not (= (TOK_TABLE_OR_COL x) 86))))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME fact_daily))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL x))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL ds) '1') (not (= (TOK_TABLE_OR_COL x) 86)))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL x)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -283,23 +283,15 @@ STAGE PLANS:
                       expr: x
                       type: int
                 outputColumnNames: _col0
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-#### A masked pattern was here ####
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0
-                        columns.types int
-                        escape.delim \
-                        serialization.format 1
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: int
+                  sort order: +
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: int
       Needs Tagging: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -415,6 +407,26 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.fact_daily
             name: default.fact_daily
+      Reduce Operator Tree:
+        Extract
+          File Output Operator
+            compressed: false
+            GlobalTableId: 0
+#### A masked pattern was here ####
+            NumFilesPerFileSink: 1
+#### A masked pattern was here ####
+            table:
+                input format: org.apache.hadoop.mapred.TextInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                properties:
+                  columns _col0
+                  columns.types int
+                  escape.delim \
+                  hive.serialization.extend.nesting.levels true
+                  serialization.format 1
+            TotalFiles: 1
+            GatherStats: false
+            MultiFileSpray: false
       Truncated Path -> Alias:
         /fact_tz/ds=1/HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME [fact_daily]
         /fact_tz/ds=1/x=238 [fact_daily]
@@ -426,13 +438,13 @@ STAGE PLANS:
 
 
 PREHOOK: query: -- List Bucketing Query
-SELECT x,y,z FROM fact_daily WHERE ds='1' and not (x = 86)
+SELECT x FROM fact_daily WHERE ds='1' and not (x = 86) ORDER BY x
 PREHOOK: type: QUERY
 PREHOOK: Input: default@fact_daily
 PREHOOK: Input: default@fact_daily@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- List Bucketing Query
-SELECT x,y,z FROM fact_daily WHERE ds='1' and not (x = 86)
+SELECT x FROM fact_daily WHERE ds='1' and not (x = 86) ORDER BY x
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@fact_daily
 POSTHOOK: Input: default@fact_daily@ds=1
@@ -446,8 +458,8 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).z SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-238	val_238	val_238
-238	val_238	val_238
-278	val_278	val_278
-278	val_278	val_278
-484	val_484	val_484
+238
+238
+278
+278
+484

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/load_dyn_part14_win.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/load_dyn_part14_win.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/load_dyn_part14_win.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/load_dyn_part14_win.q.out Tue Jul  9 09:07:35 2013
@@ -1,9 +1,13 @@
 PREHOOK: query: -- INCLUDE_OS_WINDOWS
+-- included only on  windows because of difference in file name encoding logic
+
 
 create table if not exists nzhang_part14 (key string) 
   partitioned by (value string)
 PREHOOK: type: CREATETABLE
 POSTHOOK: query: -- INCLUDE_OS_WINDOWS
+-- included only on  windows because of difference in file name encoding logic
+
 
 create table if not exists nzhang_part14 (key string) 
   partitioned by (value string)
@@ -13,8 +17,13 @@ PREHOOK: query: describe extended nzhang
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended nzhang_part14
 POSTHOOK: type: DESCTABLE
-key	string	
-value	string	
+key                 	string              	None                
+value               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: explain
@@ -42,14 +51,16 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1, Stage-7, Stage-8
-  Stage-6 depends on stages: Stage-2 , consists of Stage-5, Stage-4
+  Stage-2 depends on stages: Stage-1, Stage-9, Stage-10
+  Stage-8 depends on stages: Stage-2 , consists of Stage-5, Stage-4, Stage-6
   Stage-5
-  Stage-0 depends on stages: Stage-5, Stage-4
+  Stage-0 depends on stages: Stage-5, Stage-4, Stage-7
   Stage-3 depends on stages: Stage-0
   Stage-4
-  Stage-7 is a root stage
-  Stage-8 is a root stage
+  Stage-6
+  Stage-7 depends on stages: Stage-6
+  Stage-9 is a root stage
+  Stage-10 is a root stage
 
 STAGE PLANS:
   Stage: Stage-1
@@ -142,7 +153,7 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.nzhang_part14
 
-  Stage: Stage-6
+  Stage: Stage-8
     Conditional Operator
 
   Stage: Stage-5
@@ -179,7 +190,26 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.nzhang_part14
 
+  Stage: Stage-6
+    Map Reduce
+      Alias -> Map Operator Tree:
+#### A masked pattern was here ####
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  name: default.nzhang_part14
+
   Stage: Stage-7
+    Move Operator
+      files:
+          hdfs directory: true
+#### A masked pattern was here ####
+
+  Stage: Stage-9
     Map Reduce
       Alias -> Map Operator Tree:
         null-subquery2:t-subquery2:src 
@@ -211,7 +241,7 @@ STAGE PLANS:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
-  Stage: Stage-8
+  Stage: Stage-10
     Map Reduce
       Alias -> Map Operator Tree:
         null-subquery1-subquery1:t-subquery1-subquery1:src 
@@ -280,12 +310,14 @@ value=__HIVE_DEFAULT_PARTITION__
 PREHOOK: query: select * from nzhang_part14 where value <> 'a'
 order by key, value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@nzhang_part14
 PREHOOK: Input: default@nzhang_part14@value=%20
 PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####
 POSTHOOK: query: select * from nzhang_part14 where value <> 'a'
 order by key, value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@nzhang_part14
 POSTHOOK: Input: default@nzhang_part14@value=%20
 POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
 #### A masked pattern was here ####

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/louter_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/louter_join_ppr.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/louter_join_ppr.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/louter_join_ppr.q.out Tue Jul  9 09:07:35 2013
@@ -249,6 +249,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false
@@ -651,6 +652,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false
@@ -1054,6 +1056,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false
@@ -1363,6 +1366,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/metadataonly1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/metadataonly1.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/metadataonly1.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/metadataonly1.q.out Tue Jul  9 09:07:35 2013
@@ -65,6 +65,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types string
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -192,6 +193,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types string
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -322,6 +324,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -446,6 +449,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -832,6 +836,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -1081,6 +1086,7 @@ STAGE PLANS:
                     columns _col0,_col1
                     columns.types string:bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -1302,6 +1308,7 @@ STAGE PLANS:
                     columns _col0,_col1
                     columns.types string:bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -1468,6 +1475,7 @@ STAGE PLANS:
                     columns _col0
                     columns.types string
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false
@@ -1819,6 +1827,7 @@ STAGE PLANS:
                     columns _col0,_col1
                     columns.types string:bigint
                     escape.delim \
+                    hive.serialization.extend.nesting.levels true
                     serialization.format 1
               TotalFiles: 1
               GatherStats: false

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out Tue Jul  9 09:07:35 2013
@@ -289,11 +289,11 @@ POSTHOOK: Lineage: src_lv1.key SCRIPT [(
 POSTHOOK: Lineage: src_lv1.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: src_lv2.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv2.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-PREHOOK: query: select * from src_lv1
+PREHOOK: query: select * from src_lv1 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv1
+POSTHOOK: query: select * from src_lv1 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
@@ -301,31 +301,31 @@ POSTHOOK: Lineage: src_lv1.key SCRIPT [(
 POSTHOOK: Lineage: src_lv1.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: src_lv2.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv2.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-238	239.0
-238	240.0
-86	87.0
-86	88.0
-311	312.0
-311	313.0
-27	28.0
-27	29.0
 165	166.0
 165	167.0
-409	410.0
-409	411.0
+238	239.0
+238	240.0
 255	256.0
 255	257.0
+27	28.0
+27	29.0
 278	279.0
 278	280.0
-98	99.0
-98	100.0
+311	312.0
+311	313.0
+409	410.0
+409	411.0
 484	485.0
 484	486.0
-PREHOOK: query: select * from src_lv2
+86	87.0
+86	88.0
+98	100.0
+98	99.0
+PREHOOK: query: select * from src_lv2 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv2
+POSTHOOK: query: select * from src_lv2 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
@@ -333,26 +333,26 @@ POSTHOOK: Lineage: src_lv1.key SCRIPT [(
 POSTHOOK: Lineage: src_lv1.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: src_lv2.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv2.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-238	241.0
-238	242.0
-86	89.0
-86	90.0
-311	314.0
-311	315.0
-27	30.0
-27	31.0
 165	168.0
 165	169.0
-409	412.0
-409	413.0
+238	241.0
+238	242.0
 255	258.0
 255	259.0
+27	30.0
+27	31.0
 278	281.0
 278	282.0
-98	101.0
-98	102.0
+311	314.0
+311	315.0
+409	412.0
+409	413.0
 484	487.0
 484	488.0
+86	89.0
+86	90.0
+98	101.0
+98	102.0
 PREHOOK: query: -- 2(LV+GBY)
 -- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-GBY[12]-RS[13]-GBY[14]-SEL[15]-FS[16]
 --             -SEL[3]-UDTF[4]-LVJ[5]
@@ -646,11 +646,11 @@ POSTHOOK: Lineage: src_lv2.key SCRIPT [(
 POSTHOOK: Lineage: src_lv2.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv2.value SIMPLE [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: src_lv2.value EXPRESSION [(src_10)src_10.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-PREHOOK: query: select * from src_lv1
+PREHOOK: query: select * from src_lv1 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv1
+POSTHOOK: query: select * from src_lv1 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
@@ -672,11 +672,11 @@ POSTHOOK: Lineage: src_lv2.value EXPRESS
 484	971.0
 86	175.0
 98	199.0
-PREHOOK: query: select * from src_lv2
+PREHOOK: query: select * from src_lv2 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv2
+POSTHOOK: query: select * from src_lv2 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
@@ -1011,11 +1011,11 @@ POSTHOOK: Lineage: src_lv2.value EXPRESS
 POSTHOOK: Lineage: src_lv2.value EXPRESSION [(src_10)src_10.null, ]
 POSTHOOK: Lineage: src_lv3.key SIMPLE [(src_10)src_10.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.null, ]
-PREHOOK: query: select * from src_lv1
+PREHOOK: query: select * from src_lv1 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv1
+POSTHOOK: query: select * from src_lv1 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
@@ -1043,11 +1043,11 @@ POSTHOOK: Lineage: src_lv3.value EXPRESS
 484	971.0
 86	175.0
 98	199.0
-PREHOOK: query: select * from src_lv2
+PREHOOK: query: select * from src_lv2 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv2
+POSTHOOK: query: select * from src_lv2 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
@@ -1071,11 +1071,11 @@ POSTHOOK: Lineage: src_lv3.value EXPRESS
 311	1
 409	1
 484	1
-PREHOOK: query: select * from src_lv3
+PREHOOK: query: select * from src_lv3 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv3
+POSTHOOK: query: select * from src_lv3 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
@@ -1520,11 +1520,11 @@ POSTHOOK: Lineage: src_lv3.key SIMPLE [(
 POSTHOOK: Lineage: src_lv3.key SIMPLE [(src_10)src_10.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.null, ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
-PREHOOK: query: select * from src_lv1
+PREHOOK: query: select * from src_lv1 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv1
+POSTHOOK: query: select * from src_lv1 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
@@ -1548,11 +1548,6 @@ POSTHOOK: Lineage: src_lv3.key SIMPLE [(
 POSTHOOK: Lineage: src_lv3.key SIMPLE [(src_10)src_10.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.null, ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
-28.0	27.0
-29.0	27.0
-87.0	86.0
-88.0	86.0
-99.0	98.0
 100.0	98.0
 166.0	165.0
 167.0	165.0
@@ -1561,18 +1556,23 @@ POSTHOOK: Lineage: src_lv3.value EXPRESS
 256.0	255.0
 257.0	255.0
 279.0	278.0
+28.0	27.0
 280.0	278.0
+29.0	27.0
 312.0	311.0
 313.0	311.0
 410.0	409.0
 411.0	409.0
 485.0	484.0
 486.0	484.0
-PREHOOK: query: select * from src_lv2
+87.0	86.0
+88.0	86.0
+99.0	98.0
+PREHOOK: query: select * from src_lv2 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv2
+POSTHOOK: query: select * from src_lv2 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
@@ -1596,10 +1596,6 @@ POSTHOOK: Lineage: src_lv3.key SIMPLE [(
 POSTHOOK: Lineage: src_lv3.key SIMPLE [(src_10)src_10.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.null, ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
-30.0	27.0
-31.0	27.0
-89.0	86.0
-90.0	86.0
 101.0	98.0
 102.0	98.0
 168.0	165.0
@@ -1610,17 +1606,21 @@ POSTHOOK: Lineage: src_lv3.value EXPRESS
 259.0	255.0
 281.0	278.0
 282.0	278.0
+30.0	27.0
+31.0	27.0
 314.0	311.0
 315.0	311.0
 412.0	409.0
 413.0	409.0
 487.0	484.0
 488.0	484.0
-PREHOOK: query: select * from src_lv3
+89.0	86.0
+90.0	86.0
+PREHOOK: query: select * from src_lv3 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv3
+POSTHOOK: query: select * from src_lv3 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
@@ -2146,11 +2146,11 @@ POSTHOOK: Lineage: src_lv3.value EXPRESS
 POSTHOOK: Lineage: src_lv3.value EXPRESSION [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: src_lv3.value EXPRESSION []
 POSTHOOK: Lineage: src_lv4.value EXPRESSION []
-PREHOOK: query: select * from src_lv1
+PREHOOK: query: select * from src_lv1 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv1
+POSTHOOK: query: select * from src_lv1 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv1
 #### A masked pattern was here ####
@@ -2190,11 +2190,11 @@ POSTHOOK: Lineage: src_lv4.value EXPRESS
 484	971.0
 86	175.0
 98	199.0
-PREHOOK: query: select * from src_lv2
+PREHOOK: query: select * from src_lv2 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv2
+POSTHOOK: query: select * from src_lv2 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv2
 #### A masked pattern was here ####
@@ -2234,11 +2234,11 @@ POSTHOOK: Lineage: src_lv4.value EXPRESS
 484	975.0
 86	179.0
 98	203.0
-PREHOOK: query: select * from src_lv3
+PREHOOK: query: select * from src_lv3 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv3
+POSTHOOK: query: select * from src_lv3 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv3
 #### A masked pattern was here ####
@@ -2274,11 +2274,11 @@ val_278	278.0
 val_311	311.0
 val_409	409.0
 val_484	484.0
-PREHOOK: query: select * from src_lv4
+PREHOOK: query: select * from src_lv4 order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_lv4
 #### A masked pattern was here ####
-POSTHOOK: query: select * from src_lv4
+POSTHOOK: query: select * from src_lv4 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_lv4
 #### A masked pattern was here ####

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/orc_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/orc_createas1.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/orc_createas1.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/orc_createas1.q.out Tue Jul  9 09:07:35 2013
@@ -167,36 +167,59 @@ POSTHOOK: Lineage: orc_createas1a PARTIT
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT * FROM orc_createas1b LIMIT 5
+PREHOOK: query: EXPLAIN SELECT * FROM orc_createas1b ORDER BY key LIMIT 5
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM orc_createas1b LIMIT 5
+POSTHOOK: query: EXPLAIN SELECT * FROM orc_createas1b ORDER BY key LIMIT 5
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME orc_createas1b))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 5)))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME orc_createas1b))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key))) (TOK_LIMIT 5)))
 
 STAGE DEPENDENCIES:
+  Stage-1 is a root stage
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        orc_createas1b 
+          TableScan
+            alias: orc_createas1b
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+              outputColumnNames: _col0, _col1
+              Reduce Output Operator
+                key expressions:
+                      expr: _col0
+                      type: string
+                sort order: +
+                tag: -1
+                value expressions:
+                      expr: _col0
+                      type: string
+                      expr: _col1
+                      type: string
+      Reduce Operator Tree:
+        Extract
+          Limit
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
   Stage: Stage-0
     Fetch Operator
       limit: 5
-      Processor Tree:
-        TableScan
-          alias: orc_createas1b
-          Select Operator
-            expressions:
-                  expr: key
-                  type: string
-                  expr: value
-                  type: string
-            outputColumnNames: _col0, _col1
-            Limit
-              ListSink
 
 
 PREHOOK: query: SELECT * FROM orc_createas1b ORDER BY key LIMIT 5

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out Tue Jul  9 09:07:35 2013
@@ -48,13 +48,13 @@ POSTHOOK: Output: default@test_orc@part=
 POSTHOOK: Lineage: test_orc PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_orc PARTITION(part=2).cnt EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_orc PARTITION(part=2).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT * FROM test_orc
+PREHOOK: query: SELECT * FROM test_orc ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_orc
 PREHOOK: Input: default@test_orc@part=1
 PREHOOK: Input: default@test_orc@part=2
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM test_orc
+POSTHOOK: query: SELECT * FROM test_orc ORDER BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_orc
 POSTHOOK: Input: default@test_orc@part=1
@@ -63,13 +63,13 @@ POSTHOOK: Input: default@test_orc@part=2
 POSTHOOK: Lineage: test_orc PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_orc PARTITION(part=2).cnt EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_orc PARTITION(part=2).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-238	NULL	1
-86	NULL	1
-311	NULL	1
-27	NULL	1
-165	NULL	1
 0	3	2
 10	1	2
 100	2	2
 103	2	2
 104	2	2
+165	NULL	1
+238	NULL	1
+27	NULL	1
+311	NULL	1
+86	NULL	1

Modified: hive/branches/vectorization/ql/src/test/results/clientpositive/outer_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/results/clientpositive/outer_join_ppr.q.out?rev=1501145&r1=1501144&r2=1501145&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/results/clientpositive/outer_join_ppr.q.out (original)
+++ hive/branches/vectorization/ql/src/test/results/clientpositive/outer_join_ppr.q.out Tue Jul  9 09:07:35 2013
@@ -338,6 +338,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false
@@ -731,6 +732,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:string:string
                       escape.delim \
+                      hive.serialization.extend.nesting.levels true
                       serialization.format 1
                 TotalFiles: 1
                 GatherStats: false