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

refactor json handling to use byte[] instead of string for better performance, storage, and memory consumption (apply to search)

This commit is contained in:
kimchy 2010-02-23 21:30:10 +02:00
parent defb6a336d
commit 46ff97af5e
7 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java
View File

@ -50,7 +50,7 @@ public class SearchRequest implements ActionRequest {
private String queryHint;
private String source;
private byte[] source;
private Scroll scroll;
@ -78,7 +78,7 @@ public class SearchRequest implements ActionRequest {
this(index, source.build());
}
public SearchRequest(String index, String source) {
public SearchRequest(String index, byte[] source) {
this(new String[]{index}, source);
}
@ -86,7 +86,7 @@ public class SearchRequest implements ActionRequest {
this(indices, source.build());
}
public SearchRequest(String[] indices, String source) {
public SearchRequest(String[] indices, byte[] source) {
this.indices = indices;
this.source = source;
}
@ -126,7 +126,7 @@ public class SearchRequest implements ActionRequest {
return source(sourceBuilder.build());
}
@Required public SearchRequest source(String source) {
@Required public SearchRequest source(byte[] source) {
this.source = source;
return this;
}
@ -148,7 +148,7 @@ public class SearchRequest implements ActionRequest {
return queryHint;
}
public String source() {
public byte[] source() {
return source;
}
@ -234,7 +234,8 @@ public class SearchRequest implements ActionRequest {
if (in.readBoolean()) {
timeout = readTimeValue(in);
}
source = in.readUTF();
source = new byte[in.readInt()];
in.readFully(source);
int size = in.readInt();
if (size == 0) {
@ -285,7 +286,8 @@ public class SearchRequest implements ActionRequest {
out.writeBoolean(true);
timeout.writeTo(out);
}
out.writeUTF(source);
out.writeInt(source.length);
out.write(source);
if (indexBoost == null) {
out.writeInt(0);
} else {

4
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
View File

@ -181,9 +181,9 @@ public class RestSearchAction extends BaseRestHandler {
return searchRequest;
}
private String parseSearchSource(RestRequest request) {
private byte[] parseSearchSource(RestRequest request) {
if (request.hasContent()) {
return request.contentAsString();
return request.contentAsBytes();
}
String queryString = request.param("q");
if (queryString == null) {

3
modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java
View File

@ -51,7 +51,6 @@ import org.elasticsearch.util.component.AbstractComponent;
import org.elasticsearch.util.component.Lifecycle;
import org.elasticsearch.util.component.LifecycleComponent;
import org.elasticsearch.util.concurrent.highscalelib.NonBlockingHashMapLong;
import org.elasticsearch.util.io.FastStringReader;
import org.elasticsearch.util.json.Jackson;
import org.elasticsearch.util.settings.Settings;
import org.elasticsearch.util.timer.Timeout;
@ -290,7 +289,7 @@ public class SearchService extends AbstractComponent implements LifecycleCompone
private void parseSource(SearchContext context) throws SearchParseException {
try {
JsonParser jp = jsonFactory.createJsonParser(new FastStringReader(context.source()));
JsonParser jp = jsonFactory.createJsonParser(context.source());
JsonToken token;
while ((token = jp.nextToken()) != JsonToken.END_OBJECT) {
if (token == JsonToken.FIELD_NAME) {

8
modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.search.builder;
import org.elasticsearch.index.query.json.JsonQueryBuilder;
import org.elasticsearch.search.SearchException;
import org.elasticsearch.util.json.StringJsonBuilder;
import org.elasticsearch.util.json.JsonBuilder;
import org.elasticsearch.util.json.ToJson;
import java.util.ArrayList;
@ -125,9 +125,9 @@ public class SearchSourceBuilder {
return this;
}
public String build() throws SearchException {
public byte[] build() throws SearchException {
try {
StringJsonBuilder builder = stringJsonBuilder();
JsonBuilder builder = binaryJsonBuilder();
builder.startObject();
if (from != -1) {
@ -182,7 +182,7 @@ public class SearchSourceBuilder {
builder.endObject();
return builder.string();
return builder.copiedBytes();
} catch (Exception e) {
throw new SearchSourceBuilderException("Failed to build search source", e);
}

14
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchRequest.java
View File

@ -70,16 +70,16 @@ public class InternalSearchRequest implements Streamable {
private String[] types = Strings.EMPTY_ARRAY;
private String source;
private byte[] source;
public InternalSearchRequest() {
}
public InternalSearchRequest(ShardRouting shardRouting, String source) {
public InternalSearchRequest(ShardRouting shardRouting, byte[] source) {
this(shardRouting.index(), shardRouting.id(), source);
}
public InternalSearchRequest(String index, int shardId, String source) {
public InternalSearchRequest(String index, int shardId, byte[] source) {
this.index = index;
this.shardId = shardId;
this.source = source;
@ -93,7 +93,7 @@ public class InternalSearchRequest implements Streamable {
return shardId;
}
public String source() {
public byte[] source() {
return this.source;
}
@ -165,7 +165,8 @@ public class InternalSearchRequest implements Streamable {
if (in.readBoolean()) {
timeout = readTimeValue(in);
}
source = in.readUTF();
source = new byte[in.readInt()];
in.readFully(source);
queryBoost = in.readFloat();
int typesSize = in.readInt();
if (typesSize > 0) {
@ -193,7 +194,8 @@ public class InternalSearchRequest implements Streamable {
out.writeBoolean(true);
timeout.writeTo(out);
}
out.writeUTF(source);
out.writeInt(source.length);
out.write(source);
out.writeFloat(queryBoost);
out.writeInt(types.length);
for (String type : types) {

6
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
View File

@ -50,7 +50,7 @@ public class SearchContext implements Releasable {
private final SearchShardTarget shardTarget;
private final String source;
private final byte[] source;
private final Engine.Searcher engineSearcher;
@ -100,7 +100,7 @@ public class SearchContext implements Releasable {
private volatile Timeout keepAliveTimeout;
public SearchContext(long id, SearchShardTarget shardTarget, TimeValue timeout, float queryBoost, String source,
public SearchContext(long id, SearchShardTarget shardTarget, TimeValue timeout, float queryBoost, byte[] source,
String[] types, Engine.Searcher engineSearcher, IndexService indexService) {
this.id = id;
this.shardTarget = shardTarget;
@ -138,7 +138,7 @@ public class SearchContext implements Releasable {
return this.shardTarget;
}
public String source() {
public byte[] source() {
return source;
}

3
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TransportTwoServersSearchTests.java
View File

@ -27,6 +27,7 @@ import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.test.integration.AbstractServersTests;
import org.elasticsearch.util.Unicode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@ -237,7 +238,7 @@ public class TransportTwoServersSearchTests extends AbstractServersTests {
@Test public void testFailedSearch() throws Exception {
logger.info("Start Testing failed search");
SearchResponse searchResponse = client.search(searchRequest("test").source("{ xxx }")).actionGet();
SearchResponse searchResponse = client.search(searchRequest("test").source(Unicode.fromStringAsBytes("{ xxx }"))).actionGet();
assertThat(searchResponse.successfulShards(), equalTo(0));
logger.info("Failures:");
for (ShardSearchFailure searchFailure : searchResponse.shardFailures()) {