You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jk...@apache.org on 2017/10/31 22:34:38 UTC
[1/2] beam git commit: [BEAM-3054] Uses locale-insensitive number
formatting in ESIO and tests
Repository: beam
Updated Branches:
refs/heads/master 54bc58bd0 -> c53a121f5
[BEAM-3054] Uses locale-insensitive number formatting in ESIO and tests
The ESIO5 test framework will randomly switch the locale of the current
test, and hence it discovered this bug: this is an actual bug.
This commit switches %d to %s where appropriate, i.e. where a
machine-readable decimal number in US locale is required.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/18e66d0b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/18e66d0b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/18e66d0b
Branch: refs/heads/master
Commit: 18e66d0b1547904dee3c5ef2f7d7b97990d58c36
Parents: 54bc58b
Author: Eugene Kirpichov <ki...@google.com>
Authored: Mon Oct 30 18:48:48 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Oct 31 15:25:18 2017 -0700
----------------------------------------------------------------------
.../apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java | 2 +-
.../beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java | 6 +++---
.../org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/18e66d0b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java
index 92ad608..50a8764 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java
@@ -60,7 +60,7 @@ public class ElasticsearchIOTest extends ESIntegTestCase implements Serializable
private String[] fillAddresses(){
ArrayList<String> result = new ArrayList<>();
for (InetSocketAddress address : cluster().httpAddresses()){
- result.add(String.format("http://%s:%d", address.getHostString(), address.getPort()));
+ result.add(String.format("http://%s:%s", address.getHostString(), address.getPort()));
}
return result.toArray(new String[result.size()]);
}
http://git-wip-us.apache.org/repos/asf/beam/blob/18e66d0b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java
index bbceb8d..06cfc24 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java
@@ -64,7 +64,7 @@ class ElasticSearchIOTestUtils {
int i = 0;
for (String document : data) {
bulkRequest.append(String.format(
- "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\", \"_id\" : \"%d\" } }%n%s%n",
+ "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\", \"_id\" : \"%s\" } }%n%s%n",
connectionConfiguration.getIndex(), connectionConfiguration.getType(), i++, document));
}
String endPoint = String.format("/%s/%s/_bulk", connectionConfiguration.getIndex(),
@@ -131,9 +131,9 @@ class ElasticSearchIOTestUtils {
int index = i % scientists.length;
// insert 2 malformed documents
if (InjectionMode.INJECT_SOME_INVALID_DOCS.equals(injectionMode) && (i == 6 || i == 7)) {
- data.add(String.format("{\"scientist\";\"%s\", \"id\":%d}", scientists[index], i));
+ data.add(String.format("{\"scientist\";\"%s\", \"id\":%s}", scientists[index], i));
} else {
- data.add(String.format("{\"scientist\":\"%s\", \"id\":%d}", scientists[index], i));
+ data.add(String.format("{\"scientist\":\"%s\", \"id\":%s}", scientists[index], i));
}
}
return data;
http://git-wip-us.apache.org/repos/asf/beam/blob/18e66d0b/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 c0d0819..023eb13 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
@@ -620,7 +620,7 @@ public class ElasticsearchIO {
if (source.numSlices != null && source.numSlices > 1){
// add slice to the user query
String sliceQuery = String
- .format("\"slice\": {\"id\": %d,\"max\": %d}", source.sliceId,
+ .format("\"slice\": {\"id\": %s,\"max\": %s}", source.sliceId,
source.numSlices);
query = query.replaceFirst("\\{", "{" + sliceQuery + ",");
}
[2/2] beam git commit: This closes #4060: [BEAM-3054] Uses
locale-insensitive number formatting in ESIO and tests
Posted by jk...@apache.org.
This closes #4060: [BEAM-3054] Uses locale-insensitive number formatting in ESIO and tests
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c53a121f
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c53a121f
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c53a121f
Branch: refs/heads/master
Commit: c53a121f5405571cf836ba90e218de81c3783406
Parents: 54bc58b 18e66d0
Author: Eugene Kirpichov <ki...@google.com>
Authored: Tue Oct 31 15:32:33 2017 -0700
Committer: Eugene Kirpichov <ki...@google.com>
Committed: Tue Oct 31 15:32:33 2017 -0700
----------------------------------------------------------------------
.../apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java | 2 +-
.../beam/sdk/io/elasticsearch/ElasticSearchIOTestUtils.java | 6 +++---
.../org/apache/beam/sdk/io/elasticsearch/ElasticsearchIO.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------