This closes #2725: Revert "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/b82cd244 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b82cd244 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b82cd244 Branch: refs/heads/master Commit: b82cd2446fa681576f83bae0fc2bdd1f03be5e7e Parents: 3bcbba1 83d41fc Author: Kenneth Knowles <[email protected]> Authored: Wed Apr 26 20:32:09 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Wed Apr 26 20:32:09 2017 -0700 ---------------------------------------------------------------------- .../beam/examples/complete/game/GameStats.java | 4 +- .../translation/utils/ApexStateInternals.java | 26 +- .../translation/GroupByKeyTranslatorTest.java | 10 +- .../utils/ApexStateInternalsTest.java | 33 +- .../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 +- .../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 +- .../org/apache/beam/GcpCoreApiSurfaceTest.java | 1 + 53 files changed, 1130 insertions(+), 740 deletions(-) ----------------------------------------------------------------------
