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 2014/01/29 07:51:13 UTC
svn commit: r1562367 [1/4] - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/plan/ test/results/compiler/plan/
Author: gunther
Date: Wed Jan 29 06:51:12 2014
New Revision: 1562367
URL: http://svn.apache.org/r1562367
Log:
HIVE-6262: Remove unnecessary copies of schema + table desc from serialized plan (patch by Gunther Hagleitner, reviewed by Vikram Dixit K)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java Wed Jan 29 06:51:12 2014
@@ -18,6 +18,9 @@
package org.apache.hadoop.hive.ql.plan;
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
+
import java.io.Serializable;
import java.util.Enumeration;
import java.util.LinkedHashMap;
@@ -42,7 +45,17 @@ import org.apache.hadoop.util.Reflection
*/
@Explain(displayName = "Partition")
public class PartitionDesc implements Serializable, Cloneable {
- private static final long serialVersionUID = 2L;
+
+ static {
+ TABLE_INTERNER = Interners.newWeakInterner();
+ STRING_INTERNER = Interners.newWeakInterner();
+ CLASS_INTERNER = Interners.newWeakInterner();
+ }
+
+ private static final Interner<TableDesc> TABLE_INTERNER;
+ private static final Interner<String> STRING_INTERNER;
+ private static final Interner<Class<?>> CLASS_INTERNER;
+
private TableDesc tableDesc;
private LinkedHashMap<String, String> partSpec;
private Class<? extends InputFormat> inputFileFormatClass;
@@ -55,28 +68,28 @@ public class PartitionDesc implements Se
this.baseFileName = baseFileName;
}
- public PartitionDesc() {
+ public PartitionDesc() {
}
public PartitionDesc(final TableDesc table, final LinkedHashMap<String, String> partSpec) {
- this.tableDesc = table;
+ setTableDesc(table);
this.partSpec = partSpec;
}
public PartitionDesc(final Partition part) throws HiveException {
- tableDesc = Utilities.getTableDesc(part.getTable());
- properties = part.getMetadataFromPartitionSchema();
+ setTableDesc(Utilities.getTableDesc(part.getTable()));
+ setProperties(part.getMetadataFromPartitionSchema());
partSpec = part.getSpec();
- inputFileFormatClass = part.getInputFormatClass();
- outputFileFormatClass = part.getOutputFormatClass();
+ setInputFileFormatClass(part.getInputFormatClass());
+ setOutputFileFormatClass(part.getOutputFormatClass());
}
public PartitionDesc(final Partition part,final TableDesc tblDesc) throws HiveException {
- tableDesc = tblDesc;
- properties = part.getSchemaFromTableSchema(tblDesc.getProperties()); // each partition maintains a large properties
+ setTableDesc(tblDesc);
+ setProperties(part.getSchemaFromTableSchema(tblDesc.getProperties())); // each partition maintains a large properties
partSpec = part.getSpec();
- inputFileFormatClass = part.getInputFormatClass();
- outputFileFormatClass = part.getOutputFormatClass();
+ setOutputFileFormatClass(part.getInputFormatClass());
+ setOutputFileFormatClass(part.getOutputFormatClass());
}
@Explain(displayName = "")
@@ -85,7 +98,7 @@ public class PartitionDesc implements Se
}
public void setTableDesc(TableDesc tableDesc) {
- this.tableDesc = tableDesc;
+ this.tableDesc = TABLE_INTERNER.intern(tableDesc);
}
@Explain(displayName = "partition values")
@@ -122,7 +135,11 @@ public class PartitionDesc implements Se
public void setInputFileFormatClass(
final Class<? extends InputFormat> inputFileFormatClass) {
- this.inputFileFormatClass = inputFileFormatClass;
+ if (inputFileFormatClass == null) {
+ this.inputFileFormatClass = null;
+ } else {
+ this.inputFileFormatClass = (Class<? extends InputFormat>) CLASS_INTERNER.intern(inputFileFormatClass);
+ }
}
public Class<? extends HiveOutputFormat> getOutputFileFormatClass() {
@@ -133,8 +150,14 @@ public class PartitionDesc implements Se
}
public void setOutputFileFormatClass(final Class<?> outputFileFormatClass) {
- this.outputFileFormatClass = HiveFileFormatUtils
- .getOutputFormatSubstitute(outputFileFormatClass,false);
+ Class<? extends HiveOutputFormat> outputClass = outputFileFormatClass == null ? null :
+ HiveFileFormatUtils.getOutputFormatSubstitute(outputFileFormatClass,false);
+ if (outputClass != null) {
+ this.outputFileFormatClass = (Class<? extends HiveOutputFormat>)
+ CLASS_INTERNER.intern(outputClass);
+ } else {
+ this.outputFileFormatClass = outputClass;
+ }
}
@Explain(displayName = "properties", normalExplain = false)
@@ -157,6 +180,14 @@ public class PartitionDesc implements Se
public void setProperties(final Properties properties) {
this.properties = properties;
+ for (Enumeration<?> keys = properties.propertyNames(); keys.hasMoreElements();) {
+ String key = (String) keys.nextElement();
+ String oldValue = properties.getProperty(key);
+ if (oldValue != null) {
+ String value = STRING_INTERNER.intern(oldValue);
+ properties.setProperty(key, value);
+ }
+ }
}
/**
Modified: hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Wed Jan 29 06:51:12 2014
@@ -555,7 +555,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -1292,86 +1292,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <void property="inputFileFormatClass">
- <class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
- </void>
- <void property="outputFileFormatClass">
- <class>org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat</class>
- </void>
- <void property="properties">
- <object class="java.util.Properties">
- <void method="put">
- <string>name</string>
- <string>default.src_thrift</string>
- </void>
- <void method="put">
- <string>numFiles</string>
- <string>1</string>
- </void>
- <void method="put">
- <string>columns.types</string>
- <string></string>
- </void>
- <void method="put">
- <string>serialization.ddl</string>
- <string>struct src_thrift { }</string>
- </void>
- <void method="put">
- <string>columns</string>
- <string></string>
- </void>
- <void method="put">
- <string>serialization.format</string>
- <string>org.apache.thrift.protocol.TBinaryProtocol</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>serialization.class</string>
- <string>org.apache.hadoop.hive.serde2.thrift.test.Complex</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.thrift.ThriftDeserializer</string>
- </void>
- <void method="put">
- <string>COLUMN_STATS_ACCURATE</string>
- <string>true</string>
- </void>
- <void method="put">
- <string>file.inputformat</string>
- <string>org.apache.hadoop.mapred.SequenceFileInputFormat</string>
- </void>
- <void method="put">
- <string>totalSize</string>
- <string>1606</string>
- </void>
- <void method="put">
- <string>file.outputformat</string>
- <string>org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat</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>
- </object>
+ <object idref="TableDesc1"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -1086,82 +1086,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Wed Jan 29 06:51:12 2014
@@ -212,7 +212,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -358,7 +358,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -421,7 +421,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc3" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -1029,82 +1029,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc1"/>
</void>
</object>
</void>
@@ -1116,7 +1041,7 @@
<boolean>true</boolean>
</void>
<void property="keyDesc">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1455,7 +1380,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc2"/>
+ <object idref="TableDesc3"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -257,7 +257,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -333,7 +333,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -1154,82 +1154,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -1238,7 +1163,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1736,7 +1661,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -303,7 +303,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -387,7 +387,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -1369,82 +1369,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -1453,7 +1378,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>1</int>
@@ -2131,7 +2056,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -196,7 +196,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -251,7 +251,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -776,82 +776,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -860,7 +785,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1124,7 +1049,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -214,7 +214,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -277,7 +277,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -882,82 +882,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -966,7 +891,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1334,7 +1259,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -196,7 +196,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -251,7 +251,7 @@
<object class="java.util.ArrayList"/>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -776,82 +776,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -860,7 +785,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1124,7 +1049,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Wed Jan 29 06:51:12 2014
@@ -319,7 +319,7 @@
</object>
</void>
<void property="tableDesc">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -417,7 +417,62 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object idref="TableDesc0"/>
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <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>
+ </object>
</void>
</object>
</void>
@@ -551,7 +606,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -1091,82 +1146,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc1"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml Wed Jan 29 06:51:12 2014
@@ -319,7 +319,7 @@
</object>
</void>
<void property="tableDesc">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -417,7 +417,62 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object idref="TableDesc0"/>
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <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>
+ </object>
</void>
</object>
</void>
@@ -1514,7 +1569,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc3" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -2562,82 +2617,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc3"/>
</void>
</object>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml Wed Jan 29 06:51:12 2014
@@ -68,7 +68,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -211,7 +211,7 @@
</object>
</void>
<void property="keySerializeInfo">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -291,7 +291,7 @@
</object>
</void>
<void property="valueSerializeInfo">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.SequenceFileInputFormat</class>
</void>
@@ -873,82 +873,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc0"/>
</void>
</object>
</void>
@@ -957,7 +882,7 @@
<void property="reduceWork">
<object class="org.apache.hadoop.hive.ql.plan.ReduceWork">
<void property="keyDesc">
- <object idref="TableDesc0"/>
+ <object idref="TableDesc1"/>
</void>
<void property="numReduceTasks">
<int>-1</int>
@@ -1418,7 +1343,7 @@
</void>
<void property="tagToValueDesc">
<void method="add">
- <object idref="TableDesc1"/>
+ <object idref="TableDesc2"/>
</void>
</void>
</object>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml?rev=1562367&r1=1562366&r2=1562367&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml Wed Jan 29 06:51:12 2014
@@ -319,7 +319,7 @@
</object>
</void>
<void property="tableDesc">
- <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -417,7 +417,62 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object idref="TableDesc0"/>
+ <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <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>
+ </object>
</void>
</object>
</void>
@@ -794,7 +849,7 @@
</object>
</void>
<void property="tableDesc">
- <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -892,7 +947,62 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object idref="TableDesc1"/>
+ <object id="TableDesc1" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <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.dest2</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct dest2 { 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>
+ </object>
</void>
</object>
</void>
@@ -1273,7 +1383,7 @@
</object>
</void>
<void property="tableDesc">
- <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -1380,7 +1490,62 @@
<boolean>true</boolean>
</void>
<void property="table">
- <object idref="TableDesc2"/>
+ <object id="TableDesc2" class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <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.dest3</string>
+ </void>
+ <void method="put">
+ <string>columns.types</string>
+ <string>string:string</string>
+ </void>
+ <void method="put">
+ <string>serialization.ddl</string>
+ <string>struct dest3 { 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>
+ </object>
</void>
</object>
</void>
@@ -1854,7 +2019,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
+ <object id="TableDesc4" class="org.apache.hadoop.hive.ql.plan.TableDesc">
<void property="inputFileFormatClass">
<class>org.apache.hadoop.mapred.TextInputFormat</class>
</void>
@@ -3141,82 +3306,7 @@
</object>
</void>
<void property="tableDesc">
- <object class="org.apache.hadoop.hive.ql.plan.TableDesc">
- <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>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>COLUMN_STATS_ACCURATE</string>
- <string>true</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>
- </object>
+ <object idref="TableDesc4"/>
</void>
</object>
</void>