This closes #2413: Rename CombiningState and friends to be more user-friendly
Upgrade Dataflow worker image to beam-master-20170405 Rename combiningValue to combining in StateSpecs Rename AccumulatorCombiningState to CombiningState Rename CombiningState to GroupingState Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b92032ff Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b92032ff Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b92032ff Branch: refs/heads/master Commit: b92032ff6d3fba7d29dd73f602977137b7539482 Parents: bb18384 359040e Author: Kenneth Knowles <k...@google.com> Authored: Thu Apr 6 15:33:28 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Thu Apr 6 15:33:28 2017 -0700 ---------------------------------------------------------------------- .../translation/utils/ApexStateInternals.java | 28 ++--- .../utils/ApexStateInternalsTest.java | 18 +-- .../runners/core/InMemoryStateInternals.java | 36 +++--- .../apache/beam/runners/core/NonEmptyPanes.java | 4 +- .../beam/runners/core/SideInputHandler.java | 18 +-- .../apache/beam/runners/core/StateMerging.java | 16 +-- .../org/apache/beam/runners/core/StateTag.java | 14 +-- .../org/apache/beam/runners/core/StateTags.java | 32 +++--- .../beam/runners/core/SystemReduceFn.java | 8 +- .../AfterDelayFromFirstElementStateMachine.java | 10 +- .../core/triggers/AfterPaneStateMachine.java | 4 +- .../core/InMemoryStateInternalsTest.java | 18 +-- .../CopyOnAccessInMemoryStateInternals.java | 46 ++++---- .../CopyOnAccessInMemoryStateInternalsTest.java | 18 +-- .../state/FlinkBroadcastStateInternals.java | 68 ++++++------ .../state/FlinkKeyGroupStateInternals.java | 16 +-- .../state/FlinkSplitStateInternals.java | 16 +-- .../streaming/state/FlinkStateInternals.java | 68 ++++++------ .../FlinkBroadcastStateInternalsTest.java | 18 +-- .../streaming/FlinkStateInternalsTest.java | 18 +-- runners/google-cloud-dataflow-java/pom.xml | 2 +- .../spark/stateful/SparkStateInternals.java | 30 ++--- .../src/main/resources/beam/findbugs-filter.xml | 2 +- .../beam/sdk/transforms/GroupIntoBatches.java | 12 +- .../util/state/AccumulatorCombiningState.java | 53 --------- .../apache/beam/sdk/util/state/BagState.java | 2 +- .../beam/sdk/util/state/CombiningState.java | 27 +++-- .../beam/sdk/util/state/GroupingState.java | 42 +++++++ .../apache/beam/sdk/util/state/SetState.java | 2 +- .../org/apache/beam/sdk/util/state/State.java | 2 +- .../apache/beam/sdk/util/state/StateBinder.java | 12 +- .../apache/beam/sdk/util/state/StateSpecs.java | 110 +++++++++---------- .../beam/sdk/util/state/WatermarkHoldState.java | 2 +- .../apache/beam/sdk/transforms/ParDoTest.java | 59 +++++----- 34 files changed, 415 insertions(+), 416 deletions(-) ----------------------------------------------------------------------