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 2013/12/20 20:55:30 UTC

svn commit: r1552798 [2/4] - in /hive/branches/tez: ./ ant/src/org/apache/hadoop/hive/ant/ beeline/src/test/org/apache/hive/beeline/src/test/ common/src/java/org/apache/hadoop/hive/conf/ conf/ data/files/ hcatalog/webhcat/svr/src/main/java/org/apache/h...

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_part.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_part.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_part.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_part.q Fri Dec 20 19:55:28 2013
@@ -7,7 +7,7 @@ create table if not exists loc_staging (
   state string,
   locid int,
   zip bigint,
-  year int
+  year string
 ) row format delimited fields terminated by '|' stored as textfile;
 
 LOAD DATA LOCAL INPATH '../../data/files/loc.txt' OVERWRITE INTO TABLE loc_staging;
@@ -16,7 +16,7 @@ create table if not exists loc_orc (
   state string,
   locid int,
   zip bigint
-) partitioned by(year int) stored as orc;
+) partitioned by(year string) stored as orc;
 
 -- basicStatState: NONE colStatState: NONE
 explain extended select * from loc_orc;
@@ -29,7 +29,7 @@ insert overwrite table loc_orc partition
 explain extended select * from loc_orc;
 
 -- partition level analyze statistics for specific parition
-analyze table loc_orc partition(year=2001) compute statistics;
+analyze table loc_orc partition(year='2001') compute statistics;
 
 -- basicStatState: PARTIAL colStatState: NONE
 explain extended select * from loc_orc where year='__HIVE_DEFAULT_PARTITION__';
@@ -38,7 +38,7 @@ explain extended select * from loc_orc w
 explain extended select * from loc_orc;
 
 -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001;
+explain extended select * from loc_orc where year='2001';
 
 -- partition level analyze statistics for all partitions
 analyze table loc_orc partition(year) compute statistics;
@@ -50,14 +50,14 @@ explain extended select * from loc_orc w
 explain extended select * from loc_orc;
 
 -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001 or year='__HIVE_DEFAULT_PARTITION__';
+explain extended select * from loc_orc where year='2001' or year='__HIVE_DEFAULT_PARTITION__';
 
 -- both partitions will be pruned
 -- basicStatState: NONE colStatState: NONE
-explain extended select * from loc_orc where year=2001 and year='__HIVE_DEFAULT_PARTITION__';
+explain extended select * from loc_orc where year='2001' and year='__HIVE_DEFAULT_PARTITION__';
 
 -- partition level partial column statistics
-analyze table loc_orc partition(year=2001) compute statistics for columns state,locid;
+analyze table loc_orc partition(year='2001') compute statistics for columns state,locid;
 
 -- basicStatState: COMPLETE colStatState: NONE
 explain extended select zip from loc_orc;
@@ -70,16 +70,16 @@ explain extended select state from loc_o
 explain extended select state,locid from loc_orc;
 
 -- basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select state,locid from loc_orc where year=2001;
+explain extended select state,locid from loc_orc where year='2001';
 
 -- basicStatState: COMPLETE colStatState: NONE
-explain extended select state,locid from loc_orc where year!=2001;
+explain extended select state,locid from loc_orc where year!='2001';
 
 -- basicStatState: COMPLETE colStatState: PARTIAL
 explain extended select * from loc_orc;
 
 -- This is to test filter expression evaluation on partition column
 -- numRows: 2 dataSize: 8 basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select locid from loc_orc where locid>0 and year=2001;
-explain extended select locid,year from loc_orc where locid>0 and year=2001;
-explain extended select * from (select locid,year from loc_orc) test where locid>0 and year=2001;
+explain extended select locid from loc_orc where locid>0 and year='2001';
+explain extended select locid,year from loc_orc where locid>0 and year='2001';
+explain extended select * from (select locid,year from loc_orc) test where locid>0 and year='2001';

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q Fri Dec 20 19:55:28 2013
@@ -1,19 +1,19 @@
-create table dynamic_part_table(intcol int) partitioned by (partcol1 int, partcol2 int);
+create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string);
 
 set hive.exec.dynamic.partition.mode=nonstrict;
 
-insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, 1 from src where key=150;
+insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150;
 
-insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, 1 from src where key=150;
+insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, '1' from src where key=150;
 
-insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, NULL from src where key=150;
+insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', NULL from src where key=150;
 
-insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, NULL from src where key=150;
+insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, NULL from src where key=150;
 
-explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1;
+explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1';
 
 set hive.exec.dynamic.partition.mode=strict;
 
-explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1;
+explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1';
 
