Allow DevelopmentServer testing with internal and external plugins together

.gitignore

@@ -34,3 +34,7 @@ product-test-reports
 **/dependency-reduced-pom.xml
 core/trino-web-ui/src/main/resources/webapp/dist/
 .node
+
+# Local plugins added for testing should be excluded
+testing/trino-server-dev/etc/plugin/*
+!testing/trino-server-dev/etc/plugin/README.md

README.md

@@ -117,6 +117,13 @@ IntelliJ, using `$MODULE_DIR$` accomplishes this automatically.
 If `VM options` doesn't exist in the dialog, you need to select `Modify options`
 and enable `Add VM options`.
 
+To adjust which internal plugins are enabled for the development server, adjust the value of
+`plugin.bundles` in `config.properties`. External plugins can also be added to the server
+by copying them into the `testing/trino-server-dev/etc/plugin` directory.
+Each plugin must be added as its own subdirectory containing all necessary dependencies.
+If you want to expose a custom plugin as a catalog, you'll need to also add a corresponding
+`<catalog_name>.properties` file to `testing/trino-server-dev/etc/catalog`.
+
 ### Running the CLI
 
 Start the CLI to connect to the server and run SQL queries:

testing/trino-server-dev/etc/config.properties

@@ -56,4 +56,6 @@ plugin.bundles=\
   ../../plugin/trino-exchange-hdfs/pom.xml, \
   ../../plugin/trino-mysql-event-listener/pom.xml
 
+# This can be configured to any path, whether absolute or relative to the working directory
+plugin.dir=etc/plugin
 node-scheduler.include-coordinator=true

testing/trino-server-dev/etc/plugin/.gitignore

@@ -0,0 +1,5 @@
+# Keep this placeholder directory as a place to add plugins.
+# Ignore everything in this directory ...
+*
+# ... except this file
+!.gitignore

testing/trino-server-dev/src/main/java/io/trino/server/DevelopmentServer.java

@@ -31,7 +31,9 @@ protected Iterable<? extends Module> getAdditionalModules()
     {
         return ImmutableList.of(binder -> {
             newOptionalBinder(binder, PluginsProvider.class).setBinding()
-                    .to(DevelopmentPluginsProvider.class).in(Scopes.SINGLETON);
+                    .to(HybridDevelopmentPluginsProvider.class).in(Scopes.SINGLETON);
+            binder.bind(DevelopmentPluginsProvider.class).in(Scopes.SINGLETON);
+            binder.bind(ServerPluginsProvider.class).in(Scopes.SINGLETON);
             configBinder(binder).bindConfig(DevelopmentLoaderConfig.class);
         });
     }

testing/trino-server-dev/src/main/java/io/trino/server/HybridDevelopmentPluginsProvider.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.server;
+
+import com.google.inject.Inject;
+import io.trino.server.PluginManager.PluginsProvider;
+
+import static java.util.Objects.requireNonNull;
+
+public class HybridDevelopmentPluginsProvider
+        implements PluginsProvider
+{
+    private final DevelopmentPluginsProvider developmentPluginsProvider;
+    private final ServerPluginsProvider serverPluginsProvider;
+
+    @Inject
+    public HybridDevelopmentPluginsProvider(DevelopmentPluginsProvider developmentPluginsProvider, ServerPluginsProvider serverPluginsProvider)
+    {
+        this.developmentPluginsProvider = requireNonNull(developmentPluginsProvider, "developmentPluginsProvider is null");
+        this.serverPluginsProvider = requireNonNull(serverPluginsProvider, "serverPluginsProvider is null");
+    }
+
+    @Override
+    public void loadPlugins(Loader loader, ClassLoaderFactory createClassLoader)
+    {
+        developmentPluginsProvider.loadPlugins(loader, createClassLoader);
+        serverPluginsProvider.loadPlugins(loader, createClassLoader);
+    }
+}