hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1673437 [7/8] - in /hive/branches/hbase-metastore: ./ beeline/src/java/org/apache/hive/beeline/ bin/ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/conf/ ...
Date Tue, 14 Apr 2015 14:47:33 GMT
Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out Tue Apr 14 14:47:30 2015
@@ -237,144 +237,14 @@ TOK_QUERY
 
 
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: fact_daily
-            Statistics: Num rows: 29 Data size: 117 Basic stats: COMPLETE Column stats: NONE
-            GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate: (not (x = 86)) (type: boolean)
-              Statistics: Num rows: 15 Data size: 60 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: x (type: int)
-                outputColumnNames: _col0
-                Statistics: Num rows: 15 Data size: 60 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics: Num rows: 15 Data size: 60 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
-                        columns.types int
-                        escape.delim \
-                        hive.serialization.extend.additional.nesting.levels 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
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
-          Partition
-            base file name: HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME
-            input format: org.apache.hadoop.mapred.TextInputFormat
-            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-            partition values:
-              ds 1
-            properties:
-              COLUMN_STATS_ACCURATE false
-              bucket_count -1
-              columns x,y,z
-              columns.comments 
-              columns.types int:string:string
-#### A masked pattern was here ####
-              name default.fact_daily
-              numFiles 3
-              numRows -1
-              partition_columns ds
-              partition_columns.types string
-              rawDataSize -1
-              serialization.ddl struct fact_daily { i32 x, string y, string z}
-              serialization.format 1
-              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 117
-#### A masked pattern was here ####
-            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-          
-              input format: org.apache.hadoop.mapred.TextInputFormat
-              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              properties:
-                EXTERNAL TRUE
-                bucket_count -1
-                columns x,y,z
-                columns.comments 
-                columns.types int:string:string
-#### A masked pattern was here ####
-                name default.fact_daily
-                partition_columns ds
-                partition_columns.types string
-                serialization.ddl struct fact_daily { i32 x, string y, string z}
-                serialization.format 1
-                serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.fact_daily
-            name: default.fact_daily
-#### A masked pattern was here ####
-          Partition
-            base file name: x=238
-            input format: org.apache.hadoop.mapred.TextInputFormat
-            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-            partition values:
-              ds 1
-            properties:
-              COLUMN_STATS_ACCURATE false
-              bucket_count -1
-              columns x,y,z
-              columns.comments 
-              columns.types int:string:string
-#### A masked pattern was here ####
-              name default.fact_daily
-              numFiles 3
-              numRows -1
-              partition_columns ds
-              partition_columns.types string
-              rawDataSize -1
-              serialization.ddl struct fact_daily { i32 x, string y, string z}
-              serialization.format 1
-              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              totalSize 117
-#### A masked pattern was here ####
-            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-          
-              input format: org.apache.hadoop.mapred.TextInputFormat
-              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              properties:
-                EXTERNAL TRUE
-                bucket_count -1
-                columns x,y,z
-                columns.comments 
-                columns.types int:string:string
-#### A masked pattern was here ####
-                name default.fact_daily
-                partition_columns ds
-                partition_columns.types string
-                serialization.ddl struct fact_daily { i32 x, string y, string z}
-                serialization.format 1
-                serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-#### A masked pattern was here ####
-              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.fact_daily
-            name: default.fact_daily
-#### A masked pattern was here ####
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Partition Description:
           Partition
-            base file name: x=484
             input format: org.apache.hadoop.mapred.TextInputFormat
             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             partition values:
@@ -418,16 +288,20 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.fact_daily
             name: default.fact_daily
-      Truncated Path -> Alias:
-        /fact_tz/ds=1/HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME [fact_daily]
-        /fact_tz/ds=1/x=238 [fact_daily]
-        /fact_tz/ds=1/x=484 [fact_daily]
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: fact_daily
+          Statistics: Num rows: 29 Data size: 117 Basic stats: COMPLETE Column stats: NONE
+          GatherStats: false
+          Filter Operator
+            isSamplingPred: false
+            predicate: (not (x = 86)) (type: boolean)
+            Statistics: Num rows: 15 Data size: 60 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: x (type: int)
+              outputColumnNames: _col0
+              Statistics: Num rows: 15 Data size: 60 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 PREHOOK: query: -- List Bucketing Query
 SELECT x FROM fact_daily WHERE ds='1' and not (x = 86)

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out Tue Apr 14 14:47:30 2015
@@ -57,52 +57,14 @@ TOK_QUERY
 
 
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: a
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-            GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate: ((rand(1) < 0.1) and (not ((UDFToDouble(key) > 50.0) or (UDFToDouble(key) < 10.0)))) (type: boolean)
-              Statistics: Num rows: 56 Data size: 594 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
-                outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 56 Data size: 594 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics: Num rows: 56 Data size: 594 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.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
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Partition Description:
           Partition
