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 CF2AD177C9 for ; Thu, 7 May 2015 12:28:49 +0000 (UTC) Received: (qmail 55872 invoked by uid 500); 7 May 2015 12:28:43 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 55840 invoked by uid 500); 7 May 2015 12:28:43 -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 55831 invoked by uid 99); 7 May 2015 12:28:43 -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, 07 May 2015 12:28:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34620E4423; Thu, 7 May 2015 12:28:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbalassi@apache.org To: commits@flink.apache.org Message-Id: <486c7e95fcc44e88b842b9a3ee841ceb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [streaming] [api-breaking] Changed returntype of WindowedDataStream's mapWindow Date: Thu, 7 May 2015 12:28:43 +0000 (UTC) Repository: flink Updated Branches: refs/heads/master 0078c44e5 -> 689240315 [streaming] [api-breaking] Changed returntype of WindowedDataStream's mapWindow For a more consistent behaviour. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/68924031 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/68924031 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/68924031 Branch: refs/heads/master Commit: 68924031594e4793becb884436b0964540f5151c Parents: 0078c44 Author: mbalassi Authored: Thu May 7 10:38:31 2015 +0200 Committer: mbalassi Committed: Thu May 7 14:27:49 2015 +0200 ---------------------------------------------------------------------- .../flink/streaming/api/datastream/WindowedDataStream.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/68924031/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java ---------------------------------------------------------------------- diff --git a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java index 66dd4f3..6f8c347 100644 --- a/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java +++ b/flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java @@ -349,7 +349,7 @@ public class WindowedDataStream { * The function that will be applied to the windows. * @return The transformed DataStream */ - public WindowedDataStream mapWindow(WindowMapFunction windowMapFunction) { + public DiscretizedStream mapWindow(WindowMapFunction windowMapFunction) { return discretize(WindowTransformation.MAPWINDOW.with(clean(windowMapFunction)), getWindowBuffer(WindowTransformation.MAPWINDOW)).mapWindow(windowMapFunction); } @@ -372,7 +372,7 @@ public class WindowedDataStream { * The output type of the operator. * @return The transformed DataStream */ - public WindowedDataStream mapWindow(WindowMapFunction windowMapFunction, + public DiscretizedStream mapWindow(WindowMapFunction windowMapFunction, TypeInformation outType) { return discretize(WindowTransformation.MAPWINDOW.with(windowMapFunction),