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 010E317B49 for ; Thu, 17 Sep 2015 12:04:04 +0000 (UTC) Received: (qmail 91106 invoked by uid 500); 17 Sep 2015 12:04:03 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 91008 invoked by uid 500); 17 Sep 2015 12:04:03 -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 90873 invoked by uid 99); 17 Sep 2015 12:04:03 -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; Thu, 17 Sep 2015 12:04:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C2CFE1026; Thu, 17 Sep 2015 12:04:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fhueske@apache.org To: commits@flink.apache.org Date: Thu, 17 Sep 2015 12:04:09 -0000 Message-Id: <5d6d757237b648bbbecde1eb40492ceb@git.apache.org> In-Reply-To: <0549df3b5f6047f6b17dadfab63afc73@git.apache.org> References: <0549df3b5f6047f6b17dadfab63afc73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] flink git commit: [FLINK-2659] [runtime] Fix object reuse in UnionWithTempOperator [FLINK-2659] [runtime] Fix object reuse in UnionWithTempOperator This closes #1130 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f4cb5938 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f4cb5938 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f4cb5938 Branch: refs/heads/release-0.10.0-milestone-1 Commit: f4cb5938a5bbb4403629a59b6c1790511a834a19 Parents: 0e5cdfb Author: Greg Hogan Authored: Mon Sep 14 11:29:49 2015 -0400 Committer: Fabian Hueske Committed: Thu Sep 17 11:56:16 2015 +0200 ---------------------------------------------------------------------- .../apache/flink/runtime/operators/UnionWithTempOperator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f4cb5938/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java index d8437a9..098686c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java @@ -60,15 +60,16 @@ public class UnionWithTempOperator implements PactDriver { public void run() throws Exception { final Collector output = this.taskContext.getOutputCollector(); - T record = this.taskContext.getInputSerializer(STREAMED_INPUT).getSerializer().createInstance(); + T reuse = this.taskContext.getInputSerializer(STREAMED_INPUT).getSerializer().createInstance(); + T record; final MutableObjectIterator input = this.taskContext.getInput(STREAMED_INPUT); - while (this.running && ((record = input.next(record)) != null)) { + while (this.running && ((record = input.next(reuse)) != null)) { output.collect(record); } final MutableObjectIterator cache = this.taskContext.getInput(CACHED_INPUT); - while (this.running && ((record = cache.next(record)) != null)) { + while (this.running && ((record = cache.next(reuse)) != null)) { output.collect(record); } }