hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1463091 [10/16] - in /hive/branches/HIVE-4115: ./ bin/ bin/ext/ common/src/gen/ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/java/org/apache/hadoop/hive/contrib/serde2/ contrib/src/java/org/apache/hadoop/hive/contrib/serd...
Date Mon, 01 Apr 2013 07:01:00 GMT
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join3.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join3.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join3.q.out Mon Apr  1 07:00:00 2013
@@ -15,34 +15,25 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (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_TABREF (TOK_TABNAME src) src3) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src3) value)))))
 
 STAGE DEPENDENCIES:
-  Stage-8 is a root stage , consists of Stage-9, Stage-10, Stage-11, Stage-1
-  Stage-9 has a backup stage: Stage-1
-  Stage-5 depends on stages: Stage-9
-  Stage-0 depends on stages: Stage-1, Stage-5, Stage-6, Stage-7
+  Stage-6 is a root stage
+  Stage-5 depends on stages: Stage-6
+  Stage-0 depends on stages: Stage-5
   Stage-2 depends on stages: Stage-0
-  Stage-10 has a backup stage: Stage-1
-  Stage-6 depends on stages: Stage-10
-  Stage-11 has a backup stage: Stage-1
-  Stage-7 depends on stages: Stage-11
-  Stage-1
 
 STAGE PLANS:
-  Stage: Stage-8
-    Conditional Operator
-
-  Stage: Stage-9
+  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        src2 
+        src1 
           Fetch Operator
             limit: -1
         src3 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        src2 
+        src1 
           TableScan
-            alias: src2
+            alias: src1
             HashTable Sink Operator
               condition expressions:
                 0 {key}
@@ -53,7 +44,7 @@ STAGE PLANS:
                 0 [Column[key]]
                 1 [Column[key]]
                 2 [Column[key]]
-              Position of Big Table: 0
+              Position of Big Table: 1
         src3 
           TableScan
             alias: src3
@@ -67,14 +58,14 @@ STAGE PLANS:
                 0 [Column[key]]
                 1 [Column[key]]
                 2 [Column[key]]
-              Position of Big Table: 0
+              Position of Big Table: 1
 
   Stage: Stage-5
     Map Reduce
       Alias -> Map Operator Tree:
-        src1 
+        src2 
           TableScan
-            alias: src1
+            alias: src2
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -89,7 +80,7 @@ STAGE PLANS:
                 1 [Column[key]]
                 2 [Column[key]]
               outputColumnNames: _col0, _col9
-              Position of Big Table: 0
+              Position of Big Table: 1
               Select Operator
                 expressions:
                       expr: UDFToInteger(_col0)
@@ -121,234 +112,6 @@ STAGE PLANS:
   Stage: Stage-2
     Stats-Aggr Operator
 
