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/08/31 00:17:16 UTC
svn commit: r1163437 - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/parse/ test/queries/clientpositive/
test/results/clientpositive/ test/results/compiler/plan/
Author: jvs
Date: Tue Aug 30 22:17:15 2011
New Revision: 1163437
URL: http://svn.apache.org/viewvc?rev=1163437&view=rev
Log:
HIVE-2382. Invalid predicate pushdown from incorrect column expression
map for select operator generated by GROUP BY operation
(Charles Chen via jvs)
Added:
hive/trunk/ql/src/test/queries/clientpositive/groupby_ppd.q
hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Tue Aug 30 22:17:15 2011
@@ -5413,16 +5413,21 @@ public class SemanticAnalyzer extends Ba
ArrayList<ColumnInfo> columns = inputRR.getColumnInfos();
ArrayList<ExprNodeDesc> colList = new ArrayList<ExprNodeDesc>();
ArrayList<String> columnNames = new ArrayList<String>();
+ Map<String, ExprNodeDesc> columnExprMap =
+ new HashMap<String, ExprNodeDesc>();
for (int i = 0; i < columns.size(); i++) {
ColumnInfo col = columns.get(i);
colList.add(new ExprNodeColumnDesc(col.getType(), col.getInternalName(),
col.getTabAlias(), col.getIsVirtualCol()));
columnNames.add(col.getInternalName());
+ columnExprMap.put(col.getInternalName(),
+ new ExprNodeColumnDesc(col.getType(), col.getInternalName(),
+ col.getTabAlias(), col.getIsVirtualCol()));
}
Operator output = putOpInsertMap(OperatorFactory.getAndMakeChild(
new SelectDesc(colList, columnNames, true), new RowSchema(inputRR
.getColumnInfos()), input), inputRR);
- output.setColumnExprMap(input.getColumnExprMap());
+ output.setColumnExprMap(columnExprMap);
return output;
}
Added: hive/trunk/ql/src/test/queries/clientpositive/groupby_ppd.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/groupby_ppd.q?rev=1163437&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/groupby_ppd.q (added)
+++ hive/trunk/ql/src/test/queries/clientpositive/groupby_ppd.q Tue Aug 30 22:17:15 2011
@@ -0,0 +1,4 @@
+-- see HIVE-2382
+create table invites (id int, foo int, bar int);
+explain select * from (select foo, bar from (select bar, foo from invites c union all select bar, foo from invites d) b) a group by bar, foo having bar=1;
+drop table invites;
\ No newline at end of file
Added: hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out?rev=1163437&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out (added)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out Tue Aug 30 22:17:15 2011
@@ -0,0 +1,161 @@
+PREHOOK: query: -- see HIVE-2382
+create table invites (id int, foo int, bar int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- see HIVE-2382
+create table invites (id int, foo int, bar int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@invites
+PREHOOK: query: explain select * from (select foo, bar from (select bar, foo from invites c union all select bar, foo from invites d) b) a group by bar, foo having bar=1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain select * from (select foo, bar from (select bar, foo from invites c union all select bar, foo from invites d) b) a group by bar, foo having bar=1
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME invites) c)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL bar)) (TOK_SELEXPR (TOK_TABLE_OR_COL foo))))) (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME invites) d)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL bar)) (TOK_SELEXPR (TOK_TABLE_OR_COL foo)))))) b)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL foo)) (TOK_SELEXPR (TOK_TABLE_OR_COL bar))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_GROUPBY (TOK_TABLE_OR_COL bar) (TOK_TABLE_OR_COL foo)) (TOK_HAVING (= (TOK_TABLE_OR_COL bar) 1))))
+
+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-subquery1:b-subquery1:c
+ TableScan
+ alias: c
+ Filter Operator
+ predicate:
+ expr: (bar = 1)
+ type: boolean
+ Select Operator
+ expressions:
+ expr: bar
+ type: int
+ expr: foo
+ type: int
+ outputColumnNames: _col0, _col1
+ Union
+ Select Operator
+ expressions:
+ expr: _col1
+ type: int
+ expr: _col0
+ type: int
+ outputColumnNames: _col0, _col1
+ Select Operator
+ expressions:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ outputColumnNames: _col0, _col1
+ Group By Operator
+ bucketGroup: false
+ keys:
+ expr: _col1
+ type: int
+ expr: _col0
+ type: int
+ mode: hash
+ outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ sort order: ++
+ Map-reduce partition columns:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ tag: -1
+ a-subquery2:b-subquery2:d
+ TableScan
+ alias: d
+ Filter Operator
+ predicate:
+ expr: (bar = 1)
+ type: boolean
+ Select Operator
+ expressions:
+ expr: bar
+ type: int
+ expr: foo
+ type: int
+ outputColumnNames: _col0, _col1
+ Union
+ Select Operator
+ expressions:
+ expr: _col1
+ type: int
+ expr: _col0
+ type: int
+ outputColumnNames: _col0, _col1
+ Select Operator
+ expressions:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ outputColumnNames: _col0, _col1
+ Group By Operator
+ bucketGroup: false
+ keys:
+ expr: _col1
+ type: int
+ expr: _col0
+ type: int
+ mode: hash
+ outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ sort order: ++
+ Map-reduce partition columns:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ tag: -1
+ Reduce Operator Tree:
+ Group By Operator
+ bucketGroup: false
+ keys:
+ expr: KEY._col0
+ type: int
+ expr: KEY._col1
+ type: int
+ mode: mergepartial
+ outputColumnNames: _col0, _col1
+ Select Operator
+ expressions:
+ expr: _col0
+ type: int
+ expr: _col1
+ type: int
+ 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: drop table invites
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@invites
+PREHOOK: Output: default@invites
+POSTHOOK: query: drop table invites
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@invites
+POSTHOOK: Output: default@invites
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
@@ -22,7 +22,7 @@
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.StatsWork">
<void property="aggKey">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-52-57_564_8385471438034055340/-ext-10000/</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/scratchdir/hive_2011-08-30_13-23-31_510_1697498805648472139/-ext-10000/</string>
</void>
</object>
</void>
@@ -58,7 +58,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-52-57_564_8385471438034055340/-ext-10000</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/scratchdir/hive_2011-08-30_13-23-31_510_1697498805648472139/-ext-10000</string>
</void>
<void property="table">
<object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
@@ -111,11 +111,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/dest1</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/dest1</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059977</string>
+ <string>1314735811</string>
</void>
</object>
</void>
@@ -125,7 +125,7 @@
</object>
</void>
<void property="tmpDir">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-52-57_564_8385471438034055340/-ext-10001</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/scratchdir/hive_2011-08-30_13-23-31_510_1697498805648472139/-ext-10001</string>
</void>
</object>
</void>
@@ -196,11 +196,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059975</string>
+ <string>1314735810</string>
</void>
</object>
</void>
@@ -258,11 +258,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059975</string>
+ <string>1314735810</string>
</void>
</object>
</void>
@@ -675,6 +675,76 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -847,11 +917,7 @@
<string>src</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -894,7 +960,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -906,7 +972,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -963,11 +1029,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059975</string>
+ <string>1314735810</string>
</void>
</object>
</void>
@@ -1025,11 +1091,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059975</string>
+ <string>1314735810</string>
</void>
</object>
</void>
@@ -1058,7 +1124,7 @@
<int>1</int>
</void>
<void property="dirName">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-52-57_564_8385471438034055340/-ext-10000</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/scratchdir/hive_2011-08-30_13-23-31_510_1697498805648472139/-ext-10000</string>
</void>
<void property="gatherStats">
<boolean>true</boolean>
@@ -1067,7 +1133,7 @@
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/scratchdir/hive_2011-04-28_23-52-57_564_8385471438034055340/-ext-10000/</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/scratchdir/hive_2011-08-30_13-23-31_510_1697498805648472139/-ext-10000/</string>
</void>
<void property="tableInfo">
<object idref="TableDesc0"/>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059983</string>
+ <string>1314735816</string>
</void>
</object>
</void>
@@ -124,11 +124,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059983</string>
+ <string>1314735816</string>
</void>
</object>
</void>
@@ -794,6 +794,72 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -1006,7 +1072,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1018,7 +1084,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1075,11 +1141,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059983</string>
+ <string>1314735816</string>
</void>
</object>
</void>
@@ -1137,11 +1203,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059983</string>
+ <string>1314735816</string>
</void>
</object>
</void>
@@ -1167,13 +1233,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-05_717_3597345881693191328/-ext-10001</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-36_914_5938075765852205649/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-05_717_3597345881693191328/-ext-10001/</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-36_914_5938075765852205649/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059992</string>
+ <string>1314735820</string>
</void>
</object>
</void>
@@ -124,11 +124,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059992</string>
+ <string>1314735820</string>
</void>
</object>
</void>
@@ -1012,6 +1012,72 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo2"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -1202,7 +1268,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -1214,7 +1280,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -1271,11 +1337,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059992</string>
+ <string>1314735820</string>
</void>
</object>
</void>
@@ -1333,11 +1399,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304059992</string>
+ <string>1314735820</string>
</void>
</object>
</void>
@@ -1363,13 +1429,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-14_115_4110241814083983918/-ext-10001</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-41_528_3232121984739131523/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-14_115_4110241814083983918/-ext-10001/</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-41_528_3232121984739131523/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060000</string>
+ <string>1314735825</string>
</void>
</object>
</void>
@@ -124,11 +124,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060000</string>
+ <string>1314735825</string>
</void>
</object>
</void>
@@ -470,6 +470,76 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -620,11 +690,7 @@
<string>src</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -664,7 +730,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -676,7 +742,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -733,11 +799,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060000</string>
+ <string>1314735825</string>
</void>
</object>
</void>
@@ -795,11 +861,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060000</string>
+ <string>1314735825</string>
</void>
</object>
</void>
@@ -825,13 +891,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-22_783_4211806616452121435/-ext-10001</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-46_919_8273996101542787867/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-22_783_4211806616452121435/-ext-10001/</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-46_919_8273996101542787867/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060009</string>
+ <string>1314735830</string>
</void>
</object>
</void>
@@ -124,11 +124,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060009</string>
+ <string>1314735830</string>
</void>
</object>
</void>
@@ -541,6 +541,76 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -713,11 +783,7 @@
<string>src</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -757,7 +823,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -769,7 +835,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -826,11 +892,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060009</string>
+ <string>1314735830</string>
</void>
</object>
</void>
@@ -888,11 +954,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060009</string>
+ <string>1314735830</string>
</void>
</object>
</void>
@@ -918,13 +984,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-31_497_7161274320844726028/-ext-10001</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-51_258_269792457450539399/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-31_497_7161274320844726028/-ext-10001/</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-51_258_269792457450539399/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1163437&r1=1163436&r2=1163437&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Tue Aug 30 22:17:15 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.6.0_07" class="java.beans.XMLDecoder">
+<java version="1.6.0_24" class="java.beans.XMLDecoder">
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
<string>Stage-3</string>
@@ -62,11 +62,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060018</string>
+ <string>1314735836</string>
</void>
</object>
</void>
@@ -124,11 +124,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060018</string>
+ <string>1314735836</string>
</void>
</object>
</void>
@@ -470,6 +470,76 @@
</void>
</object>
</void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>BLOCK__OFFSET__INSIDE__FILE</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo2" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>bigint</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>INPUT__FILE__NAME</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>INPUT__FILE__NAME</string>
+ </void>
+ <void property="isPartitionColOrVirtualCol">
+ <boolean>true</boolean>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>value</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>key</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>src</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
<void property="colList">
@@ -620,11 +690,7 @@
<string>src</string>
</void>
<void property="type">
- <object class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>bigint</string>
- </void>
- </object>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
@@ -664,7 +730,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>src</string>
@@ -676,7 +742,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
<void property="baseFileName">
<string>src</string>
@@ -733,11 +799,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060018</string>
+ <string>1314735836</string>
</void>
</object>
</void>
@@ -795,11 +861,11 @@
</void>
<void method="put">
<string>location</string>
- <string>pfile:/data/users/sdong/www/open-source-hive1/build/ql/test/data/warehouse/src</string>
+ <string>pfile:/data/users/charleschen/hivetests/ht08302011-131137/61/build/ql/test/data/warehouse/src</string>
</void>
<void method="put">
<string>transient_lastDdlTime</string>
- <string>1304060018</string>
+ <string>1314735836</string>
</void>
</object>
</void>
@@ -825,13 +891,13 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
<void property="dirName">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-40_990_4453382953456116593/-ext-10001</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-57_488_5578607096887537542/-ext-10001</string>
</void>
<void property="numFiles">
<int>1</int>
</void>
<void property="statsAggPrefix">
- <string>file:/tmp/sdong/hive_2011-04-28_23-53-40_990_4453382953456116593/-ext-10001/</string>
+ <string>file:/tmp/charleschen/hive_2011-08-30_13-23-57_488_5578607096887537542/-ext-10001/</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">