You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/07/28 14:25:26 UTC

[1/2] beam git commit: Add missing displayData to ElasticsearchIO.Read

Repository: beam
Updated Branches:
  refs/heads/master 6ca53055b -> da3b8bfde


Add missing displayData to ElasticsearchIO.Read


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

Branch: refs/heads/master
Commit: d9fc36ae7ffd127b93a0b9a03b4ce8c86e5cc1fb
Parents: 6ca5305
Author: Etienne Chauchot <ec...@gmail.com>
Authored: Mon Jul 24 12:03:24 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Fri Jul 28 16:24:15 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/d9fc36ae/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
index 8e6e253..acc7f2f 100644
--- a/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
+++ b/sdks/java/io/elasticsearch/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java
@@ -392,6 +392,8 @@ public class ElasticsearchIO {
     public void populateDisplayData(DisplayData.Builder builder) {
       super.populateDisplayData(builder);
       builder.addIfNotNull(DisplayData.item("query", getQuery()));
+      builder.addIfNotNull(DisplayData.item("batchSize", getBatchSize()));
+      builder.addIfNotNull(DisplayData.item("scrollKeepalive", getScrollKeepalive()));
       getConnectionConfiguration().populateDisplayData(builder);
     }
   }


[2/2] beam git commit: This closes #3655

Posted by ie...@apache.org.
This closes #3655


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

Branch: refs/heads/master
Commit: da3b8bfde7d1b3baa31f0b7cce072d98eaf00d7e
Parents: 6ca5305 d9fc36a
Author: Ismaël Mejía <ie...@gmail.com>
Authored: Fri Jul 28 16:24:30 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Fri Jul 28 16:24:30 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------