From 8a5bb9be5584a7a107c135bbd428ccbc034a20f2 Mon Sep 17 00:00:00 2001 From: David Pilato Date: Sat, 25 Apr 2015 16:58:10 +0200 Subject: [PATCH] Bulk: remove unsafe option Due to https://github.com/elastic/elasticsearch/pull/10360 Need to be backported in master (2.0.0) and in es-1.x (1.6.0) Closes #98. (cherry picked from commit de31ef8) --- .../org/elasticsearch/river/rabbitmq/RabbitmqRiver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/elasticsearch/river/rabbitmq/RabbitmqRiver.java b/src/main/java/org/elasticsearch/river/rabbitmq/RabbitmqRiver.java index 68eeda5..8526b1e 100644 --- a/src/main/java/org/elasticsearch/river/rabbitmq/RabbitmqRiver.java +++ b/src/main/java/org/elasticsearch/river/rabbitmq/RabbitmqRiver.java @@ -539,7 +539,7 @@ private void processBody(byte[] body, BulkRequestBuilder bulkRequestBuilder) thr if (script != null) { processBodyPerLine(body, bulkRequestBuilder); } else { - bulkRequestBuilder.add(body, 0, body.length, false); + bulkRequestBuilder.add(body, 0, body.length); } } @@ -554,7 +554,7 @@ private void processBodyPerLine(byte[] body, BulkRequestBuilder bulkRequestBuild if (asMap.get("delete") != null) { // We don't touch deleteRequests String newContent = line + "\n"; - bulkRequestBuilder.add(newContent.getBytes(), 0, newContent.getBytes().length, false); + bulkRequestBuilder.add(newContent.getBytes(), 0, newContent.getBytes().length); } else { // But we send other requests to the script Engine in ctx field Map ctx; @@ -603,7 +603,7 @@ private void processBodyPerLine(byte[] body, BulkRequestBuilder bulkRequestBuild logger.trace("new bulk request is now: {}", request.toString()); } byte[] binRequest = request.toString().getBytes(); - bulkRequestBuilder.add(binRequest, 0, binRequest.length, false); + bulkRequestBuilder.add(binRequest, 0, binRequest.length); } } }