Merge branch 'master' into filter_path_dots

Author: nik9000

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,3 @@ contact_links:
   - name: Question
     url: https://discuss.elastic.co/c/elasticsearch
     about: Ask (and answer) questions here.
-  - name: Security Vulnerability
-    url: https://www.elastic.co/community/security
-    about: Send security vulnerability reports to [email protected].

benchmarks/src/main/java/org/elasticsearch/benchmark/search/aggregations/AggConstructionContentionBenchmark.java

@@ -28,9 +28,9 @@
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.NestedLookup;
 import org.elasticsearch.index.mapper.NumberFieldMapper;
 import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
-import org.elasticsearch.index.mapper.ObjectMapper;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.support.NestedScope;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -277,7 +277,7 @@ public Optional<SortAndFormats> buildSort(List<SortBuilder<?>> sortBuilders) thr
         }
 
         @Override
-        public ObjectMapper getObjectMapper(String path) {
+        public NestedLookup nestedLookup() {
             throw new UnsupportedOperationException();
         }
 
@@ -346,6 +346,11 @@ public boolean enableRewriteToFilterByFilter() {
             return true;
         }
 
+        @Override
+        public boolean isInSortOrderExecutionRequired() {
+            return false;
+        }
+
         @Override
         public void close() {
             List<Releasable> releaseMe = new ArrayList<>(this.releaseMe);

build-tools-internal/src/main/resources/changelog-schema.json

@@ -25,30 +25,24 @@
             "Authentication",
             "Authorization",
             "Autoscaling",
+            "CAT APIs",
             "CCR",
             "CRUD",
             "Client",
             "Cluster Coordination",
+            "Data streams",
             "Discovery-Plugins",
             "Distributed",
             "EQL",
             "Engine",
             "FIPS",
-            "Features/CAT APIs",
-            "Features/Data streams",
-            "Features/Features",
-            "Features/ILM+SLM",
-            "Features/Indices APIs",
-            "Features/Ingest",
-            "Features/Java High Level REST Client",
-            "Features/Java Low Level REST Client",
-            "Features/Monitoring",
-            "Features/Stats",
-            "Features/Watcher",
+            "Features",
             "Geo",
             "Graph",
             "Highlighting",
+            "ILM+SLM",
             "IdentityProvider",
+            "Indices APIs",
             "Infra/CLI",
             "Infra/Circuit Breakers",
             "Infra/Core",
@@ -60,9 +54,13 @@
             "Infra/Scripting",
             "Infra/Settings",
             "Infra/Transport API",
+            "Ingest",
+            "Java High Level REST Client",
+            "Java Low Level REST Client",
             "License",
             "Machine Learning",
             "Mapping",
+            "Monitoring",
             "Network",
             "Packaging",
             "Percolator",
@@ -76,11 +74,13 @@
             "Search",
             "Security",
             "Snapshot/Restore",
+            "Stats",
             "Store",
             "Suggesters",
             "TLS",
             "Task Management",
-            "Transform"
+            "Transform",
+            "Watcher"
           ]
         },
         "type": {

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

@@ -187,6 +187,8 @@
 import org.elasticsearch.search.aggregations.pipeline.ParsedStatsBucket;
 import org.elasticsearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregationBuilder;
 import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder;
+import org.elasticsearch.search.aggregations.timeseries.ParsedTimeSeries;
+import org.elasticsearch.search.aggregations.timeseries.TimeSeriesAggregationBuilder;
 import org.elasticsearch.search.suggest.Suggest;
 import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
 import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder;
@@ -2893,6 +2895,7 @@ static List<NamedXContentRegistry.Entry> getDefaultNamedXContents() {
         map.put(StringStatsAggregationBuilder.NAME, (p, c) -> ParsedStringStats.PARSER.parse(p, (String) c));
         map.put(TopMetricsAggregationBuilder.NAME, (p, c) -> ParsedTopMetrics.PARSER.parse(p, (String) c));
         map.put(InferencePipelineAggregationBuilder.NAME, (p, c) -> ParsedInference.fromXContent(p, (String) (c)));
+        map.put(TimeSeriesAggregationBuilder.NAME, (p, c) -> ParsedTimeSeries.fromXContent(p, (String) (c)));
         List<NamedXContentRegistry.Entry> entries = map.entrySet()
             .stream()
             .map(entry -> new NamedXContentRegistry.Entry(Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))

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

@@ -341,19 +341,19 @@ protected static TaskId findTaskToRethrottle(String actionName, String descripti
             list.rethrowFailures("Finding tasks to rethrottle");
             List<TaskGroup> taskGroups = list.getTaskGroups()
                 .stream()
-                .filter(taskGroup -> taskGroup.getTaskInfo().getDescription().equals(description))
+                .filter(taskGroup -> taskGroup.taskInfo().description().equals(description))
                 .collect(Collectors.toList());
             assertThat("tasks are left over from the last execution of this test", taskGroups, hasSize(lessThan(2)));
             if (0 == taskGroups.size()) {
                 // The parent task hasn't started yet
                 continue;
             }
             TaskGroup taskGroup = taskGroups.get(0);
-            assertThat(taskGroup.getChildTasks(), empty());
+            assertThat(taskGroup.childTasks(), empty());
             // check that the task initialized enough that it can rethrottle too.
-            Map<String, Object> statusMap = ((RawTaskStatus) taskGroup.getTaskInfo().getStatus()).toMap();
+            Map<String, Object> statusMap = ((RawTaskStatus) taskGroup.taskInfo().status()).toMap();
             if (statusMap.get("batches").equals(1)) {
-                return taskGroup.getTaskInfo().getTaskId();
+                return taskGroup.taskInfo().taskId();
             }
         } while (System.nanoTime() - start < TimeUnit.SECONDS.toNanos(10));
         throw new AssertionError(

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

@@ -255,11 +255,11 @@ public void onFailure(Exception e) {
             assertThat(response.getTaskFailures(), empty());
             assertThat(response.getNodeFailures(), empty());
             assertThat(response.getTasks(), hasSize(1));
-            assertEquals(taskIdToRethrottle, response.getTasks().get(0).getTaskId());
-            assertThat(response.getTasks().get(0).getStatus(), instanceOf(RawTaskStatus.class));
+            assertEquals(taskIdToRethrottle, response.getTasks().get(0).taskId());
+            assertThat(response.getTasks().get(0).status(), instanceOf(RawTaskStatus.class));
             assertEquals(
                 Float.toString(requestsPerSecond),
-                ((RawTaskStatus) response.getTasks().get(0).getStatus()).toMap().get("requests_per_second").toString()
+                ((RawTaskStatus) response.getTasks().get(0).status()).toMap().get("requests_per_second").toString()
             );
             assertTrue(taskFinished.await(10, TimeUnit.SECONDS));
 

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

@@ -208,7 +208,7 @@ static void mockGetRoot(RestClient restClient) throws IOException {
             Build.CURRENT.hash(),
             Build.CURRENT.date(),
             false,
-            Build.CURRENT.getQualifiedVersion()
+            Build.CURRENT.qualifiedVersion()
         );
 
         mockGetRoot(restClient, build, true);
@@ -220,7 +220,7 @@ static void mockGetRoot(RestClient restClient) throws IOException {
     public static void mockGetRoot(RestClient restClient, Build build, boolean setProductHeader) throws IOException {
         org.elasticsearch.action.main.MainResponse mainResp = new org.elasticsearch.action.main.MainResponse(
             "node",
-            Version.fromString(build.getQualifiedVersion().replace("-SNAPSHOT", "")),
+            Version.fromString(build.qualifiedVersion().replace("-SNAPSHOT", "")),
             new ClusterName("cluster"),
             "uuid",
             build

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

@@ -47,14 +47,14 @@ public void testListTasks() throws IOException {
         assertThat(response.getTasks().size(), greaterThanOrEqualTo(2));
         boolean listTasksFound = false;
         for (TaskGroup taskGroup : response.getTaskGroups()) {
-            org.elasticsearch.tasks.TaskInfo parent = taskGroup.getTaskInfo();
-            if ("cluster:monitor/tasks/lists".equals(parent.getAction())) {
-                assertThat(taskGroup.getChildTasks().size(), equalTo(1));
-                TaskGroup childGroup = taskGroup.getChildTasks().iterator().next();
-                assertThat(childGroup.getChildTasks().isEmpty(), equalTo(true));
-                org.elasticsearch.tasks.TaskInfo child = childGroup.getTaskInfo();
-                assertThat(child.getAction(), equalTo("cluster:monitor/tasks/lists[n]"));
-                assertThat(child.getParentTaskId(), equalTo(parent.getTaskId()));
+            org.elasticsearch.tasks.TaskInfo parent = taskGroup.taskInfo();
+            if ("cluster:monitor/tasks/lists".equals(parent.action())) {
+                assertThat(taskGroup.childTasks().size(), equalTo(1));
+                TaskGroup childGroup = taskGroup.childTasks().iterator().next();
+                assertThat(childGroup.childTasks().isEmpty(), equalTo(true));
+                org.elasticsearch.tasks.TaskInfo child = childGroup.taskInfo();
+                assertThat(child.action(), equalTo("cluster:monitor/tasks/lists[n]"));
+                assertThat(child.parentTaskId(), equalTo(parent.taskId()));
                 listTasksFound = true;
             }
         }
@@ -92,9 +92,9 @@ public void testGetValidTask() throws Exception {
             assertTrue(taskResponse.isCompleted());
         }
         org.elasticsearch.tasks.TaskInfo info = taskResponse.getTaskInfo();
-        assertTrue(info.isCancellable());
-        assertEquals("reindex from [source1] to [dest]", info.getDescription());
-        assertEquals("indices:data/write/reindex", info.getAction());
+        assertTrue(info.cancellable());
+        assertEquals("reindex from [source1] to [dest]", info.description());
+        assertEquals("indices:data/write/reindex", info.action());
         if (taskResponse.isCompleted() == false) {
             assertBusy(checkTaskCompletionStatus(client(), taskId));
         }
@@ -115,7 +115,7 @@ public void testCancelTasks() throws IOException {
         org.elasticsearch.tasks.TaskInfo firstTask = listResponse.getTasks().get(0);
         String node = listResponse.getPerNodeTasks().keySet().iterator().next();
 
-        CancelTasksRequest cancelTasksRequest = new CancelTasksRequest.Builder().withTaskId(new TaskId(node, firstTask.getId())).build();
+        CancelTasksRequest cancelTasksRequest = new CancelTasksRequest.Builder().withTaskId(new TaskId(node, firstTask.id())).build();
         CancelTasksResponse response = execute(
             cancelTasksRequest,
             highLevelClient().tasks()::cancel,

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

@@ -139,11 +139,11 @@ public void onFailure(Exception e) {
                 highLevelClient()::updateByQueryRethrottleAsync
             );
             assertThat(response.getTasks(), hasSize(1));
-            assertEquals(taskIdToRethrottle, response.getTasks().get(0).getTaskId());
-            assertThat(response.getTasks().get(0).getStatus(), instanceOf(RawTaskStatus.class));
+            assertEquals(taskIdToRethrottle, response.getTasks().get(0).taskId());
+            assertThat(response.getTasks().get(0).status(), instanceOf(RawTaskStatus.class));
             assertEquals(
                 Float.toString(requestsPerSecond),
-                ((RawTaskStatus) response.getTasks().get(0).getStatus()).toMap().get("requests_per_second").toString()
+                ((RawTaskStatus) response.getTasks().get(0).status()).toMap().get("requests_per_second").toString()
             );
             assertTrue(taskFinished.await(10, TimeUnit.SECONDS));
 

client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java

@@ -96,19 +96,19 @@ protected void assertInstances(
             .collect(Collectors.toMap(org.elasticsearch.client.tasks.TaskInfo::getTaskId, Function.identity()));
         for (TaskInfo ti : sTasks) {
             org.elasticsearch.client.tasks.TaskInfo taskInfo = cTasksMap.get(
-                new org.elasticsearch.client.tasks.TaskId(ti.getTaskId().getNodeId(), ti.getTaskId().getId())
+                new org.elasticsearch.client.tasks.TaskId(ti.taskId().getNodeId(), ti.taskId().getId())
             );
-            assertEquals(ti.getAction(), taskInfo.getAction());
-            assertEquals(ti.getDescription(), taskInfo.getDescription());
-            assertEquals(new HashMap<>(ti.getHeaders()), new HashMap<>(taskInfo.getHeaders()));
-            assertEquals(ti.getType(), taskInfo.getType());
-            assertEquals(ti.getStartTime(), taskInfo.getStartTime());
-            assertEquals(ti.getRunningTimeNanos(), taskInfo.getRunningTimeNanos());
-            assertEquals(ti.isCancellable(), taskInfo.isCancellable());
-            assertEquals(ti.isCancelled(), taskInfo.isCancelled());
-            assertEquals(ti.getParentTaskId().getNodeId(), taskInfo.getParentTaskId().getNodeId());
-            assertEquals(ti.getParentTaskId().getId(), taskInfo.getParentTaskId().getId());
-            FakeTaskStatus status = (FakeTaskStatus) ti.getStatus();
+            assertEquals(ti.action(), taskInfo.getAction());
+            assertEquals(ti.description(), taskInfo.getDescription());
+            assertEquals(new HashMap<>(ti.headers()), new HashMap<>(taskInfo.getHeaders()));
+            assertEquals(ti.type(), taskInfo.getType());
+            assertEquals(ti.startTime(), taskInfo.getStartTime());
+            assertEquals(ti.runningTimeNanos(), taskInfo.getRunningTimeNanos());
+            assertEquals(ti.cancellable(), taskInfo.isCancellable());
+            assertEquals(ti.cancelled(), taskInfo.isCancelled());
+            assertEquals(ti.parentTaskId().getNodeId(), taskInfo.getParentTaskId().getNodeId());
+            assertEquals(ti.parentTaskId().getId(), taskInfo.getParentTaskId().getId());
+            FakeTaskStatus status = (FakeTaskStatus) ti.status();
             assertEquals(status.code, taskInfo.getStatus().get("code"));
             assertEquals(status.status, taskInfo.getStatus().get("status"));