You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/07/13 18:49:42 UTC

svn commit: r1146129 [14/41] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ contrib/src/test/results/clientpositive/ hbase-handler/src/test/results/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/ppd/ ...

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join4.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join4.q.out Wed Jul 13 16:49:22 2011
@@ -134,7 +134,7 @@ PREHOOK: query: FROM 
  WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-26_835_1439714224998684331/-mr-10000
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-38-11_041_8830294243573092446/-mr-10000
 POSTHOOK: query: FROM 
   src a
  LEFT OUTER JOIN
@@ -147,7 +147,387 @@ POSTHOOK: query: FROM 
  WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-26_835_1439714224998684331/-mr-10000
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-38-11_041_8830294243573092446/-mr-10000
+150	val_150	150	val_150	150
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+152	val_152	152	val_152	152
+153	val_153	153	val_153	153
+155	val_155	155	val_155	155
+156	val_156	156	val_156	156
+157	val_157	157	val_157	157
+158	val_158	158	val_158	158
+160	val_160	160	val_160	160
+162	val_162	162	val_162	162
+163	val_163	163	val_163	163
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+164	val_164	164	val_164	164
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+165	val_165	165	val_165	165
+166	val_166	166	val_166	166
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+167	val_167	167	val_167	167
+168	val_168	168	val_168	168
+17	val_17	17	val_17	17
+170	val_170	170	val_170	170
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+172	val_172	172	val_172	172
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+174	val_174	174	val_174	174
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+175	val_175	175	val_175	175
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+176	val_176	176	val_176	176
+177	val_177	177	val_177	177
+178	val_178	178	val_178	178
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+179	val_179	179	val_179	179
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+18	val_18	18	val_18	18
+180	val_180	180	val_180	180
+181	val_181	181	val_181	181
+183	val_183	183	val_183	183
+186	val_186	186	val_186	186
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+187	val_187	187	val_187	187
+189	val_189	189	val_189	189
+19	val_19	19	val_19	19
+190	val_190	190	val_190	190
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+191	val_191	191	val_191	191
+192	val_192	192	val_192	192
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+193	val_193	193	val_193	193
+194	val_194	194	val_194	194
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+195	val_195	195	val_195	195
+196	val_196	196	val_196	196
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+197	val_197	197	val_197	197
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+199	val_199	199	val_199	199
+2	val_2	2	val_2	2
+PREHOOK: query: EXPLAIN
+ FROM 
+  src a
+ LEFT OUTER JOIN
+  src b
+ ON (a.key = b.key)
+ RIGHT OUTER JOIN 
+  src c 
+ ON (a.key = c.key)
+ SELECT a.key, a.value, b.key, b.value, c.key
+ WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+ FROM 
+  src a
+ LEFT OUTER JOIN
+  src b
+ ON (a.key = b.key)
+ RIGHT OUTER JOIN 
+  src c 
+ ON (a.key = c.key)
+ SELECT a.key, a.value, b.key, b.value, c.key
+ WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_RIGHTOUTERJOIN (TOK_LEFTOUTERJOIN (TOK_TABREF (TOK_TABNAME src) a) (TOK_TABREF (TOK_TABNAME src) b) (= (. (TOK_TABLE_OR_COL a) key) (. (TOK_TABLE_OR_COL b) key))) (TOK_TABREF (TOK_TABNAME src) c) (= (. (TOK_TABLE_OR_COL a) key) (. (TOK_TABLE_OR_COL c) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) value)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) value)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) key))) (TOK_WHERE (AND (AND (AND (AND (> (. (TOK_TABLE_OR_COL a) key) '10') (< (. (TOK_TABLE_OR_COL a) key) '20')) (> (. (TOK_TABLE_OR_COL b) key) '15')) (< (. (TOK_TABLE_OR_COL b) key) '25')) (<> (TOK_FUNCTION sqrt (. (TOK_TABLE_OR_COL c) key)) 13)))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        a 
+          TableScan
+            alias: a
+            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
+                    expr: value
+                    type: string
+        b 
+          TableScan
+            alias: b
+            Reduce Output Operator
+              key expressions:
+                    expr: key
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: key
+                    type: string
+              tag: 1
+              value expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+        c 
+          TableScan
+            alias: c
+            Reduce Output Operator
+              key expressions:
+                    expr: key
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: key
+                    type: string
+              tag: 2
+              value expressions:
+                    expr: key
+                    type: string
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Left Outer Join0 to 1
+               Right Outer Join0 to 2
+          condition expressions:
+            0 {VALUE._col0} {VALUE._col1}
+            1 {VALUE._col0} {VALUE._col1}
+            2 {VALUE._col0}
+          handleSkewJoin: false
+          outputColumnNames: _col0, _col1, _col4, _col5, _col8
+          Filter Operator
+            predicate:
+                expr: ((((_col4 > '15') and (_col4 < '25')) and (sqrt(_col8) <> 13)) and ((_col0 > '10') and (_col0 < '20')))
+                type: boolean
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+                    expr: _col4
+                    type: string
+                    expr: _col5
+                    type: string
+                    expr: _col8
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3, _col4
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+
+PREHOOK: query: FROM 
+  src a
+ LEFT OUTER JOIN
+  src b
+ ON (a.key = b.key)
+ RIGHT OUTER JOIN 
+  src c 
+ ON (a.key = c.key)
+ SELECT a.key, a.value, b.key, b.value, c.key
+ WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-38-20_602_416360783321217123/-mr-10000
+POSTHOOK: query: FROM 
+  src a
+ LEFT OUTER JOIN
+  src b
+ ON (a.key = b.key)
+ RIGHT OUTER JOIN 
+  src c 
+ ON (a.key = c.key)
+ SELECT a.key, a.value, b.key, b.value, c.key
+ WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-38-20_602_416360783321217123/-mr-10000
 150	val_150	150	val_150	150
 152	val_152	152	val_152	152
 152	val_152	152	val_152	152

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_random.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_random.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_random.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_random.q.out Wed Jul 13 16:49:22 2011
@@ -109,3 +109,110 @@ STAGE PLANS:
       limit: -1
 
 
