You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/05/06 23:05:14 UTC

[1/2] incubator-beam git commit: Remove setting DataflowPipelineRunner in examples

Repository: incubator-beam
Updated Branches:
  refs/heads/master dc4f2f706 -> ff825b077


Remove setting DataflowPipelineRunner in examples


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

Branch: refs/heads/master
Commit: bb74b871d27fc1484a2b6ef8aa2644842e5564c7
Parents: dc4f2f7
Author: Pei He <pe...@google.com>
Authored: Fri May 6 14:37:13 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri May 6 15:35:40 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/beam/examples/complete/AutoComplete.java  | 7 -------
 .../apache/beam/examples/complete/StreamingWordExtract.java   | 4 ----
 .../org/apache/beam/examples/cookbook/TriggerExample.java     | 4 ----
 .../org/apache/beam/examples/complete/game/GameStats.java     | 3 ---
 .../org/apache/beam/examples/complete/game/LeaderBoard.java   | 4 ----
 5 files changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb74b871/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 c83a898..ac8384b 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
@@ -20,7 +20,6 @@ package org.apache.beam.examples.complete;
 import org.apache.beam.examples.common.DataflowExampleUtils;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExamplePubsubTopicOptions;
-import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.AvroCoder;
@@ -448,12 +447,6 @@ public class AutoComplete {
   public static void main(String[] args) throws IOException {
     Options options = PipelineOptionsFactory.fromArgs(args).withValidation().as(Options.class);
 
-    if (options.isStreaming()) {
-      // In order to cancel the pipelines automatically,
-      // {@literal DataflowPipelineRunner} is forced to be used.
-      options.setRunner(DataflowPipelineRunner.class);
-    }
-
     options.setBigQuerySchema(FormatForBigquery.getSchema());
     DataflowExampleUtils dataflowUtils = new DataflowExampleUtils(options);
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb74b871/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 5de08da..aca4222 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
@@ -20,7 +20,6 @@ package org.apache.beam.examples.complete;
 import org.apache.beam.examples.common.DataflowExampleUtils;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExamplePubsubTopicOptions;
-import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.io.BigQueryIO;
@@ -129,9 +128,6 @@ public class StreamingWordExtract {
         .withValidation()
         .as(StreamingWordExtractOptions.class);
     options.setStreaming(true);
-    // In order to cancel the pipelines automatically,
-    // {@literal DataflowPipelineRunner} is forced to be used.
-    options.setRunner(DataflowPipelineRunner.class);
 
     options.setBigQuerySchema(StringToRowConverter.getSchema());
     DataflowExampleUtils dataflowUtils = new DataflowExampleUtils(options);

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb74b871/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java b/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
index 28885a7..c614550 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/TriggerExample.java
@@ -22,7 +22,6 @@ import org.apache.beam.examples.common.DataflowExampleUtils;
 import org.apache.beam.examples.common.ExampleBigQueryTableOptions;
 import org.apache.beam.examples.common.ExamplePubsubTopicOptions;
 import org.apache.beam.examples.common.PubsubFileInjector;
-import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
 import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
@@ -458,9 +457,6 @@ public class TriggerExample {
         .as(TrafficFlowOptions.class);
     options.setStreaming(true);
 
-    // In order to cancel the pipelines automatically,
-    // {@code DataflowPipelineRunner} is forced to be used.
-    options.setRunner(DataflowPipelineRunner.class);
     options.setBigQuerySchema(getSchema());
 
     DataflowExampleUtils dataflowUtils = new DataflowExampleUtils(options);

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb74b871/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 6187a1b..7814eb1 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
@@ -19,7 +19,6 @@ package org.apache.beam.examples.complete.game;
 
 import org.apache.beam.examples.common.DataflowExampleUtils;
 import org.apache.beam.examples.complete.game.utils.WriteWindowedToBigQuery;
-import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.io.PubsubIO;
@@ -244,8 +243,6 @@ public class GameStats extends LeaderBoard {
     Options options = PipelineOptionsFactory.fromArgs(args).withValidation().as(Options.class);
     // Enforce that this pipeline is always run in streaming mode.
     options.setStreaming(true);
-    // Allow the pipeline to be cancelled automatically.
-    options.setRunner(DataflowPipelineRunner.class);
     DataflowExampleUtils dataflowUtils = new DataflowExampleUtils(options);
     Pipeline pipeline = Pipeline.create(options);
 

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bb74b871/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 0b10f07..d79403a 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
@@ -21,7 +21,6 @@ import org.apache.beam.examples.common.DataflowExampleOptions;
 import org.apache.beam.examples.common.DataflowExampleUtils;
 import org.apache.beam.examples.complete.game.utils.WriteToBigQuery;
 import org.apache.beam.examples.complete.game.utils.WriteWindowedToBigQuery;
-import org.apache.beam.runners.dataflow.DataflowPipelineRunner;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.io.PubsubIO;
@@ -177,9 +176,6 @@ public class LeaderBoard extends HourlyTeamScore {
     Options options = PipelineOptionsFactory.fromArgs(args).withValidation().as(Options.class);
     // Enforce that this pipeline is always run in streaming mode.
     options.setStreaming(true);
-    // For example purposes, allow the pipeline to be easily cancelled instead of running
-    // continuously.
-    options.setRunner(DataflowPipelineRunner.class);
     DataflowExampleUtils dataflowUtils = new DataflowExampleUtils(options);
     Pipeline pipeline = Pipeline.create(options);
 


[2/2] incubator-beam git commit: This closes #302

Posted by lc...@apache.org.
This closes #302


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

Branch: refs/heads/master
Commit: ff825b077fc2deb1483e27bfd78655cb420d0042
Parents: dc4f2f7 bb74b87
Author: Luke Cwik <lc...@google.com>
Authored: Fri May 6 15:36:04 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri May 6 15:36:04 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/beam/examples/complete/AutoComplete.java  | 7 -------
 .../apache/beam/examples/complete/StreamingWordExtract.java   | 4 ----
 .../org/apache/beam/examples/cookbook/TriggerExample.java     | 4 ----
 .../org/apache/beam/examples/complete/game/GameStats.java     | 3 ---
 .../org/apache/beam/examples/complete/game/LeaderBoard.java   | 4 ----
 5 files changed, 22 deletions(-)
----------------------------------------------------------------------