You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/09/16 00:46:49 UTC

svn commit: r1625176 [4/9] - in /hive/branches/cbo: ./ common/src/java/org/apache/hadoop/hive/common/ common/src/java/org/apache/hadoop/hive/conf/ contrib/src/test/results/clientpositive/ data/conf/tez/ data/files/ itests/hive-unit/src/test/java/org/ap...

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_10_external_managed.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_10_external_managed.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_10_external_managed.q.out Mon Sep 15 22:46:44 2014
@@ -55,8 +55,10 @@ POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:importer
 PREHOOK: query: import from 'ql/test/data/exports/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: describe extended exim_department
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_11_managed_external.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_11_managed_external.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_11_managed_external.q.out Mon Sep 15 22:46:44 2014
@@ -49,8 +49,10 @@ POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:importer
 PREHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: describe extended exim_department
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_12_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_12_external_location.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_12_external_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_12_external_location.q.out Mon Sep 15 22:46:44 2014
@@ -51,9 +51,11 @@ POSTHOOK: Input: database:importer
 PREHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department' 
 	location 'ql/test/data/tablestore/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department' 
 	location 'ql/test/data/tablestore/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: describe extended exim_department
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_13_managed_location.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_13_managed_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_13_managed_location.q.out Mon Sep 15 22:46:44 2014
@@ -51,9 +51,11 @@ POSTHOOK: Input: database:importer
 PREHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department' 
 	location 'ql/test/data/tablestore/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department' 
 	location 'ql/test/data/tablestore/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: describe extended exim_department
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out Mon Sep 15 22:46:44 2014
@@ -67,10 +67,12 @@ POSTHOOK: Output: importer@exim_departme
 PREHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
 	location 'ql/test/data/tablestore/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_department
 POSTHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
 	location 'ql/test/data/tablestore/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: describe extended exim_department
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_15_external_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_15_external_part.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_15_external_part.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_15_external_part.q.out Mon Sep 15 22:46:44 2014
@@ -139,10 +139,12 @@ POSTHOOK: Output: importer@exim_employee
 PREHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_employee
 POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: describe extended exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_16_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_16_part_external.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_16_part_external.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_16_part_external.q.out Mon Sep 15 22:46:44 2014
@@ -118,11 +118,13 @@ PREHOOK: query: import table exim_employ
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_employee
 POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: show table extended like exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_17_part_managed.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_17_part_managed.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_17_part_managed.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_17_part_managed.q.out Mon Sep 15 22:46:44 2014
@@ -114,11 +114,13 @@ PREHOOK: query: import table exim_employ
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_employee
 POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: alter table exim_employee add partition	(emp_country="us", emp_state="ap")

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_18_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_18_part_external.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_18_part_external.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_18_part_external.q.out Mon Sep 15 22:46:44 2014
@@ -96,9 +96,11 @@ POSTHOOK: Input: database:importer
 PREHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: describe extended exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out Mon Sep 15 22:46:44 2014
@@ -72,10 +72,12 @@ PREHOOK: query: import external table ex
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import external table exim_employee 
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out Mon Sep 15 22:46:44 2014
@@ -98,10 +98,12 @@ PREHOOK: query: import external table ex
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: describe extended exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out Mon Sep 15 22:46:44 2014
@@ -98,10 +98,12 @@ PREHOOK: query: import table exim_employ
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
 	location 'ql/test/data/tablestore/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
 PREHOOK: query: describe extended exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out Mon Sep 15 22:46:44 2014
@@ -65,9 +65,11 @@ POSTHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: import from 'ql/test/data/exports/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_department
 POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: select * from exim_department
 PREHOOK: type: QUERY

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out Mon Sep 15 22:46:44 2014
@@ -84,9 +84,11 @@ POSTHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: Output: importer@exim_employee
 PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 PREHOOK: Output: importer@exim_employee
 POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: query: select * from exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out Mon Sep 15 22:46:44 2014
