Merge branch 'main' into esql-knn-prefilter

Author: carlosdelest

docs/reference/elasticsearch/index.md

@@ -1,4 +1,4 @@
-# Elasticsearch and index management
+# Elasticsearch
 
 This section contains reference information for {{es}} and index management features.
 
@@ -7,7 +7,7 @@ To learn more about {{es}} features and how to get started, refer to the [{{es}}
 For more details about query and scripting languages, check these sections:
 * [Query languages](../query-languages/index.md)
 * [Scripting languages](../scripting-languages/index.md)
- 
+
 {{es}} also provides the following REST APIs:
 
 * [{{es}} API](https://www.elastic.co/docs/api/doc/elasticsearch)

docs/reference/elasticsearch/rest-apis/index.md

@@ -179,12 +179,9 @@ public Task register(String type, String action, TaskAwareRequest request, boole
     // package private for testing
     void startTrace(ThreadContext threadContext, Task task) {
         TaskId parentTask = task.getParentTaskId();
-        Map<String, Object> attributes = Map.of(
-            Tracer.AttributeKeys.TASK_ID,
-            task.getId(),
-            Tracer.AttributeKeys.PARENT_TASK_ID,
-            parentTask.toString()
-        );
+        Map<String, Object> attributes = parentTask.isSet()
+            ? Map.of(Tracer.AttributeKeys.TASK_ID, task.getId(), Tracer.AttributeKeys.PARENT_TASK_ID, parentTask.toString())
+            : Map.of(Tracer.AttributeKeys.TASK_ID, task.getId());
         tracer.startTrace(threadContext, task, task.getAction(), attributes);
     }
 

server/src/main/java/org/elasticsearch/tasks/TaskManager.java

@@ -285,6 +285,9 @@ public void testRegisterTaskStartsTracing() {
         final Tracer mockTracer = mock(Tracer.class);
         final TaskManager taskManager = new TaskManager(Settings.EMPTY, threadPool, Set.of(), mockTracer);
 
+        final boolean hasParentTask = randomBoolean();
+        final TaskId parentTask = hasParentTask ? new TaskId("parentNode", 1) : TaskId.EMPTY_TASK_ID;
+
         final Task task = taskManager.register("testType", "testAction", new TaskAwareRequest() {
 
             @Override
@@ -295,11 +298,14 @@ public void setRequestId(long requestId) {}
 
             @Override
             public TaskId getParentTask() {
-                return TaskId.EMPTY_TASK_ID;
+                return parentTask;
             }
         });
 
-        verify(mockTracer).startTrace(any(), eq(task), eq("testAction"), anyMap());
+        Map<String, Object> attributes = hasParentTask
+            ? Map.of(Tracer.AttributeKeys.TASK_ID, task.getId(), Tracer.AttributeKeys.PARENT_TASK_ID, parentTask.toString())
+            : Map.of(Tracer.AttributeKeys.TASK_ID, task.getId());
+        verify(mockTracer).startTrace(any(), eq(task), eq("testAction"), eq(attributes));
     }
 
     /**

server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java

@@ -22,6 +22,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -411,10 +412,16 @@ private MethodSpec addRawInputLoop(TypeName groupsType, TypeName valuesType) {
 
         builder.beginControlFlow("for (int groupPosition = 0; groupPosition < groups.getPositionCount(); groupPosition++)");
         {
-            if (groupsIsBlock) {
-                builder.beginControlFlow("if (groups.isNull(groupPosition))");
+            if (groupsIsBlock || valuesIsBlock) {
+                String conditions = Stream.of(
+                    groupsIsBlock ? "groups.isNull(groupPosition)" : null,
+                    valuesIsBlock ? "values.isNull(groupPosition + positionOffset)" : null
+                ).filter(Objects::nonNull).collect(Collectors.joining(" || "));
+                builder.beginControlFlow("if (" + conditions + ")");
                 builder.addStatement("continue");
                 builder.endControlFlow();
+            }
+            if (groupsIsBlock) {
                 builder.addStatement("int groupStart = groups.getFirstValueIndex(groupPosition)");
                 builder.addStatement("int groupEnd = groupStart + groups.getValueCount(groupPosition)");
                 builder.beginControlFlow("for (int g = groupStart; g < groupEnd; g++)");
@@ -430,9 +437,6 @@ private MethodSpec addRawInputLoop(TypeName groupsType, TypeName valuesType) {
             }
 
             if (valuesIsBlock) {
-                builder.beginControlFlow("if (values.isNull(groupPosition + positionOffset))");
-                builder.addStatement("continue");
-                builder.endControlFlow();
                 builder.addStatement("int valuesStart = values.getFirstValueIndex(groupPosition + positionOffset)");
                 builder.addStatement("int valuesEnd = valuesStart + values.getValueCount(groupPosition + positionOffset)");
                 if (aggParam.isArray()) {