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

allow to nullify routing values when providing then through REST API

This commit is contained in:
kimchy 2011-06-13 01:23:14 +03:00
parent adbe0565f1
commit fc17ba1652
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java
View File

@ -30,12 +30,17 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.rest.*; import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestChannel;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.XContentRestResponse;
import org.elasticsearch.rest.XContentThrowableRestResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction; import static org.elasticsearch.cluster.metadata.AliasAction.*;
import static org.elasticsearch.rest.RestRequest.Method.*; import static org.elasticsearch.rest.RestRequest.Method.*;
import static org.elasticsearch.rest.RestStatus.*; import static org.elasticsearch.rest.RestStatus.*;
import static org.elasticsearch.rest.action.support.RestXContentBuilder.*; import static org.elasticsearch.rest.action.support.RestXContentBuilder.*;
@ -82,8 +87,11 @@ public class RestIndicesAliasesAction extends BaseRestHandler {
String alias = null; String alias = null;
Map<String, Object> filter = null; Map<String, Object> filter = null;
String routing = null; String routing = null;
boolean routingSet = false;
String indexRouting = null; String indexRouting = null;
boolean indexRoutingSet = false;
String searchRouting = null; String searchRouting = null;
boolean searchRoutingSet = false;
String currentFieldName = null; String currentFieldName = null;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
@ -94,11 +102,14 @@ public class RestIndicesAliasesAction extends BaseRestHandler {
} else if ("alias".equals(currentFieldName)) { } else if ("alias".equals(currentFieldName)) {
alias = parser.text(); alias = parser.text();
} else if ("routing".equals(currentFieldName)) { } else if ("routing".equals(currentFieldName)) {
routing = parser.text(); routing = parser.textOrNull();
routingSet = true;
} else if ("indexRouting".equals(currentFieldName) || "index-routing".equals(currentFieldName)) { } else if ("indexRouting".equals(currentFieldName) || "index-routing".equals(currentFieldName)) {
indexRouting = parser.text(); indexRouting = parser.textOrNull();
indexRoutingSet = true;
} else if ("searchRouting".equals(currentFieldName) || "search-routing".equals(currentFieldName)) { } else if ("searchRouting".equals(currentFieldName) || "search-routing".equals(currentFieldName)) {
searchRouting = parser.text(); searchRouting = parser.textOrNull();
searchRoutingSet = true;
} }
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if ("filter".equals(currentFieldName)) { if ("filter".equals(currentFieldName)) {
@ -114,13 +125,13 @@ public class RestIndicesAliasesAction extends BaseRestHandler {
} }
if (type == AliasAction.Type.ADD) { if (type == AliasAction.Type.ADD) {
AliasAction aliasAction = newAddAliasAction(index, alias).filter(filter); AliasAction aliasAction = newAddAliasAction(index, alias).filter(filter);
if (routing != null) { if (routingSet) {
aliasAction.routing(routing); aliasAction.routing(routing);
} }
if (indexRouting != null) { if (indexRoutingSet) {
aliasAction.indexRouting(indexRouting); aliasAction.indexRouting(indexRouting);
} }
if (searchRouting != null) { if (searchRoutingSet) {
aliasAction.searchRouting(searchRouting); aliasAction.searchRouting(searchRouting);
} }
indicesAliasesRequest.addAliasAction(aliasAction); indicesAliasesRequest.addAliasAction(aliasAction);