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/11/12 00:04:45 UTC

[1/2] incubator-beam git commit: WordCountIT: uses input with fewer keys.

Repository: incubator-beam
Updated Branches:
  refs/heads/master 6814a99c2 -> b25131422


WordCountIT: uses input with fewer keys.


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

Branch: refs/heads/master
Commit: 95ca1add2df97a5bc6fa96c0810b8d6a0cb0c00c
Parents: 6814a99
Author: Pei He <pe...@google.com>
Authored: Fri Nov 11 14:13:02 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Fri Nov 11 16:02:55 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/beam/examples/WindowedWordCountIT.java     | 6 ++++--
 .../src/test/java/org/apache/beam/examples/WordCountIT.java    | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/95ca1add/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
index a5113c8..5d77dd5 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WindowedWordCountIT.java
@@ -38,7 +38,9 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class WindowedWordCountIT {
 
-  private static final String DEFAULT_OUTPUT_CHECKSUM = "ff54f6f42b2afeb146206c1e8e915deaee0362b4";
+  private static final String DEFAULT_INPUT =
+      "gs://apache-beam-samples/shakespeare/winterstale-personae";
+  private static final String DEFAULT_OUTPUT_CHECKSUM = "cd5b52939257e12428a9fa085c32a84dd209b180";
 
   /**
    * Options for the {@link WindowedWordCount} Integration Test.
@@ -67,7 +69,7 @@ public class WindowedWordCountIT {
     WindowedWordCountITOptions options =
         TestPipeline.testingPipelineOptions().as(WindowedWordCountITOptions.class);
     options.setStreaming(isStreaming);
-    options.setTestTimeoutSeconds(1200L);
+    options.setInputFile(DEFAULT_INPUT);
 
     // Note: currently unused because the example writes to BigQuery, but WindowedWordCount.Options
     // are tightly coupled to WordCount.Options, where the option is required.

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/95ca1add/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
----------------------------------------------------------------------
diff --git a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
index 487f04b..f2afe6a 100644
--- a/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
+++ b/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java
@@ -36,7 +36,9 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class WordCountIT {
 
-  private static final String DEFAULT_OUTPUT_CHECKSUM = "8ae94f799f97cfd1cb5e8125951b32dfb52e1f12";
+  private static final String DEFAULT_INPUT =
+      "gs://apache-beam-samples/shakespeare/winterstale-personae";
+  private static final String DEFAULT_OUTPUT_CHECKSUM = "508517575eba8d8d5a54f7f0080a00951cfe84ca";
 
   /**
    * Options for the WordCount Integration Test.
@@ -56,6 +58,7 @@ public class WordCountIT {
   public void testE2EWordCount() throws Exception {
     WordCountITOptions options = TestPipeline.testingPipelineOptions().as(WordCountITOptions.class);
 
+    options.setInputFile(DEFAULT_INPUT);
     options.setOutput(IOChannelUtils.resolve(
         options.getTempRoot(),
         String.format("WordCountIT-%tF-%<tH-%<tM-%<tS-%<tL", new Date()),


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

Posted by da...@apache.org.
This closes #1351


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

Branch: refs/heads/master
Commit: b251314220861abcd4c64f3f70a1f1434885e27e
Parents: 6814a99 95ca1ad
Author: Davor Bonaci <da...@google.com>
Authored: Fri Nov 11 16:04:36 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Fri Nov 11 16:04:36 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/beam/examples/WindowedWordCountIT.java     | 6 ++++--
 .../src/test/java/org/apache/beam/examples/WordCountIT.java    | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------