hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [1/2] hive git commit: HIVE-12950 : get rid of the NullScan emptyFile madness (Sergey Shelukhin, reviewed by Ashutosh Chauhan)
Date Mon, 08 Feb 2016 23:24:44 GMT
Repository: hive
Updated Branches:
  refs/heads/master 6d5dc43d4 -> 8787b3ddd


http://git-wip-us.apache.org/repos/asf/hive/blob/8787b3dd/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
index 4f4a9c8..5ae0cb8 100644
--- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
@@ -274,9 +274,9 @@ STAGE PLANS:
                         tag: 0
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -320,7 +320,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -341,12 +341,12 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
             Path -> Partition:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -391,7 +391,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -436,7 +436,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -481,7 +481,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -527,10 +527,10 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -694,9 +694,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: bigint)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -740,7 +740,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1129,9 +1129,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1175,7 +1175,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1196,12 +1196,12 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
             Path -> Partition:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1246,7 +1246,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1291,7 +1291,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1336,7 +1336,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1382,10 +1382,10 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -1640,9 +1640,9 @@ STAGE PLANS:
                       tag: 0
                       auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1686,7 +1686,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1821,9 +1821,9 @@ STAGE PLANS:
                       value expressions: key (type: string)
                       auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [s1]
+              nullscan://null/default.src/part_ [s1]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1867,7 +1867,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [s1]
+              nullscan://null/default.src/part_ [s1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1887,9 +1887,9 @@ STAGE PLANS:
                       value expressions: key (type: string)
                       auto parallelism: false
             Path -> Alias:
-              -mr-10004default.src{} [s2]
+              nullscan://null/default.src/part_ [s2]
             Path -> Partition:
