hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jd...@apache.org
Subject [24/50] [abbrv] hive git commit: HIVE-13533: Remove AST dump (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)
Date Tue, 26 Apr 2016 17:53:47 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
index efb13a7..a6e15ba 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
@@ -54,31 +54,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T1 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -413,36 +388,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl2
 SELECT key, val, count(1) FROM T1 GROUP BY key, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl2
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -630,46 +575,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1036,48 +941,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT k, count(1) FROM (SELECT key as k, val as v FROM T1) subq1 GROUP BY k
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                     k
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-                     v
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               k
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            k
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1454,34 +1317,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3
 SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl3
-      TOK_SELECT
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         1
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1817,39 +1652,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4
 SELECT key, 1, val, count(1) FROM T1 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2038,40 +1840,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3
 SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl3
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            +
-               TOK_TABLE_OR_COL
-                  key
-               1
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         +
-            TOK_TABLE_OR_COL
-               key
-            1
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2278,58 +2046,6 @@ SELECT key + key, sum(cnt) from
 (SELECT key, count(1) as cnt FROM T1 GROUP BY key) subq1
 group by key + key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        count
-                        1
-                     cnt
-               TOK_GROUPBY
-                  TOK_TABLE_OR_COL
-                     key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            +
-               TOK_TABLE_OR_COL
-                  key
-               TOK_TABLE_OR_COL
-                  key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               sum
-               TOK_TABLE_OR_COL
-                  cnt
-      TOK_GROUPBY
-         +
-            TOK_TABLE_OR_COL
-               key
-            TOK_TABLE_OR_COL
-               key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2547,63 +2263,6 @@ SELECT key, count(1) FROM T1 GROUP BY key
 SELECT key, count(1) FROM T1 GROUP BY key
 ) subq1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -3044,70 +2703,6 @@ SELECT key, count(1) FROM T1 GROUP BY key
 SELECT key + key as key, count(1) FROM T1 GROUP BY key + key
 ) subq1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        +
-                           TOK_TABLE_OR_COL
-                              key
-                           TOK_TABLE_OR_COL
-                              key
-                        key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     +
-                        TOK_TABLE_OR_COL
-                           key
-                        TOK_TABLE_OR_COL
-                           key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-2 depends on stages: Stage-9
@@ -3667,89 +3262,6 @@ JOIN
 (SELECT key, count(1) as cnt FROM T1 GROUP BY key) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        cnt
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq1
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        cnt
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq2
-         =
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq2
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-         TOK_SELEXPR
-            +
-               .
-                  TOK_TABLE_OR_COL
-                     subq1
-                  cnt
-               .
-                  TOK_TABLE_OR_COL
-                     subq2
-                  cnt
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3992,78 +3504,6 @@ JOIN
 (SELECT key, val, count(1) FROM T1 GROUP BY key, val) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq1
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           val
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-                     TOK_TABLE_OR_COL
-                        val
-            subq2
-         =
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq2
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-1 depends on stages: Stage-2
@@ -4365,31 +3805,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T2 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4588,39 +4003,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4
 SELECT key, 1, val, count(1) FROM T2 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -5000,42 +4382,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl5
 SELECT key, 1, val, 2, count(1) FROM T2 GROUP BY key, 1, val, 2
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl5
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            2
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-         2
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -5372,59 +4718,6 @@ SELECT key, constant, val, count(1) from
 (SELECT key, 1 as constant, val from T2)subq
 group by key, constant, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T2
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     1
-                     constant
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-         subq
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               constant
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            constant
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -5808,81 +5101,6 @@ SELECT key, constant as constant2, val, 2 as constant3 from
 )subq2
 group by key, constant3, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_QUERY