-  Stage: Stage-10
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        src1 
-          Fetch Operator
-            limit: -1
-        src3 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        src1 
-          TableScan
-            alias: src1
-            HashTable Sink Operator
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 1
-        src3 
-          TableScan
-            alias: src3
-            HashTable Sink Operator
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 1
-
-  Stage: Stage-6
-    Map Reduce
-      Alias -> Map Operator Tree:
-        src2 
-          TableScan
-            alias: src2
-            Map Join Operator
-              condition map:
-                   Inner Join 0 to 1
-                   Inner Join 0 to 2
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              outputColumnNames: _col0, _col9
-              Position of Big Table: 1
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col9
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.dest1
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-11
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        src1 
-          Fetch Operator
-            limit: -1
-        src2 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        src1 
-          TableScan
-            alias: src1
-            HashTable Sink Operator
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 2
-        src2 
-          TableScan
-            alias: src2
-            HashTable Sink Operator
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 2
-
-  Stage: Stage-7
-    Map Reduce
-      Alias -> Map Operator Tree:
-        src3 
-          TableScan
-            alias: src3
-            Map Join Operator
-              condition map:
-                   Inner Join 0 to 1
-                   Inner Join 0 to 2
-              condition expressions:
-                0 {key}
-                1 
-                2 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              outputColumnNames: _col0, _col9
-              Position of Big Table: 2
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col9
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.dest1
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        src1 
-          TableScan
-            alias: src1
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-        src2 
-          TableScan
-            alias: src2
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-        src3 
-          TableScan
-            alias: src3
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 2
-              value expressions:
-                    expr: value
-                    type: string
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Inner Join 0 to 1
-               Inner Join 0 to 2
-          condition expressions:
-            0 {VALUE._col0}
-            1 
-            2 {VALUE._col1}
-          handleSkewJoin: false
-          outputColumnNames: _col0, _col9
-          Select Operator
-            expressions:
-                  expr: UDFToInteger(_col0)
-                  type: int
-                  expr: _col9
-                  type: string
-            outputColumnNames: _col0, _col1
-            File Output Operator
-              compressed: false
-              GlobalTableId: 1
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  name: default.dest1
-
 
 PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key)
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join4.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join4.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join4.q.out Mon Apr  1 07:00:00 2013
@@ -37,18 +37,13 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (
 TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)))))
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage , consists of Stage-6, Stage-1
-  Stage-6 has a backup stage: Stage-1
-  Stage-4 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1, Stage-4
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
-  Stage-1
 
 STAGE PLANS:
   Stage: Stage-5
-    Conditional Operator
-
-  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         c:b:src2 
@@ -143,94 +138,6 @@ STAGE PLANS:
   Stage: Stage-2
     Stats-Aggr Operator
 
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        c:a:src1 
-          TableScan
-            alias: src1
-            Filter Operator
-              predicate:
-                  expr: ((key > 10.0) and (key < 20.0))
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 0
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-        c:b:src2 
-          TableScan
-            alias: src2
-            Filter Operator
-              predicate:
-                  expr: ((key > 15.0) and (key < 25.0))
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Left Outer Join0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
-          handleSkewJoin: false
-          outputColumnNames: _col0, _col1, _col2, _col3
-          Select Operator
-            expressions:
-                  expr: UDFToInteger(_col0)
-                  type: int
-                  expr: _col1
-                  type: string
-                  expr: UDFToInteger(_col2)
-                  type: int
-                  expr: _col3
-                  type: string
-            outputColumnNames: _col0, _col1, _col2, _col3
-            File Output Operator
-              compressed: false
-              GlobalTableId: 1
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  name: default.dest1
-
 
 PREHOOK: query: FROM (
  FROM 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join5.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join5.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join5.q.out Mon Apr  1 07:00:00 2013
@@ -37,18 +37,13 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_RIGHTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. 
 (TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4)))))
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage , consists of Stage-6, Stage-1
-  Stage-6 has a backup stage: Stage-1
-  Stage-4 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1, Stage-4
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
-  Stage-1
 
 STAGE PLANS:
   Stage: Stage-5