-            base file name: hr=12
             input format: org.apache.hadoop.mapred.TextInputFormat
             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             partition values:
@@ -146,14 +108,20 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.srcpart
             name: default.srcpart
-      Truncated Path -> Alias:
-        /srcpart/ds=2008-04-08/hr=12 [a]
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: a
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          GatherStats: false
+          Filter Operator
+            isSamplingPred: false
+            predicate: ((rand(1) < 0.1) and (not ((UDFToDouble(key) > 50.0) or (UDFToDouble(key) < 10.0)))) (type: boolean)
+            Statistics: Num rows: 56 Data size: 594 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
+              outputColumnNames: _col0, _col1, _col2, _col3
+              Statistics: Num rows: 56 Data size: 594 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 PREHOOK: query: select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
 PREHOOK: type: QUERY
@@ -221,52 +189,14 @@ TOK_QUERY
 
 
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: a
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-            GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate: (not ((UDFToDouble(key) > 50.0) or (UDFToDouble(key) < 10.0))) (type: boolean)
-              Statistics: Num rows: 168 Data size: 1784 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
-                outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 168 Data size: 1784 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics: Num rows: 168 Data size: 1784 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.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
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Partition Description:
           Partition
-            base file name: hr=12
             input format: org.apache.hadoop.mapred.TextInputFormat
             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             partition values:
@@ -310,14 +240,20 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.srcpart
             name: default.srcpart
-      Truncated Path -> Alias:
-        /srcpart/ds=2008-04-08/hr=12 [a]
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: a
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          GatherStats: false
+          Filter Operator
+            isSamplingPred: false
+            predicate: (not ((UDFToDouble(key) > 50.0) or (UDFToDouble(key) < 10.0))) (type: boolean)
+            Statistics: Num rows: 168 Data size: 1784 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string)
+              outputColumnNames: _col0, _col1, _col2, _col3
+              Statistics: Num rows: 168 Data size: 1784 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 PREHOOK: query: select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
 PREHOOK: type: QUERY

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_all_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_all_types.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_all_types.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_all_types.q.out Tue Apr 14 14:47:30 2015
@@ -1,6 +1,7 @@
 PREHOOK: query: create table acid_uat(ti tinyint,
                  si smallint,
                  i int,
+                 j int,
                  bi bigint,
                  f float,
                  d double,
@@ -17,6 +18,7 @@ PREHOOK: Output: default@acid_uat
 POSTHOOK: query: create table acid_uat(ti tinyint,
                  si smallint,
                  i int,
+                 j int,
                  bi bigint,
                  f float,
                  d double,
@@ -34,6 +36,7 @@ PREHOOK: query: insert into table acid_u
     select ctinyint,
            csmallint,
            cint,
+           cint j,
            cbigint,
            cfloat,
            cdouble,
@@ -52,6 +55,7 @@ POSTHOOK: query: insert into table acid_
     select ctinyint,
            csmallint,
            cint,
+           cint j,
            cbigint,
            cfloat,
            cdouble,
@@ -74,6 +78,7 @@ POSTHOOK: Lineage: acid_uat.de EXPRESSIO
 POSTHOOK: Lineage: acid_uat.dt EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: acid_uat.f SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: acid_uat.i SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
+POSTHOOK: Lineage: acid_uat.j SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acid_uat.s SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ]
 POSTHOOK: Lineage: acid_uat.si SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ]
 POSTHOOK: Lineage: acid_uat.t SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ]
@@ -87,20 +92,20 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--51	NULL	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-741	-1070883071	-1645852809	NULL	-741.0	NULL	NULL	1969-12-31	0ruyd6Y50JpdGRf6HqD	0ruyd6Y50JpdGRf6HqD	xH7445Rals48VOulSyR5F               	false
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-51	NULL	-1071480828	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+NULL	-741	-1070883071	-1070883071	-1645852809	NULL	-741.0	NULL	NULL	1969-12-31	0ruyd6Y50JpdGRf6HqD	0ruyd6Y50JpdGRf6HqD	xH7445Rals48VOulSyR5F               	false
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
 PREHOOK: query: update acid_uat set
     ti = 1,
     si = 2,
-    i = 3,
+    j = 3,
     bi = 4,
     f = 3.14,
     d = 6.28,
@@ -118,7 +123,7 @@ PREHOOK: Output: default@acid_uat
 POSTHOOK: query: update acid_uat set
     ti = 1,
     si = 2,
