You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/03/02 23:38:08 UTC
svn commit: r1451954 [27/27] - in /hive/branches/ptf-windowing: ./
cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/conf/
common/src/java/org/apache/hadoop/hive/conf/ conf/
contrib/src/test/results/clientpositive/ data/conf/ data/files/ hbase-h...
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample2.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -729,6 +729,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample3.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -729,6 +729,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample4.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -729,6 +729,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample5.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -729,6 +729,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample6.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -729,6 +729,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/sample7.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-10</string>
+ <string>Stage-7</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -21,7 +21,7 @@
<void method="add">
<object id="StatsTask0" class="org.apache.hadoop.hive.ql.exec.StatsTask">
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -49,7 +49,7 @@
</object>
</void>
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -66,7 +66,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -379,7 +379,7 @@
</object>
</void>
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -393,7 +393,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -470,7 +470,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -527,7 +527,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -701,199 +701,107 @@
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object id="FilterOperator1" class="org.apache.hadoop.hive.ql.exec.FilterOperator">
+ <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object id="SelectOperator0" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
- <void property="childOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
- <void property="destTableId">
- <int>1</int>
- </void>
- <void property="dirName">
- #### A masked pattern was here ####
- </void>
- <void property="gatherStats">
- <boolean>true</boolean>
- </void>
- <void property="lbCtx">
- <object idref="ListBucketingCtx0"/>
- </void>
- <void property="maxStatsKeyPrefixLength">
- <int>200</int>
- </void>
- <void property="numFiles">
- <int>1</int>
- </void>
- <void property="statsAggPrefix">
- #### A masked pattern was here ####
- </void>
- <void property="tableInfo">
- <object idref="TableDesc0"/>
- </void>
- <void property="totalFiles">
- <int>1</int>
- </void>
- </object>
- </void>
- <void property="counterNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
- </void>
- </object>
- </void>
- <void property="operatorId">
- <string>FS_4</string>
- </void>
- <void property="parentOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object idref="SelectOperator0"/>
- </void>
- </object>
- </void>
- <void property="schema">
- <object idref="RowSchema0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
+ <void property="destTableId">
+ <int>1</int>
</void>
- </object>
- </void>
- <void property="columnExprMap">
- <object class="java.util.HashMap">
- <void method="put">
- <string>_col1</string>
- <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <void property="dirName">
+ #### A masked pattern was here ####
</void>
- <void method="put">
- <string>_col0</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="typeInfo">
- <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
- <void property="typeName">
- <string>int</string>
- </void>
- </object>
- </void>
- </object>
+ <void property="gatherStats">
+ <boolean>true</boolean>
</void>
- </object>
- </void>
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
- <void property="colList">
- <object class="java.util.ArrayList">
- <void method="add">
- <object idref="ExprNodeColumnDesc1"/>
- </void>
- <void method="add">
- <object idref="ExprNodeColumnDesc0"/>
- </void>
- </object>
+ <void property="lbCtx">
+ <object idref="ListBucketingCtx0"/>
</void>
- <void property="outputColumnNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>_col0</string>
- </void>
- <void method="add">
- <string>_col1</string>
- </void>
- </object>
+ <void property="maxStatsKeyPrefixLength">
+ <int>200</int>
+ </void>
+ <void property="numFiles">
+ <int>1</int>
</void>
- <void property="selectStar">
+ <void property="statsAggPrefix">
+ #### A masked pattern was here ####
+ </void>
+ <void property="statsCollectRawDataSize">
<boolean>true</boolean>
</void>
+ <void property="tableInfo">
+ <object idref="TableDesc0"/>
+ </void>
+ <void property="totalFiles">
+ <int>1</int>
+ </void>
</object>
</void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_3_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_3</string>
+ <string>FS_4</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="FilterOperator1"/>
+ <object idref="SelectOperator0"/>
</void>
</object>
</void>
<void property="schema">
- <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>_col0</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>_col1</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
+ <object idref="RowSchema0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="columnExprMap">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>_col1</string>
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>_col0</string>
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="typeInfo">
+ <object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
+ <void property="typeName">
+ <string>int</string>
</void>
</object>
</void>
@@ -902,11 +810,103 @@
</object>
</void>
<void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
- <void property="isSamplingPred">
+ <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
+ <void property="colList">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="ExprNodeColumnDesc1"/>
+ </void>
+ <void method="add">
+ <object idref="ExprNodeColumnDesc0"/>
+ </void>
+ </object>
+ </void>
+ <void property="outputColumnNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>_col0</string>
+ </void>
+ <void method="add">
+ <string>_col1</string>
+ </void>
+ </object>
+ </void>
+ <void property="selectStar">
<boolean>true</boolean>
</void>
- <void property="predicate">
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_SEL_3_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_3_TIME_TAKEN</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_3_FATAL_ERROR</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>SEL_3</string>
+ </void>
+ <void property="parentOperators">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object idref="FilterOperator0"/>
+ </void>
+ </object>
+ </void>
+ <void property="schema">
+ <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
+ <void property="signature">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>_col0</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
+ </void>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>_col1</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
+ <void property="predicate">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
+ <void property="childExprs">
+ <object class="java.util.ArrayList">
+ <void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
<void property="childExprs">
<object class="java.util.ArrayList">
@@ -1035,108 +1035,47 @@
</void>
</object>
</void>
- <void property="sampleDescr">
- <object class="org.apache.hadoop.hive.ql.plan.FilterDesc$sampleDesc"/>
- </void>
- </object>
- </void>
- <void property="counterNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>CNTR_NAME_FIL_1_NUM_INPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FIL_1_NUM_OUTPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FIL_1_TIME_TAKEN</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FIL_1_FATAL_ERROR</string>
- </void>
- </object>
- </void>
- <void property="operatorId">
- <string>FIL_1</string>
- </void>
- <void property="parentOperators">
- <object class="java.util.ArrayList">
<void method="add">
- <object idref="FilterOperator0"/>
- </void>
- </object>
- </void>
- <void property="schema">
- <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object class="java.util.ArrayList">
- <void method="add">
- <object id="ColumnInfo0" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object id="ColumnInfo1" class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="internalName">
- <string>value</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
+ <void property="childExprs">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <void property="column">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
</void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
+ <void method="add">
+ <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
+ <void property="typeInfo">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ <void property="value">
+ <int>100</int>
+ </void>
+ </object>
</void>
</object>
</void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
- <void property="predicate">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>key</string>
- </void>
- <void property="tabAlias">
- <string>s</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
+ <void property="genericUDF">
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPGreaterThan"/>
</void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
<void property="typeInfo">
- <object idref="PrimitiveTypeInfo1"/>
- </void>
- <void property="value">
- <int>100</int>
+ <object idref="PrimitiveTypeInfo2"/>
</void>
</object>
</void>
</object>
</void>
<void property="genericUDF">
- <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPGreaterThan"/>
+ <object class="org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPAnd"/>
</void>
<void property="typeInfo">
<object idref="PrimitiveTypeInfo2"/>
@@ -1176,10 +1115,30 @@
<void property="signature">
<object id="ArrayList1" class="java.util.ArrayList">
<void method="add">
- <object idref="ColumnInfo0"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>key</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo1"/>
+ </void>
+ </object>
</void>
<void method="add">
- <object idref="ColumnInfo1"/>
+ <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="internalName">
+ <string>value</string>
+ </void>
+ <void property="tabAlias">
+ <string>s</string>
+ </void>
+ <void property="type">
+ <object idref="PrimitiveTypeInfo0"/>
+ </void>
+ </object>
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/subq.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -17,7 +17,7 @@
<void method="add">
<object id="MoveTask1" class="org.apache.hadoop.hive.ql.exec.MoveTask">
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -34,7 +34,7 @@
</object>
</void>
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -274,7 +274,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -288,7 +288,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -346,7 +346,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -400,7 +400,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -570,143 +570,50 @@
<void property="childOperators">
<object class="java.util.ArrayList">
<void method="add">
- <object id="SelectOperator1" class="org.apache.hadoop.hive.ql.exec.SelectOperator">
- <void property="childOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
- <void property="destTableId">
- <int>1</int>
- </void>
- <void property="dirName">
- #### A masked pattern was here ####
- </void>
- <void property="numFiles">
- <int>1</int>
- </void>
- <void property="statsAggPrefix">
- #### A masked pattern was here ####
- </void>
- <void property="tableInfo">
- <object idref="TableDesc0"/>
- </void>
- <void property="totalFiles">
- <int>1</int>
- </void>
- </object>
- </void>
- <void property="counterNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
- </void>
- <void method="add">
- <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
- </void>
- </object>
- </void>
- <void property="operatorId">
- <string>FS_4</string>
- </void>
- <void property="parentOperators">
- <object class="java.util.ArrayList">
- <void method="add">
- <object idref="SelectOperator1"/>
- </void>
- </object>
- </void>
- <void property="schema">
- <object idref="RowSchema0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void property="columnExprMap">
- <object class="java.util.HashMap">
- <void method="put">
- <string>_col1</string>
- <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col1</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <object class="org.apache.hadoop.hive.ql.exec.FileSinkOperator">
+ <void property="conf">
+ <object class="org.apache.hadoop.hive.ql.plan.FileSinkDesc">
+ <void property="destTableId">
+ <int>1</int>
</void>
- <void method="put">
- <string>_col0</string>
- <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
- <void property="column">
- <string>_col0</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="typeInfo">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
+ <void property="dirName">
+ #### A masked pattern was here ####
</void>
- </object>
- </void>
- <void property="conf">
- <object class="org.apache.hadoop.hive.ql.plan.SelectDesc">
- <void property="colList">
- <object class="java.util.ArrayList">
- <void method="add">
- <object idref="ExprNodeColumnDesc1"/>
- </void>
- <void method="add">
- <object idref="ExprNodeColumnDesc0"/>
- </void>
- </object>
+ <void property="numFiles">
+ <int>1</int>
</void>
- <void property="outputColumnNames">
- <object class="java.util.ArrayList">
- <void method="add">
- <string>_col0</string>
- </void>
- <void method="add">
- <string>_col1</string>
- </void>
- </object>
+ <void property="statsAggPrefix">
+ #### A masked pattern was here ####
</void>
- <void property="selectStar">
+ <void property="statsCollectRawDataSize">
<boolean>true</boolean>
</void>
+ <void property="tableInfo">
+ <object idref="TableDesc0"/>
+ </void>
+ <void property="totalFiles">
+ <int>1</int>
+ </void>
</object>
</void>
<void property="counterNames">
<object class="java.util.ArrayList">
<void method="add">
- <string>CNTR_NAME_SEL_3_NUM_INPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_INPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_NUM_OUTPUT_ROWS</string>
+ <string>CNTR_NAME_FS_4_NUM_OUTPUT_ROWS</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_TIME_TAKEN</string>
+ <string>CNTR_NAME_FS_4_TIME_TAKEN</string>
</void>
<void method="add">
- <string>CNTR_NAME_SEL_3_FATAL_ERROR</string>
+ <string>CNTR_NAME_FS_4_FATAL_ERROR</string>
</void>
</object>
</void>
<void property="operatorId">
- <string>SEL_3</string>
+ <string>FS_4</string>
</void>
<void property="parentOperators">
<object class="java.util.ArrayList">
@@ -716,44 +623,7 @@
</object>
</void>
<void property="schema">
- <object class="org.apache.hadoop.hive.ql.exec.RowSchema">
- <void property="signature">
- <object class="java.util.ArrayList">
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="alias">
- <string>key</string>
- </void>
- <void property="internalName">
- <string>_col0</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- <void method="add">
- <object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
- <void property="alias">
- <string>value</string>
- </void>
- <void property="internalName">
- <string>_col1</string>
- </void>
- <void property="tabAlias">
- <string>src</string>
- </void>
- <void property="type">
- <object idref="PrimitiveTypeInfo0"/>
- </void>
- </object>
- </void>
- </object>
- </void>
- </object>
+ <object idref="RowSchema0"/>
</void>
</object>
</void>
@@ -763,7 +633,7 @@
<object class="java.util.HashMap">
<void method="put">
<string>_col1</string>
- <object id="ExprNodeColumnDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>value</string>
</void>
@@ -777,7 +647,7 @@
</void>
<void method="put">
<string>_col0</string>
- <object id="ExprNodeColumnDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
+ <object id="ExprNodeColumnDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
<void property="column">
<string>key</string>
</void>
@@ -796,10 +666,10 @@
<void property="colList">
<object class="java.util.ArrayList">
<void method="add">
- <object idref="ExprNodeColumnDesc3"/>
+ <object idref="ExprNodeColumnDesc1"/>
</void>
<void method="add">
- <object idref="ExprNodeColumnDesc2"/>
+ <object idref="ExprNodeColumnDesc0"/>
</void>
</object>
</void>
@@ -850,6 +720,9 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>key</string>
+ </void>
<void property="internalName">
<string>_col0</string>
</void>
@@ -863,6 +736,9 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ColumnInfo">
+ <void property="alias">
+ <string>value</string>
+ </void>
<void property="internalName">
<string>_col1</string>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf1.q.xml Sat Mar 2 22:37:59 2013
@@ -2,7 +2,7 @@
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -184,6 +184,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf4.q.xml Sat Mar 2 22:37:59 2013
@@ -2,7 +2,7 @@
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -160,6 +160,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf6.q.xml Sat Mar 2 22:37:59 2013
@@ -2,7 +2,7 @@
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -180,6 +180,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_case.q.xml Sat Mar 2 22:37:59 2013
@@ -2,7 +2,7 @@
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -184,6 +184,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/udf_when.q.xml Sat Mar 2 22:37:59 2013
@@ -2,7 +2,7 @@
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -184,6 +184,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="deserializerClass">
Modified: hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/ptf-windowing/ql/src/test/results/compiler/plan/union.q.xml Sat Mar 2 22:37:59 2013
@@ -6,7 +6,7 @@
<void method="add">
<object class="org.apache.hadoop.hive.ql.exec.ConditionalTask">
<void property="id">
- <string>Stage-9</string>
+ <string>Stage-6</string>
</void>
<void property="listTasks">
<object id="ArrayList0" class="java.util.ArrayList">
@@ -17,7 +17,7 @@
<void method="add">
<object id="MoveTask1" class="org.apache.hadoop.hive.ql.exec.MoveTask">
<void property="id">
- <string>Stage-3</string>
+ <string>Stage-0</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -34,7 +34,7 @@
</object>
</void>
<void property="id">
- <string>Stage-5</string>
+ <string>Stage-2</string>
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -274,7 +274,7 @@
</object>
</void>
<void property="id">
- <string>Stage-8</string>
+ <string>Stage-5</string>
</void>
<void property="parentTasks">
<object class="java.util.ArrayList">
@@ -288,7 +288,7 @@
</object>
</void>
<void property="id">
- <string>Stage-7</string>
+ <string>Stage-4</string>
</void>
<void property="work">
<object idref="MapredWork0"/>
@@ -346,7 +346,7 @@
</object>
</void>
<void property="id">
- <string>Stage-6</string>
+ <string>Stage-3</string>
</void>
<void property="work">
<object idref="MoveWork0"/>
@@ -400,7 +400,7 @@
</object>
</void>
<void property="id">
- <string>Stage-4</string>
+ <string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
@@ -741,6 +741,9 @@
<void property="statsAggPrefix">
#### A masked pattern was here ####
</void>
+ <void property="statsCollectRawDataSize">
+ <boolean>true</boolean>
+ </void>
<void property="tableInfo">
<object idref="TableDesc0"/>
</void>
Modified: hive/branches/ptf-windowing/ql/src/test/templates/TestParse.vm
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ql/src/test/templates/TestParse.vm?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ql/src/test/templates/TestParse.vm (original)
+++ hive/branches/ptf-windowing/ql/src/test/templates/TestParse.vm Sat Mar 2 22:37:59 2013
@@ -38,6 +38,7 @@ public class $className extends TestCase
miniMR = true;
String hadoopVer = "$hadoopVersion";
qt = new QTestUtil("$resultsDir", "$logDir", miniMR, hadoopVer);
+ qt.init(null);
} catch (Exception e) {
System.out.println("Exception: " + e.getMessage());
e.printStackTrace();
@@ -107,8 +108,8 @@ public class $className extends TestCase
qt.addFile(fpath);
org.apache.hadoop.hive.ql.exec.Operator.resetId();
+ org.apache.hadoop.hive.ql.exec.TaskFactory.resetId();
- qt.init(fname);
ASTNode tree = qt.parseQuery(fname);
int ecode = qt.checkParseResults(fname, tree);
if (ecode != 0) {
@@ -121,6 +122,7 @@ public class $className extends TestCase
+ debugHint);
}
System.out.println("Done query: " + fname);
+ qt.getQMap().clear();
}
catch (Throwable e) {
System.out.println("Exception: " + e.getMessage());
Modified: hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java (original)
+++ hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java Sat Mar 2 22:37:59 2013
@@ -19,8 +19,8 @@
package org.apache.hadoop.hive.serde2.typeinfo;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils;
@@ -34,7 +34,7 @@ import org.apache.hadoop.hive.serde2.obj
*/
public final class TypeInfoFactory {
- static HashMap<String, TypeInfo> cachedPrimitiveTypeInfo = new HashMap<String, TypeInfo>();
+ static ConcurrentHashMap<String, TypeInfo> cachedPrimitiveTypeInfo = new ConcurrentHashMap<String, TypeInfo>();
private TypeInfoFactory() {
// prevent instantiation
@@ -84,8 +84,8 @@ public final class TypeInfoFactory {
.getTypeNameFromPrimitiveJava(clazz));
}
- static HashMap<ArrayList<List<?>>, TypeInfo> cachedStructTypeInfo =
- new HashMap<ArrayList<List<?>>, TypeInfo>();
+ static ConcurrentHashMap<ArrayList<List<?>>, TypeInfo> cachedStructTypeInfo =
+ new ConcurrentHashMap<ArrayList<List<?>>, TypeInfo>();
public static TypeInfo getStructTypeInfo(List<String> names,
List<TypeInfo> typeInfos) {
@@ -100,8 +100,8 @@ public final class TypeInfoFactory {
return result;
}
- static HashMap<List<?>, TypeInfo> cachedUnionTypeInfo =
- new HashMap<List<?>, TypeInfo>();
+ static ConcurrentHashMap<List<?>, TypeInfo> cachedUnionTypeInfo =
+ new ConcurrentHashMap<List<?>, TypeInfo>();
public static TypeInfo getUnionTypeInfo(List<TypeInfo> typeInfos) {
TypeInfo result = cachedUnionTypeInfo.get(typeInfos);
@@ -112,7 +112,7 @@ public final class TypeInfoFactory {
return result;
}
- static HashMap<TypeInfo, TypeInfo> cachedListTypeInfo = new HashMap<TypeInfo, TypeInfo>();
+ static ConcurrentHashMap<TypeInfo, TypeInfo> cachedListTypeInfo = new ConcurrentHashMap<TypeInfo, TypeInfo>();
public static TypeInfo getListTypeInfo(TypeInfo elementTypeInfo) {
TypeInfo result = cachedListTypeInfo.get(elementTypeInfo);
@@ -123,8 +123,8 @@ public final class TypeInfoFactory {
return result;
}
- static HashMap<ArrayList<TypeInfo>, TypeInfo> cachedMapTypeInfo =
- new HashMap<ArrayList<TypeInfo>, TypeInfo>();
+ static ConcurrentHashMap<ArrayList<TypeInfo>, TypeInfo> cachedMapTypeInfo =
+ new ConcurrentHashMap<ArrayList<TypeInfo>, TypeInfo>();
public static TypeInfo getMapTypeInfo(TypeInfo keyTypeInfo,
TypeInfo valueTypeInfo) {
Modified: hive/branches/ptf-windowing/shims/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/shims/ivy.xml?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/shims/ivy.xml (original)
+++ hive/branches/ptf-windowing/shims/ivy.xml Sat Mar 2 22:37:59 2013
@@ -40,6 +40,7 @@
transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${jackson.version}"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${jackson.version}"/>
+ <dependency org="log4j" name="log4j" rev="${log4j.version}" />
<!-- Hadoop 0.23 dependencies. Used both for shims and for building against Hadoop 0.23. -->
<dependency org="com.google.guava" name="guava" rev="${guava-hadoop23.version}"
Modified: hive/branches/ptf-windowing/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java?rev=1451954&r1=1451953&r2=1451954&view=diff
==============================================================================
--- hive/branches/ptf-windowing/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java (original)
+++ hive/branches/ptf-windowing/shims/src/common/java/org/apache/hadoop/hive/shims/ShimLoader.java Sat Mar 2 22:37:59 2013
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.hadoop.hive.thrift.HadoopThriftAuthBridge;
import org.apache.hadoop.util.VersionInfo;
+import org.apache.log4j.AppenderSkeleton;
/**
* ShimLoader.
@@ -31,6 +32,7 @@ import org.apache.hadoop.util.VersionInf
public abstract class ShimLoader {
private static HadoopShims hadoopShims;
private static JettyShims jettyShims;
+ private static AppenderSkeleton eventCounter;
/**
* The names of the classes for shimming Hadoop for each major version.
@@ -56,6 +58,18 @@ public abstract class ShimLoader {
JETTY_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.hive.shims.Jetty20SShims");
JETTY_SHIM_CLASSES.put("0.23", "org.apache.hadoop.hive.shims.Jetty23Shims");
}
+
+ /**
+ * The names of the classes for shimming Hadoop's event counter
+ */
+ private static final HashMap<String, String> EVENT_COUNTER_SHIM_CLASSES =
+ new HashMap<String, String>();
+
+ static {
+ EVENT_COUNTER_SHIM_CLASSES.put("0.20", "org.apache.hadoop.metrics.jvm.EventCounter");
+ EVENT_COUNTER_SHIM_CLASSES.put("0.20S", "org.apache.hadoop.log.metrics.EventCounter");
+ EVENT_COUNTER_SHIM_CLASSES.put("0.23", "org.apache.hadoop.log.metrics.EventCounter");
+ }
/**
* Factory method to get an instance of HadoopShims based on the
@@ -78,6 +92,13 @@ public abstract class ShimLoader {
}
return jettyShims;
}
+
+ public static synchronized AppenderSkeleton getEventCounter() {
+ if (eventCounter == null) {
+ eventCounter = loadShims(EVENT_COUNTER_SHIM_CLASSES, AppenderSkeleton.class);
+ }
+ return eventCounter;
+ }
public static synchronized HadoopThriftAuthBridge getHadoopThriftAuthBridge() {
if (getHadoopShims().isSecureShimImpl()) {