forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix update_by_query's default size parameter (elastic#26784)
We were accidentally defaulting it to the scroll size. Untwists some of the tricks that we play with parsing so that the size is no longer scrambled. Closes elastic#26761
- Loading branch information
Showing
9 changed files
with
206 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
modules/reindex/src/test/java/org/elasticsearch/index/reindex/ManyDocumentsIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.reindex; | ||
|
|
||
| import org.apache.http.entity.ContentType; | ||
| import org.apache.http.entity.StringEntity; | ||
| import org.elasticsearch.client.Response; | ||
| import org.elasticsearch.common.xcontent.XContentHelper; | ||
| import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
| import org.elasticsearch.test.rest.ESRestTestCase; | ||
| import org.junit.Before; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Map; | ||
|
|
||
| import static java.util.Collections.emptyMap; | ||
| import static java.util.Collections.singletonMap; | ||
| import static org.hamcrest.Matchers.hasEntry; | ||
|
|
||
| /** | ||
| * Tests {@code _update_by_query}, {@code _delete_by_query}, and {@code _reindex} | ||
| * of many documents over REST. It is important to test many documents to make | ||
| * sure that we don't change the default behavior of touching <strong>all</strong> | ||
| * documents in the request. | ||
| */ | ||
| public class ManyDocumentsIT extends ESRestTestCase { | ||
| private final int count = between(150, 2000); | ||
|
|
||
| @Before | ||
| public void setupTestIndex() throws IOException { | ||
| StringBuilder bulk = new StringBuilder(); | ||
| for (int i = 0; i < count; i++) { | ||
| bulk.append("{\"index\":{}}\n"); | ||
| bulk.append("{\"test\":\"test\"}\n"); | ||
| } | ||
| client().performRequest("POST", "/test/test/_bulk", singletonMap("refresh", "true"), | ||
| new StringEntity(bulk.toString(), ContentType.APPLICATION_JSON)); | ||
| } | ||
|
|
||
| public void testReindex() throws IOException { | ||
| Map<String, Object> response = toMap(client().performRequest("POST", "/_reindex", emptyMap(), new StringEntity( | ||
| "{\"source\":{\"index\":\"test\"}, \"dest\":{\"index\":\"des\"}}", | ||
| ContentType.APPLICATION_JSON))); | ||
| assertThat(response, hasEntry("total", count)); | ||
| assertThat(response, hasEntry("created", count)); | ||
| } | ||
|
|
||
| public void testReindexFromRemote() throws IOException { | ||
| Map<?, ?> nodesInfo = toMap(client().performRequest("GET", "/_nodes/http")); | ||
| nodesInfo = (Map<?, ?>) nodesInfo.get("nodes"); | ||
| Map<?, ?> nodeInfo = (Map<?, ?>) nodesInfo.values().iterator().next(); | ||
| Map<?, ?> http = (Map<?, ?>) nodeInfo.get("http"); | ||
| String remote = "http://"+ http.get("publish_address"); | ||
| Map<String, Object> response = toMap(client().performRequest("POST", "/_reindex", emptyMap(), new StringEntity( | ||
| "{\"source\":{\"index\":\"test\",\"remote\":{\"host\":\"" + remote + "\"}}, \"dest\":{\"index\":\"des\"}}", | ||
| ContentType.APPLICATION_JSON))); | ||
| assertThat(response, hasEntry("total", count)); | ||
| assertThat(response, hasEntry("created", count)); | ||
| } | ||
|
|
||
|
|
||
| public void testUpdateByQuery() throws IOException { | ||
| Map<String, Object> response = toMap(client().performRequest("POST", "/test/_update_by_query")); | ||
| assertThat(response, hasEntry("total", count)); | ||
| assertThat(response, hasEntry("updated", count)); | ||
| } | ||
|
|
||
| public void testDeleteByQuery() throws IOException { | ||
| Map<String, Object> response = toMap(client().performRequest("POST", "/test/_delete_by_query", emptyMap(), new StringEntity( | ||
| "{\"query\":{\"match_all\":{}}}", | ||
| ContentType.APPLICATION_JSON))); | ||
| assertThat(response, hasEntry("total", count)); | ||
| assertThat(response, hasEntry("deleted", count)); | ||
| } | ||
|
|
||
| static Map<String, Object> toMap(Response response) throws IOException { | ||
| return XContentHelper.convertToMap(JsonXContent.jsonXContent, response.getEntity().getContent(), false); | ||
| } | ||
|
|
||
| } |
41 changes: 41 additions & 0 deletions
41
...s/reindex/src/test/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.reindex; | ||
|
|
||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.NamedXContentRegistry; | ||
| import org.elasticsearch.rest.RestController; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.rest.FakeRestRequest; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static java.util.Collections.emptyList; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| public class RestDeleteByQueryActionTests extends ESTestCase { | ||
| public void testParseEmpty() throws IOException { | ||
| RestDeleteByQueryAction action = new RestDeleteByQueryAction(Settings.EMPTY, mock(RestController.class)); | ||
| DeleteByQueryRequest request = action.buildRequest(new FakeRestRequest.Builder(new NamedXContentRegistry(emptyList())) | ||
| .build()); | ||
| assertEquals(AbstractBulkByScrollRequest.SIZE_ALL_MATCHES, request.getSize()); | ||
| assertEquals(AbstractBulkByScrollRequest.DEFAULT_SCROLL_SIZE, request.getSearchRequest().source().size()); | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...s/reindex/src/test/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.reindex; | ||
|
|
||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.NamedXContentRegistry; | ||
| import org.elasticsearch.rest.RestController; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.rest.FakeRestRequest; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static java.util.Collections.emptyList; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| public class RestUpdateByQueryActionTests extends ESTestCase { | ||
| public void testParseEmpty() throws IOException { | ||
| RestUpdateByQueryAction action = new RestUpdateByQueryAction(Settings.EMPTY, mock(RestController.class)); | ||
| UpdateByQueryRequest request = action.buildRequest(new FakeRestRequest.Builder(new NamedXContentRegistry(emptyList())) | ||
| .build()); | ||
| assertEquals(AbstractBulkByScrollRequest.SIZE_ALL_MATCHES, request.getSize()); | ||
| assertEquals(AbstractBulkByScrollRequest.DEFAULT_SCROLL_SIZE, request.getSearchRequest().source().size()); | ||
| } | ||
| } |