You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by bl...@apache.org on 2016/11/05 20:20:31 UTC
[14/35] avro git commit: AVRO-1883: Java: Fix incompatible schema
detection nested in unions. Contributed by Yibing Shi.
AVRO-1883: Java: Fix incompatible schema detection nested in unions. Contributed by Yibing Shi.
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/968550da
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/968550da
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/968550da
Branch: refs/heads/branch-1.8
Commit: 968550da18708c76fd04c13722d996461aa23cb7
Parents: e1c5230
Author: Ryan Blue <bl...@apache.org>
Authored: Sun Sep 4 15:15:24 2016 -0700
Committer: Ryan Blue <bl...@apache.org>
Committed: Sat Nov 5 13:15:33 2016 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../java/org/apache/avro/io/parsing/Symbol.java | 10 +++++++++-
.../java/org/apache/avro/TestSchemaValidation.java | 17 +++++++++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/968550da/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 394d253..c1205c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -42,6 +42,9 @@ Trunk (not yet released)
AVRO-1874: Py3: Use recommended module-level logging.
(Torgeir B�rresen via blue)
+ AVRO-1883: Java: Fix incompatible schema detection nested in unions.
+ (Yibing Shi via blue)
+
Avro 1.8.1 (14 May 2016)
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/avro/blob/968550da/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java b/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
index 178aa0b..f33c292 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
@@ -375,7 +375,15 @@ public abstract class Symbol {
case EXPLICIT_ACTION:
return false;
case IMPLICIT_ACTION:
- return symbol instanceof ErrorAction;
+ if (symbol instanceof ErrorAction) {
+ return true;
+ }
+
+ if (symbol instanceof UnionAdjustAction) {
+ return hasErrors(((UnionAdjustAction) symbol).symToParse);
+ }
+
+ return false;
case REPEATER:
Repeater r = (Repeater) symbol;
return hasErrors(r.end) || hasErrors(symbol, r.production);
http://git-wip-us.apache.org/repos/asf/avro/blob/968550da/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
index 0c0c166..838dc91 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidation.java
@@ -19,6 +19,7 @@
package org.apache.avro;
import java.util.ArrayList;
+import java.util.Arrays;
import org.apache.avro.reflect.ReflectData;
import org.junit.Assert;
@@ -162,6 +163,22 @@ public class TestSchemaValidation {
circleSchemaDifferentNames, ReflectData.AllowNull.get().getSchema(Circle.class));
}
+ @Test
+ public void testUnionWithIncompatibleElements() throws SchemaValidationException {
+ Schema union1 = Schema.createUnion(Arrays.asList(rec));
+ Schema union2 = Schema.createUnion(Arrays.asList(rec4));
+ testValidatorFails(builder.canReadStrategy().validateAll(),
+ union2, union1);
+ }
+
+ @Test
+ public void testUnionWithCompatibleElements() throws SchemaValidationException {
+ Schema union1 = Schema.createUnion(Arrays.asList(rec));
+ Schema union2 = Schema.createUnion(Arrays.asList(rec3));
+ testValidatorPasses(builder.canReadStrategy().validateAll(),
+ union2, union1);
+ }
+
private void testValidatorPasses(SchemaValidator validator,
Schema schema, Schema... prev) throws SchemaValidationException {
ArrayList<Schema> prior = new ArrayList<Schema>();