-    i = 3,
+    j = 3,
     bi = 4,
     f = 3.14,
     d = 6.28,
@@ -141,16 +146,16 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--51	NULL	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
-1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-51	NULL	-1071480828	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+1	2	-1070883071	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
 PREHOOK: query: update acid_uat set
   ti = ti * 2,
   si = cast(f as int),
@@ -175,13 +180,13 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--102	-51	-1071480828	-1401575336	-51.0	-51.0	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
-1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-102	-51	-1071480828	-1071480828	-1401575336	-51.0	-51.0	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+1	2	-1070883071	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out Tue Apr 14 14:47:30 2015
@@ -34,11 +34,11 @@ POSTHOOK: Input: default@acid_utt
 -1070883071	0ruyd6Y50JpdGRf6HqD
 -1070551679	iUR3Q
 -1069736047	k17Am8uPHWk02cEf1jet
-PREHOOK: query: update acid_utt set b = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
+PREHOOK: query: update acid_utt set a = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_utt
 PREHOOK: Output: default@acid_utt
-POSTHOOK: query: update acid_utt set b = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
+POSTHOOK: query: update acid_utt set a = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_utt
 POSTHOOK: Output: default@acid_utt
@@ -50,6 +50,7 @@ POSTHOOK: query: select * from acid_utt
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_utt
 #### A masked pattern was here ####
+NULL	0ruyd6Y50JpdGRf6HqD
 -1073279343	oj1YrV5Wa
 -1073051226	A34p7oRr2WvUJNf
 -1072910839	0iqrc5
@@ -57,6 +58,5 @@ POSTHOOK: Input: default@acid_utt
 -1072076362	2uLyD28144vklju213J1mr
 -1071480828	aw724t8c5558x2xneC624
 -1071363017	Anj0oF
--1070883071	fred
 -1070551679	iUR3Q
 -1069736047	k17Am8uPHWk02cEf1jet

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out Tue Apr 14 14:47:30 2015
@@ -144,17 +144,13 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 448 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: decimal(38,18)), _col1 (type: decimal(38,18)), _col2 (type: decimal(38,18)), _col3 (type: decimal(38,18))
-                  outputColumnNames: _col0, _col1, _col2, _col3
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 1 Data size: 448 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 1 Data size: 448 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
+                  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
@@ -170,4 +166,4 @@ POSTHOOK: query: select min(dc), max(dc)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@vectortab2korc
 #### A masked pattern was here ####
--4997414117561.546875	4994550248722.298828	-10252745435816.024410	-5399023399.587163986308583465
+-4997414117561.546875	4994550248722.298828	-10252745435816.02441	-5399023399.587163986308583465

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_char_2.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_char_2.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_char_2.q.out Tue Apr 14 14:47:30 2015
@@ -77,12 +77,12 @@ STAGE PLANS:
                   alias: char_2
                   Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: value (type: char(20)), key (type: char(10))
-                    outputColumnNames: value, key
+                    expressions: value (type: char(20)), UDFToInteger(key) (type: int)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: sum(UDFToInteger(key)), count()
-                      keys: value (type: char(20))
+                      aggregations: sum(_col1), count()
+                      keys: _col0 (type: char(20))
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
@@ -101,15 +101,11 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: char(20)), _col1 (type: bigint), _col2 (type: bigint)
-                  outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions: _col0 (type: char(20))
+                  sort order: +
                   Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: char(20))
-                    sort order: +
-                    Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: bigint), _col2 (type: bigint)
+                  value expressions: _col1 (type: bigint), _col2 (type: bigint)
             Execution mode: vectorized
         Reducer 3 
             Reduce Operator Tree:
@@ -209,12 +205,12 @@ STAGE PLANS:
                   alias: char_2
                   Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: value (type: char(20)), key (type: char(10))
-                    outputColumnNames: value, key
+                    expressions: value (type: char(20)), UDFToInteger(key) (type: int)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: sum(UDFToInteger(key)), count()
-                      keys: value (type: char(20))
+                      aggregations: sum(_col1), count()
+                      keys: _col0 (type: char(20))
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 500 Data size: 99000 Basic stats: COMPLETE Column stats: NONE
@@ -233,15 +229,11 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: char(20)), _col1 (type: bigint), _col2 (type: bigint)
-                  outputColumnNames: _col0, _col1, _col2
+                Reduce Output Operator
+                  key expressions: _col0 (type: char(20))
+                  sort order: -
                   Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: char(20))
