Skip to content

Commit 688833b

Browse files
DaveCTurnerDaveCTurner
committed
Merge branch 'master' of github.com:elastic/elasticsearch into zendisco2
2 parents ecd5a7f + 8188d9f commit 688833b

File tree

412 files changed

+9520
-3319
lines changed

Some content is hidden

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

412 files changed

+9520
-3319
lines changed

‎CONTRIBUTING.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,20 @@ then `File->New Project From Existing Sources`. Point to the root of
111111
the source directory, select
112112
`Import project from external model->Gradle`, enable
113113
`Use auto-import`. In order to run tests directly from
114-
IDEA 2017.2 and above it is required to disable IDEA run launcher to avoid
115-
finding yourself in "jar hell", which can be achieved by adding the
114+
IDEA 2017.2 and above, it is required to disable the IDEA run launcher in order to avoid
115+
`idea_rt.jar` causing "jar hell". This can be achieved by adding the
116116
`-Didea.no.launcher=true` [JVM
117-
option](https://intellij-support.jetbrains.com/hc/en-us/articles/206544869-Configuring-JVM-options-and-platform-properties)
118-
or by adding `idea.no.launcher=true` to the
117+
option](https://intellij-support.jetbrains.com/hc/en-us/articles/206544869-Configuring-JVM-options-and-platform-properties).
118+
Alternatively, `idea.no.launcher=true` can be set in the
119119
[`idea.properties`](https://www.jetbrains.com/help/idea/file-idea-properties.html)
120-
file which can be accessed under Help > Edit Custom Properties within IDEA. You
121-
may also need to [remove `ant-javafx.jar` from your
120+
file which can be accessed under Help > Edit Custom Properties (this will require a
121+
restart of IDEA). For IDEA 2017.3 and above, in addition to the JVM option, you will need to go to
122+
`Run->Edit Configurations->...->Defaults->JUnit` and change the value for the `Shorten command line` setting from
123+
`user-local default: none` to `classpath file`. You may also need to [remove `ant-javafx.jar` from your
122124
classpath](https://github.com/elastic/elasticsearch/issues/14348) if that is
123-
reported as a source of jar hell. Additionally, in order to run tests directly
124-
from IDEA 2017.3 and above, go to `Run->Edit Configurations...` and change the
125-
value for the `Shorten command line` setting from `user-local default: none` to
126-
`classpath file`.
125+
reported as a source of jar hell.
126+
127+
To run an instance of elasticsearch from the source code run `gradle run`
127128

128129
The Elasticsearch codebase makes heavy use of Java `assert`s and the
129130
test runner requires that assertions be enabled within the JVM. This

‎Vagrantfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,9 @@ Defaults env_keep += "BATS_ARCHIVES"
307307
SUDOERS_VARS
308308
chmod 0440 /etc/sudoers.d/elasticsearch_vars
309309
SHELL
310+
# This prevents leftovers from previous tests using the
311+
# same VM from messing up the current test
312+
config.vm.provision "clean_tmp", run: "always", type: "shell", inline: <<-SHELL
313+
rm -rf /tmp/elasticsearch*
314+
SHELL
310315
end

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -269,35 +269,6 @@ class ClusterFormationTasks {
269269
into node.baseDir
270270
}
271271
break;
272-
case 'rpm':
273-
File rpmDatabase = new File(node.baseDir, 'rpm-database')
274-
File rpmExtracted = new File(node.baseDir, 'rpm-extracted')
275-
/* Delay reading the location of the rpm file until task execution */
276-
Object rpm = "${ -> configuration.singleFile}"
277-
extract = project.tasks.create(name: name, type: LoggedExec, dependsOn: extractDependsOn) {
278-
commandLine 'rpm', '--badreloc', '--nodeps', '--noscripts', '--notriggers',
279-
'--dbpath', rpmDatabase,
280-
'--relocate', "/=${rpmExtracted}",
281-
'-i', rpm
282-
doFirst {
283-
rpmDatabase.deleteDir()
284-
rpmExtracted.deleteDir()
285-
}
286-
outputs.dir rpmExtracted
287-
}
288-
break;
289-
case 'deb':
290-
/* Delay reading the location of the deb file until task execution */
291-
File debExtracted = new File(node.baseDir, 'deb-extracted')
292-
Object deb = "${ -> configuration.singleFile}"
293-
extract = project.tasks.create(name: name, type: LoggedExec, dependsOn: extractDependsOn) {
294-
commandLine 'dpkg-deb', '-x', deb, debExtracted
295-
doFirst {
296-
debExtracted.deleteDir()
297-
}
298-
outputs.dir debExtracted
299-
}
300-
break;
301272
default:
302273
throw new InvalidUserDataException("Unknown distribution: ${node.config.distribution}")
303274
}

‎buildSrc/src/main/resources/checkstyle_suppressions.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@
658658
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]RelocationIT.java" checks="LineLength" />
659659
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]TruncatedRecoveryIT.java" checks="LineLength" />
660660
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]BytesRestResponseTests.java" checks="LineLength" />
661-
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasResolveRoutingIT.java" checks="LineLength" />
662661
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasRoutingIT.java" checks="LineLength" />
663662
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]SimpleRoutingIT.java" checks="LineLength" />
664663
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]script[/\\]FileScriptTests.java" checks="LineLength" />

‎buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.0.0-alpha1
2-
lucene = 7.2.0-snapshot-8c94404
2+
lucene = 7.2.0-snapshot-7deca62
33

44
# optional dependencies
55
spatial4j = 0.6

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

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,25 @@
2121

2222
import org.apache.http.Header;
2323
import org.elasticsearch.action.ActionListener;
24+
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
25+
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
2426
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
2527
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
28+
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
29+
import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
2630

2731
import java.io.IOException;
2832
import java.util.Collections;
2933

3034
/**
3135
* A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Indices API.
32-
*
36+
* <p>
3337
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices.html">Indices API on elastic.co</a>
3438
*/
3539
public final class IndicesClient {
3640
private final RestHighLevelClient restHighLevelClient;
3741

38-
public IndicesClient(RestHighLevelClient restHighLevelClient) {
42+
IndicesClient(RestHighLevelClient restHighLevelClient) {
3943
this.restHighLevelClient = restHighLevelClient;
4044
}
4145

@@ -56,8 +60,55 @@ public DeleteIndexResponse deleteIndex(DeleteIndexRequest deleteIndexRequest, He
5660
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html">
5761
* Delete Index API on elastic.co</a>
5862
*/
59-
public void deleteIndexAsync(DeleteIndexRequest deleteIndexRequest, ActionListener<DeleteIndexResponse> listener, Header... headers) {
63+
public void deleteIndexAsync(DeleteIndexRequest deleteIndexRequest, ActionListener<DeleteIndexResponse> listener,
64+
Header... headers) {
6065
restHighLevelClient.performRequestAsyncAndParseEntity(deleteIndexRequest, Request::deleteIndex, DeleteIndexResponse::fromXContent,
6166
listener, Collections.emptySet(), headers);
6267
}
68+
69+
/**
70+
* Creates an index using the Create Index API
71+
* <p>
72+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html">
73+
* Create Index API on elastic.co</a>
74+
*/
75+
public CreateIndexResponse createIndex(CreateIndexRequest createIndexRequest, Header... headers) throws IOException {
76+
return restHighLevelClient.performRequestAndParseEntity(createIndexRequest, Request::createIndex, CreateIndexResponse::fromXContent,
77+
Collections.emptySet(), headers);
78+
}
79+
80+
/**
81+
* Asynchronously creates an index using the Create Index API
82+
* <p>
83+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html">
84+
* Create Index API on elastic.co</a>
85+
*/
86+
public void createIndexAsync(CreateIndexRequest createIndexRequest, ActionListener<CreateIndexResponse> listener,
87+
Header... headers) {
88+
restHighLevelClient.performRequestAsyncAndParseEntity(createIndexRequest, Request::createIndex, CreateIndexResponse::fromXContent,
89+
listener, Collections.emptySet(), headers);
90+
}
91+
92+
/**
93+
* Opens an index using the Open Index API
94+
* <p>
95+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-open-close.html">
96+
* Open Index API on elastic.co</a>
97+
*/
98+
public OpenIndexResponse openIndex(OpenIndexRequest openIndexRequest, Header... headers) throws IOException {
99+
return restHighLevelClient.performRequestAndParseEntity(openIndexRequest, Request::openIndex, OpenIndexResponse::fromXContent,
100+
Collections.emptySet(), headers);
101+
}
102+
103+
/**
104+
* Asynchronously opens an index using the Open Index API
105+
* <p>
106+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-open-close.html">
107+
* Open Index API on elastic.co</a>
108+
*/
109+
public void openIndexAsync(OpenIndexRequest openIndexRequest, ActionListener<OpenIndexResponse> listener, Header... headers) {
110+
restHighLevelClient.performRequestAsyncAndParseEntity(openIndexRequest, Request::openIndex, OpenIndexResponse::fromXContent,
111+
listener, Collections.emptySet(), headers);
112+
}
113+
63114
}

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@
2929
import org.apache.http.entity.ContentType;
3030
import org.apache.lucene.util.BytesRef;
3131
import org.elasticsearch.action.DocWriteRequest;
32+
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
3233
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
34+
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
3335
import org.elasticsearch.action.bulk.BulkRequest;
3436
import org.elasticsearch.action.delete.DeleteRequest;
3537
import org.elasticsearch.action.get.GetRequest;
3638
import org.elasticsearch.action.index.IndexRequest;
3739
import org.elasticsearch.action.search.ClearScrollRequest;
40+
import org.elasticsearch.action.search.MultiSearchRequest;
3841
import org.elasticsearch.action.search.SearchRequest;
3942
import org.elasticsearch.action.search.SearchScrollRequest;
4043
import org.elasticsearch.action.support.ActiveShardCount;
@@ -49,6 +52,7 @@
4952
import org.elasticsearch.common.unit.TimeValue;
5053
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
5154
import org.elasticsearch.common.xcontent.ToXContent;
55+
import org.elasticsearch.common.xcontent.XContent;
5256
import org.elasticsearch.common.xcontent.XContentBuilder;
5357
import org.elasticsearch.common.xcontent.XContentHelper;
5458
import org.elasticsearch.common.xcontent.XContentParser;
@@ -135,6 +139,32 @@ static Request deleteIndex(DeleteIndexRequest deleteIndexRequest) {
135139
return new Request(HttpDelete.METHOD_NAME, endpoint, parameters.getParams(), null);
136140
}
137141

142+
static Request openIndex(OpenIndexRequest openIndexRequest) {
143+
String endpoint = endpoint(openIndexRequest.indices(), Strings.EMPTY_ARRAY, "_open");
144+
145+
Params parameters = Params.builder();
146+
147+
parameters.withTimeout(openIndexRequest.timeout());
148+
parameters.withMasterTimeout(openIndexRequest.masterNodeTimeout());
149+
parameters.withWaitForActiveShards(openIndexRequest.waitForActiveShards());
150+
parameters.withIndicesOptions(openIndexRequest.indicesOptions());
151+
152+
return new Request(HttpPost.METHOD_NAME, endpoint, parameters.getParams(), null);
153+
}
154+
155+
static Request createIndex(CreateIndexRequest createIndexRequest) throws IOException {
156+
String endpoint = endpoint(createIndexRequest.indices(), Strings.EMPTY_ARRAY, "");
157+
158+
Params parameters = Params.builder();
159+
parameters.withTimeout(createIndexRequest.timeout());
160+
parameters.withMasterTimeout(createIndexRequest.masterNodeTimeout());
161+
parameters.withWaitForActiveShards(createIndexRequest.waitForActiveShards());
162+
parameters.withUpdateAllTypes(createIndexRequest.updateAllTypes());
163+
164+
HttpEntity entity = createEntity(createIndexRequest, REQUEST_BODY_CONTENT_TYPE);
165+
return new Request(HttpPut.METHOD_NAME, endpoint, parameters.getParams(), entity);
166+
}
167+
138168
static Request info() {
139169
return new Request(HttpGet.METHOD_NAME, "/", Collections.emptyMap(), null);
140170
}
@@ -381,6 +411,18 @@ static Request clearScroll(ClearScrollRequest clearScrollRequest) throws IOExcep
381411
return new Request("DELETE", "/_search/scroll", Collections.emptyMap(), entity);
382412
}
383413

414+
static Request multiSearch(MultiSearchRequest multiSearchRequest) throws IOException {
415+
Params params = Params.builder();
416+
params.putParam(RestSearchAction.TYPED_KEYS_PARAM, "true");
417+
if (multiSearchRequest.maxConcurrentSearchRequests() != MultiSearchRequest.MAX_CONCURRENT_SEARCH_REQUESTS_DEFAULT) {
418+
params.putParam("max_concurrent_searches", Integer.toString(multiSearchRequest.maxConcurrentSearchRequests()));
419+
}
420+
XContent xContent = REQUEST_BODY_CONTENT_TYPE.xContent();
421+
byte[] source = MultiSearchRequest.writeMultiLineFormat(multiSearchRequest, xContent);
422+
HttpEntity entity = new ByteArrayEntity(source, createContentType(xContent.type()));
423+
return new Request("GET", "/_msearch", params.getParams(), entity);
424+
}
425+
384426
private static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) throws IOException {
385427
BytesRef source = XContentHelper.toXContent(toXContent, xContentType, false).toBytesRef();
386428
return new ByteArrayEntity(source.bytes, source.offset, source.length, createContentType(xContentType));
@@ -520,6 +562,13 @@ Params withTimeout(TimeValue timeout) {
520562
return putParam("timeout", timeout);
521563
}
522564

565+
Params withUpdateAllTypes(boolean updateAllTypes) {
566+
if (updateAllTypes) {
567+
return putParam("update_all_types", Boolean.TRUE.toString());
568+
}
569+
return this;
570+
}
571+
523572
Params withVersion(long version) {
524573
if (version != Versions.MATCH_ANY) {
525574
return putParam("version", Long.toString(version));

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.elasticsearch.action.ActionListener;
2727
import org.elasticsearch.action.ActionRequest;
2828
import org.elasticsearch.action.ActionRequestValidationException;
29+
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
30+
import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
2931
import org.elasticsearch.action.bulk.BulkRequest;
3032
import org.elasticsearch.action.bulk.BulkResponse;
3133
import org.elasticsearch.action.delete.DeleteRequest;
@@ -38,6 +40,8 @@
3840
import org.elasticsearch.action.main.MainResponse;
3941
import org.elasticsearch.action.search.ClearScrollRequest;
4042
import org.elasticsearch.action.search.ClearScrollResponse;
43+
import org.elasticsearch.action.search.MultiSearchRequest;
44+
import org.elasticsearch.action.search.MultiSearchResponse;
4145
import org.elasticsearch.action.search.SearchRequest;
4246
import org.elasticsearch.action.search.SearchResponse;
4347
import org.elasticsearch.action.search.SearchScrollRequest;
@@ -281,7 +285,7 @@ public final GetResponse get(GetRequest getRequest, Header... headers) throws IO
281285
*
282286
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-get.html">Get API on elastic.co</a>
283287
*/
284-
public void getAsync(GetRequest getRequest, ActionListener<GetResponse> listener, Header... headers) {
288+
public final void getAsync(GetRequest getRequest, ActionListener<GetResponse> listener, Header... headers) {
285289
performRequestAsyncAndParseEntity(getRequest, Request::get, GetResponse::fromXContent, listener, singleton(404), headers);
286290
}
287291

@@ -377,6 +381,28 @@ public final void searchAsync(SearchRequest searchRequest, ActionListener<Search
377381
performRequestAsyncAndParseEntity(searchRequest, Request::search, SearchResponse::fromXContent, listener, emptySet(), headers);
378382
}
379383

384+
/**
385+
* Executes a multi search using the msearch API
386+
*
387+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html">Multi search API on
388+
* elastic.co</a>
389+
*/
390+
public final MultiSearchResponse multiSearch(MultiSearchRequest multiSearchRequest, Header... headers) throws IOException {
391+
return performRequestAndParseEntity(multiSearchRequest, Request::multiSearch, MultiSearchResponse::fromXContext,
392+
emptySet(), headers);
393+
}
394+
395+
/**
396+
* Asynchronously executes a multi search using the msearch API
397+
*
398+
* See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html">Multi search API on
399+
* elastic.co</a>
400+
*/
401+
public final void multiSearchAsync(MultiSearchRequest searchRequest, ActionListener<MultiSearchResponse> listener, Header... headers) {
402+
performRequestAsyncAndParseEntity(searchRequest, Request::multiSearch, MultiSearchResponse::fromXContext, listener,
403+
emptySet(), headers);
404+
}
405+
380406
/**
381407
* Executes a search using the Search Scroll API
382408
*

0 commit comments

Comments
 (0)