-                     TOK_FROM
-                        TOK_TABREF
-                           TOK_TABNAME
-                              T2
-                     TOK_INSERT
-                        TOK_DESTINATION
-                           TOK_DIR
-                              TOK_TMP_FILE
-                        TOK_SELECT
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 key
-                           TOK_SELEXPR
-                              1
-                              constant
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 val
-                  subq
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        constant
-                     constant2
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-                  TOK_SELEXPR
-                     2
-                     constant3
-         subq2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               constant3
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            constant3
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/groupby_sort_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_6.q.out b/ql/src/test/results/clientpositive/groupby_sort_6.q.out
index 844a2a4..f523085 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_6.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_6.q.out
@@ -28,36 +28,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T1 where ds = '1' GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_WHERE
-         =
-            TOK_TABLE_OR_COL
-               ds
-            '1'
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -198,36 +168,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T1 where ds = '1' GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_WHERE
-         =
-            TOK_TABLE_OR_COL
-               ds
-            '1'
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -371,36 +311,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T1 where ds = '2' GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_WHERE
-         =
-            TOK_TABLE_OR_COL
-               ds
-            '2'
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
index 860a880..38b24a4 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
@@ -54,31 +54,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T1 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -413,36 +388,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl2
 SELECT key, val, count(1) FROM T1 GROUP BY key, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl2
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -696,46 +641,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1102,48 +1007,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT k, count(1) FROM (SELECT key as k, val as v FROM T1) subq1 GROUP BY k
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                     k
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-                     v
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               k
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            k
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1520,34 +1383,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3
 SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl3
-      TOK_SELECT
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         1
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -1883,39 +1718,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4
 SELECT key, 1, val, count(1) FROM T1 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2170,40 +1972,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl3
 SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl3
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            +
-               TOK_TABLE_OR_COL
-                  key
-               1
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         +
-            TOK_TABLE_OR_COL
-               key
-            1
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2476,58 +2244,6 @@ SELECT key + key, sum(cnt) from
 (SELECT key, count(1) as cnt FROM T1 GROUP BY key) subq1
 group by key + key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T1
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_FUNCTION
-                        count
-                        1
-                     cnt
-               TOK_GROUPBY
-                  TOK_TABLE_OR_COL
-                     key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            +
-               TOK_TABLE_OR_COL
-                  key
-               TOK_TABLE_OR_COL
-                  key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               sum
-               TOK_TABLE_OR_COL
-                  cnt
-      TOK_GROUPBY
-         +
-            TOK_TABLE_OR_COL
-               key
-            TOK_TABLE_OR_COL
-               key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2811,63 +2527,6 @@ SELECT key, count(1) FROM T1 GROUP BY key
 SELECT key, count(1) FROM T1 GROUP BY key
 ) subq1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -3308,70 +2967,6 @@ SELECT key, count(1) FROM T1 GROUP BY key
 SELECT key + key as key, count(1) FROM T1 GROUP BY key + key
 ) subq1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_UNIONALL
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        +
-                           TOK_TABLE_OR_COL
-                              key
-                           TOK_TABLE_OR_COL
-                              key
-                        key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     +
-                        TOK_TABLE_OR_COL
-                           key
-                        TOK_TABLE_OR_COL
-                           key
-         subq1
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-10 depends on stages: Stage-9
@@ -3997,89 +3592,6 @@ JOIN
 (SELECT key, count(1) as cnt FROM T1 GROUP BY key) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        cnt
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq1
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                        cnt
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq2
-         =
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq2
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-         TOK_SELEXPR
-            +
-               .
-                  TOK_TABLE_OR_COL
-                     subq1
-                  cnt
-               .
-                  TOK_TABLE_OR_COL
-                     subq2
-                  cnt
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4322,78 +3834,6 @@ JOIN
 (SELECT key, val, count(1) FROM T1 GROUP BY key, val) subq2
 ON subq1.key = subq2.key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-            subq1
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_TABREF
-                     TOK_TABNAME
-                        T1
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           key
-                     TOK_SELEXPR
-                        TOK_TABLE_OR_COL
-                           val
-                     TOK_SELEXPR
-                        TOK_FUNCTION
-                           count
-                           1
-                  TOK_GROUPBY
-                     TOK_TABLE_OR_COL
-                        key
-                     TOK_TABLE_OR_COL
-                        val
-            subq2
-         =
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq2
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-
-
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -4761,31 +4201,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl1
 SELECT key, count(1) FROM T2 GROUP BY key
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -5050,39 +4465,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl4
 SELECT key, 1, val, count(1) FROM T2 GROUP BY key, 1, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -5462,42 +4844,6 @@ EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE outputTbl5
 SELECT key, 1, val, 2, count(1) FROM T2 GROUP BY key, 1, val, 2
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            T2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl5
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            1
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            2
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         1
-         TOK_TABLE_OR_COL
-            val
-         2
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -5834,59 +5180,6 @@ SELECT key, constant, val, count(1) from
 (SELECT key, 1 as constant, val from T2)subq
 group by key, constant, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_TABREF
