http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/udf_reflect2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udf_reflect2.q.out 
b/ql/src/test/results/clientpositive/udf_reflect2.q.out
index 6c22657..a862990 100644
--- a/ql/src/test/results/clientpositive/udf_reflect2.q.out
+++ b/ql/src/test/results/clientpositive/udf_reflect2.q.out
@@ -78,235 +78,6 @@ SELECT key,
        reflect2(ts, "getTime")
 FROM (select cast(key as int) key, value, cast('2013-02-15 19:41:20' as 
timestamp) ts from src) a LIMIT 5
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     src
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        TOK_INT
-                        TOK_TABLE_OR_COL
-                           key
-                     key
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        value
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        TOK_TIMESTAMP
-                        '2013-02-15 19:41:20'
-                     ts
-         a
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "byteValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "shortValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "intValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "longValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "floatValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "doubleValue"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  key
-               "toString"
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               value
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "concat"
-               "_concat"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "contains"
-               "86"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "startsWith"
-               "v"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "endsWith"
-               "6"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "equals"
-               "val_86"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "equalsIgnoreCase"
-               "VAL_86"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "getBytes"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "indexOf"
-               "1"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "lastIndexOf"
-               "1"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "replace"
-               "val"
-               "VALUE"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "substring"
-               1
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "substring"
-               1
-               5
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "toUpperCase"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  value
-               "trim"
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               ts
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getYear"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getMonth"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getDay"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getHours"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getMinutes"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getSeconds"
-         TOK_SELEXPR
-            TOK_FUNCTION
-               reflect2
-               TOK_TABLE_OR_COL
-                  ts
-               "getTime"
-      TOK_LIMIT
-         5
-
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/udtf_explode.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udtf_explode.q.out 
b/ql/src/test/results/clientpositive/udtf_explode.q.out
index 62d8e9f..3304109 100644
--- a/ql/src/test/results/clientpositive/udtf_explode.q.out
+++ b/ql/src/test/results/clientpositive/udtf_explode.q.out
@@ -12,31 +12,6 @@ PREHOOK: query: EXPLAIN EXTENDED SELECT 
explode(array(1,2,3)) AS myCol FROM src
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN EXTENDED SELECT explode(array(1,2,3)) AS myCol FROM 
src LIMIT 3
 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_FUNCTION
