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

Rest Delete API does not honor the `version_type` parameter, closes #1337.

This commit is contained in:
Shay Banon 2011-09-15 17:07:04 +03:00
parent 25c6e8512d
commit a7e43005bb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java
View File

@ -29,7 +29,14 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString; import org.elasticsearch.common.xcontent.XContentBuilderString;
import org.elasticsearch.rest.*; import org.elasticsearch.index.VersionType;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestChannel;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.XContentRestResponse;
import org.elasticsearch.rest.XContentThrowableRestResponse;
import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestActions;
import org.elasticsearch.rest.action.support.RestXContentBuilder; import org.elasticsearch.rest.action.support.RestXContentBuilder;
@ -59,6 +66,7 @@ public class RestDeleteAction extends BaseRestHandler {
deleteRequest.listenerThreaded(false); deleteRequest.listenerThreaded(false);
// we don't spawn, then fork if local // we don't spawn, then fork if local
deleteRequest.operationThreaded(true); deleteRequest.operationThreaded(true);
deleteRequest.versionType(VersionType.fromString(request.param("version_type"), deleteRequest.versionType()));
String replicationType = request.param("replication"); String replicationType = request.param("replication");
if (replicationType != null) { if (replicationType != null) {