honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-05 20:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove stale comment about setting routing before parent

Browse Source 
Order does not matter anymore since we merged #15371
This commit is contained in:
javanna 2017-02-17 17:10:53 +01:00 committed by Luca Cavanna
parent 576e698613
commit 578853f264
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
View File

@ -432,7 +432,6 @@ public class BulkRequest extends ActionRequest implements CompositeIndicesReques
} }
line++; line++;
// order is important, we set parent after routing, so routing will be set to parent if not set explicitly
// we use internalAdd so we don't fork here, this allows us not to copy over the big byte array to small chunks // we use internalAdd so we don't fork here, this allows us not to copy over the big byte array to small chunks
// of index request. // of index request.
if ("index".equals(action)) { if ("index".equals(action)) {

2
core/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java
View File

@ -44,7 +44,7 @@ public class RestDeleteAction extends BaseRestHandler {
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
DeleteRequest deleteRequest = new DeleteRequest(request.param("index"), request.param("type"), request.param("id")); DeleteRequest deleteRequest = new DeleteRequest(request.param("index"), request.param("type"), request.param("id"));
deleteRequest.routing(request.param("routing")); deleteRequest.routing(request.param("routing"));
deleteRequest.parent(request.param("parent")); // order is important, set it after routing, so it will set the routing deleteRequest.parent(request.param("parent"));
deleteRequest.timeout(request.paramAsTime("timeout", DeleteRequest.DEFAULT_TIMEOUT)); deleteRequest.timeout(request.paramAsTime("timeout", DeleteRequest.DEFAULT_TIMEOUT));
deleteRequest.setRefreshPolicy(request.param("refresh")); deleteRequest.setRefreshPolicy(request.param("refresh"));
deleteRequest.version(RestActions.parseVersion(request)); deleteRequest.version(RestActions.parseVersion(request));

2
core/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java
View File

@ -53,7 +53,7 @@ public class RestGetAction extends BaseRestHandler {
final GetRequest getRequest = new GetRequest(request.param("index"), request.param("type"), request.param("id")); final GetRequest getRequest = new GetRequest(request.param("index"), request.param("type"), request.param("id"));
getRequest.operationThreaded(true); getRequest.operationThreaded(true);
getRequest.refresh(request.paramAsBoolean("refresh", getRequest.refresh())); getRequest.refresh(request.paramAsBoolean("refresh", getRequest.refresh()));
getRequest.routing(request.param("routing")); // order is important, set it after routing, so it will set the routing getRequest.routing(request.param("routing"));
getRequest.parent(request.param("parent")); getRequest.parent(request.param("parent"));
getRequest.preference(request.param("preference")); getRequest.preference(request.param("preference"));
getRequest.realtime(request.paramAsBoolean("realtime", getRequest.realtime())); getRequest.realtime(request.paramAsBoolean("realtime", getRequest.realtime()));

2
core/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java
View File

@ -62,7 +62,7 @@ public class RestIndexAction extends BaseRestHandler {
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
IndexRequest indexRequest = new IndexRequest(request.param("index"), request.param("type"), request.param("id")); IndexRequest indexRequest = new IndexRequest(request.param("index"), request.param("type"), request.param("id"));
indexRequest.routing(request.param("routing")); indexRequest.routing(request.param("routing"));
indexRequest.parent(request.param("parent")); // order is important, set it after routing, so it will set the routing indexRequest.parent(request.param("parent"));
indexRequest.setPipeline(request.param("pipeline")); indexRequest.setPipeline(request.param("pipeline"));
indexRequest.source(request.content(), request.getXContentType()); indexRequest.source(request.content(), request.getXContentType());
indexRequest.timeout(request.paramAsTime("timeout", IndexRequest.DEFAULT_TIMEOUT)); indexRequest.timeout(request.paramAsTime("timeout", IndexRequest.DEFAULT_TIMEOUT));

2
core/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java
View File

@ -83,7 +83,7 @@ public class RestUpdateAction extends BaseRestHandler {
IndexRequest upsertRequest = updateRequest.upsertRequest(); IndexRequest upsertRequest = updateRequest.upsertRequest();
if (upsertRequest != null) { if (upsertRequest != null) {
upsertRequest.routing(request.param("routing")); upsertRequest.routing(request.param("routing"));
upsertRequest.parent(request.param("parent")); // order is important, set it after routing, so it will set the routing upsertRequest.parent(request.param("parent"));
upsertRequest.version(RestActions.parseVersion(request)); upsertRequest.version(RestActions.parseVersion(request));
upsertRequest.versionType(VersionType.fromString(request.param("version_type"), upsertRequest.versionType())); upsertRequest.versionType(VersionType.fromString(request.param("version_type"), upsertRequest.versionType()));
} }