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 2017/05/11 19:50:57 UTC

[1/3] beam git commit: Add support for local execution to PubsubIO using the google cloud emulator

Repository: beam
Updated Branches:
  refs/heads/release-2.0.0 c839c1321 -> e8e8a6e87


Add support for local execution to PubsubIO using the google cloud emulator


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

Branch: refs/heads/release-2.0.0
Commit: 5127275037cfb864f25fa86de640e66904ee63f9
Parents: 2237697
Author: Borisa Zivkovic <bo...@huawei.com>
Authored: Thu May 11 10:27:41 2017 +0100
Committer: Dan Halperin <dh...@google.com>
Committed: Thu May 11 12:50:47 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java  | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/51272750/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
index 048fded..bdc2752e 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java
@@ -65,6 +65,12 @@ import org.slf4j.LoggerFactory;
  * Read and Write {@link PTransform}s for Cloud Pub/Sub streams. These transforms create
  * and consume unbounded {@link PCollection PCollections}.
  *
+ * <h3>Using local emulator</h3>
+ *
+ * <p>In order to use local emulator for Pubsub you should use
+ * {@code PubsubOptions#setPubsubRootUrl(String)} method to set host and port of your
+ * local emulator.
+ *
  * <h3>Permissions</h3>
  *
  * <p>Permission requirements depend on the {@link PipelineRunner} that is used to execute the


[3/3] beam git commit: This closes #3085

Posted by dh...@apache.org.
This closes #3085


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

Branch: refs/heads/release-2.0.0
Commit: e8e8a6e87554746312621a043002e2af3a2a0c28
Parents: c839c13 5127275
Author: Dan Halperin <dh...@google.com>
Authored: Thu May 11 12:50:52 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu May 11 12:50:52 2017 -0700

----------------------------------------------------------------------
 .../core/src/main/java/org/apache/beam/sdk/transforms/Top.java | 6 +++---
 .../main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java  | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[2/3] beam git commit: minor typo fix in comment

Posted by dh...@apache.org.
minor typo fix in comment


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

Branch: refs/heads/release-2.0.0
Commit: 223769700670e3d0abe478e5acdde201b725d1c8
Parents: c839c13
Author: James Xu <xu...@gmail.com>
Authored: Thu May 11 16:07:10 2017 +0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu May 11 12:50:47 2017 -0700

----------------------------------------------------------------------
 .../core/src/main/java/org/apache/beam/sdk/transforms/Top.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/22376970/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
index dd8bc5f..99ec49b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
@@ -66,7 +66,7 @@ public class Top {
    * given {@code Comparator<T>}.  The {@code Comparator<T>} must also
    * be {@code Serializable}.
    *
-   * <p>If {@code count} {@code <} the number of elements in the
+   * <p>If {@code count} {@code >} the number of elements in the
    * input {@code PCollection}, then all the elements of the input
    * {@code PCollection} will be in the resulting
    * {@code List}, albeit in sorted order.
@@ -110,7 +110,7 @@ public class Top {
    * {@code PCollection<T>}, in increasing order, sorted according to
    * their natural order.
    *
-   * <p>If {@code count} {@code <} the number of elements in the
+   * <p>If {@code count} {@code >} the number of elements in the
    * input {@code PCollection}, then all the elements of the input
    * {@code PCollection} will be in the resulting {@code PCollection}'s
    * {@code List}, albeit in sorted order.
@@ -154,7 +154,7 @@ public class Top {
    * {@code PCollection<T>}, in decreasing order, sorted according to
    * their natural order.
    *
-   * <p>If {@code count} {@code <} the number of elements in the
+   * <p>If {@code count} {@code >} the number of elements in the
    * input {@code PCollection}, then all the elements of the input
    * {@code PCollection} will be in the resulting {@code PCollection}'s
    * {@code List}, albeit in sorted order.