[Address Comment] Move TestProcedureRegistry out of the presto-spi module

Author: hantangwangd

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

@@ -21,7 +21,6 @@
 import com.facebook.presto.spi.procedure.Procedure;
 import com.facebook.presto.spi.procedure.ProcedureRegistry;
 import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
-import com.facebook.presto.spi.procedure.TestProcedureRegistry;
 import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer.BuiltInPreparedQuery;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.sql.tree.AllColumns;

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

@@ -0,0 +1,96 @@
+/*
+ * 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 com.facebook.presto.sql.analyzer;
+
+import com.facebook.presto.spi.ConnectorId;
+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.DistributedProcedure;
+import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.ProcedureRegistry;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static com.facebook.presto.spi.StandardErrorCode.PROCEDURE_NOT_FOUND;
+import static java.util.Objects.requireNonNull;
+
+public class TestProcedureRegistry
+        implements ProcedureRegistry
+{
+    private final Map<ConnectorId, Map<SchemaTableName, Procedure>> connectorProcedures = new ConcurrentHashMap<>();
+
+    @Override
+    public void addProcedures(ConnectorId connectorId, Collection<Procedure> procedures)
+    {
+        requireNonNull(connectorId, "connectorId is null");
+        requireNonNull(procedures, "procedures is null");
+
+        Map<SchemaTableName, Procedure> proceduresByName = procedures.stream().collect(Collectors.toMap(
+                procedure -> new SchemaTableName(procedure.getSchema(), procedure.getName()),
+                Function.identity()));
+        if (connectorProcedures.putIfAbsent(connectorId, proceduresByName) != null) {
+            throw new IllegalStateException("Procedures already registered for connector: " + connectorId);
+        }
+    }
+
+    @Override
+    public void removeProcedures(ConnectorId connectorId)
+    {
+        connectorProcedures.remove(connectorId);
+    }
+
+    @Override
+    public Procedure resolve(ConnectorId connectorId, SchemaTableName name)
+    {
+        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        if (procedures != null) {
+            Procedure procedure = procedures.get(name);
+            if (procedure != null) {
+                return procedure;
+            }
+        }
+        throw new PrestoException(PROCEDURE_NOT_FOUND, "Procedure not registered: " + name);
+    }
+
+    @Override
+    public DistributedProcedure resolveDistributed(ConnectorId connectorId, SchemaTableName name)
+    {
+        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        if (procedures != null) {
+            Procedure procedure = procedures.get(name);
+            if (procedure != null && procedure instanceof DistributedProcedure) {
+                return (DistributedProcedure) procedure;
+            }
+        }
+        throw new PrestoException(PROCEDURE_NOT_FOUND, "Distributed procedure not registered: " + name);
+    }
+
+    @Override
+    public boolean isDistributedProcedure(ConnectorId connectorId, SchemaTableName name)
+    {
+        Map<SchemaTableName, Procedure> procedures = connectorProcedures.get(connectorId);
+        return procedures != null &&
+                procedures.containsKey(name) &&
+                procedures.get(name) instanceof DistributedProcedure;
+    }
+
+    public static class TestProcedureContext
+            implements ConnectorProcedureContext
+    {}
+}

presto-spi/src/main/java/com/facebook/presto/spi/procedure/TestProcedureRegistry.java renamed to presto-main-base/src/main/java/com/facebook/presto/testing/TestProcedureRegistry.java

@@ -11,12 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.facebook.presto.spi.procedure;
+package com.facebook.presto.testing;
 
 import com.facebook.presto.spi.ConnectorId;
 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.DistributedProcedure;
+import com.facebook.presto.spi.procedure.Procedure;
+import com.facebook.presto.spi.procedure.ProcedureRegistry;
 
 import java.util.Collection;
 import java.util.Map;

presto-main-base/src/test/java/com/facebook/presto/execution/TestCreateMaterializedViewTask.java

@@ -41,13 +41,13 @@
 import com.facebook.presto.spi.analyzer.ViewDefinition;
 import com.facebook.presto.spi.connector.ConnectorTransactionHandle;
 import com.facebook.presto.spi.procedure.ProcedureRegistry;
-import com.facebook.presto.spi.procedure.TestProcedureRegistry;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
 import com.facebook.presto.spi.security.AccessControl;
 import com.facebook.presto.spi.security.AllowAllAccessControl;
 import com.facebook.presto.sql.parser.ParsingOptions;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.sql.tree.CreateMaterializedView;
+import com.facebook.presto.testing.TestProcedureRegistry;
 import com.facebook.presto.transaction.TransactionManager;
 import com.google.common.collect.ImmutableList;
 import org.testng.annotations.BeforeMethod;

presto-main-base/src/test/java/com/facebook/presto/sql/analyzer/AbstractAnalyzerTest.java

@@ -59,14 +59,14 @@
 import com.facebook.presto.spi.function.SqlInvokedFunction;
 import com.facebook.presto.spi.procedure.Procedure;
 import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
-import com.facebook.presto.spi.procedure.TestProcedureRegistry;
 import com.facebook.presto.spi.security.AccessControl;
 import com.facebook.presto.spi.security.AllowAllAccessControl;
 import com.facebook.presto.spi.session.PropertyMetadata;
 import com.facebook.presto.spi.transaction.IsolationLevel;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.sql.tree.NodeLocation;
 import com.facebook.presto.sql.tree.Statement;
+import com.facebook.presto.testing.TestProcedureRegistry;
 import com.facebook.presto.testing.TestingAccessControlManager;
 import com.facebook.presto.testing.TestingMetadata;
 import com.facebook.presto.testing.TestingWarningCollector;

presto-main-base/src/test/java/com/facebook/presto/sql/planner/TestLogicalPlanner.java

@@ -43,7 +43,6 @@
 import com.facebook.presto.spi.plan.ValuesNode;
 import com.facebook.presto.spi.procedure.Procedure;
 import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
-import com.facebook.presto.spi.procedure.TestProcedureRegistry;
 import com.facebook.presto.spi.relation.VariableReferenceExpression;
 import com.facebook.presto.spi.transaction.IsolationLevel;
 import com.facebook.presto.sql.analyzer.FeaturesConfig.JoinDistributionType;
@@ -61,6 +60,7 @@
 import com.facebook.presto.sql.planner.plan.StatisticsWriterNode;
 import com.facebook.presto.sql.tree.LongLiteral;
 import com.facebook.presto.testing.QueryRunner;
+import com.facebook.presto.testing.TestProcedureRegistry;
 import com.facebook.presto.testing.TestingHandleResolver;
 import com.facebook.presto.testing.TestingMetadata;
 import com.facebook.presto.testing.TestingSplitManager;

presto-tests/src/test/java/com/facebook/presto/tests/TestProcedureCreation.java

@@ -17,7 +17,7 @@
 import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.procedure.Procedure;
 import com.facebook.presto.spi.procedure.TableDataRewriteDistributedProcedure;
-import com.facebook.presto.spi.procedure.TestProcedureRegistry;
+import com.facebook.presto.testing.TestProcedureRegistry;
 import com.google.common.collect.ImmutableList;
 import org.testng.annotations.Test;