-    Conditional Operator
-
-  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         c:a:src1 
@@ -143,94 +138,6 @@ STAGE PLANS:
   Stage: Stage-2
     Stats-Aggr Operator
 
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        c:a:src1 
-          TableScan
-            alias: src1
-            Filter Operator
-              predicate:
-                  expr: ((key > 10.0) and (key < 20.0))
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 0
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-        c:b:src2 
-          TableScan
-            alias: src2
-            Filter Operator
-              predicate:
-                  expr: ((key > 15.0) and (key < 25.0))
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Right Outer Join0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
-          handleSkewJoin: false
-          outputColumnNames: _col0, _col1, _col2, _col3
-          Select Operator
-            expressions:
-                  expr: UDFToInteger(_col0)
-                  type: int
-                  expr: _col1
-                  type: string
-                  expr: UDFToInteger(_col2)
-                  type: int
-                  expr: _col3
-                  type: string
-            outputColumnNames: _col0, _col1, _col2, _col3
-            File Output Operator
-              compressed: false
-              GlobalTableId: 1
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  name: default.dest1
-
 
 PREHOOK: query: FROM (
  FROM 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join7.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join7.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join7.q.out Mon Apr  1 07:00:00 2013
@@ -250,4 +250,4 @@ POSTHOOK: Lineage: dest1.c3 EXPRESSION [
 POSTHOOK: Lineage: dest1.c4 SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c5 EXPRESSION [(src)src3.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c6 SIMPLE [(src)src3.FieldSchema(name:value, type:string, comment:default), ]
--5178357269
+-2315698213

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join8.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join8.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join8.q.out Mon Apr  1 07:00:00 2013
@@ -37,18 +37,13 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) value) c2)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src1) key) 10) (< (. (TOK_TABLE_OR_COL src1) key) 20))))) a) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) src2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value) c4)) (TOK_WHERE (and (> (. (TOK_TABLE_OR_COL src2) key) 15) (< (. (TOK_TABLE_OR_COL src2) key) 25))))) b) (= (. (TOK_TABLE_OR_COL a) c1) (. (TOK_TABLE_OR_COL b) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c1) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) c2) c2) (TOK_SELEXPR (. (
 TOK_TABLE_OR_COL b) c3) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) c4) c4)))) c)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c2)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c3)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) c4))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL c) c3)) (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL c) c1))))))
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage , consists of Stage-6, Stage-1
-  Stage-6 has a backup stage: Stage-1
-  Stage-4 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1, Stage-4
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
-  Stage-1
 
 STAGE PLANS:
   Stage: Stage-5
-    Conditional Operator
-
-  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         c:b:src2 
@@ -147,98 +142,6 @@ STAGE PLANS:
   Stage: Stage-2
     Stats-Aggr Operator
 
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        c:a:src1 
-          TableScan
-            alias: src1
-            Filter Operator
-              predicate:
-                  expr: (((key > 10.0) and (key < 20.0)) and key is not null)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 0
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-        c:b:src2 
-          TableScan
-            alias: src2
-            Filter Operator
-              predicate:
-                  expr: (((key > 15.0) and (key < 25.0)) and key is not null)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: string
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 1
-                  value expressions:
-                        expr: _col0
-                        type: string
-                        expr: _col1
-                        type: string
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Left Outer Join0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
-          handleSkewJoin: false
-          outputColumnNames: _col0, _col1, _col2, _col3
-          Filter Operator
-            predicate:
-                expr: _col2 is null
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: UDFToInteger(_col0)
-                    type: int
-                    expr: _col1
-                    type: string
-                    expr: UDFToInteger(_col2)
-                    type: int
-                    expr: _col3
-                    type: string
-              outputColumnNames: _col0, _col1, _col2, _col3
-              File Output Operator
-                compressed: false
-                GlobalTableId: 1
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                    name: default.dest1
-
 
 PREHOOK: query: FROM (
  FROM 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join9.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join9.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join9.q.out Mon Apr  1 07:00:00 2013
@@ -15,29 +15,22 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF (TOK_TABNAME srcpart) 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_TABLE_OR_COL src1) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) value))) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL src1) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL src1) hr) '12')))))
 
 STAGE DEPENDENCIES:
-  Stage-6 is a root stage , consists of Stage-7, Stage-8, Stage-1
-  Stage-7 has a backup stage: Stage-1
-  Stage-4 depends on stages: Stage-7
-  Stage-0 depends on stages: Stage-1, Stage-4, Stage-5
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
-  Stage-8 has a backup stage: Stage-1
-  Stage-5 depends on stages: Stage-8
-  Stage-1
 
 STAGE PLANS:
-  Stage: Stage-6
-    Conditional Operator
-
-  Stage: Stage-7
+  Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        src2 
+        src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        src2 
+        src1 
           TableScan
-            alias: src2
+            alias: src1
             HashTable Sink Operator
               condition expressions:
                 0 {key}
