honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow index and type to be specified as arrays in MultiSearchRequest

This commit is contained in:
Simon Willnauer 2012-12-13 12:03:39 +01:00 committed by Shay Banon
parent 6342beeeb0
commit 750c30f0b8
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.action.search; package org.elasticsearch.action.search;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.elasticsearch.ElasticSearchParseException;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.action.support.IgnoreIndices;
@ -34,6 +35,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.action.ValidateActions.addValidationError;
@ -124,6 +126,14 @@ public class MultiSearchRequest extends ActionRequest<MultiSearchRequest> {
} else if ("ignore_indices".equals(currentFieldName) || "ignoreIndices".equals(currentFieldName)) { } else if ("ignore_indices".equals(currentFieldName) || "ignoreIndices".equals(currentFieldName)) {
searchRequest.ignoreIndices(IgnoreIndices.fromString(parser.text())); searchRequest.ignoreIndices(IgnoreIndices.fromString(parser.text()));
} }
} else if (token == XContentParser.Token.START_ARRAY) {
if ("index".equals(currentFieldName) || "indices".equals(currentFieldName)) {
searchRequest.indices(parseArray(parser));
} else if ("type".equals(currentFieldName) || "type".equals(currentFieldName)) {
searchRequest.types(parseArray(parser));
} else {
throw new ElasticSearchParseException(currentFieldName + " doesn't support arrays");
}
} }
} }
} }
@ -149,6 +159,14 @@ public class MultiSearchRequest extends ActionRequest<MultiSearchRequest> {
return this; return this;
} }
private String[] parseArray(XContentParser parser) throws IOException {
final List<String> list = new ArrayList<String>();
assert parser.currentToken() == XContentParser.Token.START_ARRAY;
while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
list.add(parser.text());
}
return list.toArray(new String[list.size()]);
}
private int findNextMarker(byte marker, int from, BytesReference data, int length) { private int findNextMarker(byte marker, int from, BytesReference data, int length) {
for (int i = from; i < length; i++) { for (int i = from; i < length; i++) {

19
src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java
View File

@ -68,4 +68,23 @@ public class MultiSearchRequestTests {
assertThat(request.requests().get(4).indices(), nullValue()); assertThat(request.requests().get(4).indices(), nullValue());
assertThat(request.requests().get(4).types().length, equalTo(0)); assertThat(request.requests().get(4).types().length, equalTo(0));
} }
@Test
public void simpleAdd3() throws Exception {
byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch3.json");
MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null);
assertThat(request.requests().size(), equalTo(4));
assertThat(request.requests().get(0).indices()[0], equalTo("test0"));
assertThat(request.requests().get(0).indices()[1], equalTo("test1"));
assertThat(request.requests().get(1).indices()[0], equalTo("test2"));
assertThat(request.requests().get(1).indices()[1], equalTo("test3"));
assertThat(request.requests().get(1).types()[0], equalTo("type1"));
assertThat(request.requests().get(2).indices()[0], equalTo("test4"));
assertThat(request.requests().get(2).indices()[1], equalTo("test1"));
assertThat(request.requests().get(2).types()[0], equalTo("type2"));
assertThat(request.requests().get(2).types()[1], equalTo("type1"));
assertThat(request.requests().get(3).indices(), nullValue());
assertThat(request.requests().get(3).types().length, equalTo(0));
assertThat(request.requests().get(3).searchType(), equalTo(SearchType.COUNT));
}
} }

8
src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch3.json Normal file
View File

@ -0,0 +1,8 @@
{"index":["test0", "test1"]}
{"query" : {"match_all" {}}}
{"index" : "test2,test3", "type" : "type1"}
{"query" : {"match_all" {}}}
{"index" : ["test4", "test1"], "type" : [ "type2", "type1" ]}
{"query" : {"match_all" {}}}
{"search_type" : "count"}
{"query" : {"match_all" {}}}