-explain extended select intcol from dynamic_part_table where (partcol1=1 and partcol2=1)or (partcol1=1 and partcol2='__HIVE_DEFAULT_PARTITION__');
+explain extended select intcol from dynamic_part_table where (partcol1='1' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__');

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/regex_col.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/regex_col.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/regex_col.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/regex_col.q Fri Dec 20 19:55:28 2013
@@ -1,3 +1,5 @@
+set hive.support.quoted.identifiers=none;
+
 EXPLAIN
 SELECT * FROM srcpart;
 

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/show_tablestatus.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/show_tablestatus.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/show_tablestatus.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/show_tablestatus.q Fri Dec 20 19:55:28 2013
@@ -1,3 +1,4 @@
+set hive.support.quoted.identifiers=none;
 EXPLAIN 
 SHOW TABLE EXTENDED IN default LIKE `src`;
 

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/udf_index.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/udf_index.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/udf_index.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/udf_index.q Fri Dec 20 19:55:28 2013
@@ -1,2 +1,3 @@
+set hive.support.quoted.identifiers=none;
 DESCRIBE FUNCTION `index`;
 DESCRIBE FUNCTION EXTENDED `index`;

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_12.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_12.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_12.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_12.q Fri Dec 20 19:55:28 2013
@@ -28,5 +28,5 @@ WHERE    (((ctimestamp1 IS NULL)
               OR ((cboolean2 <= 1)
                   AND (cbigint >= csmallint))))
 GROUP BY cbigint, cboolean1, cstring1, ctimestamp1, cdouble
-ORDER BY ctimestamp1, cdouble;
+ORDER BY ctimestamp1, cdouble, cbigint, cstring1;
 

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_14.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_14.q?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_14.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/vectorization_14.q Fri Dec 20 19:55:28 2013
@@ -29,5 +29,5 @@ WHERE    (((ctinyint <= cbigint)
               AND ((cbigint > -257)
                   OR (cfloat < cint))))
 GROUP BY ctimestamp1, cfloat, cstring1, cboolean1, cdouble
-ORDER BY cstring1, cfloat, cdouble;
+ORDER BY cstring1, cfloat, cdouble, ctimestamp1;
 

Modified: hive/branches/tez/ql/src/test/results/clientnegative/invalidate_view1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/invalidate_view1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/invalidate_view1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/invalidate_view1.q.out Fri Dec 20 19:55:28 2013
@@ -37,7 +37,7 @@ POSTHOOK: query: ALTER TABLE xxx10 REPLA
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@xxx10
 POSTHOOK: Output: default@xxx10
-FAILED: SemanticException Line 1:30 Invalid column reference '`value`' in definition of VIEW xxx9 [
+FAILED: SemanticException Line 1:30 Invalid column reference 'value' in definition of VIEW xxx9 [
 SELECT `xxx10`.`key`, `xxx10`.`value` FROM `default`.`xxx10`
 ] used as xxx at Line 1:39 in definition of VIEW xxx8 [
 SELECT `xxx`.`key`, `xxx`.`value` FROM `default`.`xxx9` `xxx`

Modified: hive/branches/tez/ql/src/test/results/clientnegative/regex_col_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/regex_col_1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/regex_col_1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/regex_col_1.q.out Fri Dec 20 19:55:28 2013
@@ -1,3 +1,3 @@
-FAILED: SemanticException Line 2:7 Invalid column reference '`+++`': Dangling meta character '+' near index 0
+FAILED: SemanticException Line 3:7 Invalid column reference '`+++`': Dangling meta character '+' near index 0
 +++
 ^

Modified: hive/branches/tez/ql/src/test/results/clientnegative/regex_col_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/regex_col_2.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/regex_col_2.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/regex_col_2.q.out Fri Dec 20 19:55:28 2013
@@ -1 +1 @@
-FAILED: SemanticException [Error 10002]: Line 2:7 Invalid column reference '`.a.`'
+FAILED: SemanticException [Error 10002]: Line 3:7 Invalid column reference '`.a.`'

Modified: hive/branches/tez/ql/src/test/results/clientnegative/regex_col_groupby.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/regex_col_groupby.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/regex_col_groupby.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/regex_col_groupby.q.out Fri Dec 20 19:55:28 2013
@@ -1 +1 @@
-FAILED: SemanticException [Error 10004]: Line 2:44 Invalid table alias or column reference '`..`': (possible column names are: key, value, ds, hr)
+FAILED: SemanticException [Error 10004]: Line 3:44 Invalid table alias or column reference '`..`': (possible column names are: key, value, ds, hr)

Modified: hive/branches/tez/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Fri Dec 20 19:55:28 2013
@@ -225,11 +225,11 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: select count(*) from alter_coltype where dt = 100
+PREHOOK: query: select count(*) from alter_coltype where dt = '100'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_coltype
 #### A masked pattern was here ####
-POSTHOOK: query: select count(*) from alter_coltype where dt = 100
+POSTHOOK: query: select count(*) from alter_coltype where dt = '100'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_coltype
 #### A masked pattern was here ####

Modified: hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_part.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_part.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_part.q.out Fri Dec 20 19:55:28 2013
@@ -2,14 +2,14 @@ PREHOOK: query: create table if not exis
   state string,
   locid int,
   zip bigint,
-  year int
+  year string
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
   zip bigint,
-  year int
+  year string
 ) row format delimited fields terminated by '|' stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@loc_staging
@@ -23,13 +23,13 @@ PREHOOK: query: create table if not exis
   state string,
   locid int,
   zip bigint
-) partitioned by(year int) stored as orc
+) partitioned by(year string) stored as orc
 PREHOOK: type: CREATETABLE
 POSTHOOK: query: create table if not exists loc_orc (
   state string,
   locid int,
   zip bigint
-) partitioned by(year int) stored as orc
+) partitioned by(year string) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@loc_orc
 PREHOOK: query: -- basicStatState: NONE colStatState: NONE
@@ -211,14 +211,14 @@ STAGE PLANS:
             ListSink
 
 PREHOOK: query: -- partition level analyze statistics for specific parition
-analyze table loc_orc partition(year=2001) compute statistics
+analyze table loc_orc partition(year='2001') compute statistics
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
 PREHOOK: Input: default@loc_orc@year=2001
 PREHOOK: Output: default@loc_orc
 PREHOOK: Output: default@loc_orc@year=2001
 POSTHOOK: query: -- partition level analyze statistics for specific parition
-analyze table loc_orc partition(year=2001) compute statistics
+analyze table loc_orc partition(year='2001') compute statistics
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
 POSTHOOK: Input: default@loc_orc@year=2001
@@ -436,10 +436,10 @@ STAGE PLANS:
             ListSink
 
 PREHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001
+explain extended select * from loc_orc where year='2001'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001
+explain extended select * from loc_orc where year='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -448,7 +448,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (= (TOK_TABLE_OR_COL year) 2001))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (= (TOK_TABLE_OR_COL year) '2001'))))
 
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
@@ -748,10 +748,10 @@ STAGE PLANS:
             ListSink
 
 PREHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001 or year='__HIVE_DEFAULT_PARTITION__'
+explain extended select * from loc_orc where year='2001' or year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select * from loc_orc where year=2001 or year='__HIVE_DEFAULT_PARTITION__'
+explain extended select * from loc_orc where year='2001' or year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -760,7 +760,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (or (= (TOK_TABLE_OR_COL year) 2001) (= (TOK_TABLE_OR_COL year) '__HIVE_DEFAULT_PARTITION__')))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (or (= (TOK_TABLE_OR_COL year) '2001') (= (TOK_TABLE_OR_COL year) '__HIVE_DEFAULT_PARTITION__')))))
 
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
@@ -871,11 +871,11 @@ STAGE PLANS:
 
 PREHOOK: query: -- both partitions will be pruned
 -- basicStatState: NONE colStatState: NONE
-explain extended select * from loc_orc where year=2001 and year='__HIVE_DEFAULT_PARTITION__'
+explain extended select * from loc_orc where year='2001' and year='__HIVE_DEFAULT_PARTITION__'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- both partitions will be pruned
 -- basicStatState: NONE colStatState: NONE
-explain extended select * from loc_orc where year=2001 and year='__HIVE_DEFAULT_PARTITION__'
+explain extended select * from loc_orc where year='2001' and year='__HIVE_DEFAULT_PARTITION__'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -884,7 +884,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (= (TOK_TABLE_OR_COL year) 2001) (= (TOK_TABLE_OR_COL year) '__HIVE_DEFAULT_PARTITION__')))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (= (TOK_TABLE_OR_COL year) '2001') (= (TOK_TABLE_OR_COL year) '__HIVE_DEFAULT_PARTITION__')))))
 
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
@@ -902,7 +902,7 @@ STAGE PLANS:
           Filter Operator
             isSamplingPred: false
             predicate:
-                expr: ((year = 2001) and (year = '__HIVE_DEFAULT_PARTITION__'))
+                expr: ((year = '2001') and (year = '__HIVE_DEFAULT_PARTITION__'))
                 type: boolean
             Statistics:
                 numRows: 0 dataSize: 0 basicStatsState: NONE colStatsState: NONE
@@ -922,13 +922,13 @@ STAGE PLANS:
               ListSink
 
 PREHOOK: query: -- partition level partial column statistics
-analyze table loc_orc partition(year=2001) compute statistics for columns state,locid
+analyze table loc_orc partition(year='2001') compute statistics for columns state,locid
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
 PREHOOK: Input: default@loc_orc@year=2001
 #### A masked pattern was here ####
 POSTHOOK: query: -- partition level partial column statistics
-analyze table loc_orc partition(year=2001) compute statistics for columns state,locid
+analyze table loc_orc partition(year='2001') compute statistics for columns state,locid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
 POSTHOOK: Input: default@loc_orc@year=2001
@@ -1397,10 +1397,10 @@ STAGE PLANS:
       limit: -1
 
 PREHOOK: query: -- basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select state,locid from loc_orc where year=2001
+explain extended select state,locid from loc_orc where year='2001'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select state,locid from loc_orc where year=2001
+explain extended select state,locid from loc_orc where year='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -1409,7 +1409,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL state)) (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (= (TOK_TABLE_OR_COL year) 2001))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL state)) (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (= (TOK_TABLE_OR_COL year) '2001'))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1508,10 +1508,10 @@ STAGE PLANS:
       limit: -1
 
 PREHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select state,locid from loc_orc where year!=2001
+explain extended select state,locid from loc_orc where year!='2001'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- basicStatState: COMPLETE colStatState: NONE
-explain extended select state,locid from loc_orc where year!=2001
+explain extended select state,locid from loc_orc where year!='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -1520,7 +1520,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL state)) (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (!= (TOK_TABLE_OR_COL year) 2001))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL state)) (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (!= (TOK_TABLE_OR_COL year) '2001'))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1536,44 +1536,37 @@ STAGE PLANS:
             Statistics:
                 numRows: 1 dataSize: 325 basicStatsState: COMPLETE colStatsState: NONE
             GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate:
-                  expr: (year <> 2001)
-                  type: boolean
+            Select Operator
+              expressions:
+                    expr: state
+                    type: string
+                    expr: locid
+                    type: int
+              outputColumnNames: _col0, _col1
               Statistics:
                   numRows: 1 dataSize: 325 basicStatsState: COMPLETE colStatsState: NONE