+PREHOOK: query: EXPLAIN
+SELECT src1.c1, src2.c4 
+FROM
+(SELECT src.key as c1, src.value as c2 from src ) src1
+JOIN
+(SELECT src.key as c3, src.value as c4 from src where src.key > '2' ) src2
+ON src1.c1 = src2.c3
+WHERE rand() > 0.5
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT src1.c1, src2.c4 
+FROM
+(SELECT src.key as c1, src.value as c2 from src ) src1
+JOIN
+(SELECT src.key as c3, src.value as c4 from src where src.key > '2' ) src2
+ON src1.c1 = src2.c3
+WHERE rand() > 0.5
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key) c1) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value) c2)))) src1) (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key) c3) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value) c4)) (TOK_WHERE (> (. (TOK_TABLE_OR_COL src) key) '2')))) src2) (= (. (TOK_TABLE_OR_COL src1) c1) (. (TOK_TABLE_OR_COL src2) c3)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src1) c1)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src2) c4))) (TOK_WHERE (> (TOK_FUNCTION rand) 0.5))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        src1:src 
+          TableScan
+            alias: src
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+              outputColumnNames: _col0
+              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
+        src2:src 
+          TableScan
+            alias: src
+            Filter Operator
+              predicate:
+                  expr: (key > '2')
+                  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: _col1
+                        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, _col3
+          Filter Operator
+            predicate:
+                expr: (rand() > 0.5)
+                type: boolean
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col3
+                    type: string
+              outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out Wed Jul 13 16:49:22 2011
@@ -90,7 +90,7 @@ PREHOOK: query: FROM (
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-31_072_8845907404314698533/-mr-10000
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-50-56_212_3129782761910965240/-mr-10000
 POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value)