-              -mr-10004default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1933,7 +1933,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10004default.src{} [s2]
+              nullscan://null/default.src/part_ [s2]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -2047,9 +2047,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: bigint)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -2093,7 +2093,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/8787b3dd/ql/src/test/results/clientpositive/tez/llap_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/llap_nullscan.q.out b/ql/src/test/results/clientpositive/tez/llap_nullscan.q.out
new file mode 100644
index 0000000..3b4524a
--- /dev/null
+++ b/ql/src/test/results/clientpositive/tez/llap_nullscan.q.out
@@ -0,0 +1,462 @@
+PREHOOK: query: drop table if exists src_orc
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table if exists src_orc
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table src_orc stored as orc as select * from srcpart limit 10
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Output: database:default
+PREHOOK: Output: default@src_orc
+POSTHOOK: query: create table src_orc stored as orc as select * from srcpart limit 10
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@src_orc
+PREHOOK: query: explain extended
+select * from src_orc where 1=2
+PREHOOK: type: QUERY
+POSTHOOK: query: explain extended
+select * from src_orc where 1=2
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  
+TOK_QUERY
+   TOK_FROM
+      TOK_TABREF
+         TOK_TABNAME
+            src_orc
+   TOK_INSERT
+      TOK_DESTINATION
+         TOK_DIR
+            TOK_TMP_FILE
+      TOK_SELECT
+         TOK_SELEXPR
+            TOK_ALLCOLREF
+      TOK_WHERE
+         =
+            1
+            2
+
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: src_orc
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  GatherStats: false
+                  Filter Operator
+                    isSamplingPred: false
+                    predicate: false (type: boolean)
+                    Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: key (type: string), value (type: string), ds (type: string), hr (type: string)
+                      outputColumnNames: _col0, _col1, _col2, _col3
+                      Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                      File Output Operator
+                        compressed: false
+                        GlobalTableId: 0
+#### A masked pattern was here ####
+                        NumFilesPerFileSink: 1
+                        Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+#### A masked pattern was here ####
+                        table:
+                            input format: org.apache.hadoop.mapred.TextInputFormat
+                            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                            properties:
+                              columns _col0,_col1,_col2,_col3
+                              columns.types string:string:string:string
+                              escape.delim \
+                              hive.serialization.extend.additional.nesting.levels true
+                              serialization.escape.crlf true
+                              serialization.format 1
+                              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        TotalFiles: 1
+                        GatherStats: false
+                        MultiFileSpray: false
+            Execution mode: vectorized
+            LLAP IO: no inputs
+            Path -> Alias:
+              nullscan://null/default.src_orc/part_ [src_orc]
+            Path -> Partition:
+              nullscan://null/default.src_orc/part_ 
+                Partition
+                  input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  properties:
+                    COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
+                    bucket_count -1
+                    columns key,value,ds,hr
+                    columns.comments 
+                    columns.types string:string:string:string
+#### A masked pattern was here ####
+                    name default.src_orc
+                    numFiles 1
+                    numRows 10
+                    rawDataSize 3560
+                    serialization.ddl struct src_orc { string key, string value, string ds, string hr}
+                    serialization.format 1
+                    serialization.lib org.apache.hadoop.hive.serde2.NullStructSerDe
+                    totalSize 633
+#### A masked pattern was here ####
+                  serde: org.apache.hadoop.hive.serde2.NullStructSerDe
+                
+                    input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
+                    properties:
+                      COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
+                      bucket_count -1
+                      columns key,value,ds,hr
+                      columns.comments 
+                      columns.types string:string:string:string
+#### A masked pattern was here ####
+                      name default.src_orc
+                      numFiles 1
+                      numRows 10
+                      rawDataSize 3560
+                      serialization.ddl struct src_orc { string key, string value, string ds, string hr}
+                      serialization.format 1
+                      serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
+                      totalSize 633
+#### A masked pattern was here ####
+                    serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
+                    name: default.src_orc
+                  name: default.src_orc
+            Truncated Path -> Alias:
+              nullscan://null/default.src_orc/part_ [src_orc]
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select * from src_orc where 1=2
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select * from src_orc where 1=2
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+PREHOOK: query: explain
+select * from (select key from src_orc where false) a left outer join (select key from src_orc limit 0) b on a.key=b.key
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select * from (select key from src_orc where false) a left outer join (select key from src_orc limit 0) b on a.key=b.key
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
+        Reducer 4 <- Map 3 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: src_orc
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: false (type: boolean)
+                    Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
+                        Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+            Execution mode: vectorized
+            LLAP IO: no inputs
+        Map 3 
+            Map Operator Tree:
+                TableScan
+                  alias: src_orc
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: key (type: string)
+                    outputColumnNames: _col0
+                    Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                    Limit
+                      Number of rows: 0
+                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                      Reduce Output Operator
+                        sort order: 
+                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                        value expressions: _col0 (type: string)
+            Execution mode: vectorized
+            LLAP IO: no inputs
+        Reducer 2 
+            Reduce Operator Tree:
+              Merge Join Operator
+                condition map:
+                     Left Outer Join0 to 1
+                keys:
+                  0 _col0 (type: string)
+                  1 _col0 (type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 391 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 1 Data size: 391 Basic stats: COMPLETE Column stats: NONE
+                  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
+        Reducer 4 
+            Execution mode: vectorized
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string)
+                outputColumnNames: _col0
+                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                Limit
+                  Number of rows: 0
+                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                  Reduce Output Operator
+                    key expressions: _col0 (type: string)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: string)
+                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select * from (select key from src_orc where false) a left outer join (select key from src_orc limit 0) b on a.key=b.key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select * from (select key from src_orc where false) a left outer join (select key from src_orc limit 0) b on a.key=b.key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+PREHOOK: query: explain
+select count(key) from src_orc where false union all select count(key) from src_orc
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count(key) from src_orc where false union all select count(key) from src_orc
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Union 3 (CONTAINS)
+        Reducer 5 <- Map 4 (SIMPLE_EDGE), Union 3 (CONTAINS)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: src_orc
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: false (type: boolean)
+                    Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                    Group By Operator
+                      aggregations: count(key)
+                      mode: hash
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        sort order: 
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint)
+            Execution mode: vectorized
+            LLAP IO: no inputs
+        Map 4 
+            Map Operator Tree:
+                TableScan
+                  alias: src_orc
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: key (type: string)
+                    outputColumnNames: key
+                    Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                    Group By Operator
+                      aggregations: count(key)
+                      mode: hash
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        sort order: 
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint)
+            Execution mode: vectorized
+            LLAP IO: all inputs
+        Reducer 2 
+            Execution mode: vectorized
+            Reduce Operator Tree:
+              Group By Operator
+                aggregations: count(VALUE._col0)
+                mode: mergepartial
+                outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
+                  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
+        Reducer 5 
+            Execution mode: vectorized
+            Reduce Operator Tree:
+              Group By Operator
+                aggregations: count(VALUE._col0)
+                mode: mergepartial
+                outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE
+                  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
+        Union 3 
+            Vertex: Union 3
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(key) from src_orc where false union all select count(key) from src_orc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select count(key) from src_orc where false union all select count(key) from src_orc
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+0
+10
+PREHOOK: query: explain 
+select * from src_orc s1, src_orc s2 where false and s1.value = s2.value
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+select * from src_orc s1, src_orc s2 where false and s1.value = s2.value
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 3 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: s1
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: false (type: boolean)
+                    Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: value (type: string)
+                      sort order: +
+                      Map-reduce partition columns: value (type: string)
+                      Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: key (type: string), ds (type: string), hr (type: string)
+            Execution mode: vectorized
+            LLAP IO: no inputs
+        Map 3 
+            Map Operator Tree:
+                TableScan
+                  alias: s2
+                  Statistics: Num rows: 10 Data size: 3560 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: false (type: boolean)
+                    Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: value (type: string)
+                      sort order: +
+                      Map-reduce partition columns: value (type: string)
+                      Statistics: Num rows: 1 Data size: 356 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: key (type: string), ds (type: string), hr (type: string)
+            Execution mode: vectorized
+            LLAP IO: no inputs
+        Reducer 2 
+            Reduce Operator Tree:
+              Merge Join Operator
+                condition map:
+                     Inner Join 0 to 1
+                keys:
+                  0 value (type: string)
+                  1 value (type: string)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col7, _col8, _col9, _col10
+                Statistics: Num rows: 1 Data size: 391 Basic stats: COMPLETE Column stats: NONE
+                Select Operator
+                  expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string)
+                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+                  Statistics: Num rows: 1 Data size: 391 Basic stats: COMPLETE Column stats: NONE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 391 Basic stats: COMPLETE Column stats: NONE
+                    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
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select * from src_orc s1, src_orc s2 where false and s1.value = s2.value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+POSTHOOK: query: select * from src_orc s1, src_orc s2 where false and s1.value = s2.value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_orc
+#### A masked pattern was here ####
+PREHOOK: query: drop table if exists src_orc
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@src_orc
+PREHOOK: Output: default@src_orc
+POSTHOOK: query: drop table if exists src_orc
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@src_orc
+POSTHOOK: Output: default@src_orc

