Multi Search API: Allow to set search_type on REST endpoint URI to ap…

…ply to all search requests, closes #2023.
elastic · Jun 13, 2012 · 133bd72 · 133bd72
1 parent cf1fd26
commit 133bd72
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java
@@ -62,7 +62,8 @@ public MultiSearchRequest add(SearchRequest request) {
         return this;
     }
 
-    public MultiSearchRequest add(byte[] data, int from, int length, boolean contentUnsafe, @Nullable String[] indices, @Nullable String[] types) throws Exception {
+    public MultiSearchRequest add(byte[] data, int from, int length, boolean contentUnsafe,
+                                  @Nullable String[] indices, @Nullable String[] types, @Nullable String searchType) throws Exception {
         XContent xContent = XContentFactory.xContent(data, from, length);
         byte marker = xContent.streamSeparator();
         while (true) {
@@ -80,6 +81,7 @@ public MultiSearchRequest add(byte[] data, int from, int length, boolean content
             if (types != null && types.length > 0) {
                 searchRequest.types(types);
             }
+            searchRequest.searchType(searchType);
 
             // now parse the action
             if (nextMarker - from > 0) {

diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
@@ -62,7 +62,8 @@ public void handleRequest(final RestRequest request, final RestChannel channel)
         String[] types = RestActions.splitTypes(request.param("type"));
 
         try {
-            multiSearchRequest.add(request.contentByteArray(), request.contentByteArrayOffset(), request.contentLength(), request.contentUnsafe(), indices, types);
+            multiSearchRequest.add(request.contentByteArray(), request.contentByteArrayOffset(), request.contentLength(), request.contentUnsafe(),
+                    indices, types, request.param("search_type"));
         } catch (Exception e) {
             try {
                 XContentBuilder builder = restContentBuilder(request);

diff --git a/src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java b/src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java
@@ -36,7 +36,7 @@ public class MultiSearchRequestTests {
     @Test
     public void simpleAdd() throws Exception {
         byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch1.json");
-        MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null);
+        MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null);
         assertThat(request.requests().size(), equalTo(5));
         assertThat(request.requests().get(0).indices()[0], equalTo("test"));
         assertThat(request.requests().get(0).types().length, equalTo(0));
@@ -54,7 +54,7 @@ public void simpleAdd() throws Exception {
     @Test
     public void simpleAdd2() throws Exception {
         byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch2.json");
-        MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null);
+        MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null);
         assertThat(request.requests().size(), equalTo(5));
         assertThat(request.requests().get(0).indices()[0], equalTo("test"));
         assertThat(request.requests().get(0).types().length, equalTo(0));