-                  TOK_TABNAME
-                     T2
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     1
-                     constant
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-         subq
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               constant
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            constant
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
@@ -6270,81 +5563,6 @@ SELECT key, constant as constant2, val, 2 as constant3 from
 )subq2
 group by key, constant3, val
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_SUBQUERY
-         TOK_QUERY
-            TOK_FROM
-               TOK_SUBQUERY
-                  TOK_QUERY
-                     TOK_FROM
-                        TOK_TABREF
-                           TOK_TABNAME
-                              T2
-                     TOK_INSERT
-                        TOK_DESTINATION
-                           TOK_DIR
-                              TOK_TMP_FILE
-                        TOK_SELECT
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 key
-                           TOK_SELEXPR
-                              1
-                              constant
-                           TOK_SELEXPR
-                              TOK_TABLE_OR_COL
-                                 val
-                  subq
-            TOK_INSERT
-               TOK_DESTINATION
-                  TOK_DIR
-                     TOK_TMP_FILE
-               TOK_SELECT
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        key
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        constant
-                     constant2
-                  TOK_SELEXPR
-                     TOK_TABLE_OR_COL
-                        val
-                  TOK_SELEXPR
-                     2
-                     constant3
-         subq2
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               outputTbl4
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               key
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               constant3
-         TOK_SELEXPR
-            TOK_TABLE_OR_COL
-               val
-         TOK_SELEXPR
-            TOK_FUNCTION
-               count
-               1
-      TOK_GROUPBY
-         TOK_TABLE_OR_COL
-            key
-         TOK_TABLE_OR_COL
-            constant3
-         TOK_TABLE_OR_COL
-            val
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input23.q.out b/ql/src/test/results/clientpositive/input23.q.out
index 33f2eb6..dcb2891 100644
--- a/ql/src/test/results/clientpositive/input23.q.out
+++ b/ql/src/test/results/clientpositive/input23.q.out
@@ -5,58 +5,6 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            a
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            b
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-      TOK_WHERE
-         and
-            and
-               and
-                  =
-                     .
-                        TOK_TABLE_OR_COL
-                           a
-                        ds
-                     '2008-04-08'
-                  =
-                     .
-                        TOK_TABLE_OR_COL
-                           a
-                        hr
-                     '11'
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        b
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     b
-                  hr
-               '14'
-      TOK_LIMIT
-         5
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input42.q.out b/ql/src/test/results/clientpositive/input42.q.out
index 4219c17..866468d 100644
--- a/ql/src/test/results/clientpositive/input42.q.out
+++ b/ql/src/test/results/clientpositive/input42.q.out
@@ -8,30 +8,6 @@ POSTHOOK: query: -- SORT_QUERY_RESULTS
 explain extended
 select * from srcpart a where a.ds='2008-04-08'
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            srcpart
-         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'
-
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1157,35 +1133,6 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and key < 200
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            srcpart
-         a
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-      TOK_WHERE
-         and
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     a
-                  ds
-               '2008-04-08'
-            <
-               TOK_TABLE_OR_COL
-                  key
-               200
-
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1693,36 +1640,6 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
 select * from srcpart a where a.ds='2008-04-08' and rand(100) < 0.1
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            srcpart
-         a
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-      TOK_WHERE
-         and
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     a
-                  ds
-               '2008-04-08'
-            <
-               TOK_FUNCTION
-                  rand
-                  100
-               0.1
-
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part1.q.out b/ql/src/test/results/clientpositive/input_part1.q.out
index 501f7a9..2abaa3b 100644
--- a/ql/src/test/results/clientpositive/input_part1.q.out
+++ b/ql/src/test/results/clientpositive/input_part1.q.out
@@ -14,62 +14,6 @@ POSTHOOK: query: EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            srcpart
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               hr
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               ds
-      TOK_WHERE
-         and
-            and
-               <
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     key
-                  100
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     srcpart
-                  hr
-               '12'
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part2.q.out b/ql/src/test/results/clientpositive/input_part2.q.out
index 9eba510..2ce071c 100644
--- a/ql/src/test/results/clientpositive/input_part2.q.out
+++ b/ql/src/test/results/clientpositive/input_part2.q.out
@@ -28,109 +28,6 @@ FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_TABREF
-         TOK_TABNAME
-            srcpart
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               hr
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               ds
-      TOK_WHERE
-         and
-            and
-               <
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     key
-                  100
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     srcpart
-                  hr
-               '12'
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest2
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               hr
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  srcpart
-               ds
-      TOK_WHERE
-         and
-            and
-               <
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     key
-                  100
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        srcpart
-                     ds
-                  '2008-04-09'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     srcpart
-                  hr
-               '12'
-
-
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-8 depends on stages: Stage-2 , consists of Stage-5, Stage-4, Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input_part7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part7.q.out b/ql/src/test/results/clientpositive/input_part7.q.out
index 53125d1..1429080 100644
--- a/ql/src/test/results/clientpositive/input_part7.q.out
+++ b/ql/src/test/results/clientpositive/input_part7.q.out
@@ -14,105 +14,6 @@ SELECT * FROM (
 ) A
 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
