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 2015/03/18 06:40:11 UTC

svn commit: r1667456 [15/16] - in /hive/branches/llap: ./ beeline/src/java/org/apache/hive/beeline/ common/src/java/org/apache/hadoop/hive/conf/ contrib/src/test/queries/clientnegative/ contrib/src/test/queries/clientpositive/ contrib/src/test/results/...

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_18.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_18.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_18.q.out Wed Mar 18 05:40:07 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, ds st
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -50,18 +50,18 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1 partition (ds)
 SELECT *
 FROM (
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
   UNION ALL
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1 partition (ds)
 SELECT *
 FROM (
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
   UNION ALL
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -169,9 +169,9 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1 partition (ds)
 SELECT *
 FROM (
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
   UNION ALL
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -179,9 +179,9 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1 partition (ds)
 SELECT *
 FROM (
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
   UNION ALL
-  SELECT key, count(1) as values, ds from inputTbl1 group by key, ds
+  SELECT key, count(1) as `values`, ds from inputTbl1 group by key, ds
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -251,31 +251,31 @@ ds=13
 ds=17
 ds=18
 ds=28
-PREHOOK: query: select * from outputTbl1 where ds = '11' order by key, values
+PREHOOK: query: select * from outputTbl1 where ds = '11' order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 PREHOOK: Input: default@outputtbl1@ds=11
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds = '11' order by key, values
+POSTHOOK: query: select * from outputTbl1 where ds = '11' order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 POSTHOOK: Input: default@outputtbl1@ds=11
 #### A masked pattern was here ####
 1	1	11
 1	1	11
-PREHOOK: query: select * from outputTbl1 where ds = '18' order by key, values
+PREHOOK: query: select * from outputTbl1 where ds = '18' order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 PREHOOK: Input: default@outputtbl1@ds=18
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds = '18' order by key, values
+POSTHOOK: query: select * from outputTbl1 where ds = '18' order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 POSTHOOK: Input: default@outputtbl1@ds=18
 #### A masked pattern was here ####
 8	1	18
 8	1	18
-PREHOOK: query: select * from outputTbl1 where ds is not null order by key, values, ds
+PREHOOK: query: select * from outputTbl1 where ds is not null order by key, `values`, ds
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 PREHOOK: Input: default@outputtbl1@ds=11
@@ -285,7 +285,7 @@ PREHOOK: Input: default@outputtbl1@ds=17
 PREHOOK: Input: default@outputtbl1@ds=18
 PREHOOK: Input: default@outputtbl1@ds=28
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 where ds is not null order by key, values, ds
+POSTHOOK: query: select * from outputTbl1 where ds is not null order by key, `values`, ds
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 POSTHOOK: Input: default@outputtbl1@ds=11

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_19.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_19.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_19.q.out Wed Mar 18 05:40:07 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -48,20 +48,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@inputtbl1
 PREHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -157,21 +157,21 @@ STAGE PLANS:
                 name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -235,21 +235,21 @@ POSTHOOK: Input: default@outputtbl1
 PREHOOK: query: -- filter should be fine
 explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a where a.key = 7
 PREHOOK: type: QUERY
 POSTHOOK: query: -- filter should be fine
 explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a where a.key = 7
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -351,21 +351,21 @@ STAGE PLANS:
                 name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a where a.key = 7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values
+SELECT a.key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a where a.key = 7
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -385,26 +385,26 @@ POSTHOOK: Input: default@outputtbl1
 PREHOOK: query: -- filters and sub-queries should be fine
 explain
 insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
 (
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 ) b where b.key >= 7
 PREHOOK: type: QUERY
 POSTHOOK: query: -- filters and sub-queries should be fine
 explain
 insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
 (
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 ) b where b.key >= 7
 POSTHOOK: type: QUERY
@@ -515,26 +515,26 @@ STAGE PLANS:
                   name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
 (
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 ) b where b.key >= 7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-select key, values from
+select key, `values` from
 (
-SELECT a.key + a.key as key, a.values
+SELECT a.key + a.key as key, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 ) b where b.key >= 7
 POSTHOOK: type: QUERY
@@ -542,11 +542,11 @@ POSTHOOK: Input: default@inputtbl1
 POSTHOOK: Output: default@outputtbl1
 POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_2.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_2.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_2.q.out Wed Mar 18 05:40:07 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -48,22 +48,22 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -162,11 +162,11 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -174,11 +174,11 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -221,11 +221,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_20.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_20.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_20.q.out Wed Mar 18 05:40:07 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile
+PREHOOK: query: create table outputTbl1(`values` bigint, key string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile
+POSTHOOK: query: create table outputTbl1(`values` bigint, key string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -46,20 +46,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@inputtbl1
 PREHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -163,21 +163,21 @@ STAGE PLANS:
                   name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.values, a.key
+SELECT a.`values`, a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -220,11 +220,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_21.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_21.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_21.q.out Wed Mar 18 05:40:07 2015
@@ -48,18 +48,18 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -151,9 +151,9 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -161,9 +161,9 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT a.key
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_22.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_22.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_22.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_22.q.out Wed Mar 18 05:40:07 2015
@@ -26,11 +26,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint, values2 bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint, values2 bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -44,20 +44,20 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@inputtbl1
 PREHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -161,21 +161,21 @@ STAGE PLANS:
                   name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, a.values, a.values
+SELECT a.key, a.`values`, a.`values`
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -240,20 +240,20 @@ POSTHOOK: Input: default@outputtbl1
 8	2	2
 PREHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -357,21 +357,21 @@ STAGE PLANS:
                   name: default.outputtbl1
 
 PREHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
-SELECT a.key, concat(a.values, a.values), concat(a.values, a.values)
+SELECT a.key, concat(a.`values`, a.`values`), concat(a.`values`, a.`values`)
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -379,11 +379,11 @@ POSTHOOK: Output: default@outputtbl1
 POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
 POSTHOOK: Lineage: outputtbl1.values2 EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_23.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_23.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_23.q.out Wed Mar 18 05:40:07 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -48,20 +48,20 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from  
+  SELECT key, count(1) as `values` from  
   (SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) subq2
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from  
+  SELECT key, count(1) as `values` from  
   (SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) subq2
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -195,10 +195,10 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from  
+  SELECT key, count(1) as `values` from  
   (SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) subq2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -206,10 +206,10 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from  
+  SELECT key, count(1) as `values` from  
   (SELECT a.key, b.val from inputTbl1 a join inputTbl1 b on a.key=b.key) subq group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) subq2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -252,11 +252,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_24.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_24.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_24.q.out Wed Mar 18 05:40:07 2015
@@ -24,11 +24,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key double, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key double, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -44,18 +44,18 @@ PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE outputTbl1
 SELECT * FROM
 (
-  SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
   UNION ALL
-  SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE outputTbl1
 SELECT * FROM
 (
-  SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
   UNION ALL
-  SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -161,9 +161,9 @@ STAGE PLANS:
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
 SELECT * FROM
 (
-  SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
   UNION ALL
-  SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -171,9 +171,9 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: INSERT OVERWRITE TABLE outputTbl1
 SELECT * FROM
 (
-  SELECT CAST(key AS DOUBLE) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS DOUBLE) AS key, count(1) as `values` FROM inputTbl1 group by key
   UNION ALL
-  SELECT CAST(key AS BIGINT) AS key, count(1) as values FROM inputTbl1 group by key
+  SELECT CAST(key AS BIGINT) AS key, count(1) as `values` FROM inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -216,11 +216,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_25.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_25.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_25.q.out Wed Mar 18 05:40:07 2015
@@ -26,27 +26,27 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) partitioned by (ds string) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) partitioned by (ds string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) partitioned by (ds string) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) partitioned by (ds string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl2
-PREHOOK: query: create table outputTbl3(key string, values bigint) partitioned by (ds string,hr string) stored as textfile
+PREHOOK: query: create table outputTbl3(key string, `values` bigint) partitioned by (ds string,hr string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl3
-POSTHOOK: query: create table outputTbl3(key string, values bigint) partitioned by (ds string,hr string) stored as textfile
+POSTHOOK: query: create table outputTbl3(key string, `values` bigint) partitioned by (ds string,hr string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl3
@@ -62,18 +62,18 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1 partition(ds='2004')
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1 partition(ds='2004')
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -173,9 +173,9 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1 partition(ds='2004')
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -183,9 +183,9 @@ PREHOOK: Output: default@outputtbl1@ds=2
 POSTHOOK: query: insert overwrite table outputTbl1 partition(ds='2004')
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -233,12 +233,12 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 PREHOOK: Input: default@outputtbl1@ds=2004
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 POSTHOOK: Input: default@outputtbl1@ds=2004

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_3.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_3.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_3.q.out Wed Mar 18 05:40:07 2015
@@ -28,11 +28,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -48,22 +48,22 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 3 as values from inputTbl1
+  SELECT key, 3 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 3 as values from inputTbl1
+  SELECT key, 3 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -151,11 +151,11 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 3 as values from inputTbl1
+  SELECT key, 3 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -163,11 +163,11 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 3 as values from inputTbl1
+  SELECT key, 3 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -210,11 +210,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_4.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_4.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_4.q.out Wed Mar 18 05:40:07 2015
@@ -26,11 +26,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -46,18 +46,18 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -199,9 +199,9 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -209,9 +209,9 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -254,11 +254,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_5.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_5.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_5.q.out Wed Mar 18 05:40:07 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -50,22 +50,22 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -208,11 +208,11 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -220,11 +220,11 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -267,11 +267,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6.q.out Wed Mar 18 05:40:07 2015
@@ -20,19 +20,19 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl2
@@ -46,18 +46,18 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@inputtbl1
 PREHOOK: query: explain
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 insert overwrite table outputTbl1 select *
 insert overwrite table outputTbl2 select *
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 insert overwrite table outputTbl1 select *
 insert overwrite table outputTbl2 select *
@@ -205,9 +205,9 @@ STAGE PLANS:
                 serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
 PREHOOK: query: FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 insert overwrite table outputTbl1 select *
 insert overwrite table outputTbl2 select *
@@ -216,9 +216,9 @@ PREHOOK: Input: default@inputtbl1
 PREHOOK: Output: default@outputtbl1
 PREHOOK: Output: default@outputtbl2
 POSTHOOK: query: FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 insert overwrite table outputTbl1 select *
 insert overwrite table outputTbl2 select *
@@ -230,11 +230,11 @@ POSTHOOK: Lineage: outputtbl1.key EXPRES
 POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
 POSTHOOK: Lineage: outputtbl2.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: outputtbl2.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
@@ -248,11 +248,11 @@ POSTHOOK: Input: default@outputtbl1
 7	1
 8	2
 8	2
-PREHOOK: query: select * from outputTbl2 order by key, values
+PREHOOK: query: select * from outputTbl2 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl2 order by key, values
+POSTHOOK: query: select * from outputTbl2 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl2
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6_subq.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6_subq.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_6_subq.q.out Wed Mar 18 05:40:07 2015
@@ -20,19 +20,19 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
-PREHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+PREHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl2
-POSTHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile
+POSTHOOK: query: create table outputTbl2(key string, `values` bigint) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl2
@@ -47,9 +47,9 @@ POSTHOOK: Output: default@inputtbl1
 PREHOOK: query: explain
 FROM (
   select * from(
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   )subq
 ) a
 insert overwrite table outputTbl1 select *
@@ -58,9 +58,9 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain
 FROM (
   select * from(
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   )subq
 ) a
 insert overwrite table outputTbl1 select *
@@ -210,9 +210,9 @@ STAGE PLANS:
 
 PREHOOK: query: FROM (
   select * from(
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   )subq
 ) a
 insert overwrite table outputTbl1 select *
@@ -223,9 +223,9 @@ PREHOOK: Output: default@outputtbl1
 PREHOOK: Output: default@outputtbl2
 POSTHOOK: query: FROM (
   select * from(
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   )subq
 ) a
 insert overwrite table outputTbl1 select *
@@ -238,11 +238,11 @@ POSTHOOK: Lineage: outputtbl1.key EXPRES
 POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
 POSTHOOK: Lineage: outputtbl2.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: outputtbl2.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ]
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
@@ -256,11 +256,11 @@ POSTHOOK: Input: default@outputtbl1
 7	1
 8	2
 8	2
-PREHOOK: query: select * from outputTbl2 order by key, values
+PREHOOK: query: select * from outputTbl2 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl2 order by key, values
+POSTHOOK: query: select * from outputTbl2 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl2
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_7.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_7.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_7.q.out Wed Mar 18 05:40:07 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -50,18 +50,18 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -159,9 +159,9 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -169,9 +169,9 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -214,11 +214,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_8.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_8.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_8.q.out Wed Mar 18 05:40:07 2015
@@ -32,11 +32,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -52,22 +52,22 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -166,11 +166,11 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
@@ -178,11 +178,11 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT *
 FROM (
-  SELECT key, count(1) as values from inputTbl1 group by key
+  SELECT key, count(1) as `values` from inputTbl1 group by key
   UNION ALL
-  SELECT key, 1 as values from inputTbl1
+  SELECT key, 1 as `values` from inputTbl1
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
@@ -225,11 +225,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/union_remove_9.q.out Wed Mar 18 05:40:07 2015
@@ -30,11 +30,11 @@ create table inputTbl1(key string, val s
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputTbl1
-PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+PREHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@outputTbl1
-POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile
+POSTHOOK: query: create table outputTbl1(key string, `values` bigint) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@outputTbl1
@@ -50,12 +50,12 @@ PREHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT * FROM
 (
-select key, count(1) as values from inputTbl1 group by key 
+select key, count(1) as `values` from inputTbl1 group by key 
 union all
 select * FROM (
-  SELECT key, 1 as values from inputTbl1 
+  SELECT key, 1 as `values` from inputTbl1 
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 )b
 PREHOOK: type: QUERY
@@ -63,12 +63,12 @@ POSTHOOK: query: explain
 insert overwrite table outputTbl1
 SELECT * FROM
 (
-select key, count(1) as values from inputTbl1 group by key 
+select key, count(1) as `values` from inputTbl1 group by key 
 union all
 select * FROM (
-  SELECT key, 1 as values from inputTbl1 
+  SELECT key, 1 as `values` from inputTbl1 
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 )b
 POSTHOOK: type: QUERY
@@ -209,12 +209,12 @@ STAGE PLANS:
 PREHOOK: query: insert overwrite table outputTbl1
 SELECT * FROM
 (
-select key, count(1) as values from inputTbl1 group by key 
+select key, count(1) as `values` from inputTbl1 group by key 
 union all
 select * FROM (
-  SELECT key, 1 as values from inputTbl1 
+  SELECT key, 1 as `values` from inputTbl1 
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 )b
 PREHOOK: type: QUERY
@@ -223,12 +223,12 @@ PREHOOK: Output: default@outputtbl1
 POSTHOOK: query: insert overwrite table outputTbl1
 SELECT * FROM
 (
-select key, count(1) as values from inputTbl1 group by key 
+select key, count(1) as `values` from inputTbl1 group by key 
 union all
 select * FROM (
-  SELECT key, 1 as values from inputTbl1 
+  SELECT key, 1 as `values` from inputTbl1 
   UNION ALL
-  SELECT key, 2 as values from inputTbl1
+  SELECT key, 2 as `values` from inputTbl1
 ) a
 )b
 POSTHOOK: type: QUERY
@@ -272,11 +272,11 @@ Bucket Columns:     	[]
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: select * from outputTbl1 order by key, values
+PREHOOK: query: select * from outputTbl1 order by key, `values`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from outputTbl1 order by key, values
+POSTHOOK: query: select * from outputTbl1 order by key, `values`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@outputtbl1
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out Wed Mar 18 05:40:07 2015
@@ -2,9 +2,9 @@ PREHOOK: query: DROP TABLE IF EXISTS dec
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS decimal_txt
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: DROP TABLE IF EXISTS decimal
+PREHOOK: query: DROP TABLE IF EXISTS `decimal`
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS decimal
+POSTHOOK: query: DROP TABLE IF EXISTS `decimal`
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE decimal_txt (dec decimal)
 PREHOOK: type: CREATETABLE
@@ -22,21 +22,21 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@decimal_txt
-PREHOOK: query: CREATE TABLE DECIMAL STORED AS ORC AS SELECT * FROM decimal_txt
+PREHOOK: query: CREATE TABLE `DECIMAL` STORED AS ORC AS SELECT * FROM decimal_txt
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@decimal_txt
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DECIMAL
-POSTHOOK: query: CREATE TABLE DECIMAL STORED AS ORC AS SELECT * FROM decimal_txt
+POSTHOOK: query: CREATE TABLE `DECIMAL` STORED AS ORC AS SELECT * FROM decimal_txt
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@decimal_txt
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DECIMAL
 PREHOOK: query: EXPLAIN
-SELECT dec FROM DECIMAL order by dec
+SELECT dec FROM `DECIMAL` order by dec
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN
-SELECT dec FROM DECIMAL order by dec
+SELECT dec FROM `DECIMAL` order by dec
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -77,11 +77,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: SELECT dec FROM DECIMAL order by dec
+PREHOOK: query: SELECT dec FROM `DECIMAL` order by dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dec FROM DECIMAL order by dec
+POSTHOOK: query: SELECT dec FROM `DECIMAL` order by dec
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal
 #### A masked pattern was here ####
@@ -95,11 +95,11 @@ POSTHOOK: query: DROP TABLE DECIMAL_txt
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@decimal_txt
 POSTHOOK: Output: default@decimal_txt
-PREHOOK: query: DROP TABLE DECIMAL
+PREHOOK: query: DROP TABLE `DECIMAL`
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@decimal
 PREHOOK: Output: default@decimal
-POSTHOOK: query: DROP TABLE DECIMAL
+POSTHOOK: query: DROP TABLE `DECIMAL`
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@decimal
 POSTHOOK: Output: default@decimal

Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java (original)
+++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java Wed Mar 18 05:40:07 2015
@@ -528,7 +528,7 @@ public class ThriftTestObj implements or
                 struct.field3 = new ArrayList<InnerStruct>(_list0.size);
                 for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                 {
-                  InnerStruct _elem2; // optional
+                  InnerStruct _elem2; // required
                   _elem2 = new InnerStruct();
                   _elem2.read(iprot);
                   struct.field3.add(_elem2);
@@ -636,7 +636,7 @@ public class ThriftTestObj implements or
           struct.field3 = new ArrayList<InnerStruct>(_list5.size);
           for (int _i6 = 0; _i6 < _list5.size; ++_i6)
           {
-            InnerStruct _elem7; // optional
+            InnerStruct _elem7; // required
             _elem7 = new InnerStruct();
             _elem7.read(iprot);
             struct.field3.add(_elem7);

Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java (original)
+++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java Wed Mar 18 05:40:07 2015
@@ -1211,7 +1211,7 @@ public class Complex implements org.apac
                 struct.lint = new ArrayList<Integer>(_list18.size);
                 for (int _i19 = 0; _i19 < _list18.size; ++_i19)
                 {
-                  int _elem20; // optional
+                  int _elem20; // required
                   _elem20 = iprot.readI32();
                   struct.lint.add(_elem20);
                 }
@@ -1229,7 +1229,7 @@ public class Complex implements org.apac
                 struct.lString = new ArrayList<String>(_list21.size);
                 for (int _i22 = 0; _i22 < _list21.size; ++_i22)
                 {
-                  String _elem23; // optional
+                  String _elem23; // required
                   _elem23 = iprot.readString();
                   struct.lString.add(_elem23);
                 }
@@ -1247,7 +1247,7 @@ public class Complex implements org.apac
                 struct.lintString = new ArrayList<IntString>(_list24.size);
                 for (int _i25 = 0; _i25 < _list24.size; ++_i25)
                 {
-                  IntString _elem26; // optional
+                  IntString _elem26; // required
                   _elem26 = new IntString();
                   _elem26.read(iprot);
                   struct.lintString.add(_elem26);
@@ -1610,7 +1610,7 @@ public class Complex implements org.apac
           struct.lint = new ArrayList<Integer>(_list57.size);
           for (int _i58 = 0; _i58 < _list57.size; ++_i58)
           {
-            int _elem59; // optional
+            int _elem59; // required
             _elem59 = iprot.readI32();
             struct.lint.add(_elem59);
           }
@@ -1623,7 +1623,7 @@ public class Complex implements org.apac
           struct.lString = new ArrayList<String>(_list60.size);
           for (int _i61 = 0; _i61 < _list60.size; ++_i61)
           {
-            String _elem62; // optional
+            String _elem62; // required
             _elem62 = iprot.readString();
             struct.lString.add(_elem62);
           }
@@ -1636,7 +1636,7 @@ public class Complex implements org.apac
           struct.lintString = new ArrayList<IntString>(_list63.size);
           for (int _i64 = 0; _i64 < _list63.size; ++_i64)
           {
-            IntString _elem65; // optional
+            IntString _elem65; // required
             _elem65 = new IntString();
             _elem65.read(iprot);
             struct.lintString.add(_elem65);

Modified: hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java?rev=1667456&r1=1667455&r2=1667456&view=diff
==============================================================================
--- hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java (original)
+++ hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java Wed Mar 18 05:40:07 2015
@@ -2280,7 +2280,7 @@ public class MegaStruct implements org.a
                     _val19 = new ArrayList<String>(_list20.size);
                     for (int _i21 = 0; _i21 < _list20.size; ++_i21)
                     {
-                      String _elem22; // optional
+                      String _elem22; // required
                       _elem22 = iprot.readString();
                       _val19.add(_elem22);
                     }
@@ -2310,7 +2310,7 @@ public class MegaStruct implements org.a
                     _val26 = new ArrayList<MiniStruct>(_list27.size);
                     for (int _i28 = 0; _i28 < _list27.size; ++_i28)
                     {
-                      MiniStruct _elem29; // optional
+                      MiniStruct _elem29; // required
                       _elem29 = new MiniStruct();
                       _elem29.read(iprot);
                       _val26.add(_elem29);
@@ -2333,7 +2333,7 @@ public class MegaStruct implements org.a
                 struct.my_stringlist = new ArrayList<String>(_list30.size);
                 for (int _i31 = 0; _i31 < _list30.size; ++_i31)
                 {
-                  String _elem32; // optional
+                  String _elem32; // required
                   _elem32 = iprot.readString();
                   struct.my_stringlist.add(_elem32);
                 }
@@ -2351,7 +2351,7 @@ public class MegaStruct implements org.a
                 struct.my_structlist = new ArrayList<MiniStruct>(_list33.size);
                 for (int _i34 = 0; _i34 < _list33.size; ++_i34)
                 {
-                  MiniStruct _elem35; // optional
+                  MiniStruct _elem35; // required
                   _elem35 = new MiniStruct();
                   _elem35.read(iprot);
                   struct.my_structlist.add(_elem35);
@@ -2370,7 +2370,7 @@ public class MegaStruct implements org.a
                 struct.my_enumlist = new ArrayList<MyEnum>(_list36.size);
                 for (int _i37 = 0; _i37 < _list36.size; ++_i37)
                 {
-                  MyEnum _elem38; // optional
+                  MyEnum _elem38; // required
                   _elem38 = MyEnum.findByValue(iprot.readI32());
                   struct.my_enumlist.add(_elem38);
                 }
@@ -2388,7 +2388,7 @@ public class MegaStruct implements org.a
                 struct.my_stringset = new HashSet<String>(2*_set39.size);
                 for (int _i40 = 0; _i40 < _set39.size; ++_i40)
                 {
-                  String _elem41; // optional
+                  String _elem41; // required
                   _elem41 = iprot.readString();
                   struct.my_stringset.add(_elem41);
                 }
@@ -2406,7 +2406,7 @@ public class MegaStruct implements org.a
                 struct.my_enumset = new HashSet<MyEnum>(2*_set42.size);
                 for (int _i43 = 0; _i43 < _set42.size; ++_i43)
                 {
-                  MyEnum _elem44; // optional
+                  MyEnum _elem44; // required
                   _elem44 = MyEnum.findByValue(iprot.readI32());
                   struct.my_enumset.add(_elem44);
                 }
@@ -2424,7 +2424,7 @@ public class MegaStruct implements org.a
                 struct.my_structset = new HashSet<MiniStruct>(2*_set45.size);
                 for (int _i46 = 0; _i46 < _set45.size; ++_i46)
                 {
-                  MiniStruct _elem47; // optional
+                  MiniStruct _elem47; // required
                   _elem47 = new MiniStruct();
                   _elem47.read(iprot);
                   struct.my_structset.add(_elem47);
@@ -3023,7 +3023,7 @@ public class MegaStruct implements org.a
               _val95 = new ArrayList<String>(_list96.size);
               for (int _i97 = 0; _i97 < _list96.size; ++_i97)
               {
-                String _elem98; // optional
+                String _elem98; // required
                 _elem98 = iprot.readString();
                 _val95.add(_elem98);
               }
@@ -3047,7 +3047,7 @@ public class MegaStruct implements org.a
               _val102 = new ArrayList<MiniStruct>(_list103.size);
               for (int _i104 = 0; _i104 < _list103.size; ++_i104)
               {
-                MiniStruct _elem105; // optional
+                MiniStruct _elem105; // required
                 _elem105 = new MiniStruct();
                 _elem105.read(iprot);
                 _val102.add(_elem105);
@@ -3064,7 +3064,7 @@ public class MegaStruct implements org.a
           struct.my_stringlist = new ArrayList<String>(_list106.size);
           for (int _i107 = 0; _i107 < _list106.size; ++_i107)
           {
-            String _elem108; // optional
+            String _elem108; // required
             _elem108 = iprot.readString();
             struct.my_stringlist.add(_elem108);
           }
@@ -3077,7 +3077,7 @@ public class MegaStruct implements org.a
           struct.my_structlist = new ArrayList<MiniStruct>(_list109.size);
           for (int _i110 = 0; _i110 < _list109.size; ++_i110)
           {
-            MiniStruct _elem111; // optional
+            MiniStruct _elem111; // required
             _elem111 = new MiniStruct();
             _elem111.read(iprot);
             struct.my_structlist.add(_elem111);
@@ -3091,7 +3091,7 @@ public class MegaStruct implements org.a
           struct.my_enumlist = new ArrayList<MyEnum>(_list112.size);
           for (int _i113 = 0; _i113 < _list112.size; ++_i113)
           {
-            MyEnum _elem114; // optional
+            MyEnum _elem114; // required
             _elem114 = MyEnum.findByValue(iprot.readI32());
             struct.my_enumlist.add(_elem114);
           }
@@ -3104,7 +3104,7 @@ public class MegaStruct implements org.a
           struct.my_stringset = new HashSet<String>(2*_set115.size);
           for (int _i116 = 0; _i116 < _set115.size; ++_i116)
           {
-            String _elem117; // optional
+            String _elem117; // required
             _elem117 = iprot.readString();
             struct.my_stringset.add(_elem117);
           }
@@ -3117,7 +3117,7 @@ public class MegaStruct implements org.a
           struct.my_enumset = new HashSet<MyEnum>(2*_set118.size);
           for (int _i119 = 0; _i119 < _set118.size; ++_i119)
           {
-            MyEnum _elem120; // optional
+            MyEnum _elem120; // required
             _elem120 = MyEnum.findByValue(iprot.readI32());
             struct.my_enumset.add(_elem120);
           }
@@ -3130,7 +3130,7 @@ public class MegaStruct implements org.a
           struct.my_structset = new HashSet<MiniStruct>(2*_set121.size);
           for (int _i122 = 0; _i122 < _set121.size; ++_i122)
           {
-            MiniStruct _elem123; // optional
+            MiniStruct _elem123; // required
             _elem123 = new MiniStruct();
             _elem123.read(iprot);
             struct.my_structset.add(_elem123);