You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/05/01 02:25:42 UTC

[6/6] beam git commit: This closes #2636: Remove KeyedCombineFn

This closes #2636: Remove KeyedCombineFn

  Update Dataflow worker version to beam-master-20170430
  Remove KeyedCombineFn


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9f2733ac
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9f2733ac
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9f2733ac

Branch: refs/heads/master
Commit: 9f2733ac460ce42d6b3bd49f3db1bacb771ef85c
Parents: a198f8d 07ca542
Author: Kenneth Knowles <kl...@google.com>
Authored: Sun Apr 30 18:38:56 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Sun Apr 30 18:38:56 2017 -0700

----------------------------------------------------------------------
 .../translation/utils/ApexStateInternals.java   |  38 +-
 .../runners/core/GlobalCombineFnRunner.java     |  78 +++
 .../runners/core/GlobalCombineFnRunners.java    | 193 ++++++
 .../runners/core/InMemoryStateInternals.java    |  50 +-
 .../runners/core/PerKeyCombineFnRunner.java     |  79 ---
 .../runners/core/PerKeyCombineFnRunners.java    | 161 -----
 .../org/apache/beam/runners/core/StateTag.java  |  18 +-
 .../org/apache/beam/runners/core/StateTags.java |  43 +-
 .../beam/runners/core/SystemReduceFn.java       |  15 +-
 .../beam/runners/core/ReduceFnRunnerTest.java   |  36 +-
 .../beam/runners/core/ReduceFnTester.java       |  15 +-
 .../apache/beam/runners/core/StateTagTest.java  |  22 +-
 .../CopyOnAccessInMemoryStateInternals.java     |  66 +-
 .../CopyOnAccessInMemoryStateInternalsTest.java |  34 -
 .../flink/FlinkBatchTransformTranslators.java   |   9 +-
 .../functions/AbstractFlinkCombineRunner.java   |  44 +-
 .../FlinkMergingNonShuffleReduceFunction.java   |  10 +-
 .../functions/FlinkPartialReduceFunction.java   |   6 +-
 .../functions/FlinkReduceFunction.java          |  10 +-
 .../functions/SortingFlinkCombineRunner.java    |   1 -
 .../state/FlinkBroadcastStateInternals.java     | 173 ++---
 .../state/FlinkKeyGroupStateInternals.java      | 119 ++--
 .../state/FlinkSplitStateInternals.java         | 119 ++--
 .../streaming/state/FlinkStateInternals.java    | 173 ++---
 runners/google-cloud-dataflow-java/pom.xml      |   2 +-
 .../spark/stateful/SparkStateInternals.java     |  40 +-
 .../spark/translation/SparkKeyedCombineFn.java  |  26 +-
 .../spark/translation/TransformTranslator.java  |  44 +-
 .../streaming/StreamingTransformTranslator.java |   4 +-
 .../runners/spark/SparkRunnerDebuggerTest.java  |   7 +-
 .../src/main/resources/beam/findbugs-filter.xml |   2 +-
 .../sdk/transforms/ApproximateQuantiles.java    |   8 +-
 .../beam/sdk/transforms/ApproximateUnique.java  |   3 +-
 .../org/apache/beam/sdk/transforms/Combine.java | 672 +++++--------------
 .../beam/sdk/transforms/CombineFnBase.java      | 136 ----
 .../apache/beam/sdk/transforms/CombineFns.java  | 448 +------------
 .../beam/sdk/transforms/CombineWithContext.java | 174 +----
 .../org/apache/beam/sdk/transforms/Top.java     |   6 +-
 .../org/apache/beam/sdk/transforms/View.java    |   2 +-
 .../apache/beam/sdk/util/AppliedCombineFn.java  |  35 +-
 .../org/apache/beam/sdk/util/CombineFnUtil.java | 123 ++--
 .../apache/beam/sdk/util/state/StateBinder.java |  19 +-
 .../apache/beam/sdk/util/state/StateSpecs.java  | 177 ++---
 .../beam/sdk/transforms/CombineFnsTest.java     | 114 ++--
 .../apache/beam/sdk/transforms/CombineTest.java | 213 +++---
 .../apache/beam/sdk/transforms/ParDoTest.java   |   2 +-
 .../apache/beam/sdk/transforms/ViewTest.java    |   2 +-
 .../apache/beam/sdk/util/CombineFnUtilTest.java |  18 +-
 48 files changed, 1179 insertions(+), 2610 deletions(-)
----------------------------------------------------------------------