Skip to content

Commit bda5983

Browse files
martijnvgmartijnvg
committed
Merge remote-tracking branch 'es/6.x' into ccr-6.x
* es/6.x: (29 commits) [Docs] Add rank_eval size parameter k (#29218) Docs: Update docs/index_.asciidoc (#29172) Docs: Link C++ client lib elasticlient (#28949) Docs: HighLevelRestClient#multiSearch (#29144) [DOCS] Remove ignore_z_value parameter link Add Z value support to geo_shape Change BroadcastResponse from ToXContentFragment to ToXContentObject (#28878) REST : Split `RestUpgradeAction` into two actions (#29124) [DOCS] Unregister repository instead of deleting it (#29206) Remove type casts in logging in server component (#28807) Add error file docs to important settings Add note to low-level client docs for DNS caching (#29213) testShrinkAfterUpgrade should only set mapping.single_type if bwc version > 5.5.0 Harden periodically check to avoid endless flush loop (#29125) REST high-level client: add force merge API (#28896) Remove license information from README.textile (#29198) Decouple more classes from XContentBuilder and make builder strict (#29197) Propagate mapping.single_type setting on shrinked index (#29202) [Docs] Fix missing closing block in cluster/misc.asciidoc RankEvalRequest should implement IndicesRequest (#29188) ...
2 parents 9bf83d2 + 472b564 commit bda5983

File tree

225 files changed

+3111
-1322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+3111
-1322
lines changed

‎README.textile‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Elasticsearch is a distributed RESTful search engine built for the cloud. Featur
2727
** All the power of Lucene easily exposed through simple configuration / plugins.
2828
* Per operation consistency
2929
** Single document level operations are atomic, consistent, isolated and durable.
30-
* Open Source under the Apache License, version 2 ("ALv2")
3130

3231
h2. Getting Started
3332

@@ -217,23 +216,3 @@ Elasticsearch (1.x), it is required to perform a full cluster restart. Please
217216
see the "setup reference":
218217
https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html
219218
for more details on the upgrade process.
220-
221-
h1. License
222-
223-
<pre>
224-
This software is licensed under the Apache License, version 2 ("ALv2"), quoted below.
225-
226-
Copyright 2009-2016 Elasticsearch <https://www.elastic.co>
227-
228-
Licensed under the Apache License, Version 2.0 (the "License"); you may not
229-
use this file except in compliance with the License. You may obtain a copy of
230-
the License at
231-
232-
http://www.apache.org/licenses/LICENSE-2.0
233-
234-
Unless required by applicable law or agreed to in writing, software
235-
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
236-
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
237-
License for the specific language governing permissions and limitations under
238-
the License.
239-
</pre>

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -475,14 +475,18 @@ class BuildPlugin implements Plugin<Project> {
475475
}
476476

477477
static void configureJavadoc(Project project) {
478-
project.tasks.withType(Javadoc) {
479-
executable = new File(project.compilerJavaHome, 'bin/javadoc')
478+
// remove compiled classes from the Javadoc classpath: http://mail.openjdk.java.net/pipermail/javadoc-dev/2018-January/000400.html
479+
final List<File> classes = new ArrayList<>()
480+
project.tasks.withType(JavaCompile) { javaCompile ->
481+
classes.add(javaCompile.destinationDir)
480482
}
481-
configureJavadocJar(project)
482-
if (project.compilerJavaVersion == JavaVersion.VERSION_1_10) {
483-
project.tasks.withType(Javadoc) { it.enabled = false }
484-
project.tasks.getByName('javadocJar').each { it.enabled = false }
483+
project.tasks.withType(Javadoc) { javadoc ->
484+
javadoc.executable = new File(project.compilerJavaHome, 'bin/javadoc')
485+
javadoc.classpath = javadoc.getClasspath().filter { f ->
486+
return classes.contains(f) == false
487+
}
485488
}
489+
configureJavadocJar(project)
486490
}
487491

488492
/** Adds a javadocJar task to generate a jar containing javadocs. */

‎client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,17 @@
3434
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
3535
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
3636
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
37+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
38+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
3739
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
3840
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
3941
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
4042
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
4143
import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
42-
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
43-
import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
4444
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
4545
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
46+
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
47+
import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
4648
import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
4749
import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
4850

@@ -261,6 +263,28 @@ public void flushAsync(FlushRequest flushRequest, ActionListener<FlushResponse>
261263
listener, emptySet(), headers);
262264
}
263265

266+
/**
267+
* Force merge one or more indices using the Force Merge API
268+
* <p>
269+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-forcemerge.html">
270+
* Force Merge API on elastic.co</a>
271+
*/
272+
public ForceMergeResponse forceMerge(ForceMergeRequest forceMergeRequest, Header... headers) throws IOException {
273+
return restHighLevelClient.performRequestAndParseEntity(forceMergeRequest, Request::forceMerge, ForceMergeResponse::fromXContent,
274+
emptySet(), headers);
275+
}
276+
277+
/**
278+
* Asynchronously force merge one or more indices using the Force Merge API
279+
* <p>
280+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-forcemerge.html">
281+
* Force Merge API on elastic.co</a>
282+
*/
283+
public void forceMergeAsync(ForceMergeRequest forceMergeRequest, ActionListener<ForceMergeResponse> listener, Header... headers) {
284+
restHighLevelClient.performRequestAsyncAndParseEntity(forceMergeRequest, Request::forceMerge, ForceMergeResponse::fromXContent,
285+
listener, emptySet(), headers);
286+
}
287+
264288
/**
265289
* Clears the cache of one or more indices using the Clear Cache API
266290
* <p>

‎client/rest-high-level/src/main/java/org/elasticsearch/client/Request.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
3838
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
3939
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
40+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
4041
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
4142
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
4243
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
@@ -235,6 +236,17 @@ static Request flush(FlushRequest flushRequest) {
235236
return new Request(HttpPost.METHOD_NAME, endpoint, parameters.getParams(), null);
236237
}
237238

239+
static Request forceMerge(ForceMergeRequest forceMergeRequest) {
240+
String[] indices = forceMergeRequest.indices() == null ? Strings.EMPTY_ARRAY : forceMergeRequest.indices();
241+
String endpoint = endpoint(indices, "_forcemerge");
242+
Params parameters = Params.builder();
243+
parameters.withIndicesOptions(forceMergeRequest.indicesOptions());
244+
parameters.putParam("max_num_segments", Integer.toString(forceMergeRequest.maxNumSegments()));
245+
parameters.putParam("only_expunge_deletes", Boolean.toString(forceMergeRequest.onlyExpungeDeletes()));
246+
parameters.putParam("flush", Boolean.toString(forceMergeRequest.flush()));
247+
return new Request(HttpPost.METHOD_NAME, endpoint, parameters.getParams(), null);
248+
}
249+
238250
static Request clearCache(ClearIndicesCacheRequest clearIndicesCacheRequest) {
239251
String[] indices = clearIndicesCacheRequest.indices() == null ? Strings.EMPTY_ARRAY :clearIndicesCacheRequest.indices();
240252
String endpoint = endpoint(indices, "_cache/clear");
@@ -533,7 +545,7 @@ static Request existsAlias(GetAliasesRequest getAliasesRequest) {
533545
}
534546

535547
static Request rankEval(RankEvalRequest rankEvalRequest) throws IOException {
536-
String endpoint = endpoint(rankEvalRequest.getIndices(), Strings.EMPTY_ARRAY, "_rank_eval");
548+
String endpoint = endpoint(rankEvalRequest.indices(), Strings.EMPTY_ARRAY, "_rank_eval");
537549
HttpEntity entity = createEntity(rankEvalRequest.getRankEvalSpec(), REQUEST_BODY_CONTENT_TYPE);
538550
return new Request(HttpGet.METHOD_NAME, endpoint, Collections.emptyMap(), entity);
539551
}

‎client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
3939
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
4040
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
41+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
42+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
4143
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
4244
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
4345
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
@@ -469,6 +471,32 @@ public void testClearCache() throws IOException {
469471
}
470472
}
471473

474+
public void testForceMerge() throws IOException {
475+
{
476+
String index = "index";
477+
Settings settings = Settings.builder()
478+
.put("number_of_shards", 1)
479+
.put("number_of_replicas", 0)
480+
.build();
481+
createIndex(index, settings);
482+
ForceMergeRequest forceMergeRequest = new ForceMergeRequest(index);
483+
ForceMergeResponse forceMergeResponse =
484+
execute(forceMergeRequest, highLevelClient().indices()::forceMerge, highLevelClient().indices()::forceMergeAsync);
485+
assertThat(forceMergeResponse.getTotalShards(), equalTo(1));
486+
assertThat(forceMergeResponse.getSuccessfulShards(), equalTo(1));
487+
assertThat(forceMergeResponse.getFailedShards(), equalTo(0));
488+
assertThat(forceMergeResponse.getShardFailures(), equalTo(BroadcastResponse.EMPTY));
489+
}
490+
{
491+
String nonExistentIndex = "non_existent_index";
492+
assertFalse(indexExists(nonExistentIndex));
493+
ForceMergeRequest forceMergeRequest = new ForceMergeRequest(nonExistentIndex);
494+
ElasticsearchException exception = expectThrows(ElasticsearchException.class,
495+
() -> execute(forceMergeRequest, highLevelClient().indices()::forceMerge, highLevelClient().indices()::forceMergeAsync));
496+
assertEquals(RestStatus.NOT_FOUND, exception.status());
497+
}
498+
}
499+
472500
public void testExistsAlias() throws IOException {
473501
GetAliasesRequest getAliasesRequest = new GetAliasesRequest("alias");
474502
assertFalse(execute(getAliasesRequest, highLevelClient().indices()::existsAlias, highLevelClient().indices()::existsAliasAsync));

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RequestTests.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
4141
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
4242
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
43+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
4344
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
4445
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
4546
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
@@ -623,6 +624,43 @@ public void testFlush() {
623624
assertThat(request.getMethod(), equalTo(HttpPost.METHOD_NAME));
624625
}
625626

627+
public void testForceMerge() {
628+
String[] indices = randomBoolean() ? null : randomIndicesNames(0, 5);
629+
ForceMergeRequest forceMergeRequest;
630+
if (randomBoolean()) {
631+
forceMergeRequest = new ForceMergeRequest(indices);
632+
} else {
633+
forceMergeRequest = new ForceMergeRequest();
634+
forceMergeRequest.indices(indices);
635+
}
636+
637+
Map<String, String> expectedParams = new HashMap<>();
638+
setRandomIndicesOptions(forceMergeRequest::indicesOptions, forceMergeRequest::indicesOptions, expectedParams);
639+
if (randomBoolean()) {
640+
forceMergeRequest.maxNumSegments(randomInt());
641+
}
642+
expectedParams.put("max_num_segments", Integer.toString(forceMergeRequest.maxNumSegments()));
643+
if (randomBoolean()) {
644+
forceMergeRequest.onlyExpungeDeletes(randomBoolean());
645+
}
646+
expectedParams.put("only_expunge_deletes", Boolean.toString(forceMergeRequest.onlyExpungeDeletes()));
647+
if (randomBoolean()) {
648+
forceMergeRequest.flush(randomBoolean());
649+
}
650+
expectedParams.put("flush", Boolean.toString(forceMergeRequest.flush()));
651+
652+
Request request = Request.forceMerge(forceMergeRequest);
653+
StringJoiner endpoint = new StringJoiner("/", "/", "");
654+
if (indices != null && indices.length > 0) {
655+
endpoint.add(String.join(",", indices));
656+
}
657+
endpoint.add("_forcemerge");
658+
assertThat(request.getEndpoint(), equalTo(endpoint.toString()));
659+
assertThat(request.getParameters(), equalTo(expectedParams));
660+
assertThat(request.getEntity(), nullValue());
661+
assertThat(request.getMethod(), equalTo(HttpPost.METHOD_NAME));
662+
}
663+
626664
public void testClearCache() {
627665
String[] indices = randomBoolean() ? null : randomIndicesNames(0, 5);
628666
ClearIndicesCacheRequest clearIndicesCacheRequest;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
3838
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
3939
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
40+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
41+
import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
4042
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
4143
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
4244
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
@@ -771,6 +773,79 @@ public void onFailure(Exception e) {
771773
}
772774
}
773775

776+
public void testForceMergeIndex() throws Exception {
777+
RestHighLevelClient client = highLevelClient();
778+
779+
{
780+
createIndex("index", Settings.EMPTY);
781+
}
782+
783+
{
784+
// tag::force-merge-request
785+
ForceMergeRequest request = new ForceMergeRequest("index1"); // <1>
786+
ForceMergeRequest requestMultiple = new ForceMergeRequest("index1", "index2"); // <2>
787+
ForceMergeRequest requestAll = new ForceMergeRequest(); // <3>
788+
// end::force-merge-request
789+
790+
// tag::force-merge-request-indicesOptions
791+
request.indicesOptions(IndicesOptions.lenientExpandOpen()); // <1>
792+
// end::force-merge-request-indicesOptions
793+
794+
// tag::force-merge-request-segments-num
795+
request.maxNumSegments(1); // <1>
796+
// end::force-merge-request-segments-num
797+
798+
// tag::force-merge-request-only-expunge-deletes
799+
request.onlyExpungeDeletes(true); // <1>
800+
// end::force-merge-request-only-expunge-deletes
801+
802+
// tag::force-merge-request-flush
803+
request.flush(true); // <1>
804+
// end::force-merge-request-flush
805+
806+
// tag::force-merge-execute
807+
ForceMergeResponse forceMergeResponse = client.indices().forceMerge(request);
808+
// end::force-merge-execute
809+
810+
// tag::force-merge-response
811+
int totalShards = forceMergeResponse.getTotalShards(); // <1>
812+
int successfulShards = forceMergeResponse.getSuccessfulShards(); // <2>
813+
int failedShards = forceMergeResponse.getFailedShards(); // <3>
814+
DefaultShardOperationFailedException[] failures = forceMergeResponse.getShardFailures(); // <4>
815+
// end::force-merge-response
816+
817+
// tag::force-merge-execute-listener
818+
ActionListener<ForceMergeResponse> listener = new ActionListener<ForceMergeResponse>() {
819+
@Override
820+
public void onResponse(ForceMergeResponse forceMergeResponse) {
821+
// <1>
822+
}
823+
824+
@Override
825+
public void onFailure(Exception e) {
826+
// <2>
827+
}
828+
};
829+
// end::force-merge-execute-listener
830+
831+
// tag::force-merge-execute-async
832+
client.indices().forceMergeAsync(request, listener); // <1>
833+
// end::force-merge-execute-async
834+
}
835+
{
836+
// tag::force-merge-notfound
837+
try {
838+
ForceMergeRequest request = new ForceMergeRequest("does_not_exist");
839+
client.indices().forceMerge(request);
840+
} catch (ElasticsearchException exception) {
841+
if (exception.status() == RestStatus.NOT_FOUND) {
842+
// <1>
843+
}
844+
}
845+
// end::force-merge-notfound
846+
}
847+
}
848+
774849
public void testClearCache() throws Exception {
775850
RestHighLevelClient client = highLevelClient();
776851

@@ -855,7 +930,6 @@ public void onFailure(Exception e) {
855930
}
856931
}
857932

858-
859933
public void testCloseIndex() throws Exception {
860934
RestHighLevelClient client = highLevelClient();
861935

0 commit comments

Comments
 (0)