Merge branch 'main' of github.com:elastic/elasticsearch

Max Hniebergall · Max Hniebergall · commit 8175a0eaf3ae · 2024-09-20T11:18:01.000-04:00
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionModuleCheckTaskProvider.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionModuleCheckTaskProvider.java
@@ -59,7 +59,6 @@ public class InternalDistributionModuleCheckTaskProvider {
         "org.elasticsearch.nativeaccess",
         "org.elasticsearch.plugin",
         "org.elasticsearch.plugin.analysis",
-        "org.elasticsearch.pluginclassloader",
         "org.elasticsearch.securesm",
         "org.elasticsearch.server",
         "org.elasticsearch.simdvec",
diff --git a/libs/plugin-classloader/build.gradle b/libs/plugin-classloader/build.gradle
diff --git a/libs/plugin-classloader/src/main/java/module-info.java b/libs/plugin-classloader/src/main/java/module-info.java
diff --git a/server/build.gradle b/server/build.gradle
@@ -40,8 +40,6 @@ dependencies {
   api project(":libs:elasticsearch-tdigest")
   implementation project(":libs:elasticsearch-simdvec")
 
-  implementation project(':libs:elasticsearch-plugin-classloader')
-
   // lucene
   api "org.apache.lucene:lucene-core:${versions.lucene}"
   api "org.apache.lucene:lucene-analysis-common:${versions.lucene}"
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -25,7 +25,6 @@
     requires org.elasticsearch.nativeaccess;
     requires org.elasticsearch.geo;
     requires org.elasticsearch.lz4;
-    requires org.elasticsearch.pluginclassloader;
     requires org.elasticsearch.securesm;
     requires org.elasticsearch.xcontent;
     requires org.elasticsearch.logging;
diff --git a/server/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java b/server/src/main/java/org/elasticsearch/plugins/ExtendedPluginsClassLoader.java
@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.plugins.loader;
+package org.elasticsearch.plugins;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -17,7 +17,7 @@
 /**
  * A classloader that is a union over the parent core classloader and classloaders of extended plugins.
  */
-public class ExtendedPluginsClassLoader extends ClassLoader {
+class ExtendedPluginsClassLoader extends ClassLoader {
 
     /** Loaders of plugins extended by a plugin. */
     private final List<ClassLoader> extendedLoaders;
diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java b/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java
diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java
@@ -468,7 +468,7 @@ private void loadBundle(
             );
         }
 
-        final ClassLoader parentLoader = PluginLoaderIndirection.createLoader(
+        final ClassLoader parentLoader = ExtendedPluginsClassLoader.create(
             getClass().getClassLoader(),
             extendedPlugins.stream().map(LoadedPlugin::loader).toList()
         );
diff --git a/server/src/main/resources/org/elasticsearch/bootstrap/security.policy b/server/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -53,11 +53,6 @@ grant codeBase "${codebase.lucene-misc}" {
   permission java.nio.file.LinkPermission "hard";
 };
 
-grant codeBase "${codebase.elasticsearch-plugin-classloader}" {
-  // needed to create the classloader which allows plugins to extend other plugins
-  permission java.lang.RuntimePermission "createClassLoader";
-};
-
 grant codeBase "${codebase.elasticsearch-core}" {
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.lang.RuntimePermission "getClassLoader";
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/OrdinalsGroupingOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/OrdinalsGroupingOperator.java
@@ -46,6 +46,7 @@
 import java.util.Objects;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
@@ -325,7 +326,11 @@ private static void checkState(boolean condition, String msg) {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "[" + "aggregators=" + aggregatorFactories + "]";
+        String aggregatorDescriptions = aggregatorFactories.stream()
+            .map(factory -> "\"" + factory.describe() + "\"")
+            .collect(Collectors.joining(", "));
+
+        return this.getClass().getSimpleName() + "[" + "aggregators=[" + aggregatorDescriptions + "]]";
     }
 
     record SegmentID(int shardIndex, int segmentIndex) {
diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java
@@ -323,6 +323,35 @@ public void testProfile() throws IOException {
         );
     }
 
+    public void testProfileOrdinalsGroupingOperator() throws IOException {
+        indexTimestampData(1);
+
+        RequestObjectBuilder builder = requestObjectBuilder().query(fromIndex() + " | STATS AVG(value) BY test.keyword");
+        builder.profile(true);
+        if (Build.current().isSnapshot()) {
+            // Lock to shard level partitioning, so we get consistent profile output
+            builder.pragmas(Settings.builder().put("data_partitioning", "shard").build());
+        }
+        Map<String, Object> result = runEsql(builder);
+
+        List<List<String>> signatures = new ArrayList<>();
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> profiles = (List<Map<String, Object>>) ((Map<String, Object>) result.get("profile")).get("drivers");
+        for (Map<String, Object> p : profiles) {
+            fixTypesOnProfile(p);
+            assertThat(p, commonProfile());
+            List<String> sig = new ArrayList<>();
+            @SuppressWarnings("unchecked")
+            List<Map<String, Object>> operators = (List<Map<String, Object>>) p.get("operators");
+            for (Map<String, Object> o : operators) {
+                sig.add((String) o.get("operator"));
+            }
+            signatures.add(sig);
+        }
+
+        assertThat(signatures.get(0).get(2), equalTo("OrdinalsGroupingOperator[aggregators=[\"sum of longs\", \"count\"]]"));
+    }
+
     public void testInlineStatsProfile() throws IOException {
         assumeTrue("INLINESTATS only available on snapshots", Build.current().isSnapshot());
         indexTimestampData(1);

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ private void loadBundle(`
`468`	`468`	`);`
`469`	`469`	`}`
`470`	`470`
`471`		`- final ClassLoader parentLoader = PluginLoaderIndirection.createLoader(`
	`471`	`+ final ClassLoader parentLoader = ExtendedPluginsClassLoader.create(`
`472`	`472`	`getClass().getClassLoader(),`
`473`	`473`	`extendedPlugins.stream().map(LoadedPlugin::loader).toList()`
`474`	`474`	`);`