Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 81FD4200B61 for ; Tue, 26 Jul 2016 04:18:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 80A56160A8F; Tue, 26 Jul 2016 02:18:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A3741160A7D for ; Tue, 26 Jul 2016 04:18:00 +0200 (CEST) Received: (qmail 92143 invoked by uid 500); 26 Jul 2016 02:17:59 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 92134 invoked by uid 99); 26 Jul 2016 02:17:59 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2016 02:17:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 70F94C0362 for ; Tue, 26 Jul 2016 02:17:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id PW-AbAuqJzvu for ; Tue, 26 Jul 2016 02:17:57 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 5B11E5F474 for ; Tue, 26 Jul 2016 02:17:57 +0000 (UTC) Received: (qmail 92031 invoked by uid 99); 26 Jul 2016 02:17:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2016 02:17:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C838DE00A7; Tue, 26 Jul 2016 02:17:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lcwik@apache.org To: commits@beam.incubator.apache.org Date: Tue, 26 Jul 2016 02:17:56 -0000 Message-Id: <77b294c1c1884f1aa0c17010b9ebc0e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-beam git commit: Remove overrides of isStreaming() and getAppName() in SparkPipelineOptions archived-at: Tue, 26 Jul 2016 02:18:01 -0000 Repository: incubator-beam Updated Branches: refs/heads/master 7809f6bd2 -> 267136fb6 Remove overrides of isStreaming() and getAppName() in SparkPipelineOptions Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f52a656b Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f52a656b Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f52a656b Branch: refs/heads/master Commit: f52a656babc5de1dd8f9dc77bffc28c1726407a2 Parents: 7809f6b Author: Pei He Authored: Fri Jul 22 16:49:34 2016 -0700 Committer: Luke Cwik Committed: Mon Jul 25 19:16:26 2016 -0700 ---------------------------------------------------------------------- .../org/apache/beam/runners/spark/SparkPipelineOptions.java | 9 --------- .../beam/runners/spark/SparkStreamingPipelineOptions.java | 9 --------- .../spark/translation/streaming/FlattenStreamingTest.java | 2 +- .../spark/translation/streaming/KafkaStreamingTest.java | 2 +- .../translation/streaming/SimpleStreamingWordCountTest.java | 2 +- 5 files changed, 3 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f52a656b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java index 091382e..4bb2a57 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java @@ -32,14 +32,5 @@ public interface SparkPipelineOptions extends PipelineOptions, StreamingOptions, @Description("The url of the spark master to connect to, (e.g. spark://host:port, local[4]).") @Default.String("local[1]") String getSparkMaster(); - void setSparkMaster(String master); - - @Override - @Default.Boolean(false) - boolean isStreaming(); - - @Override - @Default.String("spark dataflow pipeline job") - String getAppName(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f52a656b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkStreamingPipelineOptions.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkStreamingPipelineOptions.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkStreamingPipelineOptions.java index c789447..5944acd 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkStreamingPipelineOptions.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkStreamingPipelineOptions.java @@ -28,14 +28,5 @@ public interface SparkStreamingPipelineOptions extends SparkPipelineOptions { + "execution is stopped") @Default.Long(-1) Long getTimeout(); - void setTimeout(Long batchInterval); - - @Override - @Default.Boolean(true) - boolean isStreaming(); - - @Override - @Default.String("spark streaming dataflow pipeline job") - String getAppName(); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f52a656b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/FlattenStreamingTest.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/FlattenStreamingTest.java b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/FlattenStreamingTest.java index 160f21d..ed7e9b7 100644 --- a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/FlattenStreamingTest.java +++ b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/FlattenStreamingTest.java @@ -59,8 +59,8 @@ public class FlattenStreamingTest { public void testRun() throws Exception { SparkStreamingPipelineOptions options = PipelineOptionsFactory.as(SparkStreamingPipelineOptions.class); - options.setAppName(this.getClass().getSimpleName()); options.setRunner(SparkRunner.class); + options.setStreaming(true); options.setTimeout(TEST_TIMEOUT_MSEC); // run for one interval Pipeline p = Pipeline.create(options); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f52a656b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/KafkaStreamingTest.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/KafkaStreamingTest.java b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/KafkaStreamingTest.java index 5578e35..904b448 100644 --- a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/KafkaStreamingTest.java +++ b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/KafkaStreamingTest.java @@ -91,8 +91,8 @@ public class KafkaStreamingTest { // test read from Kafka SparkStreamingPipelineOptions options = PipelineOptionsFactory.as(SparkStreamingPipelineOptions.class); - options.setAppName(this.getClass().getSimpleName()); options.setRunner(SparkRunner.class); + options.setStreaming(true); options.setTimeout(TEST_TIMEOUT_MSEC); // run for one interval Pipeline p = Pipeline.create(options); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f52a656b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/SimpleStreamingWordCountTest.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/SimpleStreamingWordCountTest.java b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/SimpleStreamingWordCountTest.java index 75ab274..4fa03f6 100644 --- a/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/SimpleStreamingWordCountTest.java +++ b/runners/spark/src/test/java/org/apache/beam/runners/spark/translation/streaming/SimpleStreamingWordCountTest.java @@ -56,8 +56,8 @@ public class SimpleStreamingWordCountTest implements Serializable { public void testRun() throws Exception { SparkStreamingPipelineOptions options = PipelineOptionsFactory.as(SparkStreamingPipelineOptions.class); - options.setAppName(this.getClass().getSimpleName()); options.setRunner(SparkRunner.class); + options.setStreaming(true); options.setTimeout(TEST_TIMEOUT_MSEC); // run for one interval Pipeline p = Pipeline.create(options);