-                    sort order: -
-                    Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col1 (type: bigint), _col2 (type: bigint)
+                  value expressions: _col1 (type: bigint), _col2 (type: bigint)
             Execution mode: vectorized
         Reducer 3 
             Reduce Operator Tree:

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round.q.out Tue Apr 14 14:47:30 2015
@@ -114,18 +114,18 @@ STAGE PLANS:
                   alias: decimal_tbl_txt
                   Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: dec (type: decimal(10,0)), round(dec, -1) (type: decimal(11,0))
-                    outputColumnNames: _col0, _col1
+                    expressions: dec (type: decimal(10,0))
+                    outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: round(_col0, (- 1)) (type: decimal(11,0))
                       sort order: +
                       Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: decimal(10,0)), _col1 (type: decimal(11,0))
+                      value expressions: _col0 (type: decimal(10,0))
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(10,0)), VALUE._col1 (type: decimal(11,0))
+                expressions: VALUE._col0 (type: decimal(10,0)), KEY.reducesinkkey0 (type: decimal(11,0))
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -264,18 +264,18 @@ STAGE PLANS:
                   alias: decimal_tbl_rc
                   Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: dec (type: decimal(10,0)), round(dec, -1) (type: decimal(11,0))
-                    outputColumnNames: _col0, _col1
+                    expressions: dec (type: decimal(10,0))
+                    outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: round(_col0, (- 1)) (type: decimal(11,0))
                       sort order: +
                       Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: decimal(10,0)), _col1 (type: decimal(11,0))
+                      value expressions: _col0 (type: decimal(10,0))
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(10,0)), VALUE._col1 (type: decimal(11,0))
+                expressions: VALUE._col0 (type: decimal(10,0)), KEY.reducesinkkey0 (type: decimal(11,0))
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -415,19 +415,19 @@ STAGE PLANS:
                   alias: decimal_tbl_orc
                   Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: dec (type: decimal(10,0)), round(dec, -1) (type: decimal(11,0))
-                    outputColumnNames: _col0, _col1
+                    expressions: dec (type: decimal(10,0))
+                    outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: round(_col0, (- 1)) (type: decimal(11,0))
                       sort order: +
                       Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: decimal(10,0)), _col1 (type: decimal(11,0))
+                      value expressions: _col0 (type: decimal(10,0))
             Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(10,0)), VALUE._col1 (type: decimal(11,0))
+                expressions: VALUE._col0 (type: decimal(10,0)), KEY.reducesinkkey0 (type: decimal(11,0))
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round_2.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round_2.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_decimal_round_2.q.out Tue Apr 14 14:47:30 2015
@@ -121,7 +121,7 @@ FROM decimal_tbl_1_orc ORDER BY d
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_tbl_1_orc
 #### A masked pattern was here ####
-55555	55555	55555.0	55555.00	55555.000	55560	55600	56000	60000	100000	0	0	0
+55555	55555	55555	55555	55555	55560	55600	56000	60000	100000	0	0	0
 PREHOOK: query: create table decimal_tbl_2_orc (pos decimal(38,18), neg decimal(38,18)) 
 STORED AS ORC
 PREHOOK: type: CREATETABLE
@@ -240,7 +240,7 @@ FROM decimal_tbl_2_orc ORDER BY p
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_tbl_2_orc
 #### A masked pattern was here ####
-125	125	125.3	125.32	125.315	125.3150	130	100	0	0	-125	-125	-125.3	-125.32	-125.315	-125.3150	-130	-100	0	0
+125	125	125.3	125.32	125.315	125.315	130	100	0	0	-125	-125	-125.3	-125.32	-125.315	-125.315	-130	-100	0	0
 PREHOOK: query: create table decimal_tbl_3_orc (dec decimal(38,18)) 
 STORED AS ORC
 PREHOOK: type: CREATETABLE
@@ -402,7 +402,7 @@ FROM decimal_tbl_3_orc ORDER BY d
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_tbl_3_orc
 #### A masked pattern was here ####
-0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3.1	3.14	3.142	3.1416	3.14159	3.141593	3.1415927	3.14159265	3.141592654	3.1415926536	3.14159265359	3.141592653590	3.1415926535898	3.1415926535898	3.14159265358979	3.141592653589793	3.1415926535897930
+0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3.1	3.14	3.142	3.1416	3.14159	3.141593	3.1415927	3.14159265	3.141592654	3.1415926536	3.14159265359	3.14159265359	3.1415926535898	3.1415926535898	3.14159265358979	3.141592653589793	3.141592653589793
 PREHOOK: query: create table decimal_tbl_4_orc (pos decimal(38,18), neg decimal(38,18)) 
 STORED AS ORC
 PREHOOK: type: CREATETABLE
