You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/06/30 14:28:46 UTC
[2/4] git commit: changes from comments.
changes from comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e0e4ad4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e0e4ad4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e0e4ad4a
Branch: refs/heads/master
Commit: e0e4ad4a7d1e12873b1aa1598fd7658f23462c2a
Parents: 1d36ab6
Author: Matthew Hager <Ma...@gmail.com>
Authored: Fri Jun 27 10:03:58 2014 -0500
Committer: Matthew Hager <Ma...@gmail.com>
Committed: Fri Jun 27 10:03:58 2014 -0500
----------------------------------------------------------------------
.../ElasticsearchPersistWriter.java | 61 +-------------------
1 file changed, 2 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e0e4ad4a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
index 95f5f57..c40cbfa 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
@@ -157,12 +157,7 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt
return docAsJson;
else {
ObjectNode node = (ObjectNode)OBJECT_MAPPER.readTree(docAsJson);
- try {
- node.put("_metadata", OBJECT_MAPPER.readTree(OBJECT_MAPPER.writeValueAsBytes(streamsDatum.getMetadata())));
- }
- catch(Throwable e) {
- LOGGER.warn("Unable to write metadata");
- }
+ node.put("_metadata", OBJECT_MAPPER.readTree(OBJECT_MAPPER.writeValueAsBytes(streamsDatum.getMetadata())));
return OBJECT_MAPPER.writeValueAsString(node);
}
}
@@ -180,8 +175,7 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt
} catch (Throwable e) {
// this line of code should be logically unreachable.
- LOGGER.warn("This is unexpected: {}", e.getMessage());
- e.printStackTrace();
+ LOGGER.warn("This is unexpected: {}", e);
}
}
@@ -316,27 +310,6 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt
add(indexRequestBuilder.request());
}
- /**
- * This function is trashed... needs to be fixed.
- *
- private synchronized void add(UpdateRequest request) {
- Preconditions.checkNotNull(request);
- checkAndCreateBulkRequest();
-
- checkIndexImplications(request.index());
-
- bulkRequest.add(request);
- try {
- Optional<Integer> size = Objects.firstNonNull(
- Optional.fromNullable(request.doc().source().length()),
- Optional.fromNullable(request.script().length()));
- trackItemAndBytesWritten(size.get().longValue());
- } catch (NullPointerException x) {
- trackItemAndBytesWritten(1000);
- }
- }
- */
-
protected void add(IndexRequest request) {
Preconditions.checkNotNull(request);
@@ -424,36 +397,6 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, DatumSt
}
}
- /**
- *
- private Set<String> checkIds(Set<String> input, String index, String type) {
-
- IdsQueryBuilder idsFilterBuilder = new IdsQueryBuilder();
-
- for (String s : input)
- idsFilterBuilder.addIds(s);
-
- SearchRequestBuilder searchRequestBuilder = this.manager.getClient()
- .prepareSearch(index)
- .setTypes(type)
- .setQuery(idsFilterBuilder)
- .addField("_id")
- .setSize(input.size());
-
- SearchHits hits = searchRequestBuilder.execute()
- .actionGet()
- .getHits();
-
- Set<String> toReturn = new HashSet<String>();
-
- for (SearchHit hit : hits) {
- toReturn.add(hit.getId());
- }
-
- return toReturn;
- }
- */
-
public void prepare(Object configurationObject) {
this.veryLargeBulk = config.getBulk() == null ?
Boolean.FALSE :