This closes #1157
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c390a2a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c390a2a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c390a2a7 Branch: refs/heads/gearpump-runner Commit: c390a2a7ff1b3a58de213f85218eef689e712df4 Parents: 8dfadbf 2089c5c Author: Kenneth Knowles <[email protected]> Authored: Mon Oct 24 09:10:04 2016 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Mon Oct 24 09:10:04 2016 -0700 ---------------------------------------------------------------------- .../beam/runners/core/AggregatorFactory.java | 39 ++++ .../beam/runners/core/SimpleDoFnRunner.java | 8 +- .../runners/direct/DoFnLifecycleManager.java | 42 ++-- .../beam/runners/direct/ParDoEvaluator.java | 3 +- .../direct/ParDoMultiEvaluatorFactory.java | 6 +- .../direct/ParDoSingleEvaluatorFactory.java | 5 +- ...leManagerRemovingTransformEvaluatorTest.java | 16 +- .../direct/DoFnLifecycleManagerTest.java | 12 +- .../direct/DoFnLifecycleManagersTest.java | 48 ++++- .../direct/ParDoMultiEvaluatorFactoryTest.java | 11 + .../direct/ParDoSingleEvaluatorFactoryTest.java | 11 + .../beam/runners/direct/SplittableDoFnTest.java | 8 +- .../functions/FlinkProcessContext.java | 10 +- .../apache/beam/sdk/transforms/Aggregator.java | 11 +- .../sdk/transforms/DelegatingAggregator.java | 125 +++++++++++ .../org/apache/beam/sdk/transforms/DoFn.java | 55 +++-- .../beam/sdk/transforms/DoFnAdapters.java | 1 + .../apache/beam/sdk/transforms/DoFnTester.java | 18 +- .../org/apache/beam/sdk/transforms/OldDoFn.java | 214 +++++++++---------- .../sdk/util/ReifyTimestampAndWindowsDoFn.java | 16 +- .../org/apache/beam/sdk/util/StringUtils.java | 2 +- .../DoFnDelegatingAggregatorTest.java | 5 +- .../apache/beam/sdk/transforms/ParDoTest.java | 16 +- 23 files changed, 463 insertions(+), 219 deletions(-) ----------------------------------------------------------------------