@@ -100,7 +100,194 @@ POSTHOOK: query: FROM (
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-31_072_8845907404314698533/-mr-10000
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-50-56_212_3129782761910965240/-mr-10000
+0	val_0
+0	val_0
+0	val_0
+10	val_10
+11	val_11
+12	val_12
+12	val_12
+15	val_15
+15	val_15
+17	val_17
+18	val_18
+18	val_18
+19	val_19
+2	val_2
+20	val_20
+24	val_24
+24	val_24
+26	val_26
+26	val_26
+27	val_27
+28	val_28
+30	val_30
+33	val_33
+34	val_34
+35	val_35
+35	val_35
+35	val_35
+37	val_37
+37	val_37
+4	val_4
+41	val_41
+42	val_42
+42	val_42
+43	val_43
+44	val_44
+47	val_47
+5	val_5
+5	val_5
+5	val_5
+51	val_51
+51	val_51
+53	val_53
+54	val_54
+57	val_57
+58	val_58
+58	val_58
+64	val_64
+65	val_65
+66	val_66
+67	val_67
+67	val_67
+69	val_69
+70	val_70
+70	val_70
+70	val_70
+72	val_72
+72	val_72
+74	val_74
+76	val_76
+76	val_76
+77	val_77
+78	val_78
+8	val_8
+80	val_80
+82	val_82
+83	val_83
+83	val_83
+84	val_84
+84	val_84
+85	val_85
+86	val_86
+87	val_87
+9	val_9
+90	val_90
+90	val_90
+90	val_90
+92	val_92
+95	val_95
+95	val_95
+96	val_96
+97	val_97
+97	val_97
+98	val_98
+98	val_98
+PREHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value)
+         USING '/bin/cat' AS (tkey, tvalue) 
+  CLUSTER BY tkey 
+) tmap
+SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value)
+         USING '/bin/cat' AS (tkey, tvalue) 
+  CLUSTER BY tkey 
+) tmap
+SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL tkey)))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tkey)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) tvalue))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL tmap) tkey) 100))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        tmap:src 
+          TableScan
+            alias: src
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+              outputColumnNames: _col0, _col1
+              Transform Operator
+                command: /bin/cat
+                output info:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                Filter Operator
+                  predicate:
+                      expr: (_col0 < 100)
+                      type: boolean
+                  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:
+        Extract
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: _col1
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value)
+         USING '/bin/cat' AS (tkey, tvalue) 
+  CLUSTER BY tkey 
+) tmap
+SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-51-05_287_665431322083364408/-mr-10000
+POSTHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value)
+         USING '/bin/cat' AS (tkey, tvalue) 
+  CLUSTER BY tkey 
+) tmap
+SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-51-05_287_665431322083364408/-mr-10000
 0	val_0
 0	val_0
 0	val_0

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out Wed Jul 13 16:49:22 2011
@@ -124,7 +124,7 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/tmp/sdong/hive_2011-02-10_16-57-34_795_6886645259044041600/-mr-10002 
+        file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-19_011_6078693060764998539/-mr-10002 
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -190,7 +190,7 @@ ORDER BY a.key, a.value, a.ds, a.hr, b.k
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-34_974_8461060314707067318/-mr-10000
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-20_085_7457265695938103038/-mr-10000
 POSTHOOK: query: SELECT *
 FROM srcpart a JOIN srcpart b
 ON a.key = b.key