-               explode
-               TOK_FUNCTION
-                  array
-                  1
-                  2
-                  3
-            myCol
-      TOK_LIMIT
-         3
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -141,54 +116,6 @@ PREHOOK: query: EXPLAIN EXTENDED SELECT a.myCol, count(1) 
FROM (SELECT explode(a
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN EXTENDED SELECT a.myCol, count(1) FROM (SELECT 
explode(array(1,2,3)) AS myCol FROM src LIMIT 3) a GROUP BY a.myCol
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     src
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        explode
-                        TOK_FUNCTION
-                           array
-                           1
-                           2
-                           3
-                     myCol
-               TOK_LIMIT
-                  3
-         a
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  a
-               myCol
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         .
-            TOK_TABLE_OR_COL
-               a
-            myCol
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -453,67 +380,6 @@ PREHOOK: query: EXPLAIN EXTENDED SELECT a.myKey, a.myVal, 
count(1) FROM (SELECT
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN EXTENDED SELECT a.myKey, a.myVal, count(1) FROM 
(SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal) FROM src LIMIT 
3) a GROUP BY a.myKey, a.myVal
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     src
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        explode
-                        TOK_FUNCTION
-                           map
-                           1
-                           'one'
-                           2
-                           'two'
-                           3
-                           'three'
-                     myKey
-                     myVal
-               TOK_LIMIT
-                  3
-         a
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  a
-               myKey
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  a
-               myVal
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         .
-            TOK_TABLE_OR_COL
-               a
-            myKey
-         .
-            TOK_TABLE_OR_COL
-               a
-            myVal
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/union22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union22.q.out 
b/ql/src/test/results/clientpositive/union22.q.out
index 5309c71..f075148 100644
--- a/ql/src/test/results/clientpositive/union22.q.out
+++ b/ql/src/test/results/clientpositive/union22.q.out
@@ -78,146 +78,6 @@ where a.k1 > 20
 )
 subq
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        dst_union22_delta
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           k1
-                        k1
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           k2
-                        k2
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           k3
-                        k3
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           k4
-                        k4
-                  TOK_WHERE
-                     and
-                        =
-                           TOK_TABLE_OR_COL
-                              ds
-                           '1'
-                        <=
-                           TOK_TABLE_OR_COL
-                              k0
-                           50
-            TOK_QUERY
-               TOK_FROM
-                  TOK_LEFTOUTERJOIN
-                     TOK_TABREF
-                        TOK_TABNAME
-                           dst_union22
-                        a
-                     TOK_SUBQUERY
-                        TOK_QUERY
-                           TOK_FROM
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    dst_union22_delta
-                           TOK_INSERT
-                              TOK_DESTINATION
-                                 TOK_DIR
-                                    TOK_TMP_FILE
-                              TOK_SELECT
-                                 TOK_SELEXPR
-                                    TOK_ALLCOLREF
-                              TOK_WHERE
-                                 and
-                                    =
-                                       TOK_TABLE_OR_COL
-                                          ds
-                                       '1'
-                                    >
-                                       TOK_TABLE_OR_COL
-                                          k0
-                                       50
-                        b
-                     and
-                        =
-                           .
-                              TOK_TABLE_OR_COL
-                                 a
-                              k1
-                           .
-                              TOK_TABLE_OR_COL
-                                 b
-                              k1
-                        =
-                           .
-                              TOK_TABLE_OR_COL
-                                 a
-                              ds
-                           '1'
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           k1
-                        k1
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           k2
-                        k2
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              b
-                           k3
-                        k3
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              b
-                           k4
-                        k4
-                  TOK_WHERE
-                     >
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           k1
-                        20
-         subq
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dst_union22
-            TOK_PARTSPEC
-               TOK_PARTVAL
-                  ds
-                  '2'
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-7 is a root stage , consists of Stage-8, Stage-4
   Stage-8 has a backup stage: Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union24.q.out 
b/ql/src/test/results/clientpositive/union24.q.out
index 993b838..91b582f 100644
--- a/ql/src/test/results/clientpositive/union24.q.out
+++ b/ql/src/test/results/clientpositive/union24.q.out
@@ -72,121 +72,6 @@ select s.key, s.count from (
   select key, count(1) as count from src5 where key < 10 group by key
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_UNIONALL
-               TOK_UNIONALL
-                  TOK_QUERY
-                     TOK_FROM
-                        TOK_TABREF
-                           TOK_TABNAME
-                              src2
-                     TOK_INSERT
-                        TOK_DESTINATION
-                           TOK_DIR
-                              TOK_TMP_FILE
-                        TOK_SELECT
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 key
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 count
-                        TOK_WHERE
-                           <
-                              TOK_TABLE_OR_COL
-                                 key
-                              10
-                  TOK_QUERY
-                     TOK_FROM
-                        TOK_TABREF
-                           TOK_TABNAME
-                              src3
-                     TOK_INSERT
-                        TOK_DESTINATION
-                           TOK_DIR
-                              TOK_TMP_FILE
-                        TOK_SELECT
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 key
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 count
-                        TOK_WHERE
-                           <
-                              TOK_TABLE_OR_COL
-                                 key
-                              10
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src4
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              key
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              count
-                     TOK_WHERE
-                        <
-                           TOK_TABLE_OR_COL
-                              key
-                           10
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        src5
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        count
-                  TOK_WHERE
-                     <
-                        TOK_TABLE_OR_COL
-                           key
-                        10
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
   Stage-2 depends on stages: Stage-5
@@ -674,117 +559,6 @@ select s.key, s.count from (
   select a.key as key, b.count as count from src4 a join src5 b on a.key=b.key 
where a.key < 10
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_UNIONALL
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src2
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              key
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              count
-                     TOK_WHERE
-                        <
-                           TOK_TABLE_OR_COL
-                              key
-                           10
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src3
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              key
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              count
-                     TOK_WHERE
-                        <
-                           TOK_TABLE_OR_COL
-                              key
-                           10
-            TOK_QUERY
-               TOK_FROM
-                  TOK_JOIN
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src4
-                        a
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src5
-                        b
-                     =
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        .
-                           TOK_TABLE_OR_COL
-                              b
-                           key
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        key
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              b
-                           count
-                        count
-                  TOK_WHERE
-                     <
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        10
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-2 depends on stages: Stage-4
@@ -1246,121 +1020,6 @@ select s.key, s.count from (
   select a.key as key, count(1) as count from src4 a join src5 b on 
a.key=b.key where a.key < 10 group by a.key
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_UNIONALL
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src2
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              key
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              count
-                     TOK_WHERE
-                        <
-                           TOK_TABLE_OR_COL
-                              key
-                           10
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src3
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              key
-                        TOK_SELEXPR
-                           TOK_TABLE_OR_COL
-                              count
-                     TOK_WHERE
-                        <
-                           TOK_TABLE_OR_COL
-                              key
-                           10
-            TOK_QUERY
-               TOK_FROM
-                  TOK_JOIN
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src4
-                        a
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src5
-                        b
-                     =
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        .
-                           TOK_TABLE_OR_COL
-                              b
-                           key
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        count
-                  TOK_WHERE
-                     <
-                        .
-                           TOK_TABLE_OR_COL
-                              a
-                           key
-                        10
-                  TOK_GROUPBY
-                     .
-                        TOK_TABLE_OR_COL
-                           a
-                        key
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
   Stage-5 depends on stages: Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/unionDistinct_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unionDistinct_1.q.out 
b/ql/src/test/results/clientpositive/unionDistinct_1.q.out
index 61bfa74..0330133 100644
--- a/ql/src/test/results/clientpositive/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/unionDistinct_1.q.out
@@ -6815,157 +6815,6 @@ where a.k1 > 20
 )
 subq
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_UNIONALL
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_TABREF
-                              TOK_TABNAME
-                                 dst_union22_delta
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECT
-                              TOK_SELEXPR
-                                 TOK_TABLE_OR_COL
-                                    k1
-                                 k1
-                              TOK_SELEXPR
-                                 TOK_TABLE_OR_COL
-                                    k2
-                                 k2
-                              TOK_SELEXPR
-                                 TOK_TABLE_OR_COL
-                                    k3
-                                 k3
-                              TOK_SELEXPR
-                                 TOK_TABLE_OR_COL
-                                    k4
-                                 k4
-                           TOK_WHERE
-                              and
-                                 =
-                                    TOK_TABLE_OR_COL
-                                       ds
-                                    '1'
-                                 <=
-                                    TOK_TABLE_OR_COL
-                                       k0
-                                    50
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_LEFTOUTERJOIN
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    dst_union22
-                                 a
-                              TOK_SUBQUERY
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             dst_union22_delta
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_ALLCOLREF
-                                       TOK_WHERE
-                                          and
-                                             =
-                                                TOK_TABLE_OR_COL
-                                                   ds
-                                                '1'
-                                             >
-                                                TOK_TABLE_OR_COL
-                                                   k0
-                                                50
-                                 b
-                              and
-                                 =
-                                    .
-                                       TOK_TABLE_OR_COL
-                                          a
-                                       k1
-                                    .
-                                       TOK_TABLE_OR_COL
-                                          b
-                                       k1
-                                 =
-                                    .
-                                       TOK_TABLE_OR_COL
-                                          a
-                                       ds
-                                    '1'
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECT
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    k1
-                                 k1
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    k2
-                                 k2
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       b
-                                    k3
-                                 k3
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       b
-                                    k4
-                                 k4
-                           TOK_WHERE
-                              >
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    k1
-                                 20
-                  _u1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECTDI
-                  TOK_SELEXPR
-                     TOK_ALLCOLREF
-         subq
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dst_union22
-            TOK_PARTSPEC
-               TOK_PARTVAL
-                  ds
-                  '2'
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-7 is a root stage , consists of Stage-8, Stage-4
   Stage-8 has a backup stage: Stage-4
@@ -8460,154 +8309,6 @@ select s.key, s.count from (
   select key, count(1) as count from src5 where key < 10 group by key
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_UNIONALL
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_SUBQUERY
-                              TOK_UNIONALL
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_SUBQUERY
-                                          TOK_UNIONALL
-                                             TOK_QUERY
-                                                TOK_FROM
-                                                   TOK_TABREF
-                                                      TOK_TABNAME
-                                                         src2
-                                                TOK_INSERT
-                                                   TOK_DESTINATION
-                                                      TOK_DIR
-                                                         TOK_TMP_FILE
-                                                   TOK_SELECT
-                                                      TOK_SELEXPR
-                                                         TOK_TABLE_OR_COL
-                                                            key
-                                                      TOK_SELEXPR
-                                                         TOK_TABLE_OR_COL
-                                                            count
-                                                   TOK_WHERE
-                                                      <
-                                                         TOK_TABLE_OR_COL
-                                                            key
-                                                         10
-                                             TOK_QUERY
-                                                TOK_FROM
-                                                   TOK_TABREF
-                                                      TOK_TABNAME
-                                                         src3
-                                                TOK_INSERT
-                                                   TOK_DESTINATION
-                                                      TOK_DIR
-                                                         TOK_TMP_FILE
-                                                   TOK_SELECT
-                                                      TOK_SELEXPR
-                                                         TOK_TABLE_OR_COL
-                                                            key
-                                                      TOK_SELEXPR
-                                                         TOK_TABLE_OR_COL
-                                                            count
-                                                   TOK_WHERE
-                                                      <
-                                                         TOK_TABLE_OR_COL
-                                                            key
-                                                         10
-                                          _u1
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECTDI
-                                          TOK_SELEXPR
-                                             TOK_ALLCOLREF
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             src4
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                key
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                count
-                                       TOK_WHERE
-                                          <
-                                             TOK_TABLE_OR_COL
-                                                key
-                                             10
-                              _u2
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECTDI
-                              TOK_SELEXPR
-                                 TOK_ALLCOLREF
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_TABREF
-                              TOK_TABNAME
-                                 src5
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECT
-                              TOK_SELEXPR
-                                 TOK_TABLE_OR_COL
-                                    key
-                              TOK_SELEXPR
-                                 TOK_FUNCTION
-                                    count
-                                    1
-                                 count
-                           TOK_WHERE
-                              <
-                                 TOK_TABLE_OR_COL
-                                    key
-                                 10
-                           TOK_GROUPBY
-                              TOK_TABLE_OR_COL
-                                 key
-                  _u3
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECTDI
-                  TOK_SELEXPR
-                     TOK_ALLCOLREF
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -9213,139 +8914,6 @@ select s.key, s.count from (
   select a.key as key, b.count as count from src4 a join src5 b on a.key=b.key 
where a.key < 10
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_UNIONALL
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_SUBQUERY
-                              TOK_UNIONALL
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             src2
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                key
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                count
-                                       TOK_WHERE
-                                          <
-                                             TOK_TABLE_OR_COL
-                                                key
-                                             10
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             src3
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                key
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                count
-                                       TOK_WHERE
-                                          <
-                                             TOK_TABLE_OR_COL
-                                                key
-                                             10
-                              _u1
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECTDI
-                              TOK_SELEXPR
-                                 TOK_ALLCOLREF
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_JOIN
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    src4
-                                 a
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    src5
-                                 b
-                              =
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       b
-                                    key
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECT
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 key
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       b
-                                    count
-                                 count
-                           TOK_WHERE
-                              <
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 10
-                  _u2
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECTDI
-                  TOK_SELEXPR
-                     TOK_ALLCOLREF
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1
@@ -9817,143 +9385,6 @@ select s.key, s.count from (
   select a.key as key, count(1) as count from src4 a join src5 b on 
a.key=b.key where a.key < 10 group by a.key
 )s
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_UNIONALL
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_SUBQUERY
-                              TOK_UNIONALL
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             src2
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                key
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                count
-                                       TOK_WHERE
-                                          <
-                                             TOK_TABLE_OR_COL
-                                                key
-                                             10
-                                 TOK_QUERY
-                                    TOK_FROM
-                                       TOK_TABREF
-                                          TOK_TABNAME
-                                             src3
-                                    TOK_INSERT
-                                       TOK_DESTINATION
-                                          TOK_DIR
-                                             TOK_TMP_FILE
-                                       TOK_SELECT
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                key
-                                          TOK_SELEXPR
-                                             TOK_TABLE_OR_COL
-                                                count
-                                       TOK_WHERE
-                                          <
-                                             TOK_TABLE_OR_COL
-                                                key
-                                             10
-                              _u1
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECTDI
-                              TOK_SELEXPR
-                                 TOK_ALLCOLREF
-                     TOK_QUERY
-                        TOK_FROM
-                           TOK_JOIN
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    src4
-                                 a
-                              TOK_TABREF
-                                 TOK_TABNAME
-                                    src5
-                                 b
-                              =
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       b
-                                    key
-                        TOK_INSERT
-                           TOK_DESTINATION
-                              TOK_DIR
-                                 TOK_TMP_FILE
-                           TOK_SELECT
-                              TOK_SELEXPR
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 key
-                              TOK_SELEXPR
-                                 TOK_FUNCTION
-                                    count
-                                    1
-                                 count
-                           TOK_WHERE
-                              <
-                                 .
-                                    TOK_TABLE_OR_COL
-                                       a
-                                    key
-                                 10
-                           TOK_GROUPBY
-                              .
-                                 TOK_TABLE_OR_COL
-                                    a
-                                 key
-                  _u2
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECTDI
-                  TOK_SELEXPR
-                     TOK_ALLCOLREF
-         s
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  s
-               count
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out 
b/ql/src/test/results/clientpositive/union_ppr.q.out
index 11c6dce..c5b1193 100644
--- a/ql/src/test/results/clientpositive/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/union_ppr.q.out
@@ -20,98 +20,6 @@ SELECT * FROM (
 WHERE A.ds = '2008-04-08'
 SORT BY A.key, A.value, A.ds, A.hr
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        SRCPART
-                     X
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_ALLCOLREF
-                           TOK_TABNAME
-                              X
-                  TOK_WHERE
-                     <
-                        .
-                           TOK_TABLE_OR_COL
-                              X
-                           key
-                        100
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        SRCPART
-                     Y
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_ALLCOLREF
-                           TOK_TABNAME
-                              Y
-                  TOK_WHERE
-                     <
-                        .
-                           TOK_TABLE_OR_COL
-                              Y
-                           key
-                        100
-         A
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-      TOK_WHERE
-         =
-            .
-               TOK_TABLE_OR_COL
-                  A
-               ds
-            '2008-04-08'
-      TOK_SORTBY
-         TOK_TABSORTCOLNAMEASC
-            TOK_NULLS_FIRST
-               .
-                  TOK_TABLE_OR_COL
-                     A
-                  key
-         TOK_TABSORTCOLNAMEASC
-            TOK_NULLS_FIRST
-               .
-                  TOK_TABLE_OR_COL
-                     A
-                  value
-         TOK_TABSORTCOLNAMEASC
-            TOK_NULLS_FIRST
-               .
-                  TOK_TABLE_OR_COL
-                     A
-                  ds
-         TOK_TABSORTCOLNAMEASC
-            TOK_NULLS_FIRST
-               .
-                  TOK_TABLE_OR_COL
-                     A
-                  hr
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to