@@ -46,14 +39,14 @@ STAGE PLANS:
               keys:
                 0 [Column[key]]
                 1 [Column[key]]
-              Position of Big Table: 0
+              Position of Big Table: 1
 
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        src1 
+        src2 
           TableScan
-            alias: src1
+            alias: src2
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -65,7 +58,7 @@ STAGE PLANS:
                 0 [Column[key]]
                 1 [Column[key]]
               outputColumnNames: _col0, _col7
-              Position of Big Table: 0
+              Position of Big Table: 1
               Select Operator
                 expressions:
                       expr: UDFToInteger(_col0)
@@ -97,119 +90,6 @@ STAGE PLANS:
   Stage: Stage-2
     Stats-Aggr Operator
 
-  Stage: Stage-8
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        src1 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        src1 
-          TableScan
-            alias: src1
-            HashTable Sink Operator
-              condition expressions:
-                0 {key}
-                1 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-              Position of Big Table: 1
-
-  Stage: Stage-5
-    Map Reduce
-      Alias -> Map Operator Tree:
-        src2 
-          TableScan
-            alias: src2
-            Map Join Operator
-              condition map:
-                   Inner Join 0 to 1
-              condition expressions:
-                0 {key}
-                1 {value}
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-              outputColumnNames: _col0, _col7
-              Position of Big Table: 1
-              Select Operator
-                expressions:
-                      expr: UDFToInteger(_col0)
-                      type: int
-                      expr: _col7
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.dest1
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        src1 
-          TableScan
-            alias: src1
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 0
-              value expressions:
-                    expr: key
-                    type: string
-        src2 
-          TableScan
-            alias: src2
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: value
-                    type: string
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0}
-            1 {VALUE._col1}
-          handleSkewJoin: false
-          outputColumnNames: _col0, _col7
-          Select Operator
-            expressions:
-                  expr: UDFToInteger(_col0)
-                  type: int
-                  expr: _col7
-                  type: string
-            outputColumnNames: _col0, _col1
-            File Output Operator
-              compressed: false
-              GlobalTableId: 1
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  name: default.dest1
 
 PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value where src1.ds = '2008-04-08' and src1.hr = '12'

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join_filters.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join_filters.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join_filters.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_join_filters.q.out Mon Apr  1 07:00:00 2013
@@ -44,7 +44,7 @@ POSTHOOK: query: SELECT sum(hash(a.key,a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
-19749880
+4939870
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b ON a.key = b.value AND a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out Mon Apr  1 07:00:00 2013
@@ -68,20 +68,13 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME tbl1) a)) (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 a) value) value)) (TOK_WHERE (< (TOK_TABLE_OR_COL key) 6)))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME tbl1) a)) (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 a) value) value)) (TOK_WHERE (< (TOK_TABLE_OR_COL key) 6))))) usubq1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)))) subq1) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME tbl2) a)) (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 a) value) value)) (TOK_WHERE (< (TOK_TABL
 E_OR_COL key) 6)))) 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_FUNCTIONSTAR count)))))
 
 STAGE DEPENDENCIES:
-  Stage-7 is a root stage , consists of Stage-8, Stage-9, Stage-1
-  Stage-8 has a backup stage: Stage-1
-  Stage-5 depends on stages: Stage-8
-  Stage-2 depends on stages: Stage-1, Stage-5, Stage-6
-  Stage-9 has a backup stage: Stage-1
-  Stage-6 depends on stages: Stage-9
-  Stage-1
+  Stage-6 is a root stage
+  Stage-5 depends on stages: Stage-6
+  Stage-2 depends on stages: Stage-5
   Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-7