@@ -205,7 +205,215 @@ ORDER BY a.key, a.value, a.ds, a.hr, b.k
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-34_974_8461060314707067318/-mr-10000
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-20_085_7457265695938103038/-mr-10000
+27	val_27	2008-04-08	11	27	val_27	2008-04-08	11
+27	val_27	2008-04-08	11	27	val_27	2008-04-08	12
+27	val_27	2008-04-08	12	27	val_27	2008-04-08	11
+27	val_27	2008-04-08	12	27	val_27	2008-04-08	12
+PREHOOK: query: EXPLAIN
+SELECT *
+FROM srcpart a JOIN srcpart b
+ON a.key = b.key
+WHERE a.ds = '2008-04-08' AND
+      b.ds = '2008-04-08' AND
+      CASE a.key
+        WHEN '27' THEN TRUE
+        WHEN '38' THEN FALSE
+        ELSE NULL
+       END
+ORDER BY a.key, a.value, a.ds, a.hr, b.key, b.value, b.ds, b.hr
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT *
+FROM srcpart a JOIN srcpart b
+ON a.key = b.key
+WHERE a.ds = '2008-04-08' AND
+      b.ds = '2008-04-08' AND
+      CASE a.key
+        WHEN '27' THEN TRUE
+        WHEN '38' THEN FALSE
+        ELSE NULL
+       END
+ORDER BY a.key, a.value, a.ds, a.hr, b.key, b.value, b.ds, b.hr
+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_TABLE_OR_COL a) key) (. (TOK_TABLE_OR_COL b) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (AND (AND (= (. (TOK_TABLE_OR_COL a) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL b) ds) '2008-04-08')) (TOK_FUNCTION CASE (. (TOK_TABLE_OR_COL a) key) '27' TRUE '38' FALSE TOK_NULL))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL a) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL a) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL a) ds)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL a) hr)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL b) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL b) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL b) ds)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL b) hr)))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-2 depends on stages: Stage-1
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        a 
+          TableScan
+            alias: a
+            Filter Operator
+              predicate:
+                  expr: CASE (key) WHEN ('27') THEN (true) WHEN ('38') THEN (false) ELSE (null) END
+                  type: boolean
+              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
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+        b 
+          TableScan
+            alias: b
+            Reduce Output Operator
+              key expressions:
+                    expr: key
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: key
+                    type: string
+              tag: 1
+              value expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+                    expr: ds
+                    type: string
+                    expr: hr
+                    type: string
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+          condition expressions:
+            0 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3}
+            1 {VALUE._col0} {VALUE._col1} {VALUE._col2} {VALUE._col3}
+          handleSkewJoin: false
+          outputColumnNames: _col0, _col1, _col2, _col3, _col6, _col7, _col8, _col9
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: _col1
+                  type: string
+                  expr: _col2
+                  type: string
+                  expr: _col3
+                  type: string
+                  expr: _col6
+                  type: string
+                  expr: _col7
+                  type: string
+                  expr: _col8
+                  type: string
+                  expr: _col9
+                  type: string
+            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+            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-2
+    Map Reduce
+      Alias -> Map Operator Tree:
+        file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-40_322_7654615073140246084/-mr-10002 
+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+                    expr: _col2
+                    type: string
+                    expr: _col3
+                    type: string
+                    expr: _col4
+                    type: string
+                    expr: _col5
+                    type: string
+                    expr: _col6
+                    type: string
+                    expr: _col7
+                    type: string
+              sort order: ++++++++
+              tag: -1
+              value expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+                    expr: _col2
+                    type: string
+                    expr: _col3
+                    type: string
+                    expr: _col4
+                    type: string
+                    expr: _col5
+                    type: string
+                    expr: _col6
+                    type: string
+                    expr: _col7
+                    type: string
+      Reduce Operator Tree:
+        Extract
+          File Output Operator
+            compressed: false
+            GlobalTableId: 0
+            table:
+                input format: org.apache.hadoop.mapred.TextInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+
+PREHOOK: query: SELECT *
+FROM srcpart a JOIN srcpart b
+ON a.key = b.key
+WHERE a.ds = '2008-04-08' AND
+      b.ds = '2008-04-08' AND
+      CASE a.key
+        WHEN '27' THEN TRUE
+        WHEN '38' THEN FALSE
+        ELSE NULL
+       END
+ORDER BY a.key, a.value, a.ds, a.hr, b.key, b.value, b.ds, b.hr
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-40_840_3692167909003016050/-mr-10000
+POSTHOOK: query: SELECT *
+FROM srcpart a JOIN srcpart b
+ON a.key = b.key
+WHERE a.ds = '2008-04-08' AND
+      b.ds = '2008-04-08' AND
+      CASE a.key
+        WHEN '27' THEN TRUE
+        WHEN '38' THEN FALSE
+        ELSE NULL
+       END
+ORDER BY a.key, a.value, a.ds, a.hr, b.key, b.value, b.ds, b.hr
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-53-40_840_3692167909003016050/-mr-10000
 27	val_27	2008-04-08	11	27	val_27	2008-04-08	11
 27	val_27	2008-04-08	11	27	val_27	2008-04-08	12
 27	val_27	2008-04-08	12	27	val_27	2008-04-08	11

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_union.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_union.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_union.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_union.q.out Wed Jul 13 16:49:22 2011
@@ -114,7 +114,7 @@ SELECT unioned_query.*
   WHERE key > '4' and value > 'val_4'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-42_422_7786150548202984482/-mr-10000
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-56-10_639_4479616588694636353/-mr-10000
 POSTHOOK: query: FROM (
   FROM src select src.key, src.value WHERE src.key < '100'
     UNION ALL
@@ -124,7 +124,289 @@ SELECT unioned_query.*
   WHERE key > '4' and value > 'val_4'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/tmp/sdong/hive_2011-02-10_16-57-42_422_7786150548202984482/-mr-10000
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-56-10_639_4479616588694636353/-mr-10000
+86	val_86
+409	val_409
+98	val_98
+484	val_484
+401	val_401
+66	val_66
+406	val_406
+429	val_429
+469	val_469
+495	val_495
+82	val_82
+403	val_403
+417	val_417
+430	val_430
+446	val_446
+459	val_459
+482	val_482
+413	val_413
+494	val_494
+466	val_466
+417	val_417
+489	val_489
+439	val_439
+475	val_475
+455	val_455
+57	val_57
+438	val_438
+489	val_489
+92	val_92
+47	val_47
+72	val_72
+427	val_427
+498	val_498
+437	val_437
+469	val_469
+54	val_54
+459	val_459
+51	val_51
+430	val_430
+65	val_65
+83	val_83
+67	val_67
+404	val_404
+489	val_489
+84	val_84
+466	val_466
+58	val_58
+8	val_8
+411	val_411
+463	val_463
+431	val_431
+42	val_42
+496	val_496
+468	val_468
+454	val_454
+418	val_418
+96	val_96
+51	val_51
+404	val_404
+43	val_43
+436	val_436
+469	val_469
+468	val_468
+95	val_95
+481	val_481
+457	val_457
+98	val_98
+409	val_409
+470	val_470
+413	val_413
+85	val_85
+77	val_77
+490	val_490
+87	val_87
+419	val_419
+72	val_72
+90	val_90
+435	val_435
+401	val_401
+452	val_452
+5	val_5
+497	val_497
+402	val_402
+58	val_58
+95	val_95
+472	val_472
+498	val_498
+42	val_42
+430	val_430
+489	val_489
+458	val_458
+78	val_78
+76	val_76
+41	val_41
+492	val_492
+449	val_449
+453	val_453
+64	val_64
+468	val_468
+76	val_76
+74	val_74
+69	val_69
+485	val_485
+70	val_70
+487	val_487
+480	val_480
+401	val_401
+5	val_5
+438	val_438
+467	val_467
+432	val_432
+469	val_469
+463	val_463
+80	val_80
+44	val_44
+466	val_466
+403	val_403
+483	val_483
+53	val_53
+406	val_406
+409	val_409
+406	val_406
+401	val_401
+90	val_90
+424	val_424
+431	val_431
+454	val_454
+478	val_478
+431	val_431
+424	val_424
+5	val_5
+70	val_70
+480	val_480
+70	val_70
+438	val_438
+414	val_414
+491	val_491
+439	val_439
+479	val_479
+417	val_417
+444	val_444
+429	val_429
+443	val_443
+478	val_478
+468	val_468
+493	val_493
+460	val_460
+480	val_480
+83	val_83
+462	val_462
+406	val_406
+454	val_454
+401	val_401
+421	val_421
+407	val_407
+67	val_67
+462	val_462
+492	val_492
+9	val_9
+498	val_498
+458	val_458
+97	val_97
+469	val_469
+84	val_84
+448	val_448
+414	val_414
+477	val_477
+90	val_90
+403	val_403
+400	val_400
+97	val_97
+PREHOOK: query: EXPLAIN
+FROM (
+  FROM src select src.key, src.value WHERE src.key < '100'
+    UNION ALL
+  FROM src SELECT src.* WHERE src.key > '150'
+) unioned_query
+SELECT unioned_query.*
+  WHERE key > '4' and value > 'val_4'
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src select src.key, src.value WHERE src.key < '100'
+    UNION ALL
+  FROM src SELECT src.* WHERE src.key > '150'
+) unioned_query
+SELECT unioned_query.*
+  WHERE key > '4' and value > 'val_4'
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) '100')))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME src)))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL src) key) '150'))))) unioned_query)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME unioned_query)))) (TOK_WHERE (and (> (TOK_TABLE_OR_COL key) '4') (> (TOK_TABLE_OR_COL value) 'val_4')))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        null-subquery1:unioned_query-subquery1:src 
+          TableScan
+            alias: src
+            Filter Operator
+              predicate:
+                  expr: ((key < '100') and ((key > '4') and (value > 'val_4')))
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Union
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                    outputColumnNames: _col0, _col1
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 0
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+        null-subquery2:unioned_query-subquery2:src 
+          TableScan
+            alias: src
+            Filter Operator
+              predicate:
+                  expr: ((key > '150') and ((key > '4') and (value > 'val_4')))
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                Union
+                  Select Operator
+                    expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                    outputColumnNames: _col0, _col1
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 0
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+
+PREHOOK: query: FROM (
+  FROM src select src.key, src.value WHERE src.key < '100'
+    UNION ALL
+  FROM src SELECT src.* WHERE src.key > '150'
+) unioned_query
+SELECT unioned_query.*
+  WHERE key > '4' and value > 'val_4'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-56-19_201_5931398035634081896/-mr-10000
+POSTHOOK: query: FROM (
+  FROM src select src.key, src.value WHERE src.key < '100'
+    UNION ALL
+  FROM src SELECT src.* WHERE src.key > '150'
+) unioned_query
+SELECT unioned_query.*
+  WHERE key > '4' and value > 'val_4'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-22_02-56-19_201_5931398035634081896/-mr-10000
 86	val_86
 409	val_409
 98	val_98

