Repository: avro Updated Branches: refs/heads/master f01f61b96 -> be1639c44
AVRO-1695. Java: Fix GenericData#deepCopy() to support logical types. Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/be1639c4 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/be1639c4 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/be1639c4 Branch: refs/heads/master Commit: be1639c44b16ddec8c54ecfca050364048daf896 Parents: f01f61b Author: Doug Cutting <[email protected]> Authored: Wed Aug 31 16:20:47 2016 -0700 Committer: Doug Cutting <[email protected]> Committed: Wed Aug 31 16:20:47 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../org/apache/avro/generic/GenericData.java | 35 ++++++++--- .../avro/generic/TestGenericLogicalTypes.java | 61 ++++++++++++++++++++ 3 files changed, 90 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/be1639c4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 514b801..30d5782 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,9 @@ Trunk (not yet released) AVRO-1889: Update maven-shade-plugin to enable building in Java 8 on Mac. (Sachin Goyal via blue) + AVRO-1695. Java: Fix GenericData#deepCopy() to support logical types. + (cutting) + BUG FIXES AVRO-1741: Python3: Fix error when codec is not in the header. http://git-wip-us.apache.org/repos/asf/avro/blob/be1639c4/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java b/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java index 09f4c5a..9f3cc4d 100644 --- a/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java +++ b/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java @@ -34,6 +34,7 @@ import java.util.Map; import org.apache.avro.AvroRuntimeException; import org.apache.avro.AvroTypeException; import org.apache.avro.Conversion; +import org.apache.avro.Conversions; import org.apache.avro.LogicalType; import org.apache.avro.Schema; import org.apache.avro.Schema.Field; @@ -1018,15 +1019,31 @@ public class GenericData { /** * Makes a deep copy of a value given its schema. + * <P>Logical types are converted to raw types, copied, then converted back. * @param schema the schema of the value to deep copy. * @param value the value to deep copy. * @return a deep copy of the given value. */ @SuppressWarnings({ "rawtypes", "unchecked" }) public <T> T deepCopy(Schema schema, T value) { + if (value == null) return null; + LogicalType logicalType = schema.getLogicalType(); + if (logicalType == null) // not a logical type -- use raw copy + return (T)deepCopyRaw(schema, value); + Conversion conversion = getConversionByClass(value.getClass()); + if (conversion == null) // no conversion defined -- try raw copy + return (T)deepCopyRaw(schema, value); + // logical type with conversion: convert to raw, copy, then convert back to logical + Object raw = Conversions.convertToRawType(value, schema, logicalType, conversion); + Object copy = deepCopyRaw(schema, raw); // copy raw + return (T)Conversions.convertToLogicalType(copy, schema, logicalType, conversion); + } + + private Object deepCopyRaw(Schema schema, Object value) { if (value == null) { return null; } + switch (schema.getType()) { case ARRAY: List<Object> arrayValue = (List) value; @@ -1035,7 +1052,7 @@ public class GenericData { for (Object obj : arrayValue) { arrayCopy.add(deepCopy(schema.getElementType(), obj)); } - return (T)arrayCopy; + return arrayCopy; case BOOLEAN: return value; // immutable case BYTES: @@ -1045,13 +1062,13 @@ public class GenericData { byte[] bytesCopy = new byte[length]; byteBufferValue.get(bytesCopy, 0, length); byteBufferValue.position(start); - return (T)ByteBuffer.wrap(bytesCopy, 0, length); + return ByteBuffer.wrap(bytesCopy, 0, length); case DOUBLE: return value; // immutable case ENUM: - return (T)createEnum(value.toString(), schema); + return createEnum(value.toString(), schema); case FIXED: - return (T)createFixed(null, ((GenericFixed) value).bytes(), schema); + return createFixed(null, ((GenericFixed) value).bytes(), schema); case FLOAT: return value; // immutable case INT: @@ -1066,7 +1083,7 @@ public class GenericData { mapCopy.put((CharSequence)(deepCopy(STRINGS, entry.getKey())), deepCopy(schema.getValueType(), entry.getValue())); } - return (T)mapCopy; + return mapCopy; case NULL: return null; case RECORD: @@ -1080,11 +1097,11 @@ public class GenericData { getField(value, name, pos, oldState)); setField(newRecord, name, pos, newValue, newState); } - return (T)newRecord; + return newRecord; case STRING: // Strings are immutable if (value instanceof String) { - return (T)value; + return value; } // Some CharSequence subclasses are mutable, so we still need to make @@ -1092,9 +1109,9 @@ public class GenericData { else if (value instanceof Utf8) { // Utf8 copy constructor is more efficient than converting // to string and then back to Utf8 - return (T)new Utf8((Utf8)value); + return new Utf8((Utf8)value); } - return (T)new Utf8(value.toString()); + return new Utf8(value.toString()); case UNION: return deepCopy( schema.getTypes().get(resolveUnion(schema, value)), value); http://git-wip-us.apache.org/repos/asf/avro/blob/be1639c4/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java index 3a4b1e1..dc3c6f6 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java +++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java @@ -232,4 +232,65 @@ public class TestGenericLogicalTypes { return file; } + + @Test + public void testCopyUuid() { + testCopy(LogicalTypes.uuid().addToSchema(Schema.create(Schema.Type.STRING)), + UUID.randomUUID(), + GENERIC); + } + + @Test + public void testCopyUuidRaw() { + testCopy(LogicalTypes.uuid().addToSchema(Schema.create(Schema.Type.STRING)), + UUID.randomUUID().toString(), // use raw type + GenericData.get()); // with no conversions + } + + @Test + public void testCopyDecimal() { + testCopy(LogicalTypes.decimal(9, 2).addToSchema(Schema.create(Schema.Type.BYTES)), + new BigDecimal("-34.34"), + GENERIC); + } + + @Test + public void testCopyDecimalRaw() { + testCopy(LogicalTypes.decimal(9, 2).addToSchema(Schema.create(Schema.Type.BYTES)), + ByteBuffer.wrap(new BigDecimal("-34.34").unscaledValue().toByteArray()), + GenericData.get()); // no conversions + } + + private void testCopy(Schema schema, Object value, GenericData model) { + // test direct copy of instance + checkCopy(value, model.deepCopy(schema, value), false); + + // test nested in a record + Schema recordSchema = Schema.createRecord("X", "", "test", false); + List<Schema.Field> fields = new ArrayList<Schema.Field>(); + fields.add(new Schema.Field("x", schema, "", null)); + recordSchema.setFields(fields); + + GenericRecordBuilder builder = new GenericRecordBuilder(recordSchema); + builder.set("x", value); + GenericData.Record record = builder.build(); + checkCopy(record, model.deepCopy(recordSchema, record), true); + + // test nested in array + Schema arraySchema = Schema.createArray(schema); + ArrayList array = new ArrayList(Arrays.asList(value)); + checkCopy(array, model.deepCopy(arraySchema, array), true); + + // test record nested in array + Schema recordArraySchema = Schema.createArray(recordSchema); + ArrayList recordArray = new ArrayList(Arrays.asList(record)); + checkCopy(recordArray, model.deepCopy(recordArraySchema, recordArray), true); + } + + private void checkCopy(Object original, Object copy, boolean notSame) { + if (notSame) + Assert.assertNotSame(original, copy); + Assert.assertEquals(original, copy); + } + }
