You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/01/30 21:49:41 UTC
svn commit: r1656115 - in /hive/branches/branch-1.1: ./ data/files/
ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/
ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/
Author: brock
Date: Fri Jan 30 20:49:40 2015
New Revision: 1656115
URL: http://svn.apache.org/r1656115
Log:
HIVE-9502 - Parquet cannot read Map types from files written with Hive <= 0.12 (Sergio Pena via Brock)
Added:
hive/branches/branch-1.1/data/files/alltypesparquet
- copied unchanged from r1656114, hive/trunk/data/files/alltypesparquet
hive/branches/branch-1.1/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
- copied unchanged from r1656114, hive/trunk/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
hive/branches/branch-1.1/ql/src/test/results/clientpositive/parquet_read_backward_compatible_files.q.out
- copied unchanged from r1656114, hive/trunk/ql/src/test/results/clientpositive/parquet_read_backward_compatible_files.q.out
Modified:
hive/branches/branch-1.1/ (props changed)
hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/HiveGroupConverter.java
Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 30 20:49:40 2015
@@ -3,4 +3,4 @@
/hive/branches/spark:1608589-1654414
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
-/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895
+/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656114
Modified: hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/HiveGroupConverter.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/HiveGroupConverter.java?rev=1656115&r1=1656114&r2=1656115&view=diff
==============================================================================
--- hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/HiveGroupConverter.java (original)
+++ hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/convert/HiveGroupConverter.java Fri Jan 30 20:49:40 2015
@@ -41,7 +41,7 @@ public abstract class HiveGroupConverter
OriginalType annotation = type.getOriginalType();
if (annotation == OriginalType.LIST) {
return HiveCollectionConverter.forList(type, parent, index);
- } else if (annotation == OriginalType.MAP) {
+ } else if (annotation == OriginalType.MAP || annotation == OriginalType.MAP_KEY_VALUE) {
return HiveCollectionConverter.forMap(type, parent, index);
}