@@ -457,7 +457,7 @@ STAGE PLANS:
                   alias: decimal_tbl_4_orc
                   Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: round(pos, 9) (type: decimal(30,9)), round(neg, 9) (type: decimal(30,9)), round(1809242.3151111344, 9) (type: decimal(17,9)), round((- 1809242.3151111344), 9) (type: decimal(17,9))
+                    expressions: round(pos, 9) (type: decimal(30,9)), round(neg, 9) (type: decimal(30,9)), 1809242.315111134 (type: decimal(17,9)), -1809242.315111134 (type: decimal(17,9))
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -465,6 +465,7 @@ STAGE PLANS:
                       sort order: +
                       Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col1 (type: decimal(30,9)), _col2 (type: decimal(17,9)), _col3 (type: decimal(17,9))
+            Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
               Select Operator

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_if_expr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_if_expr.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_if_expr.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/tez/vector_if_expr.q.out Tue Apr 14 14:47:30 2015
@@ -19,18 +19,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc
-                  Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (cboolean1 is not null and cboolean1) (type: boolean)
-                    Statistics: Num rows: 3072 Data size: 94309 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 3072 Data size: 660491 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: cboolean1 (type: boolean), if(cboolean1, 'first', 'second') (type: string)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3072 Data size: 94309 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3072 Data size: 660491 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: boolean)
                         sort order: +
-                        Statistics: Num rows: 3072 Data size: 94309 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3072 Data size: 660491 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: string)
             Execution mode: vectorized
         Reducer 2 
@@ -38,10 +38,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: boolean), VALUE._col0 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3072 Data size: 94309 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3072 Data size: 660491 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 3072 Data size: 94309 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 3072 Data size: 660491 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out Tue Apr 14 14:47:30 2015
@@ -94,52 +94,14 @@ TOK_QUERY
 
 
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: test_tab
-            Statistics: Num rows: 17 Data size: 1761 Basic stats: COMPLETE Column stats: NONE
-            GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate: (key = '484') (type: boolean)
-              Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: '484' (type: string), value (type: string), '1' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics: Num rows: 8 Data size: 828 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
-                        columns.types string:string:string
-                        escape.delim \
-                        hive.serialization.extend.additional.nesting.levels 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
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Partition Description:
           Partition
-            base file name: key=484
             input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
             output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
             partition values:
@@ -182,14 +144,20 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
               name: default.test_tab
             name: default.test_tab
-      Truncated Path -> Alias:
-        /test_tab/part=1/key=484 [test_tab]
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: test_tab
+          Statistics: Num rows: 17 Data size: 1761 Basic stats: COMPLETE Column stats: NONE
+          GatherStats: false
+          Filter Operator
+            isSamplingPred: false
+            predicate: (key = '484') (type: boolean)
+            Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: '484' (type: string), value (type: string), '1' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 PREHOOK: query: SELECT * FROM test_tab WHERE part = '1' AND key = '484'
 PREHOOK: type: QUERY
@@ -233,52 +201,14 @@ TOK_QUERY
 
 
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: test_tab
-            Statistics: Num rows: 17 Data size: 1761 Basic stats: COMPLETE Column stats: NONE
-            GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate: (key = '0') (type: boolean)
-              Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: '0' (type: string), value (type: string), '1' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics: Num rows: 8 Data size: 828 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
-                        columns.types string:string:string
-                        escape.delim \
-                        hive.serialization.extend.additional.nesting.levels 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
-      Path -> Alias:
-#### A masked pattern was here ####
-      Path -> Partition:
-#### A masked pattern was here ####
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Partition Description:
           Partition
-            base file name: HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME
             input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
             output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
             partition values:
@@ -321,14 +251,20 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
               name: default.test_tab
             name: default.test_tab
-      Truncated Path -> Alias:
-        /test_tab/part=1/HIVE_DEFAULT_LIST_BUCKETING_DIR_NAME [test_tab]
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: test_tab
+          Statistics: Num rows: 17 Data size: 1761 Basic stats: COMPLETE Column stats: NONE
+          GatherStats: false
+          Filter Operator
+            isSamplingPred: false
+            predicate: (key = '0') (type: boolean)
+            Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: '0' (type: string), value (type: string), '1' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 8 Data size: 828 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 PREHOOK: query: SELECT * FROM test_tab WHERE part = '1' AND key = '0'
 PREHOOK: type: QUERY

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/union_view.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/union_view.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/union_view.q.out Tue Apr 14 14:47:30 2015
@@ -44,181 +44,67 @@ POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@src_union_3
 POSTHOOK: Output: default@default__src_union_3_src_union_3_key_idx__
 STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-2 depends on stages: Stage-3
-  Stage-1 depends on stages: Stage-2
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  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-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: src_union_1
-            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 86 (type: int), value (type: string), '1' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 250 Data size: 2656 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
+        TableScan
+          alias: src_union_1
+          filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          Filter Operator
+            predicate: (key = 86) (type: boolean)
+            Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: 86 (type: int), value (type: string), '1' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-2 depends on stages: Stage-3
-  Stage-1 depends on stages: Stage-2
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  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-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: src_union_2
-            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 86 (type: int), value (type: string), '2' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 500 Data size: 5312 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
+        TableScan
+          alias: src_union_2
+          filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
+          Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
+          Filter Operator
+            predicate: (key = 86) (type: boolean)
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: 86 (type: int), value (type: string), '2' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-2 depends on stages: Stage-3
-  Stage-1 depends on stages: Stage-2
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  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-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: src_union_3
-            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: 86 (type: int), value (type: string), '3' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 500 Data size: 5312 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
+        TableScan
+          alias: src_union_3
+          filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
+          Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
+          Filter Operator
+            predicate: (key = 86) (type: boolean)
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: 86 (type: int), value (type: string), '3' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              ListSink
 
 86	val_86	1
 86	val_86	2

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_all_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_all_types.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_all_types.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_all_types.q.out Tue Apr 14 14:47:30 2015
@@ -1,6 +1,7 @@
 PREHOOK: query: create table acid_uat(ti tinyint,
                  si smallint,
                  i int,
+                 j int,
                  bi bigint,
                  f float,
                  d double,
@@ -17,6 +18,7 @@ PREHOOK: Output: default@acid_uat
 POSTHOOK: query: create table acid_uat(ti tinyint,
                  si smallint,
                  i int,
+                 j int,
                  bi bigint,
                  f float,
                  d double,
@@ -34,6 +36,7 @@ PREHOOK: query: insert into table acid_u
     select ctinyint,
            csmallint,
            cint,
+           cint j,
            cbigint,
            cfloat,
            cdouble,
@@ -52,6 +55,7 @@ POSTHOOK: query: insert into table acid_
     select ctinyint,
            csmallint,
            cint,
+           cint j,
            cbigint,
            cfloat,
            cdouble,
@@ -74,6 +78,7 @@ POSTHOOK: Lineage: acid_uat.de EXPRESSIO
 POSTHOOK: Lineage: acid_uat.dt EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: acid_uat.f SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: acid_uat.i SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
+POSTHOOK: Lineage: acid_uat.j SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 POSTHOOK: Lineage: acid_uat.s SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ]
 POSTHOOK: Lineage: acid_uat.si SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ]
 POSTHOOK: Lineage: acid_uat.t SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ]
@@ -87,20 +92,20 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--51	NULL	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-741	-1070883071	-1645852809	NULL	-741.0	NULL	NULL	1969-12-31	0ruyd6Y50JpdGRf6HqD	0ruyd6Y50JpdGRf6HqD	xH7445Rals48VOulSyR5F               	false
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-51	NULL	-1071480828	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+NULL	-741	-1070883071	-1070883071	-1645852809	NULL	-741.0	NULL	NULL	1969-12-31	0ruyd6Y50JpdGRf6HqD	0ruyd6Y50JpdGRf6HqD	xH7445Rals48VOulSyR5F               	false
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
 PREHOOK: query: update acid_uat set
     ti = 1,
     si = 2,
-    i = 3,
+    j = 3,
     bi = 4,
     f = 3.14,
     d = 6.28,
@@ -118,7 +123,7 @@ PREHOOK: Output: default@acid_uat
 POSTHOOK: query: update acid_uat set
     ti = 1,
     si = 2,
-    i = 3,
+    j = 3,
     bi = 4,
     f = 3.14,
     d = 6.28,
@@ -141,16 +146,16 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--51	NULL	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
-1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-51	NULL	-1071480828	-1071480828	-1401575336	-51.0	NULL	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+1	2	-1070883071	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
 PREHOOK: query: update acid_uat set
   ti = ti * 2,
   si = cast(f as int),
@@ -175,13 +180,13 @@ POSTHOOK: query: select * from acid_uat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uat
 #### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--102	-51	-1071480828	-1401575336	-51.0	-51.0	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