@@ -49,8 +49,10 @@ POSTHOOK: query: grant Create on databas
 POSTHOOK: type: GRANT_PRIVILEGE
 PREHOOK: query: import from 'ql/test/data/exports/exim_department'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_department
 PREHOOK: query: select * from exim_department
 PREHOOK: type: QUERY

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/exim_hidden_files.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/exim_hidden_files.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/exim_hidden_files.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/exim_hidden_files.q.out Mon Sep 15 22:46:44 2014
@@ -45,8 +45,10 @@ POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:importer
 PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
 PREHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=in
 PREHOOK: query: describe formatted exim_employee

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/import_exported_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/import_exported_table.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/import_exported_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/import_exported_table.q.out Mon Sep 15 22:46:44 2014
@@ -2,6 +2,7 @@
 PREHOOK: type: IMPORT
 #### A masked pattern was here ####
 POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
 POSTHOOK: Output: default@j1_41
 PREHOOK: query: DESCRIBE j1_41
 PREHOOK: type: DESCTABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out Mon Sep 15 22:46:44 2014
@@ -566,12 +566,16 @@ STAGE PLANS:
     Stats-Aggr Operator
 
   Stage: Stage-4
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 
   Stage: Stage-6
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/input17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input17.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input17.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input17.q.out Mon Sep 15 22:46:44 2014
@@ -35,32 +35,32 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: (aint + lint[0]) (type: int), lintstring[0] (type: struct<myint:int,mystring:string,underscore_int:int>)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               Transform Operator
                 command: cat
                 output info:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 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: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: UDFToInteger(VALUE._col0) (type: int), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 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/cbo/ql/src/test/results/clientpositive/input5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input5.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input5.q.out Mon Sep 15 22:46:44 2014
@@ -35,32 +35,32 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: lint (type: array<int>), lintstring (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               Transform Operator
                 command: cat
                 output info:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 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: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 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/cbo/ql/src/test/results/clientpositive/input_columnarserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_columnarserde.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_columnarserde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_columnarserde.q.out Mon Sep 15 22:46:44 2014
@@ -35,24 +35,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: 1 (type: int)
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: array<int>), _col1 (type: array<string>), _col2 (type: map<string,string>), _col3 (type: int), _col4 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: array<int>), VALUE._col1 (type: array<string>), VALUE._col2 (type: map<string,string>), VALUE._col3 (type: int), VALUE._col4 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
-          Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/input_dynamicserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_dynamicserde.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_dynamicserde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_dynamicserde.q.out Mon Sep 15 22:46:44 2014
@@ -42,14 +42,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 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/cbo/ql/src/test/results/clientpositive/input_lazyserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_lazyserde.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_lazyserde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_lazyserde.q.out Mon Sep 15 22:46:44 2014
@@ -1,6 +1,12 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
+DROP TABLE dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE dest1
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '1'
 COLLECTION ITEMS TERMINATED BY '2'
@@ -10,9 +16,7 @@ STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
+POSTHOOK: query: CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, e string)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '1'
 COLLECTION ITEMS TERMINATED BY '2'