-    Conditional Operator
-
-  Stage: Stage-8
+  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         subq2:a 
@@ -233,221 +226,6 @@ STAGE PLANS:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
-  Stage: Stage-9
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        subq1-subquery1:usubq1-subquery1:a 
-          Fetch Operator
-            limit: -1
-        subq1-subquery2:usubq1-subquery2:a 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        subq1-subquery1:usubq1-subquery1:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                    outputColumnNames: _col0
-                    HashTable Sink Operator
-                      condition expressions:
-                        0 
-                        1 
-                      handleSkewJoin: false
-                      keys:
-                        0 [Column[_col0]]
-                        1 [Column[_col0]]
-                      Position of Big Table: 1
-        subq1-subquery2:usubq1-subquery2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                    outputColumnNames: _col0
-                    HashTable Sink Operator
-                      condition expressions:
-                        0 
-                        1 
-                      handleSkewJoin: false
-                      keys:
-                        0 [Column[_col0]]
-                        1 [Column[_col0]]
-                      Position of Big Table: 1
-
-  Stage: Stage-6
-    Map Reduce
-      Alias -> Map Operator Tree:
-        subq2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                outputColumnNames: _col0
-                Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  condition expressions:
-                    0 
-                    1 
-                  handleSkewJoin: false
-                  keys:
-                    0 [Column[_col0]]
-                    1 [Column[_col0]]
-                  Position of Big Table: 1
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 0
-                        table:
-                            input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                            output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        subq1-subquery1:usubq1-subquery1:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                    outputColumnNames: _col0
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: int
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: int
-                      tag: 0
-        subq1-subquery2:usubq1-subquery2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                      expr: value
-                      type: string
-                outputColumnNames: _col0, _col1
-                Union
-                  Select Operator
-                    expressions:
-                          expr: _col0
-                          type: int
-                    outputColumnNames: _col0
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col0
-                            type: int
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col0
-                            type: int
-                      tag: 0
-        subq2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                outputColumnNames: _col0
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: int
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: int
-                  tag: 1
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Inner Join 0 to 1
-          condition expressions:
-            0 
-            1 
-          handleSkewJoin: false
-          Select Operator
-            Group By Operator
-              aggregations:
-                    expr: count()
-              bucketGroup: false
-              mode: hash
-              outputColumnNames: _col0
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
   Stage: Stage-0
     Fetch Operator
       limit: -1
@@ -511,13 +289,9 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1 , consists of Stage-8, Stage-9, Stage-2
-  Stage-8 has a backup stage: Stage-2
-  Stage-5 depends on stages: Stage-8
-  Stage-3 depends on stages: Stage-2, Stage-5, Stage-6
-  Stage-9 has a backup stage: Stage-2
-  Stage-6 depends on stages: Stage-9
-  Stage-2
+  Stage-6 depends on stages: Stage-1
+  Stage-5 depends on stages: Stage-6
+  Stage-3 depends on stages: Stage-5
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -579,10 +353,7 @@ STAGE PLANS:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
-  Stage: Stage-7
-    Conditional Operator
-
-  Stage: Stage-8
+  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         subq2:a 
@@ -671,122 +442,6 @@ STAGE PLANS:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
-  Stage: Stage-9
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        $INTNAME 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        $INTNAME 
-            HashTable Sink Operator
-              condition expressions:
-                0 
-                1 
-              handleSkewJoin: false
-              keys:
-                0 [Column[_col0]]
-                1 [Column[_col0]]
-              Position of Big Table: 1
-
-  Stage: Stage-6
-    Map Reduce
-      Alias -> Map Operator Tree:
-        subq2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                outputColumnNames: _col0
-                Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  condition expressions:
-                    0 
-                    1 
-                  handleSkewJoin: false
-                  keys:
-                    0 [Column[_col0]]
-                    1 [Column[_col0]]
-                  Position of Big Table: 1
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count()
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 0
-                        table:
-                            input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                            output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-        $INTNAME 
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: int
-              sort order: +
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: int
-              tag: 0
-        subq2:a 
-          TableScan
-            alias: a
-            Filter Operator
-              predicate:
-                  expr: (key < 6)
-                  type: boolean
-              Select Operator
-                expressions:
-                      expr: key
-                      type: int
-                outputColumnNames: _col0
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: int
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: int
-                  tag: 1
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Inner Join 0 to 1
-          condition expressions:
-            0 
-            1 
-          handleSkewJoin: false
-          Select Operator
-            Group By Operator
-              aggregations:
-                    expr: count()
-              bucketGroup: false
-              mode: hash
-              outputColumnNames: _col0
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
   Stage: Stage-0
     Fetch Operator
       limit: -1

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out Mon Apr  1 07:00:00 2013
@@ -1459,20 +1459,13 @@ ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME tbl1) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ (. (TOK_TABLE_OR_COL a) key) 1) key) (TOK_SELEXPR (TOK_FUNCTION concat (. (TOK_TABLE_OR_COL a) value) (. (TOK_TABLE_OR_COL a) value)) value)))) subq1) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME tbl2) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ (. (TOK_TABLE_OR_COL a) key) 1) key) (TOK_SELEXPR (TOK_FUNCTION concat (. (TOK_TABLE_OR_COL a) value) (. (TOK_TABLE_OR_COL a) value)) value)))) 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_FUNCTIONSTAR count)))))
 
 STAGE DEPENDENCIES:
