This closes #1929: Move a few more remnants of internal state to runners/core-java
Upgrade Dataflow container version to beam-master-20170208 Move StateTag and friends to runners/core-java Move StateTag adapter code to StateTags Move StateAccessor, MergingStateAccessor to runners/core-java Remove dead code referencing StateTag Move StateMerging to runners/core-java Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e21f9ae8 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e21f9ae8 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e21f9ae8 Branch: refs/heads/master Commit: e21f9ae86218005598647261f6638a51db98a6b3 Parents: d17d2db 255c7e2 Author: Kenneth Knowles <k...@google.com> Authored: Thu Feb 9 06:19:04 2017 -0800 Committer: Kenneth Knowles <k...@google.com> Committed: Thu Feb 9 06:19:04 2017 -0800 ---------------------------------------------------------------------- .../translation/utils/ApexStateInternals.java | 4 +- .../utils/ApexStateInternalsTest.java | 6 +- .../runners/core/InMemoryStateInternals.java | 3 +- .../runners/core/MergingActiveWindowSet.java | 2 - .../beam/runners/core/MergingStateAccessor.java | 41 +++ .../apache/beam/runners/core/NonEmptyPanes.java | 5 - .../beam/runners/core/PaneInfoTracker.java | 3 - .../org/apache/beam/runners/core/ReduceFn.java | 2 - .../runners/core/ReduceFnContextFactory.java | 3 - .../beam/runners/core/SideInputHandler.java | 2 - .../beam/runners/core/SimpleDoFnRunner.java | 1 - .../beam/runners/core/SplittableParDo.java | 2 - .../apache/beam/runners/core/StateAccessor.java | 38 ++ .../beam/runners/core/StateInternals.java | 1 - .../apache/beam/runners/core/StateMerging.java | 265 ++++++++++++++ .../apache/beam/runners/core/StateTable.java | 3 +- .../org/apache/beam/runners/core/StateTag.java | 117 ++++++ .../org/apache/beam/runners/core/StateTags.java | 352 +++++++++++++++++++ .../beam/runners/core/SystemReduceFn.java | 5 - .../core/TestInMemoryStateInternals.java | 1 - .../apache/beam/runners/core/WatermarkHold.java | 4 - .../AfterDelayFromFirstElementStateMachine.java | 10 +- .../core/triggers/AfterPaneStateMachine.java | 10 +- .../core/triggers/TriggerStateMachine.java | 4 +- .../TriggerStateMachineContextFactory.java | 6 +- .../triggers/TriggerStateMachineRunner.java | 8 +- .../core/InMemoryStateInternalsTest.java | 3 - .../beam/runners/core/ReduceFnTester.java | 1 - .../apache/beam/runners/core/StateTagTest.java | 172 +++++++++ .../CopyOnAccessInMemoryStateInternals.java | 4 +- .../direct/StatefulParDoEvaluatorFactory.java | 4 +- .../CopyOnAccessInMemoryStateInternalsTest.java | 4 +- .../runners/direct/EvaluationContextTest.java | 4 +- .../StatefulParDoEvaluatorFactoryTest.java | 4 +- .../wrappers/streaming/FlinkStateInternals.java | 2 +- .../streaming/FlinkStateInternalsTest.java | 6 +- runners/google-cloud-dataflow-java/pom.xml | 2 +- .../src/main/resources/beam/findbugs-filter.xml | 2 +- .../windowing/AfterDelayFromFirstElement.java | 11 - .../sdk/transforms/windowing/AfterPane.java | 10 - .../sdk/util/state/MergingStateAccessor.java | 40 --- .../beam/sdk/util/state/StateAccessor.java | 37 -- .../beam/sdk/util/state/StateMerging.java | 259 -------------- .../apache/beam/sdk/util/state/StateSpecs.java | 66 +--- .../apache/beam/sdk/util/state/StateTag.java | 111 ------ .../apache/beam/sdk/util/state/StateTags.java | 290 --------------- .../beam/sdk/util/state/StateTagTest.java | 172 --------- 47 files changed, 1029 insertions(+), 1073 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/e21f9ae8/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/e21f9ae8/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml ----------------------------------------------------------------------
