You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bc...@apache.org on 2016/08/31 17:38:38 UTC
[1/2] incubator-beam git commit: Correct some accidental renames
Repository: incubator-beam
Updated Branches:
refs/heads/master 98da6e8fb -> 7dcb4c72c
Correct some accidental renames
IDE over-eagerly replaced some occurrences of createAggregator with
createAggregatorForDoFn. This corrects that.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f70aa49e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f70aa49e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f70aa49e
Branch: refs/heads/master
Commit: f70aa49e2babc79a65a339309776837be2a45126
Parents: 98da6e8
Author: bchambers <bc...@google.com>
Authored: Wed Aug 3 13:38:43 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Wed Aug 31 10:23:29 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java | 2 +-
.../main/java/org/apache/beam/sdk/transforms/Aggregator.java | 8 ++++----
.../main/java/org/apache/beam/sdk/transforms/DoFnTester.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f70aa49e/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java b/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java
index 04a0978..f0cfd74 100644
--- a/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java
+++ b/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java
@@ -344,7 +344,7 @@ public abstract class DoFnRunnerBase<InputT, OutputT> implements DoFnRunner<Inpu
@Override
protected <AggInputT, AggOutputT> Aggregator<AggInputT, AggOutputT> createAggregatorInternal(
String name, CombineFn<AggInputT, ?, AggOutputT> combiner) {
- checkNotNull(combiner, "Combiner passed to createAggregatorForDoFn cannot be null");
+ checkNotNull(combiner, "Combiner passed to createAggregatorInternal cannot be null");
return aggregatorFactory.createAggregatorForDoFn(fn.getClass(), stepContext, name, combiner);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f70aa49e/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 67d399f..e8f6247 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
@@ -25,7 +25,7 @@ import org.apache.beam.sdk.util.ExecutionContext;
* to be combined across all bundles.
*
* <p>Aggregators are created by calling
- * {@link DoFn#createAggregator DoFn.createAggregatorForDoFn},
+ * {@link DoFn#createAggregator DoFn.createAggregator},
* typically from the {@link DoFn} constructor. Elements can be added to the
* {@code Aggregator} by calling {@link Aggregator#addValue}.
*
@@ -41,7 +41,7 @@ import org.apache.beam.sdk.util.ExecutionContext;
* private Aggregator<Integer, Integer> myAggregator;
*
* public MyDoFn() {
- * myAggregator = createAggregatorForDoFn("myAggregator", new Sum.SumIntegerFn());
+ * myAggregator = createAggregator("myAggregator", new Sum.SumIntegerFn());
* }
*
* @ProcessElement
@@ -89,9 +89,9 @@ public interface Aggregator<InputT, OutputT> {
}
// TODO: Consider the following additional API conveniences:
- // - In addition to createAggregatorForDoFn(), consider adding getAggregator() to
+ // - In addition to createAggregator(), consider adding getAggregator() to
// avoid the need to store the aggregator locally in a DoFn, i.e., create
// if not already present.
// - Add a shortcut for the most common aggregator:
- // c.createAggregatorForDoFn("name", new Sum.SumIntegerFn()).
+ // c.createAggregator("name", new Sum.SumIntegerFn()).
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f70aa49e/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java
index 6801768..b867a55 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnTester.java
@@ -667,7 +667,7 @@ public class DoFnTester<InputT, OutputT> {
String name, CombineFn<AggInputT, ?, AggOutputT> combiner) {
throw new IllegalStateException("Aggregators should not be created within ProcessContext. "
+ "Instead, create an aggregator at OldDoFn construction time with"
- + " createAggregatorForDoFn, and ensure they are set up by the time startBundle is"
+ + " createAggregator, and ensure they are set up by the time startBundle is"
+ " called with setupDelegateAggregators.");
}
}
[2/2] incubator-beam git commit: Closes #778
Posted by bc...@apache.org.
Closes #778
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7dcb4c72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7dcb4c72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7dcb4c72
Branch: refs/heads/master
Commit: 7dcb4c72cd7e2be0ccaa30424226a3451e903f76
Parents: 98da6e8 f70aa49
Author: bchambers <bc...@google.com>
Authored: Wed Aug 31 10:23:30 2016 -0700
Committer: bchambers <bc...@google.com>
Committed: Wed Aug 31 10:23:30 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java | 2 +-
.../main/java/org/apache/beam/sdk/transforms/Aggregator.java | 8 ++++----
.../main/java/org/apache/beam/sdk/transforms/DoFnTester.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------