You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/01/24 19:08:55 UTC
svn commit: r1438111 [4/4] - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/common/
metastore/src/java/org/apache/hadoop/hive/metastore/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/metadata/ ql/src/java/org...
Modified: hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml Thu Jan 24 18:08:52 2013
@@ -193,10 +193,6 @@
<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>
@@ -213,18 +209,6 @@
<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>
@@ -237,10 +221,6 @@
<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>
@@ -248,10 +228,6 @@
<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">
@@ -1282,7 +1258,7 @@
</void>
<void property="maxStatsKeyPrefixLength">
<int>200</int>
- </void>
+ </void>
<void property="numFiles">
<int>1</int>
</void>
@@ -1773,10 +1749,6 @@
<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>
@@ -1793,18 +1765,6 @@
<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>
@@ -1817,10 +1777,6 @@
<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>
@@ -1828,10 +1784,6 @@
<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">
@@ -1945,10 +1897,6 @@
<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>
@@ -1965,18 +1913,6 @@
<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>
@@ -1989,10 +1925,6 @@
<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>
@@ -2000,10 +1932,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml Thu Jan 24 18:08:52 2013
@@ -182,10 +182,6 @@
<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>
@@ -202,18 +198,6 @@
<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>
@@ -226,10 +210,6 @@
<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>
@@ -237,10 +217,6 @@
<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">
@@ -354,10 +330,6 @@
<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>
@@ -374,18 +346,6 @@
<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>
@@ -398,10 +358,6 @@
<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>
@@ -409,10 +365,6 @@
<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">
@@ -526,10 +478,6 @@
<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>
@@ -546,18 +494,6 @@
<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>
@@ -570,10 +506,6 @@
<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>
@@ -581,10 +513,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
@@ -201,10 +177,6 @@
<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>
@@ -221,18 +193,6 @@
<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>
@@ -245,10 +205,6 @@
<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>
@@ -256,10 +212,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
@@ -201,10 +177,6 @@
<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>
@@ -221,18 +193,6 @@
<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>
@@ -245,10 +205,6 @@
<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>
@@ -256,10 +212,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
@@ -201,10 +177,6 @@
<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>
@@ -221,18 +193,6 @@
<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>
@@ -245,10 +205,6 @@
<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>
@@ -256,10 +212,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
@@ -201,10 +177,6 @@
<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>
@@ -221,18 +193,6 @@
<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>
@@ -245,10 +205,6 @@
<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>
@@ -256,10 +212,6 @@
<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">
@@ -373,10 +325,6 @@
<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>
@@ -393,18 +341,6 @@
<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>
@@ -417,10 +353,6 @@
<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>
@@ -428,10 +360,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
@@ -201,10 +177,6 @@
<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>
@@ -221,18 +193,6 @@
<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>
@@ -245,10 +205,6 @@
<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>
@@ -256,10 +212,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml Thu Jan 24 18:08:52 2013
@@ -39,7 +39,7 @@
</void>
<void method="put">
<string>numFiles</string>
- <string>4</string>
+ <string>1</string>
</void>
<void method="put">
<string>columns.types</string>
@@ -66,10 +66,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
@@ -87,7 +83,7 @@
</void>
<void method="put">
<string>totalSize</string>
- <string>23248</string>
+ <string>5812</string>
</void>
<void method="put">
<string>file.outputformat</string>
@@ -986,10 +982,6 @@
<string>0</string>
</void>
<void method="put">
- <string>numPartitions</string>
- <string>4</string>
- </void>
- <void method="put">
<string>partition_columns</string>
<string>ds/hr</string>
</void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Thu Jan 24 18:08:52 2013
@@ -554,10 +554,6 @@
<string>default.srcbucket</string>
</void>
<void method="put">
- <string>numFiles</string>
- <string>2</string>
- </void>
- <void method="put">
<string>columns.types</string>
<string>int:string</string>
</void>
@@ -578,18 +574,6 @@
<string>1</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>2</string>
</void>
@@ -602,10 +586,6 @@
<string>org.apache.hadoop.mapred.TextInputFormat</string>
</void>
<void method="put">
- <string>totalSize</string>
- <string>11603</string>
- </void>
- <void method="put">
<string>file.outputformat</string>
<string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string>
</void>
@@ -613,10 +593,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Thu Jan 24 18:08:52 2013
@@ -427,10 +427,6 @@
<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>
@@ -447,18 +443,6 @@
<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>
@@ -471,10 +455,6 @@
<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>
@@ -482,10 +462,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Thu Jan 24 18:08:52 2013
@@ -64,10 +64,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Thu Jan 24 18:08:52 2013
@@ -29,10 +29,6 @@
<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>
@@ -49,18 +45,6 @@
<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>
@@ -73,10 +57,6 @@
<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>
@@ -84,10 +64,6 @@
<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">
Modified: hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Thu Jan 24 18:08:52 2013
@@ -427,10 +427,6 @@
<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>
@@ -447,18 +443,6 @@
<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>
@@ -471,10 +455,6 @@
<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>
@@ -482,10 +462,6 @@
<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">
@@ -599,10 +575,6 @@
<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>
@@ -619,18 +591,6 @@
<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>
@@ -643,10 +603,6 @@
<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>
@@ -654,10 +610,6 @@
<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">
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/NullStructSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/NullStructSerDe.java?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/NullStructSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/NullStructSerDe.java Thu Jan 24 18:08:52 2013
@@ -56,32 +56,11 @@ public class NullStructSerDe implements
return null;
}
+ private static ObjectInspector nullStructOI = new NullStructSerDeObjectInspector();
+
@Override
public ObjectInspector getObjectInspector() throws SerDeException {
- return new StructObjectInspector() {
- public String getTypeName() {
- return "null";
- }
- public Category getCategory() {
- return Category.PRIMITIVE;
- }
- @Override
- public StructField getStructFieldRef(String fieldName) {
- return null;
- }
- @Override
- public List<NullStructField> getAllStructFieldRefs() {
- return new ArrayList<NullStructField>();
- }
- @Override
- public Object getStructFieldData(Object data, StructField fieldRef) {
- return null;
- }
- @Override
- public List<Object> getStructFieldsDataAsList(Object data) {
- return new ArrayList<Object>();
- }
- };
+ return nullStructOI;
}
@Override
@@ -103,4 +82,38 @@ public class NullStructSerDe implements
return NullWritable.get();
}
+
+ /**
+ * A object inspector for null struct serde.
+ */
+ public static class NullStructSerDeObjectInspector extends StructObjectInspector {
+ public String getTypeName() {
+ return "null";
+ }
+
+ public Category getCategory() {
+ return Category.PRIMITIVE;
+ }
+
+ @Override
+ public StructField getStructFieldRef(String fieldName) {
+ return null;
+ }
+
+ @Override
+ public List<NullStructField> getAllStructFieldRefs() {
+ return new ArrayList<NullStructField>();
+ }
+
+ @Override
+ public Object getStructFieldData(Object data, StructField fieldRef) {
+ return null;
+ }
+
+ @Override
+ public List<Object> getStructFieldsDataAsList(Object data) {
+ return new ArrayList<Object>();
+ }
+ }
+
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Thu Jan 24 18:08:52 2013
@@ -24,9 +24,9 @@ import java.util.Map;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaStringObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBigDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBinaryObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableBooleanObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableByteObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableFloatObjectInspector;
@@ -34,8 +34,8 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableLongObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableShortObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableTimestampObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableStringObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.VoidObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableStringObjectInspector;
/**
* ObjectInspectorConverters.
@@ -60,6 +60,64 @@ public final class ObjectInspectorConver
}
}
+ private static Converter getConverter(PrimitiveObjectInspector inputOI,
+ PrimitiveObjectInspector outputOI) {
+ switch (outputOI.getPrimitiveCategory()) {
+ case BOOLEAN:
+ return new PrimitiveObjectInspectorConverter.BooleanConverter(
+ inputOI,
+ (SettableBooleanObjectInspector) outputOI);
+ case BYTE:
+ return new PrimitiveObjectInspectorConverter.ByteConverter(
+ inputOI,
+ (SettableByteObjectInspector) outputOI);
+ case SHORT:
+ return new PrimitiveObjectInspectorConverter.ShortConverter(
+ inputOI,
+ (SettableShortObjectInspector) outputOI);
+ case INT:
+ return new PrimitiveObjectInspectorConverter.IntConverter(
+ inputOI,
+ (SettableIntObjectInspector) outputOI);
+ case LONG:
+ return new PrimitiveObjectInspectorConverter.LongConverter(
+ inputOI,
+ (SettableLongObjectInspector) outputOI);
+ case FLOAT:
+ return new PrimitiveObjectInspectorConverter.FloatConverter(
+ inputOI,
+ (SettableFloatObjectInspector) outputOI);
+ case DOUBLE:
+ return new PrimitiveObjectInspectorConverter.DoubleConverter(
+ inputOI,
+ (SettableDoubleObjectInspector) outputOI);
+ case STRING:
+ if (outputOI instanceof WritableStringObjectInspector) {
+ return new PrimitiveObjectInspectorConverter.TextConverter(
+ inputOI);
+ } else if (outputOI instanceof JavaStringObjectInspector) {
+ return new PrimitiveObjectInspectorConverter.StringConverter(
+ inputOI);
+ }
+ case TIMESTAMP:
+ return new PrimitiveObjectInspectorConverter.TimestampConverter(
+ inputOI,
+ (SettableTimestampObjectInspector) outputOI);
+ case BINARY:
+ return new PrimitiveObjectInspectorConverter.BinaryConverter(
+ inputOI,
+ (SettableBinaryObjectInspector)outputOI);
+ case DECIMAL:
+ return new PrimitiveObjectInspectorConverter.BigDecimalConverter(
+ (PrimitiveObjectInspector) inputOI,
+ (SettableBigDecimalObjectInspector) outputOI);
+ default:
+ throw new RuntimeException("Hive internal error: conversion of "
+ + inputOI.getTypeName() + " to " + outputOI.getTypeName()
+ + " not supported yet.");
+ }
+ }
+
/**
* Returns a converter that converts objects from one OI to another OI. The
* returned (converted) object belongs to this converter, so that it can be
@@ -69,66 +127,12 @@ public final class ObjectInspectorConver
ObjectInspector outputOI) {
// If the inputOI is the same as the outputOI, just return an
// IdentityConverter.
- if (inputOI == outputOI) {
+ if (inputOI.equals(outputOI)) {
return new IdentityConverter();
}
switch (outputOI.getCategory()) {
case PRIMITIVE:
- switch (((PrimitiveObjectInspector) outputOI).getPrimitiveCategory()) {
- case BOOLEAN:
- return new PrimitiveObjectInspectorConverter.BooleanConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableBooleanObjectInspector) outputOI);
- case BYTE:
- return new PrimitiveObjectInspectorConverter.ByteConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableByteObjectInspector) outputOI);
- case SHORT:
- return new PrimitiveObjectInspectorConverter.ShortConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableShortObjectInspector) outputOI);
- case INT:
- return new PrimitiveObjectInspectorConverter.IntConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableIntObjectInspector) outputOI);
- case LONG:
- return new PrimitiveObjectInspectorConverter.LongConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableLongObjectInspector) outputOI);
- case FLOAT:
- return new PrimitiveObjectInspectorConverter.FloatConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableFloatObjectInspector) outputOI);
- case DOUBLE:
- return new PrimitiveObjectInspectorConverter.DoubleConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableDoubleObjectInspector) outputOI);
- case STRING:
- if (outputOI instanceof WritableStringObjectInspector) {
- return new PrimitiveObjectInspectorConverter.TextConverter(
- (PrimitiveObjectInspector) inputOI);
- } else if (outputOI instanceof JavaStringObjectInspector) {
- return new PrimitiveObjectInspectorConverter.StringConverter(
- (PrimitiveObjectInspector) inputOI);
- }
- case TIMESTAMP:
- return new PrimitiveObjectInspectorConverter.TimestampConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableTimestampObjectInspector) outputOI);
- case BINARY:
- return new PrimitiveObjectInspectorConverter.BinaryConverter(
- (PrimitiveObjectInspector)inputOI,
- (SettableBinaryObjectInspector)outputOI);
- case DECIMAL:
- return new PrimitiveObjectInspectorConverter.BigDecimalConverter(
- (PrimitiveObjectInspector) inputOI,
- (SettableBigDecimalObjectInspector) outputOI);
-
- default:
- throw new RuntimeException("Hive internal error: conversion of "
- + inputOI.getTypeName() + " to " + outputOI.getTypeName()
- + " not supported yet.");
- }
+ return getConverter((PrimitiveObjectInspector) inputOI, (PrimitiveObjectInspector) outputOI);
case STRUCT:
return new StructConverter(inputOI,
(SettableStructObjectInspector) outputOI);
@@ -145,6 +149,50 @@ public final class ObjectInspectorConver
}
}
+ public static ObjectInspector getConvertedOI(
+ ObjectInspector inputOI,
+ ObjectInspector outputOI) {
+ // If the inputOI is the same as the outputOI, just return it
+ if (inputOI.equals(outputOI)) {
+ return outputOI;
+ }
+ switch (outputOI.getCategory()) {
+ case PRIMITIVE:
+ return outputOI;
+ case STRUCT:
+ StructObjectInspector structOutputOI = (StructObjectInspector) outputOI;
+ if (structOutputOI.isSettable()) {
+ return outputOI;
+ }
+ else {
+ // create a standard settable struct object inspector
+ List<? extends StructField> listFields = structOutputOI.getAllStructFieldRefs();
+ List<String> structFieldNames = new ArrayList<String>(listFields.size());
+ List<ObjectInspector> structFieldObjectInspectors = new ArrayList<ObjectInspector>(
+ listFields.size());
+
+ for (StructField listField : listFields) {
+ structFieldNames.add(listField.getFieldName());
+ structFieldObjectInspectors.add(listField.getFieldObjectInspector());
+ }
+
+ StandardStructObjectInspector structStandardOutputOI = ObjectInspectorFactory
+ .getStandardStructObjectInspector(
+ structFieldNames,
+ structFieldObjectInspectors);
+ return structStandardOutputOI;
+ }
+ case LIST:
+ return outputOI;
+ case MAP:
+ return outputOI;
+ default:
+ throw new RuntimeException("Hive internal error: conversion of "
+ + inputOI.getTypeName() + " to " + outputOI.getTypeName()
+ + " not supported yet.");
+ }
+ }
+
/**
* A converter class for List.
*/
@@ -226,10 +274,11 @@ public final class ObjectInspectorConver
this.outputOI = outputOI;
inputFields = this.inputOI.getAllStructFieldRefs();
outputFields = outputOI.getAllStructFieldRefs();
- assert (inputFields.size() == outputFields.size());
- fieldConverters = new ArrayList<Converter>(inputFields.size());
- for (int f = 0; f < inputFields.size(); f++) {
+ // If the output has some extra fields, set them to NULL.
+ int minFields = Math.min(inputFields.size(), outputFields.size());
+ fieldConverters = new ArrayList<Converter>(minFields);
+ for (int f = 0; f < minFields; f++) {
fieldConverters.add(getConverter(inputFields.get(f)
.getFieldObjectInspector(), outputFields.get(f)
.getFieldObjectInspector()));
@@ -248,15 +297,19 @@ public final class ObjectInspectorConver
return null;
}
+ int minFields = Math.min(inputFields.size(), outputFields.size());
// Convert the fields
- for (int f = 0; f < inputFields.size(); f++) {
- Object inputFieldValue = inputOI.getStructFieldData(input, inputFields
- .get(f));
- Object outputFieldValue = fieldConverters.get(f).convert(
- inputFieldValue);
- outputOI.setStructFieldData(output, outputFields.get(f),
- outputFieldValue);
+ for (int f = 0; f < minFields; f++) {
+ Object inputFieldValue = inputOI.getStructFieldData(input, inputFields.get(f));
+ Object outputFieldValue = fieldConverters.get(f).convert(inputFieldValue);
+ outputOI.setStructFieldData(output, outputFields.get(f), outputFieldValue);
+ }
+
+ // set the extra fields to null
+ for (int f = minFields; f < outputFields.size(); f++) {
+ outputOI.setStructFieldData(output, outputFields.get(f), null);
}
+
return output;
}
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/SettableStructObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/SettableStructObjectInspector.java?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/SettableStructObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/SettableStructObjectInspector.java Thu Jan 24 18:08:52 2013
@@ -34,4 +34,9 @@ public abstract class SettableStructObje
*/
public abstract Object setStructFieldData(Object struct, StructField field,
Object fieldValue);
+
+ @Override
+ public boolean isSettable() {
+ return true;
+ }
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StructObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StructObjectInspector.java?rev=1438111&r1=1438110&r2=1438111&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StructObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StructObjectInspector.java Thu Jan 24 18:08:52 2013
@@ -47,6 +47,10 @@ public abstract class StructObjectInspec
*/
public abstract List<Object> getStructFieldsDataAsList(Object data);
+ public boolean isSettable() {
+ return false;
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();