Adapt to ElasticSearch v0.90.4 + Bump to 1.3.0

RefreshRequestBuilder.setWaitForOperations() seemed to have to impact, and was removed. The setForce() function seems to have another use. See #5.
yakaz · Sep 24, 2013 · a9009f3 · a9009f3
1 parent 9d950a1
commit a9009f3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,9 +32,9 @@ Version matrix:
     ┌───────────────────────────────┬────────────────────────┐
     │ Update By Query Action Plugin │ ElasticSearch          │
     ├───────────────────────────────┼────────────────────────┤
-    │ master                        │ 0.90.3 ─► master       │
+    │ master                        │ 0.90.4 ─►              │
     ├───────────────────────────────┼────────────────────────┤
-    │ 1.2.0                         │ 0.90.3 ─► master       │
+    │ 1.2.0                         │ 0.90.3                 │
     ├───────────────────────────────┼────────────────────────┤
     │ 1.1.0                         │ 0.90.0.beta1 ─► 0.90.2 │
     ├───────────────────────────────┼────────────────────────┤

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.yakaz.elasticsearch.plugins</groupId>
     <artifactId>elasticsearch-action-updatebyquery</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <url>http://github.com/yakaz/elasticsearch-action-updatebyquery</url>
@@ -45,7 +45,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>0.90.3</elasticsearch.version>
+        <elasticsearch.version>0.90.4</elasticsearch.version>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/org/elasticsearch/action/updatebyquery/TransportShardUpdateByQueryAction.java b/src/main/java/org/elasticsearch/action/updatebyquery/TransportShardUpdateByQueryAction.java
@@ -152,7 +152,7 @@ private void doExecuteInternal(ShardUpdateByQueryRequest request, ActionListener
         SearchContext searchContext = new SearchContext(
                 0,
                 shardSearchRequest,
-                null, indexShard.searcher(), indexService, indexShard,
+                null, indexShard.acquireSearcher(), indexService, indexShard,
                 scriptService,
                 cacheRecycler
         );

diff --git a/src/main/java/org/elasticsearch/rest/action/updatebyquery/RestUpdateByQueryAction.java b/src/main/java/org/elasticsearch/rest/action/updatebyquery/RestUpdateByQueryAction.java
@@ -40,10 +40,9 @@
 import java.io.IOException;
 import java.util.Map;
 
+import static org.elasticsearch.common.Strings.splitStringByCommaToArray;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.rest.RestStatus.OK;
-import static org.elasticsearch.rest.action.support.RestActions.splitIndices;
-import static org.elasticsearch.rest.action.support.RestActions.splitTypes;
 
 /**
  * Rest handler for update by query requests.
@@ -62,8 +61,8 @@ public RestUpdateByQueryAction(Settings settings, Client client, RestController
 
     public void handleRequest(final RestRequest request, final RestChannel channel) {
         UpdateByQueryRequest udqRequest = new UpdateByQueryRequest(
-                splitIndices(request.param("index")),
-                splitTypes(request.param("type"))
+                splitStringByCommaToArray(request.param("index")),
+                splitStringByCommaToArray(request.param("type"))
         );
         udqRequest.listenerThreaded(false);
         String replicationType = request.param("replication");

diff --git a/src/test/java/org/elasticsearch/test/integration/updatebyquery/UpdateByQueryTests.java b/src/test/java/org/elasticsearch/test/integration/updatebyquery/UpdateByQueryTests.java
@@ -336,7 +336,7 @@ public void testUpdateByQuery_fields() throws Exception {
                 .setTTL(111211211)
                 .setSource("field1", 1, "content", "foo")
                 .execute().actionGet();
-        client.admin().indices().prepareRefresh("test").setWaitForOperations(true).execute().actionGet();
+        client.admin().indices().prepareRefresh("test").execute().actionGet();
 
         CountResponse countResponse = client.prepareCount("test")
                 .setQuery(termQuery("field1", 1).buildAsBytes())