Rename the types in the Procedure hierarchy to avoid a breaking change

Rename abstract class `Procedure` to `BaseProcedure`, and then rename
`LocalProcedure` back to `Procedure` to maintain backward compatibility

Author: hantangwangd

presto-analyzer/src/test/java/com/facebook/presto/sql/analyzer/TestBuiltInQueryPreparer.java

@@ -18,9 +18,9 @@
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.WarningCollector;
 import com.facebook.presto.spi.analyzer.AnalyzerOptions;
-import com.facebook.presto.spi.procedure.LocalProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure.Argument;
 import com.facebook.presto.spi.procedure.Procedure;
-import com.facebook.presto.spi.procedure.Procedure.Argument;
 import com.facebook.presto.spi.procedure.ProcedureRegistry;
 import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
 import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer.BuiltInPreparedQuery;
@@ -67,8 +67,8 @@ public void setup()
         arguments.add(new Argument(SCHEMA, VARCHAR));
         arguments.add(new Argument(TABLE_NAME, VARCHAR));
 
-        List<Procedure> procedures = new ArrayList<>();
-        procedures.add(new LocalProcedure("system", "fun", arguments));
+        List<BaseProcedure> procedures = new ArrayList<>();
+        procedures.add(new Procedure("system", "fun", arguments));
         procedures.add(new TableDataRewriteDistributedProcedure("system", "distributed_fun",
                 arguments,
                 (session, transactionContext, procedureHandle, fragments) -> null,

presto-analyzer/src/test/java/com/facebook/presto/sql/analyzer/TestProcedureRegistry.java

@@ -17,8 +17,8 @@
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.SchemaTableName;
 import com.facebook.presto.spi.connector.ConnectorProcedureContext;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.facebook.presto.spi.procedure.DistributedProcedure;
-import com.facebook.presto.spi.procedure.Procedure;
 import com.facebook.presto.spi.procedure.ProcedureRegistry;
 
 import java.util.Collection;
@@ -33,15 +33,15 @@
 public class TestProcedureRegistry
         implements ProcedureRegistry
 {
-    private final Map<ConnectorId, Map<SchemaTableName, Procedure>> connectorProcedures = new ConcurrentHashMap<>();
+    private final Map<ConnectorId, Map<SchemaTableName, BaseProcedure>> connectorProcedures = new ConcurrentHashMap<>();
 
     @Override
-    public void addProcedures(ConnectorId connectorId, Collection<Procedure> procedures)
+    public void addProcedures(ConnectorId connectorId, Collection<BaseProcedure> procedures)
     {
         requireNonNull(connectorId, "connectorId is null");
         requireNonNull(procedures, "procedures is null");
 
-        Map<SchemaTableName, Procedure> proceduresByName = procedures.stream().collect(Collectors.toMap(
+        Map<SchemaTableName, BaseProcedure> proceduresByName = procedures.stream().collect(Collectors.toMap(
                 procedure -> new SchemaTableName(procedure.getSchema(), procedure.getName()),
                 Function.identity()));
         if (connectorProcedures.putIfAbsent(connectorId, proceduresByName) != null) {
@@ -56,11 +56,11 @@ public void removeProcedures(ConnectorId connectorId)
     }
 
     @Override
-    public Procedure resolve(ConnectorId connectorId, SchemaTableName name)
+    public BaseProcedure resolve(ConnectorId connectorId, SchemaTableName name)
     {
-        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        Map<SchemaTableName, BaseProcedure> procedures = connectorProcedures.get(connectorId);
         if (procedures != null) {
-            Procedure procedure = procedures.get(name);
+            BaseProcedure procedure = procedures.get(name);
             if (procedure != null) {
                 return procedure;
             }
@@ -71,9 +71,9 @@ public Procedure resolve(ConnectorId connectorId, SchemaTableName name)
     @Override
     public DistributedProcedure resolveDistributed(ConnectorId connectorId, SchemaTableName name)
     {
-        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        Map<SchemaTableName, BaseProcedure> procedures = connectorProcedures.get(connectorId);
         if (procedures != null) {
-            Procedure procedure = procedures.get(name);
+            BaseProcedure procedure = procedures.get(name);
             if (procedure != null && procedure instanceof DistributedProcedure) {
                 return (DistributedProcedure) procedure;
             }
@@ -84,7 +84,7 @@ public DistributedProcedure resolveDistributed(ConnectorId connectorId, SchemaTa
     @Override
     public boolean isDistributedProcedure(ConnectorId connectorId, SchemaTableName name)
     {
-        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        Map<SchemaTableName, BaseProcedure> procedures = connectorProcedures.get(connectorId);
         return procedures != null &&
                 procedures.containsKey(name) &&
                 procedures.get(name) instanceof DistributedProcedure;

presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcConnector.java

@@ -29,7 +29,7 @@
 import com.facebook.presto.spi.connector.classloader.ClassLoaderSafeConnectorMetadata;
 import com.facebook.presto.spi.function.FunctionMetadataManager;
 import com.facebook.presto.spi.function.StandardFunctionResolution;
-import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.facebook.presto.spi.relation.RowExpressionService;
 import com.facebook.presto.spi.session.PropertyMetadata;
 import com.facebook.presto.spi.transaction.IsolationLevel;
@@ -62,7 +62,7 @@ public class JdbcConnector
     private final JdbcRecordSetProvider jdbcRecordSetProvider;
     private final JdbcPageSinkProvider jdbcPageSinkProvider;
     private final Optional<ConnectorAccessControl> accessControl;
-    private final Set<Procedure> procedures;
+    private final Set<BaseProcedure> procedures;
 
     private final ConcurrentMap<ConnectorTransactionHandle, JdbcMetadata> transactions = new ConcurrentHashMap<>();
     private final FunctionMetadataManager functionManager;
@@ -79,7 +79,7 @@ public JdbcConnector(
             JdbcRecordSetProvider jdbcRecordSetProvider,
             JdbcPageSinkProvider jdbcPageSinkProvider,
             Optional<ConnectorAccessControl> accessControl,
-            Set<Procedure> procedures,
+            Set<BaseProcedure> procedures,
             FunctionMetadataManager functionManager,
             StandardFunctionResolution functionResolution,
             RowExpressionService rowExpressionService,
@@ -174,7 +174,7 @@ public ConnectorAccessControl getAccessControl()
     }
 
     @Override
-    public Set<Procedure> getProcedures()
+    public Set<BaseProcedure> getProcedures()
     {
         return procedures;
     }

presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcModule.java

@@ -14,7 +14,7 @@
 package com.facebook.presto.plugin.jdbc;
 
 import com.facebook.presto.spi.connector.ConnectorAccessControl;
-import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
@@ -40,7 +40,7 @@ public JdbcModule(String connectorId)
     public void configure(Binder binder)
     {
         newOptionalBinder(binder, ConnectorAccessControl.class);
-        newSetBinder(binder, Procedure.class);
+        newSetBinder(binder, BaseProcedure.class);
         binder.bind(JdbcConnectorId.class).toInstance(new JdbcConnectorId(connectorId));
 
         binder.bind(JdbcMetadataCache.class).in(Scopes.SINGLETON);

presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseConnector.java

@@ -29,7 +29,7 @@
 import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
 import com.facebook.presto.spi.function.FunctionMetadataManager;
 import com.facebook.presto.spi.function.StandardFunctionResolution;
-import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.facebook.presto.spi.relation.RowExpressionService;
 import com.facebook.presto.spi.session.PropertyMetadata;
 import com.facebook.presto.spi.transaction.IsolationLevel;
@@ -62,7 +62,7 @@ public class ClickHouseConnector
     private final ClickHouseRecordSetProvider clickHouseRecordSetProvider;
     private final ClickHousePageSinkProvider clickHousePageSinkProvider;
     private final Optional<ConnectorAccessControl> accessControl;
-    private final Set<Procedure> procedures;
+    private final Set<BaseProcedure> procedures;
 
     private final ConcurrentMap<ConnectorTransactionHandle, ClickHouseMetadata> transactions = new ConcurrentHashMap<>();
     private final FunctionMetadataManager functionManager;
@@ -80,7 +80,7 @@ public ClickHouseConnector(
             ClickHouseRecordSetProvider clickHouseRecordSetProvider,
             ClickHousePageSinkProvider clickHousePageSinkProvider,
             Optional<ConnectorAccessControl> accessControl,
-            Set<Procedure> procedures,
+            Set<BaseProcedure> procedures,
             FunctionMetadataManager functionManager,
             StandardFunctionResolution functionResolution,
             RowExpressionService rowExpressionService,
@@ -179,7 +179,7 @@ public ConnectorAccessControl getAccessControl()
     }
 
     @Override
-    public Set<Procedure> getProcedures()
+    public Set<BaseProcedure> getProcedures()
     {
         return procedures;
     }

presto-clickhouse/src/main/java/com/facebook/presto/plugin/clickhouse/ClickHouseModule.java

@@ -15,7 +15,7 @@
 
 import com.facebook.presto.plugin.clickhouse.optimization.ClickHouseQueryGenerator;
 import com.facebook.presto.spi.connector.ConnectorAccessControl;
-import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
@@ -45,7 +45,7 @@ public ClickHouseModule(String connectorId)
     public void configure(Binder binder)
     {
         newOptionalBinder(binder, ConnectorAccessControl.class);
-        newSetBinder(binder, Procedure.class);
+        newSetBinder(binder, BaseProcedure.class);
         binder.bind(ClickHouseConnectorId.class).toInstance(new ClickHouseConnectorId(connectorId));
         binder.bind(ClickHouseMetadataFactory.class).in(Scopes.SINGLETON);
         binder.bind(ClickHouseClient.class).in(Scopes.SINGLETON);

presto-delta/src/main/java/com/facebook/presto/delta/DeltaModule.java

@@ -45,7 +45,7 @@
 import com.facebook.presto.hive.metastore.MetastoreCacheStats;
 import com.facebook.presto.hive.metastore.MetastoreConfig;
 import com.facebook.presto.hive.metastore.thrift.ThriftHiveMetastoreConfig;
-import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
 import com.google.inject.Binder;
@@ -125,7 +125,7 @@ protected void setup(Binder binder)
         binder.bind(FileFormatDataSourceStats.class).in(Scopes.SINGLETON);
         newExporter(binder).export(FileFormatDataSourceStats.class).as(generatedNameOf(FileFormatDataSourceStats.class, connectorId));
 
-        Multibinder<Procedure> procedures = newSetBinder(binder, Procedure.class);
+        Multibinder<BaseProcedure> procedures = newSetBinder(binder, BaseProcedure.class);
         if (buildConfigObject(MetastoreClientConfig.class).isInvalidateMetastoreCacheProcedureEnabled()) {
             procedures.addBinding().toProvider(InvalidateMetastoreCacheProcedure.class).in(Scopes.SINGLETON);
         }

presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/InvalidateMetastoreCacheProcedure.java

@@ -17,9 +17,9 @@
 import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
-import com.facebook.presto.spi.procedure.LocalProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure.Argument;
 import com.facebook.presto.spi.procedure.Procedure;
-import com.facebook.presto.spi.procedure.Procedure.Argument;
 import com.google.common.collect.ImmutableList;
 import jakarta.inject.Inject;
 
@@ -38,7 +38,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class InvalidateMetastoreCacheProcedure
-        implements Provider<Procedure>
+        implements Provider<BaseProcedure>
 {
     private static final MethodHandle INVALIDATE_METASTORE_CACHE = methodHandle(
             InvalidateMetastoreCacheProcedure.class,
@@ -64,9 +64,9 @@ public InvalidateMetastoreCacheProcedure(ExtendedHiveMetastore extendedHiveMetas
     }
 
     @Override
-    public Procedure get()
+    public BaseProcedure get()
     {
-        return new LocalProcedure(
+        return new Procedure(
                 "system",
                 "invalidate_metastore_cache",
                 ImmutableList.of(

presto-hive/src/main/java/com/facebook/presto/hive/CreateEmptyPartitionProcedure.java

@@ -22,9 +22,9 @@
 import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
-import com.facebook.presto.spi.procedure.LocalProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure.Argument;
 import com.facebook.presto.spi.procedure.Procedure;
-import com.facebook.presto.spi.procedure.Procedure.Argument;
 import com.google.common.collect.ImmutableList;
 import io.airlift.slice.Slices;
 import jakarta.inject.Inject;
@@ -49,7 +49,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class CreateEmptyPartitionProcedure
-        implements Provider<Procedure>
+        implements Provider<BaseProcedure>
 {
     private static final MethodHandle CREATE_EMPTY_PARTITION = methodHandle(
             CreateEmptyPartitionProcedure.class,
@@ -82,9 +82,9 @@ public CreateEmptyPartitionProcedure(
     }
 
     @Override
-    public Procedure get()
+    public BaseProcedure get()
     {
-        return new LocalProcedure(
+        return new Procedure(
                 "system",
                 "create_empty_partition",
                 ImmutableList.of(

presto-hive/src/main/java/com/facebook/presto/hive/DirectoryListCacheInvalidationProcedure.java

@@ -16,9 +16,9 @@
 import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
-import com.facebook.presto.spi.procedure.LocalProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure;
+import com.facebook.presto.spi.procedure.BaseProcedure.Argument;
 import com.facebook.presto.spi.procedure.Procedure;
-import com.facebook.presto.spi.procedure.Procedure.Argument;
 import com.google.common.collect.ImmutableList;
 import jakarta.inject.Inject;
 
@@ -34,7 +34,7 @@
 import static java.util.Objects.requireNonNull;
 
 public class DirectoryListCacheInvalidationProcedure
-        implements Provider<Procedure>
+        implements Provider<BaseProcedure>
 {
     private static final MethodHandle CACHE_DATA_INVALIDATION = methodHandle(
             DirectoryListCacheInvalidationProcedure.class,
@@ -51,9 +51,9 @@ public DirectoryListCacheInvalidationProcedure(DirectoryLister directoryLister)
     }
 
     @Override
-    public Procedure get()
+    public BaseProcedure get()
     {
-        return new LocalProcedure(
+        return new Procedure(
                 "system",
                 "invalidate_directory_list_cache",
                 ImmutableList.of(