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/04/04 00:51:53 UTC
svn commit: r1464227 - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java
test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java
Author: hashutosh
Date: Wed Apr 3 22:51:53 2013
New Revision: 1464227
URL: http://svn.apache.org/r1464227
Log:
HIVE-4138 : ORC's union object inspector returns a type name that isn't parseable by TypeInfoUtils (Owen Omalley via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java?rev=1464227&r1=1464226&r2=1464227&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java Wed Apr 3 22:51:53 2013
@@ -116,17 +116,17 @@ final class OrcUnion implements UnionObj
@Override
public String getTypeName() {
- StringBuilder builder = new StringBuilder("union{");
+ StringBuilder builder = new StringBuilder("uniontype<");
boolean first = true;
for(ObjectInspector child: children) {
if (first) {
first = false;
} else {
- builder.append(", ");
+ builder.append(",");
}
builder.append(child.getTypeName());
}
- builder.append("}");
+ builder.append(">");
return builder.toString();
}
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java?rev=1464227&r1=1464226&r2=1464227&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java Wed Apr 3 22:51:53 2013
@@ -656,7 +656,7 @@ public class TestOrcFile {
assertEquals(true, rows.hasNext());
row = (OrcStruct) rows.next(null);
inspector = reader.getObjectInspector();
- assertEquals("struct<time:timestamp,union:union{int, string}>",
+ assertEquals("struct<time:timestamp,union:uniontype<int,string>>",
inspector.getTypeName());
assertEquals(Timestamp.valueOf("2000-03-12 15:00:00"),
row.getFieldValue(0));
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java?rev=1464227&r1=1464226&r2=1464227&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcStruct.java Wed Apr 3 22:51:53 2013
@@ -77,7 +77,7 @@ public class TestOrcStruct {
OrcStruct.createObjectInspector(typeInfo);
assertEquals("struct<c1:boolean,c2:tinyint,c3:smallint,c4:int,c5:" +
"bigint,c6:float,c7:double,c8:binary,c9:string,c10:struct<" +
- "c1:int>,c11:map<int,int>,c12:union{int},c13:array<timestamp>>",
+ "c1:int>,c11:map<int,int>,c12:uniontype<int>,c13:array<timestamp>>",
inspector.getTypeName());
assertEquals(null,
inspector.getAllStructFieldRefs().get(0).getFieldComment());