-  Stage-6 is a root stage , consists of Stage-7, Stage-8, Stage-1
-  Stage-7 has a backup stage: Stage-1
-  Stage-4 depends on stages: Stage-7
-  Stage-2 depends on stages: Stage-1, Stage-4, Stage-5
-  Stage-8 has a backup stage: Stage-1
-  Stage-5 depends on stages: Stage-8
-  Stage-1
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
+  Stage-2 depends on stages: Stage-4
   Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-6
-    Conditional Operator
-
-  Stage: Stage-7
+  Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
         subq2:a 
@@ -1564,128 +1557,6 @@ STAGE PLANS:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
-  Stage: Stage-8
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        subq1:a 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        subq1:a 
-          TableScan
-            alias: a
-            Select Operator
-              expressions:
-                    expr: (key + 1)
-                    type: int
-              outputColumnNames: _col0
-              HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[_col0]]
-                Position of Big Table: 1
-
-  Stage: Stage-5
-    Map Reduce
-      Alias -> Map Operator Tree:
-        subq2:a 
-          TableScan
-            alias: a
-            Select Operator
-              expressions:
-                    expr: (key + 1)
-                    type: int
-              outputColumnNames: _col0
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                condition expressions:
-                  0 
-                  1 
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[_col0]]
-                Position of Big Table: 1
-                Select Operator
-                  Group By Operator
-                    aggregations:
-                          expr: count()
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 0
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-      Local Work:
-        Map Reduce Local Work
-
-  Stage: Stage-1
-    Map Reduce
-      Alias -> Map Operator Tree:
-        subq1:a 
-          TableScan
-            alias: a
-            Select Operator
-              expressions:
-                    expr: (key + 1)
-                    type: int
-              outputColumnNames: _col0
-              Reduce Output Operator
-                key expressions:
-                      expr: _col0
-                      type: int
-                sort order: +
-                Map-reduce partition columns:
-                      expr: _col0
-                      type: int
-                tag: 0
-        subq2:a 
-          TableScan
-            alias: a
-            Select Operator
-              expressions:
-                    expr: (key + 1)
-                    type: int
-              outputColumnNames: _col0
-              Reduce Output Operator
-                key expressions:
-                      expr: _col0
-                      type: int
-                sort order: +
-                Map-reduce partition columns:
-                      expr: _col0
-                      type: int
-                tag: 1
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Inner Join 0 to 1
-          condition expressions:
-            0 
-            1 
-          handleSkewJoin: false
-          Select Operator
-            Group By Operator
-              aggregations:
-                    expr: count()
-              bucketGroup: false
-              mode: hash
-              outputColumnNames: _col0
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
   Stage: Stage-0
     Fetch Operator
       limit: -1

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/column_access_stats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/column_access_stats.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/column_access_stats.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/column_access_stats.q.out Mon Apr  1 07:00:00 2013
@@ -14,7 +14,7 @@ SELECT key FROM T1 ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key
 
 1
