This closes #2627: Remove extraneous type variable from StateSpec Make DoFnSignatures robust to StateSpec subclasses Simplify type parameters of StateSpec and related
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b40b2650 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b40b2650 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b40b2650 Branch: refs/heads/master Commit: b40b26501805fd6eabc1a5d9ffe60baa4a989bc7 Parents: eec903f 190422c Author: Kenneth Knowles <k...@google.com> Authored: Tue May 2 11:55:43 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Tue May 2 11:55:43 2017 -0700 ---------------------------------------------------------------------- .../operators/ApexParDoOperator.java | 4 +- .../translation/utils/ApexStateInternals.java | 42 +++-- .../apex/translation/utils/NoOpStepContext.java | 2 +- .../translation/utils/StateInternalsProxy.java | 6 +- .../utils/ApexStateInternalsTest.java | 12 +- .../construction/PTransformMatchersTest.java | 2 +- .../beam/runners/core/BaseExecutionContext.java | 2 +- .../beam/runners/core/ExecutionContext.java | 2 +- .../GroupAlsoByWindowViaOutputBufferDoFn.java | 2 +- .../core/GroupAlsoByWindowViaWindowSetDoFn.java | 2 +- .../GroupAlsoByWindowViaWindowSetNewDoFn.java | 2 +- .../runners/core/InMemoryStateInternals.java | 36 ++-- .../runners/core/MergingActiveWindowSet.java | 4 +- .../beam/runners/core/MergingStateAccessor.java | 2 +- .../apache/beam/runners/core/NonEmptyPanes.java | 2 +- .../beam/runners/core/PaneInfoTracker.java | 2 +- .../runners/core/ReduceFnContextFactory.java | 37 ++-- .../beam/runners/core/ReduceFnRunner.java | 4 +- .../beam/runners/core/SideInputHandler.java | 14 +- .../beam/runners/core/SimpleDoFnRunner.java | 8 +- .../beam/runners/core/SimpleOldDoFnRunner.java | 2 +- .../beam/runners/core/SplittableParDo.java | 8 +- .../apache/beam/runners/core/StateAccessor.java | 2 +- .../beam/runners/core/StateInternals.java | 8 +- .../runners/core/StateInternalsFactory.java | 2 +- .../apache/beam/runners/core/StateMerging.java | 16 +- .../apache/beam/runners/core/StateTable.java | 10 +- .../org/apache/beam/runners/core/StateTag.java | 28 ++- .../org/apache/beam/runners/core/StateTags.java | 70 ++++---- .../beam/runners/core/StatefulDoFnRunner.java | 6 +- .../beam/runners/core/SystemReduceFn.java | 8 +- .../core/TestInMemoryStateInternals.java | 6 +- .../apache/beam/runners/core/WatermarkHold.java | 8 +- .../beam/runners/core/WindowingInternals.java | 2 +- .../AfterDelayFromFirstElementStateMachine.java | 2 +- .../core/triggers/AfterPaneStateMachine.java | 2 +- .../TriggerStateMachineContextFactory.java | 12 +- .../triggers/TriggerStateMachineRunner.java | 2 +- .../core/GroupAlsoByWindowsProperties.java | 10 +- .../core/InMemoryStateInternalsTest.java | 16 +- .../core/MergingActiveWindowSetTest.java | 2 +- .../beam/runners/core/ReduceFnTester.java | 18 +- .../beam/runners/core/SplittableParDoTest.java | 2 +- .../apache/beam/runners/core/StateTagTest.java | 62 +++---- .../runners/core/StatefulDoFnRunnerTest.java | 4 +- .../CopyOnAccessInMemoryStateInternals.java | 118 ++++++------- .../runners/direct/DirectExecutionContext.java | 15 +- .../beam/runners/direct/EvaluationContext.java | 8 +- .../GroupAlsoByWindowEvaluatorFactory.java | 6 +- .../beam/runners/direct/ParDoEvaluator.java | 2 +- ...littableProcessElementsEvaluatorFactory.java | 2 +- .../direct/StatefulParDoEvaluatorFactory.java | 5 +- .../runners/direct/StepTransformResult.java | 4 +- .../beam/runners/direct/TransformResult.java | 2 +- .../CopyOnAccessInMemoryStateInternalsTest.java | 106 +++++------ .../beam/runners/direct/DirectRunnerTest.java | 1 + .../runners/direct/EvaluationContextTest.java | 12 +- .../StatefulParDoEvaluatorFactoryTest.java | 10 +- .../functions/FlinkNoOpStepContext.java | 2 +- .../functions/FlinkStatefulDoFnFunction.java | 2 +- .../wrappers/streaming/DoFnOperator.java | 6 +- .../streaming/SplittableDoFnOperator.java | 4 +- .../wrappers/streaming/WindowDoFnOperator.java | 4 +- .../state/FlinkBroadcastStateInternals.java | 45 +++-- .../state/FlinkKeyGroupStateInternals.java | 29 ++- .../state/FlinkSplitStateInternals.java | 29 ++- .../streaming/state/FlinkStateInternals.java | 48 ++--- .../flink/streaming/DoFnOperatorTest.java | 4 +- .../FlinkBroadcastStateInternalsTest.java | 6 +- .../FlinkKeyGroupStateInternalsTest.java | 2 +- .../streaming/FlinkSplitStateInternalsTest.java | 2 +- .../streaming/FlinkStateInternalsTest.java | 12 +- .../BatchStatefulParDoOverridesTest.java | 2 +- .../DataflowPipelineTranslatorTest.java | 2 +- .../spark/stateful/SparkStateInternals.java | 44 +++-- ...SparkGroupAlsoByWindowViaOutputBufferFn.java | 2 +- .../spark/translation/SparkProcessContext.java | 2 +- .../spark/translation/TranslationUtils.java | 2 +- .../org/apache/beam/sdk/transforms/DoFn.java | 8 +- .../beam/sdk/transforms/GroupIntoBatches.java | 6 +- .../org/apache/beam/sdk/transforms/ParDo.java | 2 +- .../sdk/transforms/reflect/DoFnSignatures.java | 25 ++- .../apache/beam/sdk/util/state/StateBinder.java | 28 +-- .../apache/beam/sdk/util/state/StateSpec.java | 15 +- .../apache/beam/sdk/util/state/StateSpecs.java | 92 +++++----- .../apache/beam/sdk/transforms/ParDoTest.java | 177 +++++++++---------- .../transforms/reflect/DoFnInvokersTest.java | 2 +- .../transforms/reflect/DoFnSignaturesTest.java | 26 +-- .../beam/fn/harness/fake/FakeStepContext.java | 2 +- 89 files changed, 711 insertions(+), 707 deletions(-) ----------------------------------------------------------------------
