You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/07/29 23:08:19 UTC
svn commit: r1508202 [46/48] - in /hive/branches/tez: ./
beeline/src/java/org/apache/hive/beeline/
cli/src/java/org/apache/hadoop/hive/cli/
common/src/java/org/apache/hadoop/hive/common/metrics/
common/src/java/org/apache/hadoop/hive/conf/ common/src/t...
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml Mon Jul 29 21:08:03 2013
@@ -1,143 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
#### A masked pattern was here ####
- <object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="id">
<string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToPartnInfo">
- <void method="put">
- <string>dest1</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.dest1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct dest1 { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
+ <void property="finalMapRed">
+ <boolean>true</boolean>
</void>
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToPartnInfo">
+ <void method="put">
+ <string>dest1</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.dest1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.dest1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct dest1 { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="aliasToWork">
<void method="put">
<string>dest1</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -177,6 +180,10 @@
<void property="properties">
<object class="java.util.Properties">
<void method="put">
+ <string>hive.serialization.extend.nesting.levels</string>
+ <string>true</string>
+ </void>
+ <void method="put">
<string>columns</string>
<string>_col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8,_col9,_col10,_col11,_col12,_col13,_col14,_col15,_col16,_col17,_col18</string>
</void>
@@ -1825,16 +1832,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="finalMapRed">
- <boolean>true</boolean>
- </void>
- <void property="nameToSplitSample">
- <object class="java.util.HashMap"/>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -1843,10 +1842,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -1982,10 +1979,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml Mon Jul 29 21:08:03 2013
@@ -1,163 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
#### A masked pattern was here ####
- <object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="id">
<string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToPartnInfo">
- <void method="put">
- <string>src</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>5812</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
+ <void property="finalMapRed">
+ <boolean>true</boolean>
</void>
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToPartnInfo">
+ <void method="put">
+ <string>src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>numFiles</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>rawDataSize</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numRows</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numPartitions</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>totalSize</string>
+ <string>5812</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="aliasToWork">
<void method="put">
<string>src</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -197,6 +200,10 @@
<void property="properties">
<object class="java.util.Properties">
<void method="put">
+ <string>hive.serialization.extend.nesting.levels</string>
+ <string>true</string>
+ </void>
+ <void method="put">
<string>columns</string>
<string>_col0,_col1</string>
</void>
@@ -583,16 +590,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="finalMapRed">
- <boolean>true</boolean>
- </void>
- <void property="nameToSplitSample">
- <object class="java.util.HashMap"/>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -601,10 +600,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -780,10 +777,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml Mon Jul 29 21:08:03 2013
@@ -1,163 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
#### A masked pattern was here ####
- <object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="id">
<string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToPartnInfo">
- <void method="put">
- <string>src</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>5812</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
+ <void property="finalMapRed">
+ <boolean>true</boolean>
</void>
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToPartnInfo">
+ <void method="put">
+ <string>src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>numFiles</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>rawDataSize</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numRows</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numPartitions</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>totalSize</string>
+ <string>5812</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="aliasToWork">
<void method="put">
<string>src</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -201,6 +204,10 @@
<void property="properties">
<object class="java.util.Properties">
<void method="put">
+ <string>hive.serialization.extend.nesting.levels</string>
+ <string>true</string>
+ </void>
+ <void method="put">
<string>columns</string>
<string>_col0,_col1</string>
</void>
@@ -677,16 +684,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="finalMapRed">
- <boolean>true</boolean>
- </void>
- <void property="nameToSplitSample">
- <object class="java.util.HashMap"/>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -695,10 +694,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -874,10 +871,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml Mon Jul 29 21:08:03 2013
@@ -1,163 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
#### A masked pattern was here ####
- <object class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="id">
<string>Stage-1</string>
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToPartnInfo">
- <void method="put">
- <string>src</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>5812</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
+ <void property="finalMapRed">
+ <boolean>true</boolean>
</void>
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToPartnInfo">
+ <void method="put">
+ <string>src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>numFiles</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>rawDataSize</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numRows</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numPartitions</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>totalSize</string>
+ <string>5812</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="aliasToWork">
<void method="put">
<string>src</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -201,6 +204,10 @@
<void property="properties">
<object class="java.util.Properties">
<void method="put">
+ <string>hive.serialization.extend.nesting.levels</string>
+ <string>true</string>
+ </void>
+ <void method="put">
<string>columns</string>
<string>_col0,_col1</string>
</void>
@@ -757,16 +764,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="finalMapRed">
- <boolean>true</boolean>
- </void>
- <void property="nameToSplitSample">
- <object class="java.util.HashMap"/>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -775,10 +774,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -954,10 +951,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml Mon Jul 29 21:08:03 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
#### A masked pattern was here ####
- <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
<void method="add">
@@ -25,7 +25,7 @@
<object idref="MoveTask0"/>
</void>
<void method="add">
- <object id="MapRedTask1" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object id="MapRedTask1" class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
<void method="add">
@@ -38,8 +38,8 @@
</void>
<void property="work">
<object id="MapredWork0" class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToWork">
<void method="put">
#### A masked pattern was here ####
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -181,19 +181,14 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="inputformat">
- <string>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</string>
- </void>
- <void property="mapperCannotSpanPartns">
- <boolean>true</boolean>
- </void>
- <void property="numReduceTasks">
- <int>0</int>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="inputformat">
+ <string>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</string>
+ </void>
+ <void property="mapperCannotSpanPartns">
+ <boolean>true</boolean>
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -202,10 +197,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -255,10 +248,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
@@ -279,7 +269,7 @@
<void property="parentTasks">
<object class="java.util.ArrayList">
<void method="add">
- <object id="MapRedTask2" class="org.apache.hadoop.hive.ql.exec.MapRedTask">
+ <object id="MapRedTask2" class="org.apache.hadoop.hive.ql.exec.mr.MapRedTask">
<void property="childTasks">
<object class="java.util.ArrayList">
<void method="add">
@@ -404,306 +394,309 @@
</void>
<void property="work">
<object class="org.apache.hadoop.hive.ql.plan.MapredWork">
- <void property="aliasToPartnInfo">
- <void method="put">
- <string>null-subquery1:unioninput-subquery1:src</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>5812</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
- <void method="put">
- <string>null-subquery2:unioninput-subquery2:src</string>
- <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="partSpec">
- <object class="java.util.LinkedHashMap"/>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="deserializerClass">
- <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
- </void>
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.TextInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string>string:string</string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src { string key, string value}</string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string>key,value</string>
- </void>
- <void method="put">
- <string>rawDataSize</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numRows</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>numPartitions</string>
- <string>0</string>
- </void>
- <void method="put">
- <string>bucket_count</string>
- <string>-1</string>
- </void>
- <void method="put">
- <string>serialization.lib</string>
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.TextInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>5812</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
- </void>
- <void method="put">
- <string>location</string>
- #### A masked pattern was here ####
- </void>
- <void method="put">
- <string>transient_lastDdlTime</string>
- #### A masked pattern was here ####
- </void>
- </object>
- </void>
- <void property="serdeClassName">
- <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
- </void>
- </object>
- </void>
- </object>
- </void>
+ <void property="finalMapRed">
+ <boolean>true</boolean>
</void>
- <void property="aliasToWork">
- <object class="java.util.LinkedHashMap">
+ <void property="mapWork">
+ <void property="aliasToPartnInfo">
+ <void method="put">
+ <string>null-subquery1:unioninput-subquery1:src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>numFiles</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>rawDataSize</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numRows</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numPartitions</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>totalSize</string>
+ <string>5812</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void method="put">
+ <string>null-subquery2:unioninput-subquery2:src</string>
+ <object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="partSpec">
+ <object class="java.util.LinkedHashMap"/>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void property="tableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <void property="deserializerClass">
+ <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class>
+ </void>
+ <void property="inputFileFormatClass">
+ <class>org.apache.hadoop.mapred.TextInputFormat</class>
+ </void>
+ <void property="outputFileFormatClass">
+ <class>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</class>
+ </void>
+ <void property="properties">
+ <object class="java.util.Properties">
+ <void method="put">
+ <string>name</string>
+ <string>default.src</string>
+ </void>
+ <void method="put">
+ <string>numFiles</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct src { string key, string value}</string>
+ </void>
+ <void method="put">
+ <string>serialization.format</string>
+ <string>1</string>
+ </void>
+ <void method="put">
+ <string>columns</string>
+ <string>key,value</string>
+ </void>
+ <void method="put">
+ <string>rawDataSize</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numRows</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>numPartitions</string>
+ <string>0</string>
+ </void>
+ <void method="put">
+ <string>bucket_count</string>
+ <string>-1</string>
+ </void>
+ <void method="put">
+ <string>serialization.lib</string>
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ <void method="put">
+ <string>file.inputformat</string>
+ <string>org.apache.hadoop.mapred.TextInputFormat</string>
+ </void>
+ <void method="put">
+ <string>totalSize</string>
+ <string>5812</string>
+ </void>
+ <void method="put">
+ <string>file.outputformat</string>
+ <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
+ </void>
+ <void method="put">
+ <string>location</string>
+ #### A masked pattern was here ####
+ </void>
+ <void method="put">
+ <string>transient_lastDdlTime</string>
+ #### A masked pattern was here ####
+ </void>
+ </object>
+ </void>
+ <void property="serdeClassName">
+ <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string>
+ </void>
+ </object>
+ </void>
+ </object>
+ </void>
+ </void>
+ <void property="aliasToWork">
<void method="put">
<string>null-subquery1:unioninput-subquery1:src</string>
<object id="TableScanOperator1" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
@@ -1063,12 +1056,12 @@
<void property="typeInfo">
<object id="PrimitiveTypeInfo1" class="org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo">
<void property="typeName">
- <string>double</string>
+ <string>int</string>
</void>
</object>
</void>
<void property="value">
- <double>100.0</double>
+ <int>100</int>
</void>
</object>
</void>
@@ -1470,7 +1463,7 @@
<object idref="PrimitiveTypeInfo1"/>
</void>
<void property="value">
- <double>100.0</double>
+ <int>100</int>
</void>
</object>
</void>
@@ -1641,16 +1634,8 @@
<string>null-subquery2:unioninput-subquery2:src</string>
<object idref="TableScanOperator2"/>
</void>
- </object>
- </void>
- <void property="finalMapRed">
- <boolean>true</boolean>
- </void>
- <void property="nameToSplitSample">
- <object class="java.util.HashMap"/>
- </void>
- <void property="pathToAliases">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToAliases">
<void method="put">
#### A masked pattern was here ####
<object class="java.util.ArrayList">
@@ -1662,10 +1647,8 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="pathToPartitionInfo">
- <object class="java.util.LinkedHashMap">
+ </void>
+ <void property="pathToPartitionInfo">
<void method="put">
#### A masked pattern was here ####
<object class="org.apache.hadoop.hive.ql.plan.PartitionDesc">
@@ -1841,10 +1824,7 @@
</void>
</object>
</void>
- </object>
- </void>
- <void property="tagToValueDesc">
- <object class="java.util.ArrayList"/>
+ </void>
</void>
</object>
</void>
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java?rev=1508202&r1=1508201&r2=1508202&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java Mon Jul 29 21:08:03 2013
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hive.serde2;
+import java.sql.Date;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -134,6 +136,10 @@ public class RegexSerDe extends Abstract
columnOIs.add(PrimitiveObjectInspectorFactory.javaDoubleObjectInspector);
} else if (typeName.equals(serdeConstants.BOOLEAN_TYPE_NAME)) {
columnOIs.add(PrimitiveObjectInspectorFactory.javaBooleanObjectInspector);
+ } else if (typeName.equals(serdeConstants.TIMESTAMP_TYPE_NAME)) {
+ columnOIs.add(PrimitiveObjectInspectorFactory.javaTimestampObjectInspector);
+ } else if (typeName.equals(serdeConstants.DATE_TYPE_NAME)) {
+ columnOIs.add(PrimitiveObjectInspectorFactory.javaDateObjectInspector);
} else if (typeName.equals(serdeConstants.DECIMAL_TYPE_NAME)) {
columnOIs.add(PrimitiveObjectInspectorFactory.javaHiveDecimalObjectInspector);
} else {
@@ -229,6 +235,14 @@ public class RegexSerDe extends Abstract
Boolean b;
b = Boolean.valueOf(t);
row.set(c, b);
+ } else if (typeName.equals(serdeConstants.TIMESTAMP_TYPE_NAME)) {
+ Timestamp ts;
+ ts = Timestamp.valueOf(t);
+ row.set(c, ts);
+ } else if (typeName.equals(serdeConstants.DATE_TYPE_NAME)) {
+ Date d;
+ d = Date.valueOf(t);
+ row.set(c, d);
} else if (typeName.equals(serdeConstants.DECIMAL_TYPE_NAME)) {
HiveDecimal bd;
bd = new HiveDecimal(t);