You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/24 23:10:39 UTC
[2/2] incubator-beam git commit: Cleanup some javadoc that referring
Dataflow
Cleanup some javadoc that referring Dataflow
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ddda21bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ddda21bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ddda21bf
Branch: refs/heads/master
Commit: ddda21bf96956cc18d8768aefaff9c317710d65c
Parents: 2f4321e
Author: Pei He <pe...@google.com>
Authored: Wed Aug 24 14:47:11 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Wed Aug 24 16:10:34 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/examples/DebuggingWordCount.java | 2 +-
.../main/java/org/apache/beam/examples/WindowedWordCount.java | 3 +--
.../java/org/apache/beam/examples/common/ExampleOptions.java | 2 +-
.../src/main/java/org/apache/beam/examples/complete/README.md | 4 ++--
.../org/apache/beam/examples/complete/StreamingWordExtract.java | 2 +-
.../org/apache/beam/examples/complete/TopWikipediaSessions.java | 2 +-
.../org/apache/beam/examples/complete/TrafficMaxLaneFlow.java | 4 ++--
.../java/org/apache/beam/examples/complete/TrafficRoutes.java | 4 ++--
8 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
index 4a9aba9..5a0930c 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
/**
- * An example that verifies word counts in Shakespeare and includes Dataflow best practices.
+ * An example that verifies word counts in Shakespeare and includes Beam best practices.
*
* <p>This class, {@link DebuggingWordCount}, is the third in a series of four successively more
* detailed 'word count' examples. You may first want to take a look at {@link MinimalWordCount}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
index 6d69f14..5f60524 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/WindowedWordCount.java
@@ -183,8 +183,7 @@ public class WindowedWordCount {
public static void main(String[] args) throws IOException {
Options options = PipelineOptionsFactory.fromArgs(args).withValidation().as(Options.class);
options.setBigQuerySchema(getSchema());
- // DataflowExampleUtils creates the necessary input sources to simplify execution of this
- // Pipeline.
+ // ExampleUtils creates the necessary input sources to simplify execution of this Pipeline.
ExampleUtils exampleUtils = new ExampleUtils(options);
exampleUtils.setup();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
index a7dcc7c..8b7ed07 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleOptions.java
@@ -33,7 +33,7 @@ import org.joda.time.format.DateTimeFormatter;
* Options that can be used to configure the Beam examples.
*/
public interface ExampleOptions extends PipelineOptions {
- @Description("Whether to keep jobs running on the Dataflow service after local process exit")
+ @Description("Whether to keep jobs running after local process exit")
@Default.Boolean(false)
boolean getKeepJobsRunning();
void setKeepJobsRunning(boolean keepJobsRunning);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/complete/README.md
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/README.md b/examples/java/src/main/java/org/apache/beam/examples/complete/README.md
index 99c93ef..b98be7a 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/README.md
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/README.md
@@ -43,14 +43,14 @@ This directory contains end-to-end example pipelines that perform complex data p
<code>Windowing</code> to perform time-based aggregations of data.
</li>
<li><a href="https://github.com/GoogleCloudPlatform/DataflowJavaSDK/blob/master/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficMaxLaneFlow.java">TrafficMaxLaneFlow</a>
- — A streaming Cloud Dataflow example using BigQuery output in the
+ — A streaming Beam Example using BigQuery output in the
<code>traffic sensor</code> domain. Demonstrates the Cloud Dataflow streaming
runner, sliding windows, Cloud Pub/Sub topic ingestion, the use of the
<code>AvroCoder</code> to encode a custom class, and custom
<code>Combine</code> transforms.
</li>
<li><a href="https://github.com/GoogleCloudPlatform/DataflowJavaSDK/blob/master/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficRoutes.java">TrafficRoutes</a>
- — A streaming Cloud Dataflow example using BigQuery output in the
+ — A streaming Beam Example using BigQuery output in the
<code>traffic sensor</code> domain. Demonstrates the Cloud Dataflow streaming
runner, <code>GroupByKey</code>, keyed state, sliding windows, and Cloud
Pub/Sub topic ingestion.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java b/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
index c4ad35b..348bab8 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/StreamingWordExtract.java
@@ -37,7 +37,7 @@ import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
/**
- * A streaming Dataflow Example using BigQuery output.
+ * A streaming Beam Example using BigQuery output.
*
* <p>This pipeline example reads lines of the input text file, splits each line
* into individual words, capitalizes those words, and writes the output to
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
index 4c5472b..1b2064a 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TopWikipediaSessions.java
@@ -181,7 +181,7 @@ public class TopWikipediaSessions {
/**
* Options supported by this class.
*
- * <p>Inherits standard Dataflow configuration options.
+ * <p>Inherits standard Beam configuration options.
*/
private static interface Options extends PipelineOptions {
@Description(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
index f7ff035..1b27e65 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficMaxLaneFlow.java
@@ -53,7 +53,7 @@ import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
/**
- * A Dataflow Example that runs in both batch and streaming modes with traffic sensor data.
+ * A Beam Example that runs in both batch and streaming modes with traffic sensor data.
* You can configure the running mode by setting {@literal --streaming} to true or false.
*
* <p>Concepts: The batch and streaming runners, sliding windows,
@@ -329,7 +329,7 @@ public class TrafficMaxLaneFlow {
.withValidation()
.as(TrafficMaxLaneFlowOptions.class);
options.setBigQuerySchema(FormatMaxesFn.getSchema());
- // Using DataflowExampleUtils to set up required resources.
+ // Using ExampleUtils to set up required resources.
ExampleUtils exampleUtils = new ExampleUtils(options);
exampleUtils.setup();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ddda21bf/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
index 12eaeaa..f3c2d39 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TrafficRoutes.java
@@ -57,7 +57,7 @@ import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
/**
- * A Dataflow Example that runs in both batch and streaming modes with traffic sensor data.
+ * A Beam Example that runs in both batch and streaming modes with traffic sensor data.
* You can configure the running mode by setting {@literal --streaming} to true or false.
*
* <p>Concepts: The batch and streaming runners, GroupByKey, sliding windows.
@@ -340,7 +340,7 @@ public class TrafficRoutes {
.as(TrafficRoutesOptions.class);
options.setBigQuerySchema(FormatStatsFn.getSchema());
- // Using DataflowExampleUtils to set up required resources.
+ // Using ExampleUtils to set up required resources.
ExampleUtils exampleUtils = new ExampleUtils(options);
exampleUtils.setup();