This closes #2741: Rollforwards "Replace OutputTimeFn UDF with TimestampCombiner enum"
Update Dataflow worker container to 20170428-2 Rollforwards "Replace OutputTimeFn UDF with TimestampCombiner enum"" Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/d233a240 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d233a240 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d233a240 Branch: refs/heads/master Commit: d233a240e48be4bc7144ff45855439e0c6536235 Parents: b236104 1a74b4e Author: Kenneth Knowles <[email protected]> Authored: Fri Apr 28 18:07:26 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Fri Apr 28 18:07:26 2017 -0700 ---------------------------------------------------------------------- .../beam/examples/complete/game/GameStats.java | 4 +- .../translation/utils/ApexStateInternals.java | 26 +- .../translation/ApexStateInternalsTest.java | 33 +- .../translation/GroupByKeyTranslatorTest.java | 10 +- .../core/construction/WindowingStrategies.java | 52 ++- .../construction/WindowingStrategiesTest.java | 6 +- .../runners/core/InMemoryStateInternals.java | 32 +- .../beam/runners/core/ReduceFnRunner.java | 4 +- .../beam/runners/core/SplittableParDo.java | 8 +- .../apache/beam/runners/core/StateMerging.java | 32 +- .../org/apache/beam/runners/core/StateTag.java | 11 +- .../org/apache/beam/runners/core/StateTags.java | 16 +- .../core/TestInMemoryStateInternals.java | 2 +- .../apache/beam/runners/core/WatermarkHold.java | 45 +-- .../core/GroupAlsoByWindowsProperties.java | 20 +- .../core/InMemoryStateInternalsTest.java | 34 +- .../beam/runners/core/ReduceFnRunnerTest.java | 38 +-- .../beam/runners/core/ReduceFnTester.java | 13 +- .../apache/beam/runners/core/StateTagTest.java | 16 +- .../CopyOnAccessInMemoryStateInternals.java | 24 +- .../direct/ParDoMultiOverrideFactory.java | 6 +- .../CopyOnAccessInMemoryStateInternalsTest.java | 54 ++-- .../functions/HashingFlinkCombineRunner.java | 19 +- .../functions/SortingFlinkCombineRunner.java | 30 +- .../state/FlinkBroadcastStateInternals.java | 8 +- .../state/FlinkKeyGroupStateInternals.java | 8 +- .../state/FlinkSplitStateInternals.java | 8 +- .../streaming/state/FlinkStateInternals.java | 34 +- .../streaming/FlinkStateInternalsTest.java | 34 +- runners/google-cloud-dataflow-java/pom.xml | 2 +- .../spark/stateful/SparkStateInternals.java | 33 +- .../translation/SparkAbstractCombineFn.java | 4 +- .../spark/translation/SparkGlobalCombineFn.java | 37 ++- .../spark/translation/SparkKeyedCombineFn.java | 37 ++- sdks/java/core/pom.xml | 5 - .../beam/sdk/testing/WindowFnTestUtils.java | 53 +++- .../apache/beam/sdk/transforms/GroupByKey.java | 3 +- .../sdk/transforms/windowing/OutputTimeFn.java | 314 ------------------- .../sdk/transforms/windowing/OutputTimeFns.java | 212 ------------- .../transforms/windowing/TimestampCombiner.java | 186 +++++++++++ .../beam/sdk/transforms/windowing/Window.java | 22 +- .../org/apache/beam/sdk/util/Reshuffle.java | 7 +- .../apache/beam/sdk/util/WindowingStrategy.java | 176 +++-------- .../apache/beam/sdk/util/state/StateBinder.java | 12 +- .../apache/beam/sdk/util/state/StateSpecs.java | 23 +- .../beam/sdk/util/state/WatermarkHoldState.java | 19 +- .../org/apache/beam/SdkCoreApiSurfaceTest.java | 1 - .../beam/sdk/transforms/GroupByKeyTest.java | 10 +- .../sdk/transforms/join/CoGroupByKeyTest.java | 6 +- .../transforms/windowing/OutputTimeFnsTest.java | 51 --- .../sdk/transforms/windowing/SessionsTest.java | 6 +- .../sdk/transforms/windowing/WindowTest.java | 23 +- .../sdk/transforms/windowing/WindowingTest.java | 2 +- .../extensions/gcp/GcpCoreApiSurfaceTest.java | 1 - 54 files changed, 741 insertions(+), 1131 deletions(-) ----------------------------------------------------------------------