Modified: hive/trunk/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppr_pushdown3.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppr_pushdown3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppr_pushdown3.q.out Wed Jul 13 16:49:22 2011
@@ -20,27 +20,23 @@ STAGE PLANS:
               predicate:
                   expr: (key < 10)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key < 10)
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                        expr: ds
-                        type: string
-                        expr: hr
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/query_result_fileformat.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/query_result_fileformat.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/query_result_fileformat.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/query_result_fileformat.q.out Wed Jul 13 16:49:22 2011
@@ -56,23 +56,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 'key1')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 'key1')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator
@@ -136,23 +132,19 @@ STAGE PLANS:
               predicate:
                   expr: (key = 'key1')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 'key1')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
+                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

Modified: hive/trunk/ql/src/test/results/clientpositive/quote1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/quote1.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/quote1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/quote1.q.out Wed Jul 13 16:49:22 2011
@@ -33,32 +33,28 @@ STAGE PLANS:
               predicate:
                   expr: ((key >= 200) and (key < 300))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key >= 200) and (key < 300))
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                outputColumnNames: _col0, _col1
                 Select Operator
                   expressions:
-                        expr: key
-                        type: string
-                        expr: value
+                        expr: UDFToInteger(_col0)
+                        type: int
+                        expr: _col1
                         type: string
                   outputColumnNames: _col0, _col1