-                     and
-                        =
-                           .
-                              TOK_TABLE_OR_COL
-                                 X
-                              ds
-                           '2008-04-08'
-                        <
-                           .
-                              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
-                     and
-                        =
-                           .
-                              TOK_TABLE_OR_COL
-                                 Y
-                              ds
-                           '2008-04-08'
-                        <
-                           .
-                              TOK_TABLE_OR_COL
-                                 Y
-                              key
-                           100
-         A
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_DIR
-            TOK_TMP_FILE
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-      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

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/input_part9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part9.q.out b/ql/src/test/results/clientpositive/input_part9.q.out
index 0a3c87b..920096e 100644
--- a/ql/src/test/results/clientpositive/input_part9.q.out
+++ b/ql/src/test/results/clientpositive/input_part9.q.out
@@ -8,35 +8,6 @@ POSTHOOK: query: -- SORT_QUERY_RESULTS
 EXPLAIN EXTENDED
 SELECT x.* FROM SRCPART x WHERE key IS NOT NULL AND ds = '2008-04-08'
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-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
-         AND
-            TOK_FUNCTION
-               TOK_ISNOTNULL
-               TOK_TABLE_OR_COL
-                  key
-            =
-               TOK_TABLE_OR_COL
-                  ds
-               '2008-04-08'
-
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join17.q.out b/ql/src/test/results/clientpositive/join17.q.out
index 13260ef..39c49a5 100644
--- a/ql/src/test/results/clientpositive/join17.q.out
+++ b/ql/src/test/results/clientpositive/join17.q.out
@@ -18,44 +18,6 @@ POSTHOOK: query: EXPLAIN EXTENDED
 FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1 SELECT src1.*, src2.*
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_TABREF
-            TOK_TABNAME
-               src
-            src1
-         TOK_TABREF
-            TOK_TABNAME
-               src
-            src2
-         =
-            .
-               TOK_TABLE_OR_COL
-                  src1
-               key
-            .
-               TOK_TABLE_OR_COL
-                  src2
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest1
-      TOK_SELECT
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-               TOK_TABNAME
-                  src1
-         TOK_SELEXPR
-            TOK_ALLCOLREF
-               TOK_TABNAME
-                  src2
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join26.q.out b/ql/src/test/results/clientpositive/join26.q.out
index 5533ce4..0fdc403 100644
--- a/ql/src/test/results/clientpositive/join26.q.out
+++ b/ql/src/test/results/clientpositive/join26.q.out
@@ -22,85 +22,6 @@ SELECT /*+ MAPJOIN(x,y) */ x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.key = z.key and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_JOIN
-            TOK_TABREF
-               TOK_TABNAME
-                  src1
-               x
-            TOK_TABREF
-               TOK_TABNAME
-                  src
-               y
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     x
-                  key
-               .
-                  TOK_TABLE_OR_COL
-                     y
-                  key
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        x
-                     key
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     key
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_HINTLIST
-            TOK_HINT
-               TOK_MAPJOIN
-               TOK_HINTARGLIST
-                  x
-                  y
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  y
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-10 is a root stage
   Stage-1 depends on stages: Stage-10

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join32.q.out b/ql/src/test/results/clientpositive/join32.q.out
index 5cb124b..aad5463 100644
--- a/ql/src/test/results/clientpositive/join32.q.out
+++ b/ql/src/test/results/clientpositive/join32.q.out
@@ -26,79 +26,6 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_JOIN
-            TOK_TABREF
-               TOK_TABNAME
-                  src1
-               x
-            TOK_TABREF
-               TOK_TABNAME
-                  src
-               y
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     x
-                  key
-               .
-                  TOK_TABLE_OR_COL
-                     y
-                  key
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        x
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     value
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  y
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-6 depends on stages: Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join32_lessSize.q.out b/ql/src/test/results/clientpositive/join32_lessSize.q.out
index 544e814..a94b951 100644
--- a/ql/src/test/results/clientpositive/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/join32_lessSize.q.out
@@ -34,79 +34,6 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_JOIN
-            TOK_TABREF
-               TOK_TABNAME
-                  src1
-               x
-            TOK_TABREF
-               TOK_TABNAME
-                  src
-               y
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     x
-                  key
-               .
-                  TOK_TABLE_OR_COL
-                     y
-                  key
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        x
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     value
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  y
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-7 depends on stages: Stage-9
@@ -579,79 +506,6 @@ FROM src w JOIN src1 x ON (x.value = w.value)
 JOIN src y ON (x.key = y.key) 
 JOIN src1 z ON (x.key = z.key)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_JOIN
