You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/10/17 18:25:15 UTC
[13/15] orc git commit: minor debugging
minor debugging
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/2246b1a0
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/2246b1a0
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/2246b1a0
Branch: refs/heads/orc-72
Commit: 2246b1a01a26e01e72b31047f85a81c0cf64f08f
Parents: 839d29d
Author: Owen O'Malley <om...@apache.org>
Authored: Fri Oct 14 13:06:36 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Fri Oct 14 13:07:23 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/orc/bench/avro/AvroSchemaUtils.java | 12 +++++++-----
.../src/java/org/apache/orc/bench/avro/AvroWriter.java | 2 ++
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/2246b1a0/java/bench/src/java/org/apache/orc/bench/avro/AvroSchemaUtils.java
----------------------------------------------------------------------
diff --git a/java/bench/src/java/org/apache/orc/bench/avro/AvroSchemaUtils.java b/java/bench/src/java/org/apache/orc/bench/avro/AvroSchemaUtils.java
index 5df7b70..893a4fd 100644
--- a/java/bench/src/java/org/apache/orc/bench/avro/AvroSchemaUtils.java
+++ b/java/bench/src/java/org/apache/orc/bench/avro/AvroSchemaUtils.java
@@ -110,7 +110,7 @@ public class AvroSchemaUtils {
throw new UnsupportedOperationException(typeInfo + " is not supported.");
}
- return wrapInUnionWithNull(schema);
+ return schema;
}
private static Schema createAvroUnion(TypeDescription typeInfo) {
@@ -128,7 +128,7 @@ public class AvroSchemaUtils {
}
}
- return Schema.createUnion(childSchemas);
+ return wrapInUnionWithNull(Schema.createUnion(childSchemas));
}
private static Schema createAvroRecord(TypeDescription typeInfo) {
@@ -140,7 +140,8 @@ public class AvroSchemaUtils {
for (int i = 0; i < fieldNames.size(); ++i) {
TypeDescription childTypeInfo = fieldTypes.get(i);
Schema.Field field = new Schema.Field(fieldNames.get(i),
- createAvroSchema(childTypeInfo), childTypeInfo.toString(),
+ wrapInUnionWithNull(createAvroSchema(childTypeInfo)),
+ childTypeInfo.toString(),
(Object) null);
childFields.add(field);
}
@@ -158,14 +159,15 @@ public class AvroSchemaUtils {
+ typeInfo);
}
- Schema valueSchema = createAvroSchema(typeInfo.getChildren().get(1));
+ Schema valueSchema = wrapInUnionWithNull(createAvroSchema
+ (typeInfo.getChildren().get(1)));
return Schema.createMap(valueSchema);
}
private static Schema createAvroArray(TypeDescription typeInfo) {
Schema child = createAvroSchema(typeInfo.getChildren().get(0));
- return Schema.createArray(child);
+ return Schema.createArray(wrapInUnionWithNull(child));
}
private static Schema wrapInUnionWithNull(Schema schema) {
http://git-wip-us.apache.org/repos/asf/orc/blob/2246b1a0/java/bench/src/java/org/apache/orc/bench/avro/AvroWriter.java
----------------------------------------------------------------------
diff --git a/java/bench/src/java/org/apache/orc/bench/avro/AvroWriter.java b/java/bench/src/java/org/apache/orc/bench/avro/AvroWriter.java
index 2735a71..8cc9d06 100644
--- a/java/bench/src/java/org/apache/orc/bench/avro/AvroWriter.java
+++ b/java/bench/src/java/org/apache/orc/bench/avro/AvroWriter.java
@@ -308,6 +308,8 @@ public class AvroWriter {
String compression) throws IOException {
List<TypeDescription> childTypes = schema.getChildren();
Schema avroSchema = AvroSchemaUtils.createAvroSchema(schema);
+ System.out.println("Hive schema " + schema);
+ System.out.println("Avro schema " + avroSchema);
List<Schema.Field> avroFields = avroSchema.getFields();
converters = new AvroConverter[childTypes.size()];
for(int c=0; c < converters.length; ++c) {