http://git-wip-us.apache.org/repos/asf/hive/blob/8787b3dd/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
index 3c3a2ae..6b6791f 100644
--- a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
@@ -172,9 +172,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
             Path -> Partition:
-              -mr-10004default.test1{ds=1} 
+              nullscan://null/default.test1/part_ds=1_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -214,7 +214,7 @@ STAGE PLANS:
                     name: default.test1
                   name: default.test1
             Truncated Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -321,9 +321,9 @@ STAGE PLANS:
                         tag: -1
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
             Path -> Partition:
-              -mr-10004default.test1{ds=1} 
+              nullscan://null/default.test1/part_ds=1_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -363,7 +363,7 @@ STAGE PLANS:
                     name: default.test1
                   name: default.test1
             Truncated Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1044,11 +1044,11 @@ STAGE PLANS:
                         tag: -1
                         auto parallelism: true
             Path -> Alias:
-              -mr-10004default.test2{ds=1, hr=1} [test2]
-              -mr-10005default.test2{ds=1, hr=2} [test2]
-              -mr-10006default.test2{ds=1, hr=3} [test2]
+              nullscan://null/default.test2/part_ds=1_hr=1_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=2_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=3_ [test2]
             Path -> Partition:
-              -mr-10004default.test2{ds=1, hr=1} 
+              nullscan://null/default.test2/part_ds=1_hr=1_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1088,7 +1088,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10005default.test2{ds=1, hr=2} 
+              nullscan://null/default.test2/part_ds=1_hr=2_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1128,7 +1128,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10006default.test2{ds=1, hr=3} 
+              nullscan://null/default.test2/part_ds=1_hr=3_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1169,9 +1169,9 @@ STAGE PLANS:
                     name: default.test2
                   name: default.test2
             Truncated Path -> Alias:
-              -mr-10004default.test2{ds=1, hr=1} [test2]
-              -mr-10005default.test2{ds=1, hr=2} [test2]
-              -mr-10006default.test2{ds=1, hr=3} [test2]
+              nullscan://null/default.test2/part_ds=1_hr=1_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=2_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=3_ [test2]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1529,10 +1529,10 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
-              -mr-10005default.test1{ds=2} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
+              nullscan://null/default.test1/part_ds=2_ [test1]
             Path -> Partition:
-              -mr-10004default.test1{ds=1} 
+              nullscan://null/default.test1/part_ds=1_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1571,7 +1571,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test1
                   name: default.test1
-              -mr-10005default.test1{ds=2} 
+              nullscan://null/default.test1/part_ds=2_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1611,8 +1611,8 @@ STAGE PLANS:
                     name: default.test1
                   name: default.test1
             Truncated Path -> Alias:
-              -mr-10004default.test1{ds=1} [test1]
-              -mr-10005default.test1{ds=2} [test1]
+              nullscan://null/default.test1/part_ds=1_ [test1]
+              nullscan://null/default.test1/part_ds=2_ [test1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1779,13 +1779,13 @@ STAGE PLANS:
                         tag: -1
                         auto parallelism: true
             Path -> Alias:
-              -mr-10004default.test2{ds=01_10_10, hr=01} [test2]
-              -mr-10005default.test2{ds=01_10_20, hr=02} [test2]
-              -mr-10006default.test2{ds=1, hr=1} [test2]
-              -mr-10007default.test2{ds=1, hr=2} [test2]
-              -mr-10008default.test2{ds=1, hr=3} [test2]
+              nullscan://null/default.test2/part_ds=01_10_10_hr=01_ [test2]
+              nullscan://null/default.test2/part_ds=01_10_20_hr=02_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=1_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=2_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=3_ [test2]
             Path -> Partition:
-              -mr-10004default.test2{ds=01_10_10, hr=01} 
+              nullscan://null/default.test2/part_ds=01_10_10_hr=01_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1825,7 +1825,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10005default.test2{ds=01_10_20, hr=02} 
+              nullscan://null/default.test2/part_ds=01_10_20_hr=02_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1865,7 +1865,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10006default.test2{ds=1, hr=1} 
+              nullscan://null/default.test2/part_ds=1_hr=1_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1905,7 +1905,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10007default.test2{ds=1, hr=2} 
+              nullscan://null/default.test2/part_ds=1_hr=2_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1945,7 +1945,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.test2
                   name: default.test2
-              -mr-10008default.test2{ds=1, hr=3} 
+              nullscan://null/default.test2/part_ds=1_hr=3_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1986,11 +1986,11 @@ STAGE PLANS:
                     name: default.test2
                   name: default.test2
             Truncated Path -> Alias:
-              -mr-10004default.test2{ds=01_10_10, hr=01} [test2]
-              -mr-10005default.test2{ds=01_10_20, hr=02} [test2]
-              -mr-10006default.test2{ds=1, hr=1} [test2]
-              -mr-10007default.test2{ds=1, hr=2} [test2]
-              -mr-10008default.test2{ds=1, hr=3} [test2]
+              nullscan://null/default.test2/part_ds=01_10_10_hr=01_ [test2]
+              nullscan://null/default.test2/part_ds=01_10_20_hr=02_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=1_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=2_ [test2]
+              nullscan://null/default.test2/part_ds=1_hr=3_ [test2]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/8787b3dd/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
index d57597c..60eb5b2 100644
--- a/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
@@ -276,9 +276,9 @@ STAGE PLANS:
                         tag: 0
                         auto parallelism: true
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -322,7 +322,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -343,12 +343,12 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
             Path -> Partition:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -393,7 +393,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -438,7 +438,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -483,7 +483,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -529,10 +529,10 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -698,9 +698,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: bigint)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -744,7 +744,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -1136,9 +1136,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1182,7 +1182,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1203,12 +1203,12 @@ STAGE PLANS:
                         value expressions: _col0 (type: string)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
             Path -> Partition:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1253,7 +1253,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1298,7 +1298,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1343,7 +1343,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     name: default.srcpart
                   name: default.srcpart
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} 
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1389,10 +1389,10 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              -mr-10004default.srcpart{ds=2008-04-08, hr=11} [srcpart]
-              -mr-10005default.srcpart{ds=2008-04-08, hr=12} [srcpart]
-              -mr-10006default.srcpart{ds=2008-04-09, hr=11} [srcpart]
-              -mr-10007default.srcpart{ds=2008-04-09, hr=12} [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-08_hr=12_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=11_ [srcpart]
+              nullscan://null/default.srcpart/part_ds=2008-04-09_hr=12_ [srcpart]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1650,9 +1650,9 @@ STAGE PLANS:
                       tag: 0
                       auto parallelism: true
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1696,7 +1696,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Map 5 
             Map Operator Tree:
                 TableScan
@@ -1838,9 +1838,9 @@ STAGE PLANS:
                       value expressions: key (type: string)
                       auto parallelism: true
             Path -> Alias:
-              -mr-10003default.src{} [s1]
+              nullscan://null/default.src/part_ [s1]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1884,7 +1884,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [s1]
+              nullscan://null/default.src/part_ [s1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1904,9 +1904,9 @@ STAGE PLANS:
                       value expressions: key (type: string)
                       auto parallelism: true
             Path -> Alias:
-              -mr-10004default.src{} [s2]
+              nullscan://null/default.src/part_ [s2]
             Path -> Partition:
-              -mr-10004default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1950,7 +1950,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10004default.src{} [s2]
+              nullscan://null/default.src/part_ [s2]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -2066,9 +2066,9 @@ STAGE PLANS:
                         value expressions: _col0 (type: bigint)
                         auto parallelism: false
             Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
             Path -> Partition:
-              -mr-10003default.src{} 
+              nullscan://null/default.src/part_ 
                 Partition
                   input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -2112,7 +2112,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              -mr-10003default.src{} [src]
+              nullscan://null/default.src/part_ [src]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/8787b3dd/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatch.java
----------------------------------------------------------------------
diff --git a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatch.java b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatch.java
index 380300e..9c066e0 100644
--- a/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatch.java
+++ b/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatch.java
@@ -163,7 +163,9 @@ public class VectorizedRowBatch implements Writable {
           if (k > 0) {
             b.append(", ");
           }
-          cv.stringifyValue(b, i);
+          if (cv != null) {
+            cv.stringifyValue(b, i);
+          }
         }
         b.append(']');
         if (i < size - 1) {


Mime
View raw message