-            TOK_JOIN
-               TOK_TABREF
-                  TOK_TABNAME
-                     src
-                  w
-               TOK_TABREF
-                  TOK_TABNAME
-                     src1
-                  x
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        x
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        w
-                     value
-            TOK_TABREF
-               TOK_TABNAME
-                  src
-               y
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     x
-                  key
-               .
-                  TOK_TABLE_OR_COL
-                     y
-                  key
-         TOK_TABREF
-            TOK_TABNAME
-               src1
-            z
-         =
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-            .
-               TOK_TABLE_OR_COL
-                  z
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  y
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-13 is a root stage
   Stage-10 depends on stages: Stage-13
@@ -1215,98 +1069,6 @@ SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_JOIN
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src1
-                        x
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        y
-                     =
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           key
-                        .
-                           TOK_TABLE_OR_COL
-                              y
-                           key
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           key
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           value
-            res
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        res
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     value
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j2
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  res
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  res
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-6 depends on stages: Stage-8
@@ -1827,98 +1589,6 @@ SELECT res.key, z.value, res.value
 FROM (select x.key, x.value from src1 x LEFT OUTER JOIN src y ON (x.key = y.key)) res 
 JOIN srcpart z ON (res.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_QUERY
-               TOK_FROM
-                  TOK_LEFTOUTERJOIN
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src1
-                        x
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        y
-                     =
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           key
-                        .
-                           TOK_TABLE_OR_COL
-                              y
-                           key
-               TOK_INSERT
-                  TOK_DESTINATION
-                     TOK_DIR
-                        TOK_TMP_FILE
-                  TOK_SELECT
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           key
-                     TOK_SELEXPR
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           value
-            res
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        res
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     value
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j2
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  res
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  res
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-6 depends on stages: Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join33.q.out b/ql/src/test/results/clientpositive/join33.q.out
index 5cb124b..aad5463 100644
--- a/ql/src/test/results/clientpositive/join33.q.out
+++ b/ql/src/test/results/clientpositive/join33.q.out
@@ -26,79 +26,6 @@ SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 
 JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_JOIN
-            TOK_TABREF
-               TOK_TABNAME
-                  src1
-               x
-            TOK_TABREF
-               TOK_TABNAME
-                  src
-               y
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     x
-                  key
-               .
-                  TOK_TABLE_OR_COL
-                     y
-                  key
-         TOK_TABREF
-            TOK_TABNAME
-               srcpart
-            z
-         and
-            and
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        x
-                     value
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     value
-               =
-                  .
-                     TOK_TABLE_OR_COL
-                        z
-                     ds
-                  '2008-04-08'
-            =
-               .
-                  TOK_TABLE_OR_COL
-                     z
-                  hr
-               11
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  z
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  y
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-8 is a root stage
   Stage-6 depends on stages: Stage-8

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out
index e2c2b1a..74fac5c 100644
--- a/ql/src/test/results/clientpositive/join34.q.out
+++ b/ql/src/test/results/clientpositive/join34.q.out
@@ -34,110 +34,6 @@ FROM
 ) subq1
 JOIN src1 x ON (x.key = subq1.key)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_UNIONALL
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        x
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x
-                              key
-                           key
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x
-                              value
-                           value
-                     TOK_WHERE
-                        <
-                           .
-                              TOK_TABLE_OR_COL
-                                 x
-                              key
-                           20
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        x1
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x1
-                              key
-                           key
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x1
-                              value
-                           value
-                     TOK_WHERE
-                        >
-                           .
-                              TOK_TABLE_OR_COL
-                                 x1
-                              key
-                           100
-            subq1
-         TOK_TABREF
-            TOK_TABNAME
-               src1
-            x
-         =
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               value
-
-
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
   Stage-5 depends on stages: Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/6908198d/ql/src/test/results/clientpositive/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out
