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

add support for op type in also in bulk

This commit is contained in:
kimchy 2010-09-22 00:07:45 +02:00
parent 3479f2a981
commit cfdf6b0103
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ public class BulkRequest implements ActionRequest {
String index = null; String index = null;
String type = null; String type = null;
String id = null; String id = null;
String opType = null;
String currentFieldName = null; String currentFieldName = null;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
@ -115,6 +116,8 @@ public class BulkRequest implements ActionRequest {
type = parser.text(); type = parser.text();
} else if ("id".equals(currentFieldName)) { } else if ("id".equals(currentFieldName)) {
id = parser.text(); id = parser.text();
} else if ("op_type".equals(currentFieldName) || "opType".equals(currentFieldName)) {
opType = parser.text();
} }
} }
} }
@ -126,9 +129,20 @@ public class BulkRequest implements ActionRequest {
if (nextMarker == -1) { if (nextMarker == -1) {
break; break;
} }
if ("index".equals(action)) {
if (opType == null) {
add(new IndexRequest(index, type, id) add(new IndexRequest(index, type, id)
.create("create".equals(action))
.source(data, from, nextMarker - from, contentUnsafe)); .source(data, from, nextMarker - from, contentUnsafe));
} else {
add(new IndexRequest(index, type, id)
.create("create".equals(opType))
.source(data, from, nextMarker - from, contentUnsafe));
}
} else if ("create".equals(action)) {
add(new IndexRequest(index, type, id)
.create(true)
.source(data, from, nextMarker - from, contentUnsafe));
}
// move pointers // move pointers
from = nextMarker + 1; from = nextMarker + 1;
} }