-                  Select Operator
-                    expressions:
-                          expr: UDFToInteger(_col0)
-                          type: int
-                          expr: _col1
-                          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
+                  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
 
   Stage: Stage-5
     Conditional Operator
@@ -122,25 +118,21 @@ STAGE PLANS:
               predicate:
                   expr: (table = '2008-04-08')
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (table = '2008-04-08')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: location
-                        type: int
-                        expr: type
-                        type: string
-                        expr: table
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              Select Operator
+                expressions:
+                      expr: location
+                      type: int
+                      expr: type
+                      type: string
+                      expr: table
+                      type: string
+                outputColumnNames: _col0, _col1, _col2
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out Wed Jul 13 16:49:22 2011
@@ -143,38 +143,33 @@ STAGE PLANS:
               predicate:
                   expr: (not ((key > 50) or (key < 10)))
                   type: boolean
-              Filter Operator
-                isSamplingPred: false
-                predicate:
-                    expr: (((ds = '2008-04-08') and (not ((key > 50) or (key < 10)))) and (hr like '%2'))
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: key
-                        type: string
-                        expr: value
-                        type: string
-                        expr: ds
-                        type: string
-                        expr: hr
-                        type: string
-                  outputColumnNames: _col0, _col1, _col2, _col3
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 0
-                    directory: file:/tmp/sdong/hive_2011-02-10_16-59-31_097_6104330106842070340/-ext-10001
-                    NumFilesPerFileSink: 1
-                    Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_16-59-31_097_6104330106842070340/-ext-10001/
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        properties:
-                          columns _col0,_col1,_col2,_col3
-                          columns.types string:string:string:string
-                          serialization.format 1
-                    TotalFiles: 1
-                    GatherStats: false
-                    MultiFileSpray: false
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  directory: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-41-58_245_7085869776801424539/-ext-10001
+                  NumFilesPerFileSink: 1
+                  Stats Publishing Key Prefix: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-41-58_245_7085869776801424539/-ext-10001/
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        columns _col0,_col1,_col2,_col3
+                        columns.types string:string:string:string
+                        serialization.format 1
+                  TotalFiles: 1
+                  GatherStats: false
+                  MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=12 [a]

Modified: hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out Wed Jul 13 16:49:22 2011
@@ -106,31 +106,27 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 10) and (key < 20))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 10) and (key < 20))
-                    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
+              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
@@ -138,31 +134,27 @@ STAGE PLANS:
               predicate:
                   expr: ((key > 15) and (key < 25))
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: ((key > 15) and (key < 25))
-                    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
+              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:

Modified: hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate.q.out Wed Jul 13 16:49:22 2011
@@ -258,52 +258,47 @@ STAGE PLANS:
               predicate:
                   expr: (ds = '2010-03-29')
                   type: boolean
-              Filter Operator
-                isSamplingPred: false
-                predicate:
-                    expr: (ds = '2010-03-29')
-                    type: boolean
-                Select Operator
-                  expressions:
-                        expr: aet
-                        type: string
-                        expr: aes
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  Transform Operator
-                    command: cat
-                    output info:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        properties:
-                          columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
-                          columns.types string,string,int,string,bigint,string,string
-                          field.delim 9
-                          serialization.format 9
-                    Reduce Output Operator
-                      key expressions:
-                            expr: _col1
-                            type: string
-                      sort order: +
-                      Map-reduce partition columns:
-                            expr: _col1
-                            type: string
-                      tag: -1
-                      value expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
-                            expr: _col2
-                            type: int
-                            expr: _col3
-                            type: string
-                            expr: _col4
-                            type: bigint
-                            expr: _col5
-                            type: string
-                            expr: _col6
-                            type: string
+              Select Operator
+                expressions:
+                      expr: aet
+                      type: string
+                      expr: aes
+                      type: string
+                outputColumnNames: _col0, _col1
+                Transform Operator
+                  command: cat
+                  output info:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
+                        columns.types string,string,int,string,bigint,string,string
+                        field.delim 9
+                        serialization.format 9
+                  Reduce Output Operator
+                    key expressions:
+                          expr: _col1
+                          type: string
+                    sort order: +
+                    Map-reduce partition columns:
+                          expr: _col1
+                          type: string
+                    tag: -1
+                    value expressions:
+                          expr: _col0
+                          type: string
+                          expr: _col1
+                          type: string
+                          expr: _col2
+                          type: int
+                          expr: _col3
+                          type: string
+                          expr: _col4
+                          type: bigint
+                          expr: _col5
+                          type: string
+                          expr: _col6
+                          type: string
       Needs Tagging: false
       Reduce Operator Tree:
         Extract