-1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+11	NULL	-1073279343	-1073279343	-1595604468	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
+NULL	-7382	-1073051226	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1969-12-31	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
+11	NULL	-1072910839	-1072910839	2048385991	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
+NULL	8373	-1072081801	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1969-12-31	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
+NULL	-5470	-1072076362	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1969-12-31	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
+-102	-51	-1071480828	-1071480828	-1401575336	-51.0	-51.0	-51	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
+8	NULL	-1071363017	-1071363017	1349676361	8.0	NULL	8	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
+1	2	-1070883071	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
+NULL	-947	-1070551679	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1969-12-31	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
+11	NULL	-1069736047	-1069736047	-453772520	11.0	NULL	11	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true

Modified: hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_tmp_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_tmp_table.q.out?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_tmp_table.q.out (original)
+++ hive/branches/hbase-metastore/ql/src/test/results/clientpositive/update_tmp_table.q.out Tue Apr 14 14:47:30 2015
@@ -34,11 +34,11 @@ POSTHOOK: Input: default@acid_utt
 -1070883071	0ruyd6Y50JpdGRf6HqD
 -1070551679	iUR3Q
 -1069736047	k17Am8uPHWk02cEf1jet
-PREHOOK: query: update acid_utt set b = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
+PREHOOK: query: update acid_utt set a = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_utt
 PREHOOK: Output: default@acid_utt
-POSTHOOK: query: update acid_utt set b = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
+POSTHOOK: query: update acid_utt set a = 'fred' where b = '0ruyd6Y50JpdGRf6HqD'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_utt
 POSTHOOK: Output: default@acid_utt
@@ -50,6 +50,7 @@ POSTHOOK: query: select * from acid_utt
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_utt
 #### A masked pattern was here ####
+NULL	0ruyd6Y50JpdGRf6HqD
 -1073279343	oj1YrV5Wa
 -1073051226	A34p7oRr2WvUJNf
 -1072910839	0iqrc5
@@ -57,6 +58,5 @@ POSTHOOK: Input: default@acid_utt
 -1072076362	2uLyD28144vklju213J1mr
 -1071480828	aw724t8c5558x2xneC624
 -1071363017	Anj0oF
--1070883071	fred
 -1070551679	iUR3Q
 -1069736047	k17Am8uPHWk02cEf1jet

Modified: hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/ByteStream.java
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/ByteStream.java?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/ByteStream.java (original)
+++ hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/ByteStream.java Tue Apr 14 14:47:30 2015
@@ -19,11 +19,13 @@
 package org.apache.hadoop.hive.serde2;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.apache.hadoop.hive.common.io.NonSyncByteArrayInputStream;
 import org.apache.hadoop.hive.common.io.NonSyncByteArrayOutputStream;
 import org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe;
 import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
+import org.apache.hadoop.hive.serde2.ByteStream.Output;
 
 /**
  * Extensions to bytearrayinput/output streams.
@@ -90,14 +92,32 @@ public class ByteStream {
     }
 
     @Override
+    public void writeByte(long offset, byte value) {
+      getData()[(int) offset] = value;
+    }
+
+    @Override
     public void reserve(int byteCount) {
       for (int i = 0; i < byteCount; ++i) {
         write(0);
       }
     }
+
+    public boolean arraysEquals(Output output) {
+      if (count != output.count) {
+        return false;
+      }
+      for (int i = 0; i < count; i++) {
+        if (buf[i] != output.buf[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
   }
 
   public static interface RandomAccessOutput {
+    public void writeByte(long offset, byte value);
     public void writeInt(long offset, int value);
     public void reserve(int byteCount);
     public void write(int b);

Modified: hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/WriteBuffers.java
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/WriteBuffers.java?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/WriteBuffers.java (original)
+++ hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/WriteBuffers.java Tue Apr 14 14:47:30 2015
@@ -303,6 +303,38 @@ public final class WriteBuffers implemen
     return true;
   }
 
+  /**
+   * Compares part of the buffer with a part of an external byte array.
+   * Does not modify readPoint.
+   */
+  public boolean isEqual(byte[] left, int leftOffset, int leftLength, long rightOffset, int rightLength) {
+    if (rightLength != leftLength) {
+      return false;
+    }
+    int rightIndex = getBufferIndex(rightOffset), rightFrom = getOffset(rightOffset);
+    byte[] rightBuffer = writeBuffers.get(rightIndex);
+    if (rightFrom + rightLength <= wbSize) {
+      // TODO: allow using unsafe optionally.
+      for (int i = 0; i < leftLength; ++i) {
+        if (left[leftOffset + i] != rightBuffer[rightFrom + i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+    for (int i = 0; i < rightLength; ++i) {
+      if (rightFrom == wbSize) {
+        ++rightIndex;
+        rightBuffer = writeBuffers.get(rightIndex);
+        rightFrom = 0;
+      }
+      if (left[leftOffset + i] != rightBuffer[rightFrom++]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   public void clear() {
     writeBuffers.clear();
     clearState();
@@ -520,6 +552,19 @@ public final class WriteBuffers implemen
     writePos.bufferIndex = prevIndex;
     writePos.buffer = writeBuffers.get(writePos.bufferIndex);
     writePos.offset = prevOffset;
+  }
+
+
+  @Override
+  public void writeByte(long offset, byte value) {
+    int prevIndex = writePos.bufferIndex, prevOffset = writePos.offset;
+    setWritePoint(offset);
+    // One byte is always available for writing.
+    writePos.buffer[writePos.offset] = value;
+
+    writePos.bufferIndex = prevIndex;
+    writePos.buffer = writeBuffers.get(writePos.bufferIndex);
+    writePos.offset = prevOffset;
   }
 
   // Lifted from org.apache.hadoop.util.hash.MurmurHash... but supports offset.

Modified: hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java (original)
+++ hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java Tue Apr 14 14:47:30 2015
@@ -132,7 +132,7 @@ public class BinarySortableSerDe extends
   boolean[] columnSortOrderIsDesc;
 
   private static byte[] decimalBuffer = null;
-  private static Charset decimalCharSet = Charset.forName("US-ASCII");
+  public static Charset decimalCharSet = Charset.forName("US-ASCII");
 
   @Override
   public void initialize(Configuration conf, Properties tbl)
@@ -572,7 +572,7 @@ public class BinarySortableSerDe extends
     return ((BaseCharTypeInfo)type).getLength();
   }
 
-  static Text deserializeText(InputByteBuffer buffer, boolean invert, Text r)
+  public static Text deserializeText(InputByteBuffer buffer, boolean invert, Text r)
       throws IOException {
     // Get the actual length first
     int start = buffer.tell();
@@ -636,7 +636,7 @@ public class BinarySortableSerDe extends
     return serializeBytesWritable;
   }
 
-  private static void writeByte(RandomAccessOutput buffer, byte b, boolean invert) {
+  public static void writeByte(RandomAccessOutput buffer, byte b, boolean invert) {
     if (invert) {
       b = (byte) (0xff ^ b);
     }
@@ -892,7 +892,7 @@ public class BinarySortableSerDe extends
 
   }
 
-  private static void serializeBytes(
+  public static void serializeBytes(
       ByteStream.Output buffer, byte[] data, int length, boolean invert) {
     for (int i = 0; i < length; i++) {
       if (data[i] == 0 || data[i] == 1) {
@@ -905,14 +905,27 @@ public class BinarySortableSerDe extends
     writeByte(buffer, (byte) 0, invert);
   }
 
-  private static void serializeInt(ByteStream.Output buffer, int v, boolean invert) {
+  public static void serializeBytes(
+      ByteStream.Output buffer, byte[] data, int offset, int length, boolean invert) {
+    for (int i = offset; i < offset + length; i++) {
+      if (data[i] == 0 || data[i] == 1) {
+        writeByte(buffer, (byte) 1, invert);
+        writeByte(buffer, (byte) (data[i] + 1), invert);
+      } else {
+        writeByte(buffer, data[i], invert);
+      }
+    }
+    writeByte(buffer, (byte) 0, invert);
+  }
+
+  public static void serializeInt(ByteStream.Output buffer, int v, boolean invert) {
     writeByte(buffer, (byte) ((v >> 24) ^ 0x80), invert);
     writeByte(buffer, (byte) (v >> 16), invert);
     writeByte(buffer, (byte) (v >> 8), invert);
     writeByte(buffer, (byte) v, invert);
   }
 
-  private static void serializeLong(ByteStream.Output buffer, long v, boolean invert) {
+  public static void serializeLong(ByteStream.Output buffer, long v, boolean invert) {
     writeByte(buffer, (byte) ((v >> 56) ^ 0x80), invert);
     writeByte(buffer, (byte) (v >> 48), invert);
     writeByte(buffer, (byte) (v >> 40), invert);

Modified: hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/InputByteBuffer.java
URL: http://svn.apache.org/viewvc/hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/InputByteBuffer.java?rev=1673437&r1=1673436&r2=1673437&view=diff
==============================================================================
--- hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/InputByteBuffer.java (original)
+++ hive/branches/hbase-metastore/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/InputByteBuffer.java Tue Apr 14 14:47:30 2015
@@ -78,6 +78,10 @@ public class InputByteBuffer {
     return end;
   }
 
+  public final boolean isEof() {
+    return (start >= end);
+  }
+
   /**
    * Returns the underlying byte array.
    */



Mime
View raw message