This closes #1858: Move state-oriented remnants of OldDoFn to runners/core-java
Upgrade Dataflow container version to beam-master-20170203 Move StateNamespace and related to runners/core-java Move StateInternals to runners/core-java Move StateTable to runners/core-java Move TimerInternals to runners/core-java Move TimerInternalsFactory to runners/core-java Move StateInternalsFactory to runners/core-java Remove comment-only uses that block runners/core-java migrations Move WindowingInternals to runners/core-java Delete long-deprecated StateContexts methods Move InMemoryStateInternals to runners/core-java Eliminate use of InMemoryStateInternals in the Java SDK Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/224e4476 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/224e4476 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/224e4476 Branch: refs/heads/master Commit: 224e447653e5fef60982a230127b974dcb700161 Parents: e0189f3 fd7e614 Author: Kenneth Knowles <k...@google.com> Authored: Mon Feb 6 14:30:06 2017 -0800 Committer: Kenneth Knowles <k...@google.com> Committed: Mon Feb 6 14:30:06 2017 -0800 ---------------------------------------------------------------------- .../apex/translation/TranslationContext.java | 2 +- .../operators/ApexGroupByKeyOperator.java | 10 +- .../operators/ApexParDoOperator.java | 4 +- .../translation/utils/ApexStateInternals.java | 8 +- .../apex/translation/utils/NoOpStepContext.java | 4 +- .../utils/ApexStateInternalsTest.java | 6 +- .../beam/runners/core/BaseExecutionContext.java | 2 - .../beam/runners/core/ExecutionContext.java | 2 - .../GroupAlsoByWindowViaOutputBufferDoFn.java | 3 - .../core/GroupAlsoByWindowViaWindowSetDoFn.java | 3 - .../GroupAlsoByWindowViaWindowSetNewDoFn.java | 4 - .../runners/core/InMemoryStateInternals.java | 439 +++++++++++++++++++ .../runners/core/InMemoryTimerInternals.java | 2 - .../apache/beam/runners/core/KeyedWorkItem.java | 2 +- .../beam/runners/core/KeyedWorkItemCoder.java | 4 +- .../beam/runners/core/KeyedWorkItems.java | 2 +- .../core/LateDataDroppingDoFnRunner.java | 1 - .../runners/core/MergingActiveWindowSet.java | 2 - .../org/apache/beam/runners/core/OldDoFn.java | 1 - .../beam/runners/core/PaneInfoTracker.java | 1 - .../runners/core/ReduceFnContextFactory.java | 8 +- .../beam/runners/core/ReduceFnRunner.java | 6 +- .../beam/runners/core/SideInputHandler.java | 2 - .../beam/runners/core/SimpleDoFnRunner.java | 3 - .../beam/runners/core/SimpleOldDoFnRunner.java | 3 - .../beam/runners/core/SplittableParDo.java | 6 - .../beam/runners/core/StateInternals.java | 60 +++ .../runners/core/StateInternalsFactory.java | 35 ++ .../beam/runners/core/StateNamespace.java | 56 +++ .../runners/core/StateNamespaceForTest.java | 65 +++ .../beam/runners/core/StateNamespaces.java | 278 ++++++++++++ .../apache/beam/runners/core/StateTable.java | 85 ++++ .../core/TestInMemoryStateInternals.java | 64 +++ .../beam/runners/core/TimerInternals.java | 286 ++++++++++++ .../runners/core/TimerInternalsFactory.java | 35 ++ .../apache/beam/runners/core/WatermarkHold.java | 1 - .../beam/runners/core/WindowingInternals.java | 81 ++++ .../core/WindowingInternalsAdapters.java | 1 - .../TriggerStateMachineContextFactory.java | 6 +- ...roupAlsoByWindowViaOutputBufferDoFnTest.java | 1 - .../core/GroupAlsoByWindowsProperties.java | 5 - .../core/InMemoryStateInternalsTest.java | 357 +++++++++++++++ .../core/InMemoryTimerInternalsTest.java | 4 +- .../runners/core/KeyedWorkItemCoderTest.java | 3 +- .../core/LateDataDroppingDoFnRunnerTest.java | 1 - .../core/MergingActiveWindowSetTest.java | 2 - .../core/PushbackSideInputDoFnRunnerTest.java | 3 +- .../beam/runners/core/ReduceFnTester.java | 7 +- .../beam/runners/core/SideInputHandlerTest.java | 1 - .../beam/runners/core/SimpleDoFnRunnerTest.java | 4 +- .../runners/core/SimpleOldDoFnRunnerTest.java | 1 - .../beam/runners/core/SplittableParDoTest.java | 8 +- .../beam/runners/core/StateNamespacesTest.java | 130 ++++++ .../beam/runners/core/TimerInternalsTest.java | 105 +++++ .../core/triggers/NeverStateMachineTest.java | 1 - .../triggers/TriggerStateMachineTester.java | 14 +- .../CopyOnAccessInMemoryStateInternals.java | 18 +- .../runners/direct/DirectExecutionContext.java | 2 +- .../beam/runners/direct/DirectRunner.java | 2 +- .../runners/direct/DirectTimerInternals.java | 4 +- ...ecycleManagerRemovingTransformEvaluator.java | 2 +- .../beam/runners/direct/EvaluationContext.java | 2 +- .../direct/ExecutorServiceParallelExecutor.java | 2 +- .../GroupAlsoByWindowEvaluatorFactory.java | 2 +- .../beam/runners/direct/ParDoEvaluator.java | 2 +- ...littableProcessElementsEvaluatorFactory.java | 8 +- .../direct/StatefulParDoEvaluatorFactory.java | 6 +- .../beam/runners/direct/WatermarkManager.java | 6 +- .../CopyOnAccessInMemoryStateInternalsTest.java | 6 +- .../direct/DirectTimerInternalsTest.java | 4 +- ...leManagerRemovingTransformEvaluatorTest.java | 4 +- .../runners/direct/EvaluationContextTest.java | 4 +- .../StatefulParDoEvaluatorFactoryTest.java | 6 +- .../runners/direct/WatermarkManagerTest.java | 4 +- .../functions/FlinkProcessContextBase.java | 6 +- .../wrappers/streaming/DoFnOperator.java | 4 +- .../wrappers/streaming/FlinkStateInternals.java | 4 +- .../streaming/SingletonKeyedWorkItem.java | 2 +- .../wrappers/streaming/WindowDoFnOperator.java | 11 +- .../streaming/FlinkStateInternalsTest.java | 4 +- runners/google-cloud-dataflow-java/pom.xml | 2 +- .../translation/SparkGroupAlsoByWindowFn.java | 8 +- .../spark/translation/SparkProcessContext.java | 4 +- .../spark/translation/TranslationUtils.java | 7 +- .../apache/beam/sdk/transforms/DoFnTester.java | 11 - .../beam/sdk/transforms/windowing/PaneInfo.java | 2 - .../apache/beam/sdk/util/TimerInternals.java | 286 ------------ .../beam/sdk/util/WindowingInternals.java | 82 ---- .../sdk/util/state/InMemoryStateInternals.java | 430 ------------------ .../beam/sdk/util/state/ReadableState.java | 4 +- .../beam/sdk/util/state/StateContexts.java | 63 --- .../beam/sdk/util/state/StateInternals.java | 57 --- .../sdk/util/state/StateInternalsFactory.java | 35 -- .../beam/sdk/util/state/StateNamespace.java | 56 --- .../sdk/util/state/StateNamespaceForTest.java | 65 --- .../beam/sdk/util/state/StateNamespaces.java | 278 ------------ .../apache/beam/sdk/util/state/StateTable.java | 82 ---- .../util/state/TestInMemoryStateInternals.java | 61 --- .../sdk/util/state/TimerInternalsFactory.java | 36 -- .../sdk/transforms/join/UnionCoderTest.java | 7 - .../beam/sdk/util/TimerInternalsTest.java | 106 ----- .../util/state/InMemoryStateInternalsTest.java | 348 --------------- .../sdk/util/state/StateNamespacesTest.java | 130 ------ .../beam/fn/harness/fake/FakeStepContext.java | 4 +- 104 files changed, 2187 insertions(+), 2322 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/224e4476/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkGroupAlsoByWindowFn.java ----------------------------------------------------------------------