@@ -27,7 +27,7 @@ PREHOOK: query: SELECT key, val FROM T1 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key,val
 
 1	11
@@ -95,7 +95,7 @@ PREHOOK: query: SELECT key FROM (SELECT 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key
 
 1
@@ -152,7 +152,7 @@ PREHOOK: query: SELECT k FROM (SELECT ke
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key
 
 1
@@ -165,7 +165,7 @@ PREHOOK: query: SELECT key + 1 as k FROM
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key
 
 2.0
@@ -178,7 +178,7 @@ PREHOOK: query: SELECT key + val as k FR
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key,val
 
 12.0
@@ -274,7 +274,7 @@ SELECT val as c FROM T1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key,val
 
 1
@@ -375,7 +375,7 @@ SELECT key as c FROM T1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
-Table:t1
+Table:default@t1
 Columns:key
 
 1
@@ -398,7 +398,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Output: default@t2
 PREHOOK: Output: default@t3
-Table:t1
+Table:default@t1
 Columns:key,val
 
 PREHOOK: query: -- Simple joins
@@ -410,10 +410,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key,val
 
-Table:t1
+Table:default@t1
 Columns:key,val
 
 1	11	1	1
@@ -523,10 +523,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key
 
-Table:t1
+Table:default@t1
 Columns:key
 
 1
@@ -543,10 +543,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key,val
 
-Table:t1
+Table:default@t1
 Columns:key,val
 
 PREHOOK: query: -- Map join
@@ -558,10 +558,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key,val
 
-Table:t1
+Table:default@t1
 Columns:key,val
 
 1	11	1	1
@@ -701,10 +701,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key,val
 
-Table:t1
+Table:default@t1
 Columns:key,val
 
 PREHOOK: query: EXPLAIN
@@ -840,10 +840,10 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-Table:t2
+Table:default@t2
 Columns:key,val
 
-Table:t1
+Table:default@t1
 Columns:key,val
 
 PREHOOK: query: -- Join followed by join
@@ -1050,15 +1050,15 @@ PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 PREHOOK: Input: default@t3
 #### A masked pattern was here ####
-Table:t3
-Columns:key,val
-
-Table:t2
+Table:default@t2
 Columns:key
 
-Table:t1
+Table:default@t1
 Columns:key
 
+Table:default@t3
+Columns:key,val
+
 1	1	11.0
 2	2	12.0
 3	3	13.0

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape1.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
Files hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape1.q.out (original) and hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape1.q.out Mon Apr  1 07:00:00 2013 differ

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape2.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
Files hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape2.q.out (original) and hive/branches/HIVE-4115/ql/src/test/results/clientpositive/escape2.q.out Mon Apr  1 07:00:00 2013 differ

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out Mon Apr  1 07:00:00 2013
@@ -71,9 +71,11 @@ partitionColumns:struct partition_column
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 #### A masked pattern was here ####
 PREHOOK: query: drop table exim_employee
 PREHOOK: type: DROPTABLE

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_part.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_02_part.q.out Mon Apr  1 07:00:00 2013
@@ -88,10 +88,12 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 1	in	tn

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out Mon Apr  1 07:00:00 2013
@@ -124,6 +124,7 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ka
@@ -131,6 +132,7 @@ PREHOOK: Input: importer@exim_employee@e
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ka

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out Mon Apr  1 07:00:00 2013
@@ -180,11 +180,13 @@ minFileSize:0
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out Mon Apr  1 07:00:00 2013
@@ -118,11 +118,13 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ka
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ka
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out Mon Apr  1 07:00:00 2013
@@ -115,10 +115,12 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 #### A masked pattern was here ####
 1	in	ka

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out Mon Apr  1 07:00:00 2013
@@ -129,6 +129,7 @@ emp_state           	string             
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=al
@@ -137,6 +138,7 @@ PREHOOK: Input: importer@exim_employee@e
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=al

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out Mon Apr  1 07:00:00 2013
@@ -135,12 +135,14 @@ emp_state           	string             
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out Mon Apr  1 07:00:00 2013
@@ -140,12 +140,14 @@ emp_state           	string             
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
@@ -171,12 +173,14 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
@@ -196,12 +200,14 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_16_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_16_part_external.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_16_part_external.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_16_part_external.q.out Mon Apr  1 07:00:00 2013
@@ -142,10 +142,12 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 1	us	tn
@@ -157,10 +159,12 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 PREHOOK: query: drop table exim_employee

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_17_part_managed.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_17_part_managed.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_17_part_managed.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_17_part_managed.q.out Mon Apr  1 07:00:00 2013
@@ -166,11 +166,13 @@ minFileSize:0
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ap
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ap
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
@@ -183,11 +185,13 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ap
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=ap
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out Mon Apr  1 07:00:00 2013
@@ -139,10 +139,12 @@ minFileSize:11
 
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 1	us	tn
@@ -154,10 +156,12 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 PREHOOK: query: drop table exim_employee

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out Mon Apr  1 07:00:00 2013
@@ -139,11 +139,13 @@ minFileSize:23
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
@@ -162,11 +164,13 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=ka
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out Mon Apr  1 07:00:00 2013
@@ -143,10 +143,12 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 1	us	tn
@@ -158,10 +160,12 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 PREHOOK: query: drop table exim_employee

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out Mon Apr  1 07:00:00 2013
@@ -143,10 +143,12 @@ minFileSize:11
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 1	us	tn
@@ -158,10 +160,12 @@ POSTHOOK: Input: importer@exim_employee@
 #### A masked pattern was here ####
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=us/emp_state=tn
 #### A masked pattern was here ####
 PREHOOK: query: drop table exim_employee

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out Mon Apr  1 07:00:00 2013
@@ -79,10 +79,12 @@ POSTHOOK: Output: importer@exim_employee
 POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
 PREHOOK: query: select * from exim_employee
 PREHOOK: type: QUERY
+PREHOOK: Input: importer@exim_employee
 PREHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 POSTHOOK: query: select * from exim_employee
 POSTHOOK: type: QUERY
+POSTHOOK: Input: importer@exim_employee
 POSTHOOK: Input: importer@exim_employee@emp_country=in/emp_state=tn
 #### A masked pattern was here ####
 1	in	tn

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out?rev=1463091&r1=1463090&r2=1463091&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out Mon Apr  1 07:00:00 2013
@@ -252,10 +252,12 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c9 SIMPLE []
 PREHOOK: query: select * from T2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t2
 PREHOOK: Input: default@t2@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: query: select * from T2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t2@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c1 SIMPLE []
@@ -381,10 +383,12 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-
 5	name	NULL	2	kavin	NULL	9	c	8	0	0	7	1	2	0	3	2	NULL	1	NULL	3	2	0	0	5	10	2010-04-17
 PREHOOK: query: select * from T1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
 PREHOOK: Input: default@t1@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: query: select * from T1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t1@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c1 SIMPLE []
@@ -510,10 +514,12 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-
 5	1	1	1	0	0	4	2010-04-17
 PREHOOK: query: select * from T3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t3
 PREHOOK: Input: default@t3@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: query: select * from T3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t3
 POSTHOOK: Input: default@t3@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c1 SIMPLE []
@@ -639,10 +645,12 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-
 4	5	0	2010-04-17
 PREHOOK: query: select * from T4
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t4
 PREHOOK: Input: default@t4@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: query: select * from T4
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t4
 POSTHOOK: Input: default@t4@ds=2010-04-17
 #### A masked pattern was here ####
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c1 SIMPLE []



Mime
View raw message