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

Bulk API: Rename `index` to `_index`, `type` to `_type` and `id` to `_id`, closes #421.

This commit is contained in:
kimchy 2010-10-10 19:31:56 +02:00
parent 1b593c4d72
commit a14b73bc13
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
View File

@ -110,11 +110,11 @@ public class BulkRequest implements ActionRequest {
if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName();
} else if (token.isValue()) {
if ("index".equals(currentFieldName)) {
if ("_index".equals(currentFieldName)) {
index = parser.text();
} else if ("type".equals(currentFieldName)) {
} else if ("_type".equals(currentFieldName)) {
type = parser.text();
} else if ("id".equals(currentFieldName)) {
} else if ("_id".equals(currentFieldName)) {
id = parser.text();
} else if ("op_type".equals(currentFieldName) || "opType".equals(currentFieldName)) {
opType = parser.text();

34
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java
View File

@ -28,6 +28,7 @@ import org.elasticsearch.client.Requests;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.rest.*;
import java.io.IOException;
@ -38,10 +39,10 @@ import static org.elasticsearch.rest.action.support.RestXContentBuilder.*;
/**
* <pre>
* { "index" : { "index" : "test", "type" : "type1", "id" : "1" }
* { "index" : { "_index" : "test", "_type" : "type1", "_id" : "1" }
* { "type1" : { "field1" : "value1" } }
* { "delete" : { "index" : "test", "type" : "type1", "id" : "2" } }
* { "create" : { "index" : "test", "type" : "type1", "id" : "1" }
* { "delete" : { "_index" : "test", "_type" : "type1", "_id" : "2" } }
* { "create" : { "_index" : "test", "_type" : "type1", "_id" : "1" }
* { "type1" : { "field1" : "value1" } }
* </pre>
*
@ -77,15 +78,17 @@ public class RestBulkAction extends BaseRestHandler {
XContentBuilder builder = restContentBuilder(request);
builder.startObject();
builder.startArray("items");
builder.startArray(Fields.ITEMS);
for (BulkItemResponse itemResponse : response) {
builder.startObject();
builder.startObject(itemResponse.opType());
builder.field("index", itemResponse.index());
builder.field("type", itemResponse.type());
builder.field("id", itemResponse.id());
builder.field(Fields._INDEX, itemResponse.index());
builder.field(Fields._TYPE, itemResponse.type());
builder.field(Fields._ID, itemResponse.id());
if (itemResponse.failed()) {
builder.field("error", itemResponse.failure().message());
builder.field(Fields.ERROR, itemResponse.failure().message());
} else {
builder.field(Fields.OK, true);
}
builder.endObject();
builder.endObject();
@ -109,12 +112,13 @@ public class RestBulkAction extends BaseRestHandler {
});
}
private int findNextMarker(byte marker, int from, byte[] data, int length) {
for (int i = from; i < length; i++) {
if (data[i] == marker) {
return i;
}
}
return -1;
static final class Fields {
static final XContentBuilderString ITEMS = new XContentBuilderString("items");
static final XContentBuilderString _INDEX = new XContentBuilderString("_index");
static final XContentBuilderString _TYPE = new XContentBuilderString("_type");
static final XContentBuilderString _ID = new XContentBuilderString("_id");
static final XContentBuilderString ERROR = new XContentBuilderString("error");
static final XContentBuilderString OK = new XContentBuilderString("ok");
}
}