-              Select Operator
-                expressions:
-                      expr: state
-                      type: string
-                      expr: locid
-                      type: int
-                outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+#### A masked pattern was here ####
+                NumFilesPerFileSink: 1
                 Statistics:
                     numRows: 1 dataSize: 325 basicStatsState: COMPLETE colStatsState: NONE
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-#### A masked pattern was here ####
-                  NumFilesPerFileSink: 1
-                  Statistics:
-                      numRows: 1 dataSize: 325 basicStatsState: COMPLETE colStatsState: NONE
 #### A masked pattern was here ####
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      properties:
-                        columns _col0,_col1
-                        columns.types string:int
-                        escape.delim \
-                        hive.serialization.extend.nesting.levels true
-                        serialization.format 1
-                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  TotalFiles: 1
-                  GatherStats: false
-                  MultiFileSpray: false
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    properties:
+                      columns _col0,_col1
+                      columns.types string:int
+                      escape.delim \
+                      hive.serialization.extend.nesting.levels true
+                      serialization.format 1
+                      serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                TotalFiles: 1
+                GatherStats: false
+                MultiFileSpray: false
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
@@ -1749,11 +1742,11 @@ STAGE PLANS:
 
 PREHOOK: query: -- This is to test filter expression evaluation on partition column
 -- numRows: 2 dataSize: 8 basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select locid from loc_orc where locid>0 and year=2001
+explain extended select locid from loc_orc where locid>0 and year='2001'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- This is to test filter expression evaluation on partition column
 -- numRows: 2 dataSize: 8 basicStatState: COMPLETE colStatState: COMPLETE
-explain extended select locid from loc_orc where locid>0 and year=2001
+explain extended select locid from loc_orc where locid>0 and year='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -1762,7 +1755,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) 2001)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid))) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) '2001')))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1865,9 +1858,9 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: explain extended select locid,year from loc_orc where locid>0 and year=2001
+PREHOOK: query: explain extended select locid,year from loc_orc where locid>0 and year='2001'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select locid,year from loc_orc where locid>0 and year=2001
+POSTHOOK: query: explain extended select locid,year from loc_orc where locid>0 and year='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -1876,7 +1869,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid)) (TOK_SELEXPR (TOK_TABLE_OR_COL year))) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) 2001)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid)) (TOK_SELEXPR (TOK_TABLE_OR_COL year))) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) '2001')))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1981,9 +1974,9 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: explain extended select * from (select locid,year from loc_orc) test where locid>0 and year=2001
+PREHOOK: query: explain extended select * from (select locid,year from loc_orc) test where locid>0 and year='2001'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select * from (select locid,year from loc_orc) test where locid>0 and year=2001
+POSTHOOK: query: explain extended select * from (select locid,year from loc_orc) test where locid>0 and year='2001'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=2001).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
@@ -1992,7 +1985,7 @@ POSTHOOK: Lineage: loc_orc PARTITION(yea
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ]
 POSTHOOK: Lineage: loc_orc PARTITION(year=__HIVE_DEFAULT_PARTITION__).zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid)) (TOK_SELEXPR (TOK_TABLE_OR_COL year))))) test)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) 2001)))))
+  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME loc_orc))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL locid)) (TOK_SELEXPR (TOK_TABLE_OR_COL year))))) test)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (> (TOK_TABLE_OR_COL locid) 0) (= (TOK_TABLE_OR_COL year) '2001')))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out Fri Dec 20 19:55:28 2013
@@ -95,7 +95,7 @@ POSTHOOK: Lineage: orderpayment_small.ti
 POSTHOOK: Lineage: orderpayment_small.userid SIMPLE []
 POSTHOOK: Lineage: user_small.userid SIMPLE [(testsrc)testsrc.FieldSchema(name:key, type:int, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_JOIN (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME `orderpayment_small`) `orderpayment`) (TOK_TABREF (TOK_TABNAME `orderpayment_small`) `dim_pay_date`) (= (. (TOK_TABLE_OR_COL `dim_pay_date`) `date`) (. (TOK_TABLE_OR_COL `orderpayment`) `date`))) (TOK_TABREF (TOK_TABNAME `orderpayment_small`) `deal`) (= (. (TOK_TABLE_OR_COL `deal`) `dealid`) (. (TOK_TABLE_OR_COL `orderpayment`) `dealid`))) (TOK_TABREF (TOK_TABNAME `orderpayment_small`) `order_city`) (= (. (TOK_TABLE_OR_COL `order_city`) `cityid`) (. (TOK_TABLE_OR_COL `orderpayment`) `cityid`))) (TOK_TABREF (TOK_TABNAME `user_small`) `user`) (= (. (TOK_TABLE_OR_COL `user`) `userid`) (. (TOK_TABLE_OR_COL `orderpayment`) `userid`)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL `dim_pay_date`) `date`)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL `deal`) `dealid`))) (TOK_LIMIT 5)))
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_JOIN (TOK_JOIN (TOK_JOIN (TOK_TABREF (TOK_TABNAME orderpayment_small) orderpayment) (TOK_TABREF (TOK_TABNAME orderpayment_small) dim_pay_date) (= (. (TOK_TABLE_OR_COL dim_pay_date) date) (. (TOK_TABLE_OR_COL orderpayment) date))) (TOK_TABREF (TOK_TABNAME orderpayment_small) deal) (= (. (TOK_TABLE_OR_COL deal) dealid) (. (TOK_TABLE_OR_COL orderpayment) dealid))) (TOK_TABREF (TOK_TABNAME orderpayment_small) order_city) (= (. (TOK_TABLE_OR_COL order_city) cityid) (. (TOK_TABLE_OR_COL orderpayment) cityid))) (TOK_TABREF (TOK_TABNAME user_small) user) (= (. (TOK_TABLE_OR_COL user) userid) (. (TOK_TABLE_OR_COL orderpayment) userid)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL dim_pay_date) date)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL deal) dealid))) (TOK_LIMIT 5)))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out Fri Dec 20 19:55:28 2013
@@ -1,43 +1,43 @@
-PREHOOK: query: create table dynamic_part_table(intcol int) partitioned by (partcol1 int, partcol2 int)
+PREHOOK: query: create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table dynamic_part_table(intcol int) partitioned by (partcol1 int, partcol2 int)
+POSTHOOK: query: create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@dynamic_part_table
-PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, 1 from src where key=150
+PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dynamic_part_table
-POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, 1 from src where key=150
+POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dynamic_part_table@partcol1=1/partcol2=1
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
-PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, 1 from src where key=150
+PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, '1' from src where key=150
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dynamic_part_table
-POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, 1 from src where key=150
+POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, '1' from src where key=150
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dynamic_part_table@partcol1=__HIVE_DEFAULT_PARTITION__/partcol2=1
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
-PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, NULL from src where key=150
+PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', NULL from src where key=150
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dynamic_part_table
-POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, 1, NULL from src where key=150
+POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', NULL from src where key=150
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dynamic_part_table@partcol1=1/partcol2=__HIVE_DEFAULT_PARTITION__
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
-PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, NULL from src where key=150
+PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, NULL from src where key=150
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dynamic_part_table
-POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select 1, NULL, NULL from src where key=150
+POSTHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', NULL, NULL from src where key=150
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dynamic_part_table@partcol1=__HIVE_DEFAULT_PARTITION__/partcol2=__HIVE_DEFAULT_PARTITION__
@@ -45,16 +45,16 @@ POSTHOOK: Lineage: dynamic_part_table PA
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
-PREHOOK: query: explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1
+PREHOOK: query: explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1
+POSTHOOK: query: explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL partcol1) 1) (= (TOK_TABLE_OR_COL partcol2) 1)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL partcol1) '1') (= (TOK_TABLE_OR_COL partcol2) '1')))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -73,7 +73,7 @@ STAGE PLANS:
             Select Operator
               expressions:
                     expr: intcol
-                    type: int
+                    type: string
               outputColumnNames: _col0
               Statistics:
                   numRows: 1 dataSize: 1 basicStatsState: COMPLETE colStatsState: NONE
@@ -90,7 +90,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       columns _col0
-                      columns.types int
+                      columns.types string
                       escape.delim \
                       hive.serialization.extend.nesting.levels true
                       serialization.format 1
@@ -114,14 +114,14 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns intcol
-              columns.types int
+              columns.types string
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
               numRows 1
               partition_columns partcol1/partcol2
               rawDataSize 1
-              serialization.ddl struct dynamic_part_table { i32 intcol}
+              serialization.ddl struct dynamic_part_table { string intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               totalSize 2
@@ -133,11 +133,11 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns intcol
-                columns.types int
+                columns.types string
 #### A masked pattern was here ####
                 name default.dynamic_part_table
                 partition_columns partcol1/partcol2
-                serialization.ddl struct dynamic_part_table { i32 intcol}
+                serialization.ddl struct dynamic_part_table { string intcol}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 #### A masked pattern was here ####
@@ -151,16 +151,16 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1
+PREHOOK: query: explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select intcol from dynamic_part_table where partcol1=1 and partcol2=1
+POSTHOOK: query: explain extended select intcol from dynamic_part_table where partcol1='1' and partcol2='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL partcol1) 1) (= (TOK_TABLE_OR_COL partcol2) 1)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL partcol1) '1') (= (TOK_TABLE_OR_COL partcol2) '1')))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -179,7 +179,7 @@ STAGE PLANS:
             Select Operator
               expressions:
                     expr: intcol
-                    type: int
+                    type: string
               outputColumnNames: _col0
               Statistics:
                   numRows: 1 dataSize: 1 basicStatsState: COMPLETE colStatsState: NONE
@@ -196,7 +196,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       columns _col0
-                      columns.types int
+                      columns.types string
                       escape.delim \
                       hive.serialization.extend.nesting.levels true
                       serialization.format 1
@@ -220,14 +220,14 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns intcol
-              columns.types int
+              columns.types string
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
               numRows 1
               partition_columns partcol1/partcol2
               rawDataSize 1
-              serialization.ddl struct dynamic_part_table { i32 intcol}
+              serialization.ddl struct dynamic_part_table { string intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               totalSize 2
@@ -239,11 +239,11 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns intcol
-                columns.types int
+                columns.types string
 #### A masked pattern was here ####
                 name default.dynamic_part_table
                 partition_columns partcol1/partcol2
-                serialization.ddl struct dynamic_part_table { i32 intcol}
+                serialization.ddl struct dynamic_part_table { string intcol}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 #### A masked pattern was here ####
@@ -257,16 +257,16 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: explain extended select intcol from dynamic_part_table where (partcol1=1 and partcol2=1)or (partcol1=1 and partcol2='__HIVE_DEFAULT_PARTITION__')
+PREHOOK: query: explain extended select intcol from dynamic_part_table where (partcol1='1' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__')
 PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select intcol from dynamic_part_table where (partcol1=1 and partcol2=1)or (partcol1=1 and partcol2='__HIVE_DEFAULT_PARTITION__')
+POSTHOOK: query: explain extended select intcol from dynamic_part_table where (partcol1='1' and partcol2='1')or (partcol1='1' and partcol2='__HIVE_DEFAULT_PARTITION__')
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=1,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=1).intcol SIMPLE []
 POSTHOOK: Lineage: dynamic_part_table PARTITION(partcol1=__HIVE_DEFAULT_PARTITION__,partcol2=__HIVE_DEFAULT_PARTITION__).intcol SIMPLE []
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (or (and (= (TOK_TABLE_OR_COL partcol1) 1) (= (TOK_TABLE_OR_COL partcol2) 1)) (and (= (TOK_TABLE_OR_COL partcol1) 1) (= (TOK_TABLE_OR_COL partcol2) '__HIVE_DEFAULT_PARTITION__'))))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dynamic_part_table))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL intcol))) (TOK_WHERE (or (and (= (TOK_TABLE_OR_COL partcol1) '1') (= (TOK_TABLE_OR_COL partcol2) '1')) (and (= (TOK_TABLE_OR_COL partcol1) '1') (= (TOK_TABLE_OR_COL partcol2) '__HIVE_DEFAULT_PARTITION__'))))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -285,7 +285,7 @@ STAGE PLANS:
             Select Operator
               expressions:
                     expr: intcol
-                    type: int
+                    type: string
               outputColumnNames: _col0
               Statistics:
                   numRows: 2 dataSize: 2 basicStatsState: COMPLETE colStatsState: NONE
@@ -302,7 +302,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       columns _col0
-                      columns.types int
+                      columns.types string
                       escape.delim \
                       hive.serialization.extend.nesting.levels true
                       serialization.format 1
@@ -326,14 +326,14 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns intcol
-              columns.types int
+              columns.types string
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
               numRows 1
               partition_columns partcol1/partcol2
               rawDataSize 1
-              serialization.ddl struct dynamic_part_table { i32 intcol}
+              serialization.ddl struct dynamic_part_table { string intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               totalSize 2
@@ -345,11 +345,11 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns intcol
-                columns.types int
+                columns.types string
 #### A masked pattern was here ####
                 name default.dynamic_part_table
                 partition_columns partcol1/partcol2
-                serialization.ddl struct dynamic_part_table { i32 intcol}
+                serialization.ddl struct dynamic_part_table { string intcol}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 #### A masked pattern was here ####
@@ -368,14 +368,14 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE true
               bucket_count -1
               columns intcol
-              columns.types int
+              columns.types string
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
               numRows 1
               partition_columns partcol1/partcol2
               rawDataSize 1
-              serialization.ddl struct dynamic_part_table { i32 intcol}
+              serialization.ddl struct dynamic_part_table { string intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               totalSize 2
@@ -387,11 +387,11 @@ STAGE PLANS:
               properties:
                 bucket_count -1
                 columns intcol
-                columns.types int
+                columns.types string
 #### A masked pattern was here ####
                 name default.dynamic_part_table
                 partition_columns partcol1/partcol2
-                serialization.ddl struct dynamic_part_table { i32 intcol}
+                serialization.ddl struct dynamic_part_table { string intcol}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 #### A masked pattern was here ####

Modified: hive/branches/tez/ql/src/test/results/clientpositive/escape_clusterby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/escape_clusterby1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/escape_clusterby1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/escape_clusterby1.q.out Fri Dec 20 19:55:28 2013
@@ -66,7 +66,7 @@ POSTHOOK: query: explain
 select `key`, value from src cluster by `key`, value
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `key`)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL `key`) (TOK_TABLE_OR_COL value))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/escape_distributeby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/escape_distributeby1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/escape_distributeby1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/escape_distributeby1.q.out Fri Dec 20 19:55:28 2013
@@ -61,7 +61,7 @@ POSTHOOK: query: explain
 select `key`, value from src distribute by `key`, value
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `key`)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_DISTRIBUTEBY (TOK_TABLE_OR_COL `key`) (TOK_TABLE_OR_COL value))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_DISTRIBUTEBY (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/escape_orderby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/escape_orderby1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/escape_orderby1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/escape_orderby1.q.out Fri Dec 20 19:55:28 2013
@@ -61,7 +61,7 @@ POSTHOOK: query: explain
 select `key`, value from src order by `key`, value
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `key`)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL `key`)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/escape_sortby1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/escape_sortby1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/escape_sortby1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/escape_sortby1.q.out Fri Dec 20 19:55:28 2013
@@ -61,7 +61,7 @@ POSTHOOK: query: explain
 select `key`, value from src sort by `key`, value
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `key`)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL `key`)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap3.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap3.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap3.q.out Fri Dec 20 19:55:28 2013
@@ -131,7 +131,7 @@ POSTHOOK: Lineage: default__src_src2_ind
 POSTHOOK: Lineage: default__src_src2_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src2_index__.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src1_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `_bucketname`) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL `_offset`) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL `_bitmaps`) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 0)))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src2_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `_bucketname`) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL `_offset`) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL `_bitmaps`) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL value) "val_0")))) b) (AND (= (. (TOK_TABLE_OR_COL a) bucketname) (. (TOK_TABLE_OR_COL b) bucketname)) (= (. (TOK_TABLE_OR_COL a) offset) (. (TOK_TABLE_OR_COL b) offset))))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (
 TOK_TABLE_OR_COL a) bucketname) `_bucketname`) (TOK_SELEXPR (TOK_FUNCTION COLLECT_SET (. (TOK_TABLE_OR_COL a) offset)) `_offsets`)) (TOK_WHERE (NOT (TOK_FUNCTION EWAH_BITMAP_EMPTY (TOK_FUNCTION EWAH_BITMAP_AND (. (TOK_TABLE_OR_COL a) bitmaps) (. (TOK_TABLE_OR_COL b) bitmaps))))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL a) bucketname))))
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src1_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL _bucketname) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL _offset) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL _bitmaps) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 0)))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src2_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL _bucketname) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL _offset) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL _bitmaps) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL value) "val_0")))) b) (AND (= (. (TOK_TABLE_OR_COL a) bucketname) (. (TOK_TABLE_OR_COL b) bucketname)) (= (. (TOK_TABLE_OR_COL a) offset) (. (TOK_TABLE_OR_COL b) offset))))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR
 _COL a) bucketname) _bucketname) (TOK_SELEXPR (TOK_FUNCTION COLLECT_SET (. (TOK_TABLE_OR_COL a) offset)) _offsets)) (TOK_WHERE (NOT (TOK_FUNCTION EWAH_BITMAP_EMPTY (TOK_FUNCTION EWAH_BITMAP_AND (. (TOK_TABLE_OR_COL a) bitmaps) (. (TOK_TABLE_OR_COL b) bitmaps))))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL a) bucketname))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/index_bitmap_auto.q.out Fri Dec 20 19:55:28 2013
@@ -150,7 +150,7 @@ POSTHOOK: Lineage: default__src_src2_ind
 POSTHOOK: Lineage: default__src_src2_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
 POSTHOOK: Lineage: default__src_src2_index__.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src1_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `_bucketname`) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL `_offset`) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL `_bitmaps`) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 0)))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src2_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL `_bucketname`) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL `_offset`) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL `_bitmaps`) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL value) "val_0")))) b) (AND (= (. (TOK_TABLE_OR_COL a) bucketname) (. (TOK_TABLE_OR_COL b) bucketname)) (= (. (TOK_TABLE_OR_COL a) offset) (. (TOK_TABLE_OR_COL b) offset))))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (
 TOK_TABLE_OR_COL a) bucketname) `_bucketname`) (TOK_SELEXPR (TOK_FUNCTION COLLECT_SET (. (TOK_TABLE_OR_COL a) offset)) `_offsets`)) (TOK_WHERE (NOT (TOK_FUNCTION EWAH_BITMAP_EMPTY (TOK_FUNCTION EWAH_BITMAP_AND (. (TOK_TABLE_OR_COL a) bitmaps) (. (TOK_TABLE_OR_COL b) bitmaps))))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL a) bucketname))))
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src1_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL _bucketname) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL _offset) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL _bitmaps) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 0)))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME default__src_src2_index__))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL _bucketname) bucketname) (TOK_SELEXPR (TOK_TABLE_OR_COL _offset) offset) (TOK_SELEXPR (TOK_TABLE_OR_COL _bitmaps) bitmaps)) (TOK_WHERE (= (TOK_TABLE_OR_COL value) "val_0")))) b) (AND (= (. (TOK_TABLE_OR_COL a) bucketname) (. (TOK_TABLE_OR_COL b) bucketname)) (= (. (TOK_TABLE_OR_COL a) offset) (. (TOK_TABLE_OR_COL b) offset))))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR
 _COL a) bucketname) _bucketname) (TOK_SELEXPR (TOK_FUNCTION COLLECT_SET (. (TOK_TABLE_OR_COL a) offset)) _offsets)) (TOK_WHERE (NOT (TOK_FUNCTION EWAH_BITMAP_EMPTY (TOK_FUNCTION EWAH_BITMAP_AND (. (TOK_TABLE_OR_COL a) bitmaps) (. (TOK_TABLE_OR_COL b) bitmaps))))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL a) bucketname))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/quote1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/quote1.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/quote1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/quote1.q.out Fri Dec 20 19:55:28 2013
@@ -12,7 +12,7 @@ FROM src
 INSERT OVERWRITE TABLE dest1 PARTITION(`table`='2008-04-08') SELECT src.key as `partition`, src.value as `from` WHERE src.key >= 200 and src.key < 300
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1) (TOK_PARTSPEC (TOK_PARTVAL `table` '2008-04-08')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key) `partition`) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value) `from`)) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 200) (< (. (TOK_TABLE_OR_COL src) key) 300)))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1) (TOK_PARTSPEC (TOK_PARTVAL table '2008-04-08')))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key) partition) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value) from)) (TOK_WHERE (and (>= (. (TOK_TABLE_OR_COL src) key) 200) (< (. (TOK_TABLE_OR_COL src) key) 300)))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -116,7 +116,7 @@ POSTHOOK: query: EXPLAIN
 SELECT `int`.`location`, `int`.`type`, `int`.`table` FROM dest1 `int` WHERE `int`.`table` = '2008-04-08'
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dest1) `int`)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL `int`) `location`)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL `int`) `type`)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL `int`) `table`))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL `int`) `table`) '2008-04-08'))))
+  (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME dest1) int)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL int) location)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL int) type)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL int) table))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL int) table) '2008-04-08'))))
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

Modified: hive/branches/tez/ql/src/test/results/clientpositive/skewjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/skewjoin.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/skewjoin.q.out Fri Dec 20 19:55:28 2013
@@ -60,7 +60,7 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-5 depends on stages: Stage-1 , consists of Stage-6
+  Stage-5 depends on stages: Stage-1 , consists of Stage-6, Stage-0
   Stage-6
   Stage-4 depends on stages: Stage-6
   Stage-0 depends on stages: Stage-1, Stage-4
@@ -701,7 +701,7 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-5 depends on stages: Stage-1 , consists of Stage-6
+  Stage-5 depends on stages: Stage-1 , consists of Stage-6, Stage-2
   Stage-6
   Stage-4 depends on stages: Stage-6
   Stage-2 depends on stages: Stage-1, Stage-4
@@ -928,7 +928,7 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-5 depends on stages: Stage-1 , consists of Stage-6
+  Stage-5 depends on stages: Stage-1 , consists of Stage-6, Stage-2
   Stage-6
   Stage-4 depends on stages: Stage-6
   Stage-2 depends on stages: Stage-1, Stage-4
@@ -1173,7 +1173,7 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1 , consists of Stage-8, Stage-9
+  Stage-7 depends on stages: Stage-1 , consists of Stage-8, Stage-9, Stage-2
   Stage-8
   Stage-5 depends on stages: Stage-8
   Stage-2 depends on stages: Stage-1, Stage-5, Stage-6

Modified: hive/branches/tez/ql/src/test/results/clientpositive/vectorization_12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/vectorization_12.q.out?rev=1552798&r1=1552797&r2=1552798&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/vectorization_12.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/vectorization_12.q.out Fri Dec 20 19:55:28 2013
@@ -27,7 +27,7 @@ WHERE    (((ctimestamp1 IS NULL)
               OR ((cboolean2 <= 1)
                   AND (cbigint >= csmallint))))
 GROUP BY cbigint, cboolean1, cstring1, ctimestamp1, cdouble
-ORDER BY ctimestamp1, cdouble
+ORDER BY ctimestamp1, cdouble, cbigint, cstring1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
@@ -60,7 +60,7 @@ WHERE    (((ctimestamp1 IS NULL)
               OR ((cboolean2 <= 1)
                   AND (cbigint >= csmallint))))
 GROUP BY cbigint, cboolean1, cstring1, ctimestamp1, cdouble
-ORDER BY ctimestamp1, cdouble
+ORDER BY ctimestamp1, cdouble, cbigint, cstring1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
@@ -247,8 +247,8 @@ POSTHOOK: Input: default@alltypesorc
 1864027286	true	0W67K0mT27r22f817281Ocq	NULL	-5818.0	3.7421376E7	-1864027286	1	1864027286	0.0	-5818.0	5818.0	-5818.0	-3.7421376E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5818.0	-5818.0	-3.7427194E7	0.0
 1864027286	true	FpsIohh60Bho67Fb7f	NULL	-5732.0	3.6868224E7	-1864027286	1	1864027286	0.0	-5732.0	5732.0	-5732.0	-3.6868224E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5732.0	-5732.0	-3.6873956E7	0.0
 1864027286	true	MGsGfU7253gN2Hnt2W	NULL	-5679.0	3.6527328E7	-1864027286	1	1864027286	0.0	-5679.0	5679.0	-5679.0	-3.6527328E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5679.0	-5679.0	-3.6533007E7	0.0
-1864027286	true	lxQp116	NULL	-5638.15	3.62645808E7	-1864027286	1	1864027286	0.0	-5638.15	5638.15	-5638.15	-3.62645808E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5638.15	-5638.15	-3.6270218949999996E7	0.0
 -1887561756	false	w62rRn0DnCSWJ1ht6qWa	NULL	-5638.15	3.62645808E7	1887561756	1	-1887561756	0.0	-5638.15	5638.15	-5638.15	-3.62645808E7	-1.88756739415E9	-1887561756	-1.554726368159204E-4	-5638.15	-5638.15	-3.6270218949999996E7	0.0
+1864027286	true	lxQp116	NULL	-5638.15	3.62645808E7	-1864027286	1	1864027286	0.0	-5638.15	5638.15	-5638.15	-3.62645808E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5638.15	-5638.15	-3.6270218949999996E7	0.0
 1864027286	true	wEe2THv60F6	NULL	-5589.0	3.5948448E7	-1864027286	1	1864027286	0.0	-5589.0	5589.0	-5589.0	-3.5948448E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5589.0	-5589.0	-3.5954037E7	0.0
 1864027286	true	7MHXQ0V71I	NULL	-5564.0	3.5787648E7	-1864027286	1	1864027286	0.0	-5564.0	5564.0	-5564.0	-3.5787648E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5564.0	-5564.0	-3.5793212E7	0.0
 1864027286	true	N7L608vFx24p0uNVwJr2o6G	NULL	-5536.0	3.5607552E7	-1864027286	1	1864027286	0.0	-5536.0	5536.0	-5536.0	-3.5607552E7	1.86402164785E9	1864027286	-1.554726368159204E-4	-5536.0	-5536.0	-3.5613088E7	0.0