index 96f7cc8..6fe9cae 100644
--- a/ql/src/test/results/clientpositive/join35.q.out
+++ b/ql/src/test/results/clientpositive/join35.q.out
@@ -34,118 +34,6 @@ FROM
 ) subq1
 JOIN src1 x ON (x.key = subq1.key)
 POSTHOOK: type: QUERY
-ABSTRACT SYNTAX TREE:
-  
-TOK_QUERY
-   TOK_FROM
-      TOK_JOIN
-         TOK_SUBQUERY
-            TOK_UNIONALL
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        x
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x
-                              key
-                           key
-                        TOK_SELEXPR
-                           TOK_FUNCTION
-                              count
-                              1
-                           cnt
-                     TOK_WHERE
-                        <
-                           .
-                              TOK_TABLE_OR_COL
-                                 x
-                              key
-                           20
-                     TOK_GROUPBY
-                        .
-                           TOK_TABLE_OR_COL
-                              x
-                           key
-               TOK_QUERY
-                  TOK_FROM
-                     TOK_TABREF
-                        TOK_TABNAME
-                           src
-                        x1
-                  TOK_INSERT
-                     TOK_DESTINATION
-                        TOK_DIR
-                           TOK_TMP_FILE
-                     TOK_SELECT
-                        TOK_SELEXPR
-                           .
-                              TOK_TABLE_OR_COL
-                                 x1
-                              key
-                           key
-                        TOK_SELEXPR
-                           TOK_FUNCTION
-                              count
-                              1
-                           cnt
-                     TOK_WHERE
-                        >
-                           .
-                              TOK_TABLE_OR_COL
-                                 x1
-                              key
-                           100
-                     TOK_GROUPBY
-                        .
-                           TOK_TABLE_OR_COL
-                              x1
-                           key
-            subq1
-         TOK_TABREF
-            TOK_TABNAME
-               src1
-            x
-         =
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               key
-   TOK_INSERT
-      TOK_DESTINATION
-         TOK_TAB
-            TOK_TABNAME
-               dest_j1
-      TOK_SELECT
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               key
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  x
-               value
-         TOK_SELEXPR
-            .
-               TOK_TABLE_OR_COL
-                  subq1
-               cnt
-
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-7 depends on stages: Stage-1, Stage-4


Mime
View raw message