You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/11/12 19:23:14 UTC
svn commit: r1541190 [14/15] - in /hive/branches/tez: ./
ant/src/org/apache/hadoop/hive/ant/ beeline/
beeline/src/java/org/apache/hive/beeline/ cli/
cli/src/java/org/apache/hadoop/hive/cli/ common/
common/src/java/org/apache/hadoop/hive/common/ common/...
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml Tue Nov 12 18:23:05 2013
@@ -276,6 +276,10 @@
<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>
@@ -1106,6 +1110,10 @@
<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>
@@ -1178,6 +1186,10 @@
<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>
@@ -1843,6 +1855,10 @@
<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>
@@ -1975,6 +1991,10 @@
<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>
@@ -2716,6 +2736,10 @@
<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>
@@ -2788,6 +2812,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml Tue Nov 12 18:23:05 2013
@@ -265,6 +265,10 @@
<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>
@@ -397,6 +401,10 @@
<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>
@@ -529,6 +537,10 @@
<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>
@@ -1634,6 +1646,10 @@
<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>
@@ -1706,6 +1722,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -250,6 +254,10 @@
<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>
@@ -1601,6 +1609,10 @@
<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>
@@ -1673,6 +1685,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -250,6 +254,10 @@
<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>
@@ -1601,6 +1609,10 @@
<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>
@@ -1673,6 +1685,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -250,6 +254,10 @@
<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>
@@ -1601,6 +1609,10 @@
<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>
@@ -1673,6 +1685,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -250,6 +254,10 @@
<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>
@@ -382,6 +390,10 @@
<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>
@@ -2355,6 +2367,10 @@
<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>
@@ -2427,6 +2443,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -250,6 +254,10 @@
<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>
@@ -1683,6 +1691,10 @@
<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>
@@ -1755,6 +1767,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml Tue Nov 12 18:23:05 2013
@@ -79,6 +79,10 @@
<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>
@@ -1006,6 +1010,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1281,6 +1285,10 @@
<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>
@@ -1357,6 +1365,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1291,6 +1295,10 @@
<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>
@@ -1367,6 +1375,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1281,6 +1285,10 @@
<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>
@@ -1357,6 +1365,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1278,6 +1282,10 @@
<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>
@@ -1354,6 +1362,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1281,6 +1285,10 @@
<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>
@@ -1357,6 +1365,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml Tue Nov 12 18:23:05 2013
@@ -652,6 +652,10 @@
<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>
@@ -1326,6 +1330,10 @@
<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>
@@ -1402,6 +1410,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml Tue Nov 12 18:23:05 2013
@@ -534,6 +534,10 @@
<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>
@@ -1065,6 +1069,10 @@
<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>
@@ -1137,6 +1145,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -2039,6 +2043,10 @@
<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>
@@ -2111,6 +2119,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -662,6 +666,10 @@
<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>
@@ -734,6 +742,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -766,6 +770,10 @@
<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>
@@ -838,6 +846,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml Tue Nov 12 18:23:05 2013
@@ -118,6 +118,10 @@
<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>
@@ -846,6 +850,10 @@
<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>
@@ -918,6 +926,10 @@
<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>
Modified: hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml Tue Nov 12 18:23:05 2013
@@ -534,6 +534,10 @@
<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>
@@ -666,6 +670,10 @@
<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>
@@ -1771,6 +1779,10 @@
<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>
@@ -1843,6 +1855,10 @@
<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>
Modified: hive/branches/tez/serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/pom.xml?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/pom.xml (original)
+++ hive/branches/tez/serde/pom.xml Tue Nov 12 18:23:05 2013
@@ -42,7 +42,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
- <classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
@@ -51,6 +50,11 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Tue Nov 12 18:23:05 2013
@@ -37,6 +37,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
@@ -255,6 +256,13 @@ public final class SerDeUtils {
sb.append('"');
break;
}
+ case CHAR: {
+ sb.append('"');
+ sb.append(escapeString(((HiveCharObjectInspector) poi)
+ .getPrimitiveJavaObject(o).toString()));
+ sb.append('"');
+ break;
+ }
case VARCHAR: {
sb.append('"');
sb.append(escapeString(((HiveVarcharObjectInspector) poi)
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java Tue Nov 12 18:23:05 2013
@@ -39,6 +39,7 @@ import org.apache.hadoop.hive.serde2.Ser
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DateWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -57,6 +58,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
@@ -64,6 +66,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector;
+import org.apache.hadoop.hive.serde2.typeinfo.BaseCharTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.ListTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.MapTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
@@ -282,6 +285,15 @@ public class BinarySortableSerDe extends
return deserializeText(buffer, invert, r);
}
+ case CHAR: {
+ HiveCharWritable r =
+ reuse == null ? new HiveCharWritable() : (HiveCharWritable) reuse;
+ // Use internal text member to read value
+ deserializeText(buffer, invert, r.getTextValue());
+ r.enforceMaxLength(getCharacterMaxLength(type));
+ return r;
+ }
+
case VARCHAR: {
HiveVarcharWritable r =
reuse == null ? new HiveVarcharWritable() : (HiveVarcharWritable) reuse;
@@ -289,7 +301,7 @@ public class BinarySortableSerDe extends
deserializeText(buffer, invert, r.getTextValue());
// If we cache helper data for deserialization we could avoid having
// to call getVarcharMaxLength() on every deserialize call.
- r.enforceMaxLength(getVarcharMaxLength(type));
+ r.enforceMaxLength(getCharacterMaxLength(type));
return r;
}
@@ -525,8 +537,8 @@ public class BinarySortableSerDe extends
return v;
}
- static int getVarcharMaxLength(TypeInfo type) {
- return ((VarcharTypeInfo)type).getLength();
+ static int getCharacterMaxLength(TypeInfo type) {
+ return ((BaseCharTypeInfo)type).getLength();
}
static Text deserializeText(InputByteBuffer buffer, boolean invert, Text r)
@@ -689,8 +701,17 @@ public class BinarySortableSerDe extends
Text t = soi.getPrimitiveWritableObject(o);
serializeBytes(buffer, t.getBytes(), t.getLength(), invert);
return;
- }
+ }
+ case CHAR: {
+ HiveCharObjectInspector hcoi = (HiveCharObjectInspector) poi;
+ HiveCharWritable hc = hcoi.getPrimitiveWritableObject(o);
+ // Trailing space should ignored for char comparisons.
+ // So write stripped values for this SerDe.
+ Text t = hc.getStrippedValue();
+ serializeBytes(buffer, t.getBytes(), t.getLength(), invert);
+ return;
+ }
case VARCHAR: {
HiveVarcharObjectInspector hcoi = (HiveVarcharObjectInspector)poi;
HiveVarcharWritable hc = hcoi.getPrimitiveWritableObject(o);
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveVarcharWritable.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveVarcharWritable.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveVarcharWritable.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveVarcharWritable.java Tue Nov 12 18:23:05 2013
@@ -27,9 +27,8 @@ import org.apache.hadoop.hive.shims.Shim
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
-public class HiveVarcharWritable implements WritableComparable<HiveVarcharWritable>{
- protected Text value = new Text();
- transient protected int characterLength = -1;
+public class HiveVarcharWritable extends HiveBaseCharWritable
+ implements WritableComparable<HiveVarcharWritable>{
public HiveVarcharWritable() {
}
@@ -52,15 +51,10 @@ public class HiveVarcharWritable impleme
public void set(HiveVarcharWritable val) {
value.set(val.value);
- characterLength = val.characterLength;
}
public void set(HiveVarcharWritable val, int maxLength) {
- if (val.characterLength > 0 && val.characterLength >= maxLength) {
- set(val);
- } else {
- set(val.getHiveVarchar(), maxLength);
- }
+ set(val.getHiveVarchar(), maxLength);
}
public void set(HiveVarchar val, int len) {
@@ -68,7 +62,6 @@ public class HiveVarcharWritable impleme
}
public void set(String val, int maxLength) {
- characterLength = -1;
value.set(HiveBaseChar.enforceMaxLength(val, maxLength));
}
@@ -76,52 +69,17 @@ public class HiveVarcharWritable impleme
return new HiveVarchar(value.toString(), -1);
}
- public int getCharacterLength() {
- if (characterLength < 0) {
- characterLength = getHiveVarchar().getCharacterLength();
- }
- return characterLength;
- }
-
public void enforceMaxLength(int maxLength) {
// Might be possible to truncate the existing Text value, for now just do something simple.
set(getHiveVarchar(), maxLength);
}
- public void readFields(DataInput in) throws IOException {
- characterLength = -1;
- value.readFields(in);
- }
-
- public void write(DataOutput out) throws IOException {
- value.write(out);
- }
-
public int compareTo(HiveVarcharWritable rhs) {
- return ShimLoader.getHadoopShims().compareText(value, rhs.value);
- }
-
- public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof HiveVarcharWritable)) {
- return false;
- }
- return value.equals(((HiveVarcharWritable)obj).value);
+ return value.compareTo(rhs.value);
}
@Override
public String toString() {
return value.toString();
}
-
- public int hashCode() {
- return value.hashCode();
- }
-
- /**
- * Access to the internal Text member. Use with care.
- * @return
- */
- public Text getTextValue() {
- return value;
- }
}
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java Tue Nov 12 18:23:05 2013
@@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.laz
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyDateObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyDoubleObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyFloatObjectInspector;
+import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyIntObjectInspector;
@@ -113,6 +114,8 @@ public final class LazyFactory {
return new LazyDouble((LazyDoubleObjectInspector) oi);
case STRING:
return new LazyString((LazyStringObjectInspector) oi);
+ case CHAR:
+ return new LazyHiveChar((LazyHiveCharObjectInspector) oi);
case VARCHAR:
return new LazyHiveVarchar((LazyHiveVarcharObjectInspector) oi);
case DATE:
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java Tue Nov 12 18:23:05 2013
@@ -31,6 +31,7 @@ import org.apache.commons.codec.binary.B
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
@@ -40,6 +41,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
@@ -226,7 +228,13 @@ public final class LazyUtils {
needsEscape);
break;
}
-
+ case CHAR: {
+ HiveCharWritable hc = ((HiveCharObjectInspector) oi).getPrimitiveWritableObject(o);
+ Text t = hc.getPaddedValue();
+ writeEscaped(out, t.getBytes(), 0, t.getLength(), escaped, escapeChar,
+ needsEscape);
+ break;
+ }
case VARCHAR: {
HiveVarcharWritable hc = ((HiveVarcharObjectInspector)oi).getPrimitiveWritableObject(o);
Text t = hc.getTextValue();
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyHiveVarcharObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyHiveVarcharObjectInspector.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyHiveVarcharObjectInspector.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyHiveVarcharObjectInspector.java Tue Nov 12 18:23:05 2013
@@ -23,7 +23,7 @@ import org.apache.hadoop.hive.serde2.io.
import org.apache.hadoop.hive.serde2.lazy.LazyHiveVarchar;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
-import org.apache.hadoop.hive.serde2.typeinfo.VarcharUtils;
+import org.apache.hadoop.hive.serde2.typeinfo.BaseCharUtils;
public class LazyHiveVarcharObjectInspector
extends AbstractPrimitiveLazyObjectInspector<HiveVarcharWritable>
@@ -55,7 +55,7 @@ public class LazyHiveVarcharObjectInspec
}
HiveVarchar ret = ((LazyHiveVarchar) o).getWritableObject().getHiveVarchar();
- if (!VarcharUtils.doesPrimitiveMatchTypeParams(
+ if (!BaseCharUtils.doesPrimitiveMatchTypeParams(
ret, (VarcharTypeInfo)typeInfo)) {
HiveVarchar newValue = new HiveVarchar(ret, ((VarcharTypeInfo)typeInfo).getLength());
return newValue;
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java Tue Nov 12 18:23:05 2013
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
+import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
@@ -122,6 +123,9 @@ public final class LazyPrimitiveObjectIn
// Object inspector hasn't been cached for this type/params yet, create now
switch (typeInfo.getPrimitiveCategory()) {
+ case CHAR:
+ poi = new LazyHiveCharObjectInspector((CharTypeInfo) typeInfo);
+ break;
case VARCHAR:
poi = new LazyHiveVarcharObjectInspector((VarcharTypeInfo)typeInfo);
break;
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryFactory.java Tue Nov 12 18:23:05 2013
@@ -27,6 +27,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableHiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableHiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableHiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableBinaryObjectInspector;
@@ -72,6 +73,8 @@ public final class LazyBinaryFactory {
return new LazyBinaryDouble((WritableDoubleObjectInspector) oi);
case STRING:
return new LazyBinaryString((WritableStringObjectInspector) oi);
+ case CHAR:
+ return new LazyBinaryHiveChar((WritableHiveCharObjectInspector) oi);
case VARCHAR:
return new LazyBinaryHiveVarchar((WritableHiveVarcharObjectInspector) oi);
case VOID: // for NULL
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java Tue Nov 12 18:23:05 2013
@@ -50,6 +50,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
@@ -369,6 +370,12 @@ public class LazyBinarySerDe extends Abs
serializeText(byteStream, t, skipLengthPrefix);
return warnedOnceNullMapKey;
}
+ case CHAR: {
+ HiveCharObjectInspector hcoi = (HiveCharObjectInspector) poi;
+ Text t = hcoi.getPrimitiveWritableObject(obj).getTextValue();
+ serializeText(byteStream, t, skipLengthPrefix);
+ return warnedOnceNullMapKey;
+ }
case VARCHAR: {
HiveVarcharObjectInspector hcoi = (HiveVarcharObjectInspector) poi;
Text t = hcoi.getPrimitiveWritableObject(obj).getTextValue();
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java Tue Nov 12 18:23:05 2013
@@ -195,7 +195,7 @@ public final class LazyBinaryUtils {
recordInfo.elementOffset = vInt.length;
recordInfo.elementSize = vInt.value;
break;
-
+ case CHAR:
case VARCHAR:
LazyBinaryUtils.readVInt(bytes, offset, vInt);
recordInfo.elementOffset = vInt.length;
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorConverters.java Tue Nov 12 18:23:05 2013
@@ -31,6 +31,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableFloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableIntObjectInspector;
@@ -103,6 +104,10 @@ public final class ObjectInspectorConver
return new PrimitiveObjectInspectorConverter.StringConverter(
inputOI);
}
+ case CHAR:
+ return new PrimitiveObjectInspectorConverter.HiveCharConverter(
+ inputOI,
+ (SettableHiveCharObjectInspector) outputOI);
case VARCHAR:
return new PrimitiveObjectInspectorConverter.HiveVarcharConverter(
inputOI,
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Tue Nov 12 18:23:05 2013
@@ -31,6 +31,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.io.DateWritable;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
@@ -43,6 +44,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.DoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.FloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.IntObjectInspector;
@@ -55,6 +57,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDateObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableDoubleObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableFloatObjectInspector;
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveCharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableHiveVarcharObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableIntObjectInspector;
@@ -503,6 +506,8 @@ public final class ObjectInspectorUtils
}
return r;
}
+ case CHAR:
+ return ((HiveCharObjectInspector) poi).getPrimitiveWritableObject(o).hashCode();
case VARCHAR:
return ((HiveVarcharObjectInspector)poi).getPrimitiveWritableObject(o).hashCode();
case BINARY:
@@ -692,7 +697,7 @@ public final class ObjectInspectorUtils
Text t1 = (Text) poi1.getPrimitiveWritableObject(o1);
Text t2 = (Text) poi2.getPrimitiveWritableObject(o2);
return t1 == null ? (t2 == null ? 0 : -1) : (t2 == null ? 1
- : ShimLoader.getHadoopShims().compareText(t1, t2));
+ : t1.compareTo(t2));
} else {
String s1 = (String) poi1.getPrimitiveJavaObject(o1);
String s2 = (String) poi2.getPrimitiveJavaObject(o2);
@@ -700,6 +705,11 @@ public final class ObjectInspectorUtils
.compareTo(s2));
}
}
+ case CHAR: {
+ HiveCharWritable t1 = ((HiveCharObjectInspector)poi1).getPrimitiveWritableObject(o1);
+ HiveCharWritable t2 = ((HiveCharObjectInspector)poi2).getPrimitiveWritableObject(o2);
+ return t1.compareTo(t2);
+ }
case VARCHAR: {
HiveVarcharWritable t1 = ((HiveVarcharObjectInspector)poi1).getPrimitiveWritableObject(o1);
HiveVarcharWritable t2 = ((HiveVarcharObjectInspector)poi2).getPrimitiveWritableObject(o2);
@@ -1048,6 +1058,8 @@ public final class ObjectInspectorUtils
case STRING:
return oi instanceof WritableStringObjectInspector ||
oi instanceof JavaStringObjectInspector;
+ case CHAR:
+ return oi instanceof SettableHiveCharObjectInspector;
case VARCHAR:
return oi instanceof SettableHiveVarcharObjectInspector;
case DATE:
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java Tue Nov 12 18:23:05 2013
@@ -31,7 +31,7 @@ public interface PrimitiveObjectInspecto
*/
public static enum PrimitiveCategory {
VOID, BOOLEAN, BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, STRING,
- DATE, TIMESTAMP, BINARY, DECIMAL, VARCHAR, UNKNOWN
+ DATE, TIMESTAMP, BINARY, DECIMAL, VARCHAR, CHAR, UNKNOWN
};
public PrimitiveTypeInfo getTypeInfo();
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java Tue Nov 12 18:23:05 2013
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.serde2.ob
import org.apache.hadoop.hive.common.type.HiveVarchar;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
-import org.apache.hadoop.hive.serde2.typeinfo.VarcharUtils;
+import org.apache.hadoop.hive.serde2.typeinfo.BaseCharUtils;
public class JavaHiveVarcharObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements SettableHiveVarcharObjectInspector {
@@ -39,7 +39,7 @@ implements SettableHiveVarcharObjectInsp
return null;
}
HiveVarchar value = (HiveVarchar)o;
- if (VarcharUtils.doesPrimitiveMatchTypeParams(
+ if (BaseCharUtils.doesPrimitiveMatchTypeParams(
value, (VarcharTypeInfo)typeInfo)) {
return value;
}
@@ -69,7 +69,7 @@ implements SettableHiveVarcharObjectInsp
@Override
public Object set(Object o, HiveVarchar value) {
HiveVarchar setValue = (HiveVarchar)o;
- if (VarcharUtils.doesPrimitiveMatchTypeParams(
+ if (BaseCharUtils.doesPrimitiveMatchTypeParams(
value, (VarcharTypeInfo)typeInfo)) {
setValue.setValue(value);
} else {
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorConverter.java Tue Nov 12 18:23:05 2013
@@ -21,9 +21,11 @@ package org.apache.hadoop.hive.serde2.ob
import java.sql.Date;
import java.sql.Timestamp;
+import org.apache.hadoop.hive.common.type.HiveChar;
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.common.type.HiveVarchar;
import org.apache.hadoop.hive.serde2.ByteStream;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.lazy.LazyInteger;
import org.apache.hadoop.hive.serde2.lazy.LazyLong;
@@ -391,6 +393,16 @@ public class PrimitiveObjectInspectorCon
t.set(((StringObjectInspector) inputOI).getPrimitiveJavaObject(input));
}
return t;
+ case CHAR:
+ // when converting from char, the value should be stripped of any trailing spaces.
+ if (inputOI.preferWritable()) {
+ // char text value is already stripped of trailing space
+ t.set(((HiveCharObjectInspector) inputOI).getPrimitiveWritableObject(input)
+ .getStrippedValue());
+ } else {
+ t.set(((HiveCharObjectInspector) inputOI).getPrimitiveJavaObject(input).getStrippedValue());
+ }
+ return t;
case VARCHAR:
if (inputOI.preferWritable()) {
t.set(((HiveVarcharObjectInspector) inputOI).getPrimitiveWritableObject(input)
@@ -470,4 +482,29 @@ public class PrimitiveObjectInspectorCon
}
}
+
+ public static class HiveCharConverter implements Converter {
+ PrimitiveObjectInspector inputOI;
+ SettableHiveCharObjectInspector outputOI;
+ HiveCharWritable hc;
+
+ public HiveCharConverter(PrimitiveObjectInspector inputOI,
+ SettableHiveCharObjectInspector outputOI) {
+ this.inputOI = inputOI;
+ this.outputOI = outputOI;
+ hc = new HiveCharWritable();
+ }
+
+ @Override
+ public Object convert(Object input) {
+ switch (inputOI.getPrimitiveCategory()) {
+ case BOOLEAN:
+ return outputOI.set(hc,
+ ((BooleanObjectInspector) inputOI).get(input) ?
+ new HiveChar("TRUE", -1) : new HiveChar("FALSE", -1));
+ default:
+ return outputOI.set(hc, PrimitiveObjectInspectorUtils.getHiveChar(input, inputOI));
+ }
+ }
+ }
}
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java Tue Nov 12 18:23:05 2013
@@ -26,6 +26,7 @@ import org.apache.hadoop.hive.serde.serd
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DateWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -34,6 +35,7 @@ import org.apache.hadoop.hive.serde2.obj
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils.PrimitiveTypeEntry;
+import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
@@ -73,6 +75,8 @@ public final class PrimitiveObjectInspec
new WritableDoubleObjectInspector();
public static final WritableStringObjectInspector writableStringObjectInspector =
new WritableStringObjectInspector();
+ public static final WritableHiveCharObjectInspector writableHiveCharObjectInspector =
+ new WritableHiveCharObjectInspector((CharTypeInfo) TypeInfoFactory.charTypeInfo);
public static final WritableHiveVarcharObjectInspector writableHiveVarcharObjectInspector =
new WritableHiveVarcharObjectInspector((VarcharTypeInfo) TypeInfoFactory.varcharTypeInfo);
public static final WritableVoidObjectInspector writableVoidObjectInspector =
@@ -106,6 +110,7 @@ public final class PrimitiveObjectInspec
writableDoubleObjectInspector);
cachedPrimitiveWritableInspectorCache.put(TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME),
writableStringObjectInspector);
+ cachedPrimitiveWritableInspectorCache.put(TypeInfoFactory.charTypeInfo, writableHiveCharObjectInspector);
cachedPrimitiveWritableInspectorCache.put(TypeInfoFactory.varcharTypeInfo, writableHiveVarcharObjectInspector);
cachedPrimitiveWritableInspectorCache.put(TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.VOID_TYPE_NAME),
writableVoidObjectInspector);
@@ -129,6 +134,7 @@ public final class PrimitiveObjectInspec
primitiveCategoryToWritableOI.put(PrimitiveCategory.FLOAT, writableFloatObjectInspector);
primitiveCategoryToWritableOI.put(PrimitiveCategory.DOUBLE, writableDoubleObjectInspector);
primitiveCategoryToWritableOI.put(PrimitiveCategory.STRING, writableStringObjectInspector);
+ primitiveCategoryToWritableOI.put(PrimitiveCategory.CHAR, writableHiveCharObjectInspector);
primitiveCategoryToWritableOI.put(PrimitiveCategory.VARCHAR, writableHiveVarcharObjectInspector);
primitiveCategoryToWritableOI.put(PrimitiveCategory.VOID, writableVoidObjectInspector);
primitiveCategoryToWritableOI.put(PrimitiveCategory.DATE, writableDateObjectInspector);
@@ -153,6 +159,8 @@ public final class PrimitiveObjectInspec
new JavaDoubleObjectInspector();
public static final JavaStringObjectInspector javaStringObjectInspector =
new JavaStringObjectInspector();
+ public static final JavaHiveCharObjectInspector javaHiveCharObjectInspector =
+ new JavaHiveCharObjectInspector((CharTypeInfo) TypeInfoFactory.charTypeInfo);
public static final JavaHiveVarcharObjectInspector javaHiveVarcharObjectInspector =
new JavaHiveVarcharObjectInspector((VarcharTypeInfo) TypeInfoFactory.varcharTypeInfo);
public static final JavaVoidObjectInspector javaVoidObjectInspector =
@@ -186,6 +194,7 @@ public final class PrimitiveObjectInspec
javaDoubleObjectInspector);
cachedPrimitiveJavaInspectorCache.put(TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME),
javaStringObjectInspector);
+ cachedPrimitiveJavaInspectorCache.put(TypeInfoFactory.charTypeInfo, javaHiveCharObjectInspector);
cachedPrimitiveJavaInspectorCache.put(TypeInfoFactory.varcharTypeInfo, javaHiveVarcharObjectInspector);
cachedPrimitiveJavaInspectorCache.put(TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.VOID_TYPE_NAME),
javaVoidObjectInspector);
@@ -209,6 +218,7 @@ public final class PrimitiveObjectInspec
primitiveCategoryToJavaOI.put(PrimitiveCategory.FLOAT, javaFloatObjectInspector);
primitiveCategoryToJavaOI.put(PrimitiveCategory.DOUBLE, javaDoubleObjectInspector);
primitiveCategoryToJavaOI.put(PrimitiveCategory.STRING, javaStringObjectInspector);
+ primitiveCategoryToJavaOI.put(PrimitiveCategory.CHAR, javaHiveCharObjectInspector);
primitiveCategoryToJavaOI.put(PrimitiveCategory.VARCHAR, javaHiveVarcharObjectInspector);
primitiveCategoryToJavaOI.put(PrimitiveCategory.VOID, javaVoidObjectInspector);
primitiveCategoryToJavaOI.put(PrimitiveCategory.DATE, javaDateObjectInspector);
@@ -247,6 +257,9 @@ public final class PrimitiveObjectInspec
}
switch (typeInfo.getPrimitiveCategory()) {
+ case CHAR:
+ result = new WritableHiveCharObjectInspector((CharTypeInfo) typeInfo);
+ break;
case VARCHAR:
result = new WritableHiveVarcharObjectInspector((VarcharTypeInfo)typeInfo);
break;
@@ -287,6 +300,9 @@ public final class PrimitiveObjectInspec
return new WritableConstantDoubleObjectInspector((DoubleWritable)value);
case STRING:
return new WritableConstantStringObjectInspector((Text)value);
+ case CHAR:
+ return new WritableConstantHiveCharObjectInspector((CharTypeInfo) typeInfo,
+ (HiveCharWritable) value);
case VARCHAR:
return new WritableConstantHiveVarcharObjectInspector((VarcharTypeInfo)typeInfo,
(HiveVarcharWritable)value);
@@ -336,6 +352,9 @@ public final class PrimitiveObjectInspec
}
switch (typeInfo.getPrimitiveCategory()) {
+ case CHAR:
+ result = new JavaHiveCharObjectInspector((CharTypeInfo) typeInfo);
+ break;
case VARCHAR:
result = new JavaHiveVarcharObjectInspector((VarcharTypeInfo)typeInfo);
break;
Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java?rev=1541190&r1=1541189&r2=1541190&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java Tue Nov 12 18:23:05 2013
@@ -29,12 +29,14 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hive.common.type.HiveChar;
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.common.type.HiveVarchar;
import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DateWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
+import org.apache.hadoop.hive.serde2.io.HiveCharWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -225,6 +227,9 @@ public final class PrimitiveObjectInspec
public static final PrimitiveTypeEntry varcharTypeEntry = new PrimitiveTypeEntry(
PrimitiveCategory.VARCHAR, serdeConstants.VARCHAR_TYPE_NAME, null, HiveVarchar.class,
HiveVarcharWritable.class);
+ public static final PrimitiveTypeEntry charTypeEntry = new PrimitiveTypeEntry(
+ PrimitiveCategory.CHAR, serdeConstants.CHAR_TYPE_NAME, null, HiveChar.class,
+ HiveCharWritable.class);
// The following is a complex type for special handling
public static final PrimitiveTypeEntry unknownTypeEntry = new PrimitiveTypeEntry(
@@ -233,6 +238,7 @@ public final class PrimitiveObjectInspec
static {
registerType(binaryTypeEntry);
registerType(stringTypeEntry);
+ registerType(charTypeEntry);
registerType(varcharTypeEntry);
registerType(booleanTypeEntry);
registerType(intTypeEntry);
@@ -404,6 +410,10 @@ public final class PrimitiveObjectInspec
.getPrimitiveWritableObject(o2);
return t1.equals(t2);
}
+ case CHAR: {
+ return ((HiveCharObjectInspector)oi1).getPrimitiveWritableObject(o1)
+ .equals(((HiveCharObjectInspector)oi2).getPrimitiveWritableObject(o2));
+ }
case VARCHAR: {
return ((HiveVarcharObjectInspector)oi1).getPrimitiveWritableObject(o1)
.equals(((HiveVarcharObjectInspector)oi2).getPrimitiveWritableObject(o2));
@@ -611,6 +621,7 @@ public final class PrimitiveObjectInspec
}
break;
}
+ case CHAR:
case VARCHAR: {
result = Integer.parseInt(getString(o, oi));
break;
@@ -674,6 +685,7 @@ public final class PrimitiveObjectInspec
result = Long.parseLong(s);
}
break;
+ case CHAR:
case VARCHAR: {
result = Long.parseLong(getString(o, oi));
break;
@@ -731,6 +743,7 @@ public final class PrimitiveObjectInspec
String s = soi.getPrimitiveJavaObject(o);
result = Double.parseDouble(s);
break;
+ case CHAR:
case VARCHAR:
result = Double.parseDouble(getString(o, oi));
break;
@@ -809,6 +822,10 @@ public final class PrimitiveObjectInspec
StringObjectInspector soi = (StringObjectInspector) oi;
result = soi.getPrimitiveJavaObject(o);
break;
+ case CHAR:
+ // when converting from char to string/varchar, strip any trailing spaces
+ result = ((HiveCharObjectInspector) oi).getPrimitiveJavaObject(o).getStrippedValue();
+ break;
case VARCHAR:
HiveVarcharObjectInspector hcoi = (HiveVarcharObjectInspector) oi;
result = hcoi.getPrimitiveJavaObject(o).toString();
@@ -830,6 +847,25 @@ public final class PrimitiveObjectInspec
return result;
}
+ public static HiveChar getHiveChar(Object o, PrimitiveObjectInspector oi) {
+ if (o == null) {
+ return null;
+ }
+
+ HiveChar result = null;
+ switch (oi.getPrimitiveCategory()) {
+ case CHAR:
+ result = ((HiveCharObjectInspector) oi).getPrimitiveJavaObject(o);
+ break;
+ default:
+ // No char length available, copy whole string value here.
+ result = new HiveChar();
+ result.setValue(getString(o, oi));
+ break;
+ }
+ return result;
+ }
+
public static HiveVarchar getHiveVarchar(Object o, PrimitiveObjectInspector oi) {
if (o == null) {
@@ -852,6 +888,12 @@ public final class PrimitiveObjectInspec
return result;
}
+ public static BytesWritable getBinaryFromText(Text text) {
+ BytesWritable bw = new BytesWritable();
+ bw.set(text.getBytes(), 0, text.getLength());
+ return bw;
+ }
+
public static BytesWritable getBinary(Object o, PrimitiveObjectInspector oi) {
if (null == o) {
@@ -865,9 +907,14 @@ public final class PrimitiveObjectInspec
case STRING:
Text text = ((StringObjectInspector) oi).getPrimitiveWritableObject(o);
- BytesWritable bw = new BytesWritable();
- bw.set(text.getBytes(), 0, text.getLength());
- return bw;
+ return getBinaryFromText(text);
+ case CHAR:
+ // char to binary conversion: include trailing spaces?
+ return getBinaryFromText(
+ ((HiveCharObjectInspector) oi).getPrimitiveWritableObject(o).getPaddedValue());
+ case VARCHAR:
+ return getBinaryFromText(
+ ((HiveVarcharObjectInspector) oi).getPrimitiveWritableObject(o).getTextValue());
case BINARY:
return ((BinaryObjectInspector) oi).getPrimitiveWritableObject(o);
@@ -915,6 +962,7 @@ public final class PrimitiveObjectInspec
case STRING:
result = HiveDecimal.create(((StringObjectInspector) oi).getPrimitiveJavaObject(o));
break;
+ case CHAR:
case VARCHAR:
result = HiveDecimal.create(getString(o, oi));
break;
@@ -953,6 +1001,7 @@ public final class PrimitiveObjectInspec
result = null;
}
break;
+ case CHAR:
case VARCHAR: {
try {
String val = getString(o, oi).trim();
@@ -1017,6 +1066,7 @@ public final class PrimitiveObjectInspec
String s = soi.getPrimitiveJavaObject(o);
result = getTimestampFromString(s);
break;
+ case CHAR:
case VARCHAR:
result = getTimestampFromString(getString(o, oi));
break;
@@ -1089,6 +1139,7 @@ public final class PrimitiveObjectInspec
case DECIMAL:
return PrimitiveGrouping.NUMERIC_GROUP;
case STRING:
+ case CHAR:
case VARCHAR:
return PrimitiveGrouping.STRING_GROUP;
case BOOLEAN: