diff --git common/src/gen/org/apache/hive/common/package-info.java common/src/gen/org/apache/hive/common/package-info.java index dfba75d..3b86233 100644 --- common/src/gen/org/apache/hive/common/package-info.java +++ common/src/gen/org/apache/hive/common/package-info.java @@ -1,7 +1,7 @@ /* * Generated by saveVersion.sh */ -@HiveVersionAnnotation(version="0.11.0-SNAPSHOT", revision="1455560", branch="trunk", - user="hortonas", date="Tue Mar 12 18:15:21 UTC 2013", url="https://svn.apache.org/repos/asf/hive/trunk", - srcChecksum="adaf44e8486f911a7ef879a83d8b2ea7") +@HiveVersionAnnotation(version="0.11.0-SNAPSHOT", revision="8b7f8edd4489915ca402f65346066c3c8cda800a", branch="trunk", + user="owen", date="Tue Mar 12 21:25:01 PDT 2013", url="git://Owens-Air.local/Users/owen/work/code/hive", + srcChecksum="") package org.apache.hive.common; diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java index 23fbe4c..dc09c93 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcUnion.java @@ -116,17 +116,17 @@ public Object getField(Object obj) { @Override public String getTypeName() { - StringBuilder builder = new StringBuilder("union{"); + StringBuilder builder = new StringBuilder("union<"); 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(); } diff --git ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java index c2b3b38..1ab1355 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java @@ -656,7 +656,7 @@ public void testUnionAndTimestamp() throws Exception { assertEquals(true, rows.hasNext()); row = (OrcStruct) rows.next(null); inspector = reader.getObjectInspector(); - assertEquals("struct", + assertEquals("struct>", inspector.getTypeName()); assertEquals(Timestamp.valueOf("2000-03-12 15:00:00"), row.getFieldValue(0));