You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nemo.apache.org by jo...@apache.org on 2018/11/01 02:03:16 UTC

[incubator-nemo] 01/01: Merge branch 'master' into maven-artifact

This is an automated email from the ASF dual-hosted git repository.

jooykim pushed a commit to branch maven-artifact
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git

commit 85d25073a371dbcecbc140d6a218254a666a881e
Merge: 49266b5 7858051
Author: Joo Yeon Kim <jo...@apache.org>
AuthorDate: Thu Nov 1 11:02:27 2018 +0900

    Merge branch 'master' into maven-artifact

 .../GroupByKeyAndWindowDoFnTransform.java          | 165 ++++++++++---
 .../frontend/beam/transform/DoFnTransformTest.java |  35 ---
 .../GroupByKeyAndWindowDoFnTransformTest.java      | 176 +++++++++++++
 .../beam/transform/TestOutputCollector.java        |  69 ++++++
 pom.xml                                            |  16 +-
 .../runtime/executor/data/PipeManagerWorker.java   |   8 +-
 .../datatransfer/DataFetcherOutputCollector.java   |   1 +
 .../datatransfer/InputWatermarkManager.java        |  46 ++++
 .../datatransfer/MultiInputWatermarkManager.java   |  90 +++++++
 .../datatransfer/NextIntraTaskOperatorInfo.java    |  59 +++++
 .../OperatorVertexOutputCollector.java             |  35 ++-
 .../datatransfer/SingleInputWatermarkManager.java  |  46 ++++
 .../task/MultiThreadParentTaskDataFetcher.java     | 150 +++++++++++
 .../executor/task/ParentTaskDataFetcher.java       |   1 -
 .../nemo/runtime/executor/task/TaskExecutor.java   | 111 +++++++--
 .../datatransfer/InputWatermarkManagerTest.java    |  88 +++++++
 .../runtime/executor/task/TaskExecutorTest.java    | 274 +++++++++++++++------
 17 files changed, 1173 insertions(+), 197 deletions(-)