Test

Author: nik9000

x-pack/plugin/esql/qa/server/extra-checkers/build.gradle

@@ -0,0 +1,28 @@
+apply plugin: 'elasticsearch.internal-es-plugin'
+apply plugin: 'elasticsearch.internal-java-rest-test'
+apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
+apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
+apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
+apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
+apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
+apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
+
+
+esplugin {
+  name = 'extra-checkers'
+  description = 'An example plugin disallowing CATEGORIZE'
+  classname ='org.elasticsearch.xpack.esql.qa.extra.ExtraCheckersPlugin'
+  extendedPlugins = ['x-pack-esql']
+}
+
+dependencies {
+  compileOnly project(':x-pack:plugin:esql')
+  compileOnly project(':x-pack:plugin:esql-core')
+}
+
+tasks.named('javaRestTest') {
+  usesDefaultDistribution("to be triaged")
+  maxParallelForks = 1
+  jvmArgs('--add-opens=java.base/java.nio=ALL-UNNAMED')
+}
+

x-pack/plugin/esql/qa/server/extra-checkers/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/extra/ExtraCheckersIT.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.qa.extra;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.ResponseException;
+import org.elasticsearch.test.TestClustersThreadFilter;
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.cluster.local.distribution.DistributionType;
+import org.elasticsearch.test.rest.ESRestTestCase;
+import org.junit.ClassRule;
+
+import java.io.IOException;
+
+import static org.hamcrest.Matchers.equalTo;
+
+@ThreadLeakFilters(filters = TestClustersThreadFilter.class)
+public class ExtraCheckersIT extends ESRestTestCase {
+    @ClassRule
+    public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
+        .distribution(DistributionType.DEFAULT)
+        .setting("xpack.security.enabled", "false")
+        .setting("xpack.license.self_generated.type", "trial")
+        .shared(true)
+        .plugin("extra-checkers")
+        .build();
+
+    public void testIncludesCategorize() throws IOException {
+        Request request = new Request("POST", "/_query");
+        request.setJsonEntity("""
+            {
+              "query": "ROW message=\\"foo bar\\" | STATS COUNT(*) BY CATEGORIZE(message)"
+            }""");
+        request.addParameter("error_trace", "");
+        Exception e = expectThrows(ResponseException.class, () -> client().performRequest(request));
+        assertThat(e.getMessage(), equalTo("ADFSADF"));
+    }
+
+    @Override
+    protected String getTestRestCluster() {
+        return cluster.getHttpAddresses();
+    }
+}

x-pack/plugin/esql/qa/server/extra-checkers/src/main/java/org/elasticsearch/xpack/esql/qa/extra/DisallowCategorize.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.qa.extra;
+
+import org.elasticsearch.xpack.esql.analysis.Verifier;
+import org.elasticsearch.xpack.esql.common.Failure;
+import org.elasticsearch.xpack.esql.common.Failures;
+import org.elasticsearch.xpack.esql.expression.function.grouping.Categorize;
+import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
+import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+
+public class DisallowCategorize implements Verifier.ExtraCheckers {
+    @Override
+    public List<BiConsumer<LogicalPlan, Failures>> extra() {
+        return List.of(DisallowCategorize::disallowCategorize);
+    }
+
+    private static void disallowCategorize(LogicalPlan plan, Failures failures) {
+        if (plan instanceof Aggregate) {
+            plan.forEachExpression(Categorize.class, cat -> failures.add(new Failure(cat, "CATEGORIZE is unsupported")));
+        }
+    }
+}

x-pack/plugin/esql/qa/server/extra-checkers/src/main/java/org/elasticsearch/xpack/esql/qa/extra/ExtraCheckersPlugin.java

@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.qa.extra;
+
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.xpack.esql.analysis.Verifier;
+
+/**
+ * Marker plugin to enable {@link Verifier.ExtraCheckers}.
+ */
+public class ExtraCheckersPlugin extends Plugin {}

x-pack/plugin/esql/qa/server/extra-checkers/src/main/resources/services/org.elasticsearch.xpack.esql.analysis.Verifier.ExtraCheckers

@@ -0,0 +1,8 @@
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+org.elasticsearch.xpack.esql.qa.extra.DisallowCategorize

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/execution/PlanExecutor.java

@@ -49,7 +49,6 @@ public class PlanExecutor {
     private final Verifier verifier;
     private final PlanTelemetryManager planTelemetryManager;
     private final EsqlQueryLog queryLog;
-    private final List<Verifier.ExtraCheckers> extraCheckers;
 
     public PlanExecutor(
         IndexResolver indexResolver,
@@ -66,7 +65,6 @@ public PlanExecutor(
         this.verifier = new Verifier(extraCheckers, metrics, licenseState);
         this.planTelemetryManager = new PlanTelemetryManager(meterRegistry);
         this.queryLog = queryLog;
-        this.extraCheckers = extraCheckers;
     }
 
     public void esql(