You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/05/04 01:25:24 UTC
[1/2] incubator-beam git commit: Replace dataflow stagingLocation
with tempLocation in example module.
Repository: incubator-beam
Updated Branches:
refs/heads/master 9b9d73fbf -> 6819dff86
Replace dataflow stagingLocation with tempLocation in example module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/35924006
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/35924006
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/35924006
Branch: refs/heads/master
Commit: 359240064167171cf4d549263254b8a612b4b67b
Parents: 9b9d73f
Author: Pei He <pe...@google.com>
Authored: Tue Apr 26 19:55:34 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 3 14:00:20 2016 -0700
----------------------------------------------------------------------
examples/java/README.md | 4 ++--
.../apache/beam/examples/DebuggingWordCount.java | 2 +-
.../apache/beam/examples/MinimalWordCount.java | 12 ++++++------
.../apache/beam/examples/WindowedWordCount.java | 2 +-
.../java/org/apache/beam/examples/WordCount.java | 19 ++++++++-----------
.../beam/examples/complete/AutoComplete.java | 4 ++--
.../org/apache/beam/examples/complete/TfIdf.java | 2 +-
.../examples/complete/TopWikipediaSessions.java | 2 +-
.../examples/cookbook/BigQueryTornadoes.java | 2 +-
.../examples/cookbook/CombinePerKeyExamples.java | 2 +-
.../examples/cookbook/DatastoreWordCount.java | 2 +-
.../beam/examples/cookbook/DeDupExample.java | 12 +++++-------
.../beam/examples/cookbook/FilterExamples.java | 2 +-
.../beam/examples/cookbook/JoinExamples.java | 2 +-
.../examples/cookbook/MaxPerKeyExamples.java | 2 +-
.../beam/examples/complete/game/GameStats.java | 2 +-
.../examples/complete/game/HourlyTeamScore.java | 2 +-
.../beam/examples/complete/game/LeaderBoard.java | 2 +-
.../beam/examples/complete/game/UserScore.java | 2 +-
19 files changed, 37 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/README.md
----------------------------------------------------------------------
diff --git a/examples/java/README.md b/examples/java/README.md
index cbcd01f..4533303 100644
--- a/examples/java/README.md
+++ b/examples/java/README.md
@@ -44,7 +44,7 @@ the same pipeline on fully managed resources in Google Cloud Platform:
mvn compile exec:java -pl examples \
-Dexec.mainClass=com.google.cloud.dataflow.examples.WordCount \
-Dexec.args="--project=<YOUR CLOUD PLATFORM PROJECT ID> \
- --stagingLocation=<YOUR CLOUD STORAGE LOCATION> \
+ --tempLocation=<YOUR CLOUD STORAGE LOCATION> \
--runner=BlockingDataflowPipelineRunner"
Make sure to use your project id, not the project number or the descriptive name.
@@ -66,7 +66,7 @@ Platform:
java -cp examples/target/google-cloud-dataflow-java-examples-all-bundled-<VERSION>.jar \
com.google.cloud.dataflow.examples.WordCount \
--project=<YOUR CLOUD PLATFORM PROJECT ID> \
- --stagingLocation=<YOUR CLOUD STORAGE LOCATION> \
+ --tempLocation=<YOUR CLOUD STORAGE LOCATION> \
--runner=BlockingDataflowPipelineRunner
Other examples can be run similarly by replacing the `WordCount` class path with the example classpath, e.g.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/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 2e48465..11c56d1 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
@@ -68,7 +68,7 @@ import java.util.regex.Pattern;
* below, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* --workerLogLevelOverrides={"org.apache.beam.examples":"DEBUG"}
* }
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
index ec517c4..65d450d 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
@@ -50,26 +50,26 @@ import org.apache.beam.sdk.values.KV;
* 4. Writing data to Cloud Storage as text files
* </pre>
*
- * <p>To execute this pipeline, first edit the code to set your project ID, the staging
+ * <p>To execute this pipeline, first edit the code to set your project ID, the temp
* location, and the output location. The specified GCS bucket(s) must already exist.
*
- * <p>Then, run the pipeline as described in the README. It will be deployed and run using the
- * Dataflow service. No args are required to run the pipeline. You can see the results in your
+ * <p>Then, run the pipeline as described in the README. It will be deployed and run with the
+ * selected runner. No args are required to run the pipeline. You can see the results in your
* output bucket in the GCS browser.
*/
public class MinimalWordCount {
public static void main(String[] args) {
- // Create a DataflowPipelineOptions object. This object lets us set various execution
+ // Create a PipelineOptions object. This object lets us set various execution
// options for our pipeline, such as the associated Cloud Platform project and the location
// in Google Cloud Storage to stage files.
DataflowPipelineOptions options = PipelineOptionsFactory.create()
- .as(DataflowPipelineOptions.class);
+ .as(DataflowPipelineOptions.class);
options.setRunner(BlockingDataflowPipelineRunner.class);
// CHANGE 1/3: Your project ID is required in order to run your pipeline on the Google Cloud.
options.setProject("SET_YOUR_PROJECT_ID_HERE");
// CHANGE 2/3: Your Google Cloud Storage path is required for staging local files.
- options.setStagingLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_STAGING_DIRECTORY");
+ options.setTempLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_TEMP_DIRECTORY");
// Create the Pipeline object with the options we defined above.
Pipeline p = Pipeline.create(options);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/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 ecb837e..4d019bb 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
@@ -83,7 +83,7 @@ import java.util.List;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
index 364d075..f5611d3 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/WordCount.java
@@ -17,7 +17,6 @@
*/
package org.apache.beam.examples;
-import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.options.Default;
@@ -37,9 +36,8 @@ import org.apache.beam.sdk.util.gcsfs.GcsPath;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
-
/**
- * An example that counts words in Shakespeare and includes Dataflow best practices.
+ * An example that counts words in Shakespeare and includes Beam best practices.
*
* <p>This class, {@link WordCount}, is the second in a series of four successively more detailed
* 'word count' examples. You may first want to take a look at {@link MinimalWordCount}.
@@ -56,13 +54,13 @@ import org.apache.beam.sdk.values.PCollection;
*
* <p>New Concepts:
* <pre>
- * 1. Executing a Pipeline both locally and using the Dataflow service
+ * 1. Executing a Pipeline both locally and using the selected runner
* 2. Using ParDo with static DoFns defined out-of-line
* 3. Building a composite transform
* 4. Defining your own pipeline options
* </pre>
*
- * <p>Concept #1: you can execute this pipeline either locally or using the Dataflow service.
+ * <p>Concept #1: you can execute this pipeline either locally or using the selected runner.
* These are now command-line options and not hard-coded as they were in the MinimalWordCount
* example.
* To execute this pipeline locally, specify general pipeline configuration:
@@ -78,7 +76,7 @@ import org.apache.beam.sdk.values.PCollection;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
@@ -173,17 +171,16 @@ public class WordCount {
void setOutput(String value);
/**
- * Returns "gs://${YOUR_STAGING_DIRECTORY}/counts.txt" as the default destination.
+ * Returns "gs://${YOUR_TEMP_DIRECTORY}/counts.txt" as the default destination.
*/
public static class OutputFactory implements DefaultValueFactory<String> {
@Override
public String create(PipelineOptions options) {
- DataflowPipelineOptions dataflowOptions = options.as(DataflowPipelineOptions.class);
- if (dataflowOptions.getStagingLocation() != null) {
- return GcsPath.fromUri(dataflowOptions.getStagingLocation())
+ if (options.getTempLocation() != null) {
+ return GcsPath.fromUri(options.getTempLocation())
.resolve("counts.txt").toString();
} else {
- throw new IllegalArgumentException("Must specify --output or --stagingLocation");
+ throw new IllegalArgumentException("Must specify --output or --tempLocation");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java b/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
index 2f2283c..c83a898 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/AutoComplete.java
@@ -81,7 +81,7 @@ import java.util.regex.Pattern;
* specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=DataflowPipelineRunner
* --inputFile=gs://path/to/input*.txt
* }</pre>
@@ -90,7 +90,7 @@ import java.util.regex.Pattern;
* specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=DataflowPipelineRunner
* --inputFile=gs://YOUR_INPUT_DIRECTORY/*.txt
* --streaming
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java b/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
index 4b0db93..1f1885f 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/TfIdf.java
@@ -79,7 +79,7 @@ import java.util.Set;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* and an output prefix on GCS:
* --output=gs://YOUR_OUTPUT_PREFIX
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/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 e7090fd..c483608 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
@@ -59,7 +59,7 @@ import java.util.List;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
index 47631aa..80a2f25 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/BigQueryTornadoes.java
@@ -60,7 +60,7 @@ import java.util.List;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
index 1577b77..505989c 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/CombinePerKeyExamples.java
@@ -67,7 +67,7 @@ import java.util.List;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://<STAGING DIRECTORY>
+ * --tempLocation=gs://<STAGING DIRECTORY>
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
index 021fc14..bfaecdf 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DatastoreWordCount.java
@@ -69,7 +69,7 @@ import javax.annotation.Nullable;
* }</pre>
*
* <p>To run this example using Dataflow service, you must additionally
- * provide either {@literal --stagingLocation} or {@literal --tempLocation}, and
+ * provide either {@literal --tempLocation} or {@literal --tempLocation}, and
* select one of the Dataflow pipeline runners, eg
* {@literal --runner=BlockingDataflowPipelineRunner}.
*
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
index fe2bbc8..37ddb4b 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/DeDupExample.java
@@ -17,7 +17,6 @@
*/
package org.apache.beam.examples.cookbook;
-import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.io.TextIO;
import org.apache.beam.sdk.options.Default;
@@ -43,7 +42,7 @@ import org.apache.beam.sdk.util.gcsfs.GcsPath;
*
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* and an output prefix on GCS:
* --output=gs://YOUR_OUTPUT_PREFIX
@@ -69,16 +68,15 @@ public class DeDupExample {
String getOutput();
void setOutput(String value);
- /** Returns gs://${STAGING_LOCATION}/"deduped.txt". */
+ /** Returns gs://${TEMP_LOCATION}/"deduped.txt". */
public static class OutputFactory implements DefaultValueFactory<String> {
@Override
public String create(PipelineOptions options) {
- DataflowPipelineOptions dataflowOptions = options.as(DataflowPipelineOptions.class);
- if (dataflowOptions.getStagingLocation() != null) {
- return GcsPath.fromUri(dataflowOptions.getStagingLocation())
+ if (options.getTempLocation() != null) {
+ return GcsPath.fromUri(options.getTempLocation())
.resolve("deduped.txt").toString();
} else {
- throw new IllegalArgumentException("Must specify --output or --stagingLocation");
+ throw new IllegalArgumentException("Must specify --output or --tempLocation");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
index 597ef70..1c6a6e1 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/FilterExamples.java
@@ -72,7 +72,7 @@ import java.util.logging.Logger;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
index 7cf138f..8e642f8 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/JoinExamples.java
@@ -55,7 +55,7 @@ import com.google.api.services.bigquery.model.TableRow;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
index 3bc1208..2480967 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/MaxPerKeyExamples.java
@@ -61,7 +61,7 @@ import java.util.List;
* <p>To execute this pipeline using the Dataflow service, specify pipeline configuration:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* }
* </pre>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
index 12dfdf9..6187a1b 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java
@@ -83,7 +83,7 @@ import java.util.TimeZone;
* like this:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* --dataset=YOUR-DATASET
* --topic=projects/YOUR-PROJECT/topics/YOUR-TOPIC
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
index b516a32..845c56f 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java
@@ -59,7 +59,7 @@ import java.util.TimeZone;
* like this:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* --dataset=YOUR-DATASET
* }
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
index a5d9fb9..0b10f07 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java
@@ -80,7 +80,7 @@ import java.util.TimeZone;
* like this:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* --dataset=YOUR-DATASET
* --topic=projects/YOUR-PROJECT/topics/YOUR-TOPIC
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/35924006/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
index 6a6c1cf..866adef 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java
@@ -62,7 +62,7 @@ import java.util.Map;
* the pipeline configuration like this:
* <pre>{@code
* --project=YOUR_PROJECT_ID
- * --stagingLocation=gs://YOUR_STAGING_DIRECTORY
+ * --tempLocation=gs://YOUR_TEMP_DIRECTORY
* --runner=BlockingDataflowPipelineRunner
* --dataset=YOUR-DATASET
* }
[2/2] incubator-beam git commit: This closes #252
Posted by da...@apache.org.
This closes #252
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6819dff8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6819dff8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6819dff8
Branch: refs/heads/master
Commit: 6819dff86692c19bf9d74693bd3b75a908c91e66
Parents: 9b9d73f 3592400
Author: Davor Bonaci <da...@google.com>
Authored: Tue May 3 14:00:29 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Tue May 3 14:00:29 2016 -0700
----------------------------------------------------------------------
examples/java/README.md | 4 ++--
.../apache/beam/examples/DebuggingWordCount.java | 2 +-
.../apache/beam/examples/MinimalWordCount.java | 12 ++++++------
.../apache/beam/examples/WindowedWordCount.java | 2 +-
.../java/org/apache/beam/examples/WordCount.java | 19 ++++++++-----------
.../beam/examples/complete/AutoComplete.java | 4 ++--
.../org/apache/beam/examples/complete/TfIdf.java | 2 +-
.../examples/complete/TopWikipediaSessions.java | 2 +-
.../examples/cookbook/BigQueryTornadoes.java | 2 +-
.../examples/cookbook/CombinePerKeyExamples.java | 2 +-
.../examples/cookbook/DatastoreWordCount.java | 2 +-
.../beam/examples/cookbook/DeDupExample.java | 12 +++++-------
.../beam/examples/cookbook/FilterExamples.java | 2 +-
.../beam/examples/cookbook/JoinExamples.java | 2 +-
.../examples/cookbook/MaxPerKeyExamples.java | 2 +-
.../beam/examples/complete/game/GameStats.java | 2 +-
.../examples/complete/game/HourlyTeamScore.java | 2 +-
.../beam/examples/complete/game/LeaderBoard.java | 2 +-
.../beam/examples/complete/game/UserScore.java | 2 +-
19 files changed, 37 insertions(+), 42 deletions(-)
----------------------------------------------------------------------