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 0D831200CB4 for ; Tue, 13 Jun 2017 07:17:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0C30B160BF3; Tue, 13 Jun 2017 05:17:23 +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 5B087160BEE for ; Tue, 13 Jun 2017 07:17:22 +0200 (CEST) Received: (qmail 68691 invoked by uid 500); 13 Jun 2017 05:17:21 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 68416 invoked by uid 99); 13 Jun 2017 05:17:21 -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; Tue, 13 Jun 2017 05:17:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49147E037F; Tue, 13 Jun 2017 05:17:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tzulitai@apache.org To: commits@flink.apache.org Date: Tue, 13 Jun 2017 05:17:23 -0000 Message-Id: <21e8c2aa57ca4892a4799557e107c8f8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/15] flink git commit: [hotfix] [cep] Fix incorrect CompatibilityResult.requiresMigration calls in CEP archived-at: Tue, 13 Jun 2017 05:17:23 -0000 [hotfix] [cep] Fix incorrect CompatibilityResult.requiresMigration calls in CEP Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8d0c4c04 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8d0c4c04 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8d0c4c04 Branch: refs/heads/master Commit: 8d0c4c0405a24e087e66d3a4bf07d1105eda2fc9 Parents: b216a4a Author: Tzu-Li (Gordon) Tai Authored: Sun Jun 11 11:02:38 2017 +0200 Committer: Tzu-Li (Gordon) Tai Committed: Tue Jun 13 06:37:45 2017 +0200 ---------------------------------------------------------------------- .../apache/flink/api/common/typeutils/CompatibilityResult.java | 6 ++++-- .../flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java | 2 +- .../src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8d0c4c04/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompatibilityResult.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompatibilityResult.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompatibilityResult.java index 5ad0b5e..4c83ded 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompatibilityResult.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompatibilityResult.java @@ -21,6 +21,8 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.util.Preconditions; +import javax.annotation.Nonnull; + /** * A {@code CompatibilityResult} contains information about whether or not data migration * is required in order to continue using new serializers for previously serialized data. @@ -60,10 +62,10 @@ public final class CompatibilityResult { * * @return a result that signals migration is necessary, also providing a convert deserializer. */ - public static CompatibilityResult requiresMigration(TypeDeserializer convertDeserializer) { + public static CompatibilityResult requiresMigration(@Nonnull TypeDeserializer convertDeserializer) { Preconditions.checkNotNull(convertDeserializer, "Convert deserializer cannot be null."); - return new CompatibilityResult<>(true, Preconditions.checkNotNull(convertDeserializer)); + return new CompatibilityResult<>(true, convertDeserializer); } /** http://git-wip-us.apache.org/repos/asf/flink/blob/8d0c4c04/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java index cac1601..a6c5bde 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFA.java @@ -1108,7 +1108,7 @@ public class NFA implements Serializable { } } - return CompatibilityResult.requiresMigration(null); + return CompatibilityResult.requiresMigration(); } private void serializeStates(Set> states, DataOutputView out) throws IOException { http://git-wip-us.apache.org/repos/asf/flink/blob/8d0c4c04/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java index d592c65..5947465 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/SharedBuffer.java @@ -1163,7 +1163,7 @@ public class SharedBuffer implements Serializable { } } - return CompatibilityResult.requiresMigration(null); + return CompatibilityResult.requiresMigration(); } }