Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C3F7117241 for ; Fri, 22 May 2015 14:19:05 +0000 (UTC) Received: (qmail 48603 invoked by uid 500); 22 May 2015 14:19:05 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 48569 invoked by uid 500); 22 May 2015 14:19:05 -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 48560 invoked by uid 99); 22 May 2015 14:19:05 -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, 22 May 2015 14:19:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79C14E0593; Fri, 22 May 2015 14:19:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aljoscha@apache.org To: commits@flink.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [hotfix][table] Fix not-equals code generation Date: Fri, 22 May 2015 14:19:05 +0000 (UTC) Repository: flink Updated Branches: refs/heads/master 36c2026fb -> 24c4f8323 [hotfix][table] Fix not-equals code generation This was using != before, now uses !(a.equals(b)) Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/24c4f832 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/24c4f832 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/24c4f832 Branch: refs/heads/master Commit: 24c4f832307f2871c04f639117a323abd9662ceb Parents: 36c2026 Author: Aljoscha Krettek Authored: Fri May 22 14:13:54 2015 +0200 Committer: Aljoscha Krettek Committed: Fri May 22 16:18:46 2015 +0200 ---------------------------------------------------------------------- .../apache/flink/api/table/codegen/ExpressionCodeGenerator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/24c4f832/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala ---------------------------------------------------------------------- diff --git a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala index 8cb678a..49f7600 100644 --- a/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala +++ b/flink-staging/flink-table/src/main/scala/org/apache/flink/api/table/codegen/ExpressionCodeGenerator.scala @@ -322,7 +322,7 @@ abstract class ExpressionCodeGenerator[R]( case NotEqualTo(left, right) => generateIfNonNull(left, right, BOOLEAN_TYPE_INFO) { - (leftTerm, rightTerm) => s"$leftTerm != $rightTerm" + (leftTerm, rightTerm) => s"!($leftTerm.equals($rightTerm))" } case And(left, right) =>