Modified: hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out Wed Jul 13 16:49:22 2011
@@ -216,27 +216,23 @@ STAGE PLANS:
               predicate:
                   expr: (key = 103)
                   type: boolean
-              Filter Operator
-                predicate:
-                    expr: (key = 103)
-                    type: boolean
-                Reduce Output Operator
-                  key expressions:
-                        expr: key
-                        type: string
-                        expr: hr
-                        type: string
-                        expr: ds
-                        type: string
-                  sort order: +++
-                  Map-reduce partition columns:
-                        expr: key
-                        type: string
-                        expr: hr
-                        type: string
-                        expr: ds
-                        type: string
-                  tag: 0
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                      expr: hr
+                      type: string
+                      expr: ds
+                      type: string
+                sort order: +++
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                      expr: hr
+                      type: string
+                      expr: ds
+                      type: string
+                tag: 0
         b 
           TableScan
             alias: b

Modified: hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out Wed Jul 13 16:49:22 2011
@@ -53,20 +53,25 @@ STAGE PLANS:
                       field.delim 9
                       serialization.format 9
                       serialization.last.column.takes.rest true
-                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
+                Filter Operator
+                  isSamplingPred: false
+                  predicate:
+                      expr: (_col0 < 100)
+                      type: boolean
+                  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
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src [tmap:src]
@@ -109,34 +114,29 @@ STAGE PLANS:
             name: default.src
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            isSamplingPred: false
-            predicate:
-                expr: (_col0 < 100)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: regexp_extract(_col1, 'val_(\d+\t\d+)', 1)
-                    type: string
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                directory: file:/tmp/sdong/hive_2011-02-10_17-01-39_424_6724088978945525837/-ext-10001
-                NumFilesPerFileSink: 1
-                Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_17-01-39_424_6724088978945525837/-ext-10001/
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    properties:
-                      columns _col0,_col1
-                      columns.types string:string
-                      serialization.format 1
-                TotalFiles: 1
-                GatherStats: false
-                MultiFileSpray: false
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: regexp_extract(_col1, 'val_(\d+\t\d+)', 1)
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              directory: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-47-02_223_1393307901149024596/-ext-10001
+              NumFilesPerFileSink: 1
+              Stats Publishing Key Prefix: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-47-02_223_1393307901149024596/-ext-10001/
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  properties:
+                    columns _col0,_col1
+                    columns.types string:string
+                    serialization.format 1
+              TotalFiles: 1
+              GatherStats: false
+              MultiFileSpray: false
 
   Stage: Stage-0
     Fetch Operator
@@ -302,20 +302,25 @@ STAGE PLANS:
                       field.delim 9
                       serialization.format 9
                       serialization.last.column.takes.rest true
-                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
+                Filter Operator
+                  isSamplingPred: false
+                  predicate:
+                      expr: (_col0 < 100)
+                      type: boolean
+                  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
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src [tmap:src]
@@ -358,34 +363,29 @@ STAGE PLANS:
             name: default.src
       Reduce Operator Tree:
         Extract
-          Filter Operator
-            isSamplingPred: false
-            predicate:
-                expr: (_col0 < 100)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: regexp_extract(_col1, 'val_(\d+\t\d+)')
-                    type: string
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                directory: file:/tmp/sdong/hive_2011-02-10_17-01-43_012_4690012969555367930/-ext-10001
-                NumFilesPerFileSink: 1
-                Stats Publishing Key Prefix: file:/tmp/sdong/hive_2011-02-10_17-01-43_012_4690012969555367930/-ext-10001/
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    properties:
-                      columns _col0,_col1
-                      columns.types string:string
-                      serialization.format 1
-                TotalFiles: 1
-                GatherStats: false
-                MultiFileSpray: false
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: string
+                  expr: regexp_extract(_col1, 'val_(\d+\t\d+)')
+                  type: string
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              directory: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-47-14_408_4797588639767330030/-ext-10001
+              NumFilesPerFileSink: 1
+              Stats Publishing Key Prefix: file:/var/folders/uc/ucuNeMAVGQGzy3459D8z2+++Z0Q/-Tmp-/amarsri/hive_2011-03-17_11-47-14_408_4797588639767330030/-ext-10001/
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  properties:
+                    columns _col0,_col1
+                    columns.types string:string
+                    serialization.format 1
+              TotalFiles: 1
+              GatherStats: false
+              MultiFileSpray: false
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out Wed Jul 13 16:49:22 2011
@@ -293,7 +293,7 @@ STAGE PLANS:
           Filter Operator
             isSamplingPred: false
             predicate:
-                expr: ((((_col0 > 10) and (_col0 < 20)) and (_col4 > 15)) and (_col4 < 25))
+                expr: ((_col0 > 10) and (_col0 < 20))
                 type: boolean
             Select Operator
               expressions:
@@ -401,25 +401,20 @@ STAGE PLANS:
           TableScan
             alias: a
             GatherStats: false
-            Filter Operator
-              isSamplingPred: false
-              predicate:
-                  expr: (ds = '2008-04-08')
-                  type: boolean
-              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
-                      expr: value
-                      type: string
+            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
+                    expr: value
+                    type: string
         b 
           TableScan
             alias: b
@@ -579,7 +574,7 @@ STAGE PLANS:
           Filter Operator
             isSamplingPred: false
             predicate:
-                expr: ((((_col0 > 10) and (_col0 < 20)) and (_col6 > 15)) and (_col6 < 25))
+                expr: ((_col0 > 10) and (_col0 < 20))
                 type: boolean
             Select Operator
               expressions:
@@ -858,7 +853,7 @@ STAGE PLANS:
           Filter Operator
             isSamplingPred: false
             predicate:
-                expr: (((((_col0 > 10) and (_col0 < 20)) and (_col4 > 15)) and (_col4 < 25)) and (_col6 = '2008-04-08'))
+                expr: ((_col0 > 10) and (_col0 < 20))
                 type: boolean
             Select Operator
               expressions:
@@ -1221,7 +1216,7 @@ STAGE PLANS:
           Filter Operator
             isSamplingPred: false
             predicate:
-                expr: (((((_col0 > 10) and (_col0 < 20)) and (_col6 > 15)) and (_col6 < 25)) and (_col2 = '2008-04-08'))
+                expr: (((_col0 > 10) and (_col0 < 20)) and (_col2 = '2008-04-08'))
                 type: boolean
             Select Operator
               expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample1.q.out?rev=1146129&r1=1146128&r2=1146129&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample1.q.out Wed Jul 13 16:49:22 2011
@@ -39,59 +39,54 @@ STAGE PLANS:
               predicate:
                   expr: (((hash(rand()) & 2147483647) % 1) = 0)
                   type: boolean
-              Filter Operator
-                isSamplingPred: false
-                predicate:
-                    expr: ((ds = '2008-04-08') and (hr = '11'))
-                    type: boolean
+              Select Operator
+                expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
+                outputColumnNames: _col0, _col1, _col2, _col3
                 Select Operator
                   expressions:
-                        expr: key
+                        expr: UDFToInteger(_col0)
+                        type: int
+                        expr: _col1
                         type: string
-                        expr: value
+                        expr: _col2
                         type: string
-                        expr: ds
-                        type: string
-                        expr: hr
+                        expr: _col3
                         type: string
                   outputColumnNames: _col0, _col1, _col2, _col3
-                  Select Operator
-                    expressions:
-                          expr: UDFToInteger(_col0)
-                          type: int
-                          expr: _col1
-                          type: string
-                          expr: _col2
-                          type: string
-                          expr: _col3
-                          type: string
-                    outputColumnNames: _col0, _col1, _col2, _col3
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 1
-                      directory: pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-19_19-53-28_734_1650557364525480631/-ext-10002
-                      NumFilesPerFileSink: 1
-                      Stats Publishing Key Prefix: pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-19_19-53-28_734_1650557364525480631/-ext-10000/
-                      table:
-                          input format: org.apache.hadoop.mapred.TextInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                          properties:
-                            bucket_count -1
-                            columns key,value,dt,hr
-                            columns.types int:string:string:string
-                            file.inputformat org.apache.hadoop.mapred.TextInputFormat
-                            file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            location pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1
-                            name default.dest1
-                            serialization.ddl struct dest1 { i32 key, string value, string dt, string hr}
-                            serialization.format 1
-                            serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            transient_lastDdlTime 1303268008
-                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                          name: default.dest1
-                      TotalFiles: 1
-                      GatherStats: true
-                      MultiFileSpray: false
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 1
+                    directory: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_02-57-22_086_7502476312093213805/-ext-10002
+                    NumFilesPerFileSink: 1
+                    Stats Publishing Key Prefix: pfile:/home/amarsri/workspace/hive/build/ql/scratchdir/hive_2011-07-11_02-57-22_086_7502476312093213805/-ext-10000/
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                        properties:
+                          bucket_count -1
+                          columns key,value,dt,hr
+                          columns.types int:string:string:string
+                          file.inputformat org.apache.hadoop.mapred.TextInputFormat
+                          file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          location pfile:/home/amarsri/workspace/hive/build/ql/test/data/warehouse/dest1
+                          name default.dest1
+                          serialization.ddl struct dest1 { i32 key, string value, string dt, string hr}
+                          serialization.format 1
+                          serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          transient_lastDdlTime 1310378242
+                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        name: default.dest1
+                    TotalFiles: 1
+                    GatherStats: true
+                    MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
         pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [s]