Remove Guice boilerplate for KillQueryProcedure

Make the procedure be declared as other procedures.
trinodb · Aug 8, 2023 · 309b764 · 309b764
1 parent c76d4be
commit 309b764
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java b/core/trino-main/src/main/java/io/trino/connector/system/KillQueryProcedure.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import io.trino.FullConnectorSession;
 import io.trino.annotation.UsedByGeneratedCode;
 import io.trino.dispatcher.DispatchManager;
@@ -44,6 +45,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class KillQueryProcedure
+        implements Provider<Procedure>
 {
     private static final MethodHandle KILL_QUERY = methodHandle(KillQueryProcedure.class, "killQuery", String.class, String.class, ConnectorSession.class);
 
@@ -88,7 +90,8 @@ public void killQuery(String queryId, String message, ConnectorSession session)
         }
     }
 
-    public Procedure getProcedure()
+    @Override
+    public Procedure get()
     {
         return new Procedure(
                 "runtime",

diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnectorModule.java
@@ -17,7 +17,6 @@
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import com.google.inject.multibindings.Multibinder;
-import com.google.inject.multibindings.ProvidesIntoSet;
 import io.trino.connector.system.jdbc.AttributeJdbcTable;
 import io.trino.connector.system.jdbc.CatalogJdbcTable;
 import io.trino.connector.system.jdbc.ColumnJdbcTable;
@@ -72,7 +71,8 @@ public void configure(Binder binder)
         globalTableBinder.addBinding().to(TableTypeJdbcTable.class).in(Scopes.SINGLETON);
         globalTableBinder.addBinding().to(UdtJdbcTable.class).in(Scopes.SINGLETON);
 
-        Multibinder.newSetBinder(binder, Procedure.class);
+        Multibinder<Procedure> procedures = Multibinder.newSetBinder(binder, Procedure.class);
+        procedures.addBinding().toProvider(KillQueryProcedure.class).in(Scopes.SINGLETON);
 
         binder.bind(KillQueryProcedure.class).in(Scopes.SINGLETON);
 
@@ -82,10 +82,4 @@ public void configure(Binder binder)
         tableFunctions.addBinding().toProvider(ExcludeColumns.class).in(Scopes.SINGLETON);
         tableFunctions.addBinding().toProvider(Sequence.class).in(Scopes.SINGLETON);
     }
-
-    @ProvidesIntoSet
-    public static Procedure getKillQueryProcedure(KillQueryProcedure procedure)
-    {
-        return procedure.getProcedure();
-    }
 }