Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 71946200D2D for ; Fri, 27 Oct 2017 16:46:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 70150160BDC; Fri, 27 Oct 2017 14:46:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B50201609E9 for ; Fri, 27 Oct 2017 16:46:48 +0200 (CEST) Received: (qmail 59529 invoked by uid 500); 27 Oct 2017 14:46:47 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 59518 invoked by uid 99); 27 Oct 2017 14:46:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Oct 2017 14:46:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE48FDFB3D; Fri, 27 Oct 2017 14:46:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@avro.apache.org Message-Id: <27ccb3aae77c4cb8b94ea9ac7fbf4297@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: avro git commit: AVRO-1883: Java: Fix incompatible schema detection nested in unions. Contributed by Yibing Shi. Date: Fri, 27 Oct 2017 14:46:47 +0000 (UTC) archived-at: Fri, 27 Oct 2017 14:46:49 -0000 Repository: avro Updated Branches: refs/heads/branch-1.7 59f8a8c40 -> 011a85653 AVRO-1883: Java: Fix incompatible schema detection nested in unions. Contributed by Yibing Shi. (cherry picked from commit 968550da18708c76fd04c13722d996461aa23cb7) Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/011a8565 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/011a8565 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/011a8565 Branch: refs/heads/branch-1.7 Commit: 011a856536a6d255dc6ecd077f5246ee95c0ff1c Parents: 59f8a8c Author: Ryan Blue Authored: Sun Sep 4 15:15:24 2016 -0700 Committer: Sean Busbey Committed: Fri Oct 27 09:19:13 2017 -0500 ---------------------------------------------------------------------- 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/011a8565/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b082a60..9f24bbd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -72,6 +72,9 @@ Trunk (not yet released) AVRO-1656. Fix 'How to Contribute' link. (Benjamin Clauss via blue) + AVRO-1883: Java: Fix incompatible schema detection nested in unions. + (Yibing Shi via blue) + Avro 1.7.7 (23 July 2014) NEW FEATURES http://git-wip-us.apache.org/repos/asf/avro/blob/011a8565/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 08a9d14..92b2dab 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 @@ -361,7 +361,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/011a8565/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 0d56abb..9e25767 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.junit.Assert; import org.junit.Test; @@ -119,6 +120,22 @@ public class TestSchemaValidation { builder.strategy(null).validateAll(); } + @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 prior = new ArrayList();