@@ -41,24 +45,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: lint (type: array<int>), lstring (type: array<string>), mstringstring (type: map<string,string>), aint (type: int), astring (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: 1 (type: int)
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: array<int>), _col1 (type: array<string>), _col2 (type: map<string,string>), _col3 (type: int), _col4 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: array<int>), VALUE._col1 (type: array<string>), VALUE._col2 (type: map<string,string>), VALUE._col3 (type: int), VALUE._col4 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
-          Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -236,11 +240,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket2
 POSTHOOK: Output: default@destbin
 POSTHOOK: Lineage: destbin.a EXPRESSION [(srcbucket2)srcbucket2.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: SELECT * from destBin ORDER BY a
+PREHOOK: query: SELECT * from destBin
 PREHOOK: type: QUERY
 PREHOOK: Input: default@destbin
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * from destBin ORDER BY a
+POSTHOOK: query: SELECT * from destBin
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@destbin
 #### A masked pattern was here ####
@@ -752,3 +756,93 @@ POSTHOOK: query: DROP TABLE destBin
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@destbin
 POSTHOOK: Output: default@destbin
+PREHOOK: query: DROP TABLE dest2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest2
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE dest3
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest3
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE dest2 (a map<string,map<string,map<string,uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>>>>)
+  ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest2
+POSTHOOK: query: CREATE TABLE dest2 (a map<string,map<string,map<string,uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>>>>)
+  ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest2
+PREHOOK: query: INSERT OVERWRITE TABLE dest2 SELECT src_thrift.attributes FROM src_thrift
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest2
+POSTHOOK: query: INSERT OVERWRITE TABLE dest2 SELECT src_thrift.attributes FROM src_thrift
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest2
+POSTHOOK: Lineage: dest2.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:attributes, type:map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>>, comment:from deserializer), ]
+PREHOOK: query: SELECT a from dest2 limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT a from dest2 limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest2
+#### A masked pattern was here ####
+{"key_0":{"erVal0":{"value_0":{3:1.0}}}}
+{"key_1":{"erVal1":{"value_1":{3:1.0}}}}
+{"key_2":{"erVal2":{"value_2":{3:1.0}}}}
+{"key_3":{"erVal3":{"value_3":{3:1.0}}}}
+{"key_4":{"erVal4":{"value_4":{3:1.0}}}}
+{"key_5":{"erVal5":{"value_5":{3:1.0}}}}
+{"key_6":{"erVal6":{"value_6":{3:1.0}}}}
+{"key_7":{"erVal7":{"value_7":{3:1.0}}}}
+{"key_8":{"erVal8":{"value_8":{3:1.0}}}}
+{"key_9":{"erVal9":{"value_9":{3:1.0}}}}
+PREHOOK: query: CREATE TABLE dest3 (
+unionfield1 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield2 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield3 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>
+) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest3
+POSTHOOK: query: CREATE TABLE dest3 (
+unionfield1 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield2 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>,
+unionfield3 uniontype<int, bigint, string, double, boolean, array<string>, map<string,string>>
+) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' STORED AS SEQUENCEFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest3
+PREHOOK: query: INSERT OVERWRITE TABLE dest3 SELECT src_thrift.unionField1,src_thrift.unionField2,src_thrift.unionField3 from src_thrift
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: default@dest3
+POSTHOOK: query: INSERT OVERWRITE TABLE dest3 SELECT src_thrift.unionField1,src_thrift.unionField2,src_thrift.unionField3 from src_thrift
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: default@dest3
+POSTHOOK: Lineage: dest3.unionfield1 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield1, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+POSTHOOK: Lineage: dest3.unionfield2 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield2, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+POSTHOOK: Lineage: dest3.unionfield3 SIMPLE [(src_thrift)src_thrift.FieldSchema(name:unionfield3, type:uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>, comment:from deserializer), ]
+PREHOOK: query: SELECT unionfield1, unionField2, unionfield3 from dest3 limit 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest3
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT unionfield1, unionField2, unionfield3 from dest3 limit 10
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest3
+#### A masked pattern was here ####
+{2:"test0"}	{6:{"key_0":"value_0"}}	{5:["0","0","0"]}
+{2:"test1"}	{6:{"key_1":"value_1"}}	{5:["10","100","1000"]}
+{2:"test2"}	{6:{"key_2":"value_2"}}	{5:["20","200","2000"]}
+{2:"test3"}	{6:{"key_3":"value_3"}}	{5:["30","300","3000"]}
+{2:"test4"}	{6:{"key_4":"value_4"}}	{5:["40","400","4000"]}
+{2:"test5"}	{6:{"key_5":"value_5"}}	{5:["50","500","5000"]}
+{2:"test6"}	{6:{"key_6":"value_6"}}	{5:["60","600","6000"]}
+{2:"test7"}	{6:{"key_7":"value_7"}}	{5:["70","700","7000"]}
+{2:"test8"}	{6:{"key_8":"value_8"}}	{5:["80","800","8000"]}
+{2:"test9"}	{6:{"key_9":"value_9"}}	{5:["90","900","9000"]}

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath.q.out Mon Sep 15 22:46:44 2014
@@ -30,14 +30,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: lint[1] (type: int), lintstring[0].mystring (type: string), mstringstring['key_2'] (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 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/cbo/ql/src/test/results/clientpositive/input_testxpath2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath2.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath2.q.out Mon Sep 15 22:46:44 2014
@@ -30,17 +30,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: (lint is not null and (not mstringstring is null)) (type: boolean)
-              Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: size(lint) (type: int), size(lintstring) (type: int), size(mstringstring) (type: int)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 837 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 3 Data size: 437 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 837 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/cbo/ql/src/test/results/clientpositive/input_testxpath3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath3.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath3.q.out Mon Sep 15 22:46:44 2014
@@ -16,14 +16,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 3070 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/cbo/ql/src/test/results/clientpositive/input_testxpath4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath4.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/input_testxpath4.q.out Mon Sep 15 22:46:44 2014
@@ -22,17 +22,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -94,17 +94,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src_thrift
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: ((mstringstring['key_9'] is not null and lintstring.myint is not null) and lintstring is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array<int>)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 2 Data size: 558 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 292 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 558 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/cbo/ql/src/test/results/clientpositive/inputddl8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/inputddl8.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/inputddl8.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/inputddl8.q.out Mon Sep 15 22:46:44 2014
@@ -30,6 +30,10 @@ lint                	array<int>         
 lstring             	array<string>       	from deserializer   
 lintstring          	array<struct<myint:int,mystring:string,underscore_int:int>>	from deserializer   
 mstringstring       	map<string,string>  	from deserializer   
+attributes          	map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>>	from deserializer   
+unionfield1         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
+unionfield2         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
+unionfield3         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
 ds                  	string              	                    
 country             	string              	                    
 	 	 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/join_thrift.q.out Mon Sep 15 22:46:44 2014
@@ -10,6 +10,10 @@ lint                	array<int>         
 lstring             	array<string>       	from deserializer   
 lintstring          	array<struct<myint:int,mystring:string,underscore_int:int>>	from deserializer   
 mstringstring       	map<string,string>  	from deserializer   
+attributes          	map<string,map<string,map<string,uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>>>>	from deserializer   
+unionfield1         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
+unionfield2         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
+unionfield3         	uniontype<int,bigint,string,double,boolean,array<string>,map<string,string>>	from deserializer   
 PREHOOK: query: EXPLAIN
 SELECT s1.aint, s2.lintstring
 FROM src_thrift s1
@@ -32,27 +36,27 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: s2
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: aint is not null (type: boolean)
-              Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: aint (type: int)
                 sort order: +
                 Map-reduce partition columns: aint (type: int)
-                Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
                 value expressions: lintstring (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
           TableScan
             alias: s1
-            Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: aint is not null (type: boolean)
-              Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: aint (type: int)
                 sort order: +
                 Map-reduce partition columns: aint (type: int)
-                Statistics: Num rows: 6 Data size: 875 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 6 Data size: 1674 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -60,15 +64,15 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col3}
-          outputColumnNames: _col0, _col13
-          Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+          outputColumnNames: _col0, _col17
+          Statistics: Num rows: 6 Data size: 1841 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col13 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
+            expressions: _col0 (type: int), _col17 (type: array<struct<myint:int,mystring:string,underscore_int:int>>)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 6 Data size: 1841 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 6 Data size: 962 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 6 Data size: 1841 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/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out Mon Sep 15 22:46:44 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out Mon Sep 15 22:46:44 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out Mon Sep 15 22:46:44 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out Mon Sep 15 22:46:44 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out Mon Sep 15 22:46:44 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out Mon Sep 15 22:46:44 2014
@@ -202,12 +202,16 @@ STAGE PLANS:
     Stats-Aggr Operator
 
   Stage: Stage-3
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 
   Stage: Stage-5
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out Mon Sep 15 22:46:44 2014
@@ -176,12 +176,16 @@ STAGE PLANS:
     Stats-Aggr Operator
 
   Stage: Stage-3
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 
   Stage: Stage-5
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          RCFile Merge Operator
       merge level: block
       input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out?rev=1625176&r1=1625175&r2=1625176&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out Mon Sep 15 22:46:44 2014
@@ -111,12 +111,16 @@ STAGE PLANS:
     Stats-Aggr Operator
 
   Stage: Stage-3
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          ORC File Merge Operator
       merge level: stripe
       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
 
   Stage: Stage-5
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          ORC File Merge Operator
       merge level: stripe
       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
 
@@ -270,12 +274,16 @@ STAGE PLANS:
     Stats-Aggr Operator
 
   Stage: Stage-3
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          ORC File Merge Operator
       merge level: stripe
       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
 
   Stage: Stage-5
-    Merge Work
+    Merge File Operator
+      Map Operator Tree:
+          ORC File Merge Operator
       merge level: stripe
       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat