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 2016/12/20 23:13:24 UTC
[1/3] incubator-beam git commit: Remove deprecated AggregatorFactory
from SDK
Repository: incubator-beam
Updated Branches:
refs/heads/master acd2196cf -> 6a05d7f17
Remove deprecated AggregatorFactory from SDK
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/aab46a0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/aab46a0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/aab46a0e
Branch: refs/heads/master
Commit: aab46a0ec6e0e45208f64de7aabb9af643acd0ec
Parents: a3f68d3
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Dec 15 20:13:25 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 14:05:35 2016 -0800
----------------------------------------------------------------------
.../apache/beam/sdk/transforms/Aggregator.java | 19 -------------------
1 file changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/aab46a0e/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Aggregator.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Aggregator.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Aggregator.java
index 43f53a8..4119c53 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Aggregator.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Aggregator.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.transforms;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
-import org.apache.beam.sdk.util.ExecutionContext;
/**
* An {@code Aggregator<InputT>} enables monitoring of values of type {@code InputT},
@@ -68,22 +67,4 @@ public interface Aggregator<InputT, OutputT> {
* aggregator.
*/
CombineFn<InputT, ?, OutputT> getCombineFn();
-
- /**
- * @deprecated this is for use only by runners and exists only for a migration period. Please
- * use the identical interface in org.apache.beam.runners.core
- */
- @Deprecated
- interface AggregatorFactory {
- /**
- * Create an aggregator with the given {@code name} and {@link CombineFn}.
- *
- * <p>This method is called to create an aggregator for a {@link DoFn}. It receives the
- * class of the {@link DoFn} being executed and the context of the step it is being
- * executed in.
- */
- <InputT, AccumT, OutputT> Aggregator<InputT, OutputT> createAggregatorForDoFn(
- Class<?> fnClass, ExecutionContext.StepContext stepContext,
- String aggregatorName, CombineFn<InputT, AccumT, OutputT> combine);
- }
}
[2/3] incubator-beam git commit: Update Dataflow worker to
beam-master-20161220
Posted by ke...@apache.org.
Update Dataflow worker to beam-master-20161220
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/a3f68d34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/a3f68d34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/a3f68d34
Branch: refs/heads/master
Commit: a3f68d343d018d99a04ac5c9134a11f1bc74935b
Parents: 2f4b803
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Dec 20 14:05:19 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 14:05:35 2016 -0800
----------------------------------------------------------------------
.../org/apache/beam/runners/dataflow/dataflow.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/a3f68d34/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties b/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
index 27a518f..bf08e83 100644
--- a/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
+++ b/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
@@ -18,6 +18,6 @@
environment.major.version=6
-worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20161216
+worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20161220
-worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20161216
+worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20161220
[3/3] incubator-beam git commit: This closes #1665: Remove deprecated
AggregatorFactory from SDK
Posted by ke...@apache.org.
This closes #1665: Remove deprecated AggregatorFactory from SDK
Update Dataflow worker to beam-master-20161220
Remove deprecated AggregatorFactory from SDK
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6a05d7f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6a05d7f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6a05d7f1
Branch: refs/heads/master
Commit: 6a05d7f17aab5cab202cdbf50b766b4fc86180b4
Parents: acd2196 aab46a0
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Dec 20 15:07:12 2016 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Dec 20 15:07:12 2016 -0800
----------------------------------------------------------------------
.../beam/runners/dataflow/dataflow.properties | 4 ++--
.../apache/beam/sdk/transforms/Aggregator.java | 19 -------------------
2 files changed, 2 insertions(+), 21 deletions(-)
----------------------------------------------------------------------