Add pluggable QueryAnalyzer interface

presto-analyzer/pom.xml

@@ -47,11 +47,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>

presto-analyzer/src/main/java/com/facebook/presto/sql/analyzer/BuiltInQueryAnalysis.java

@@ -0,0 +1,55 @@
+/*
+ * 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.analyzer.QueryAnalysis;
+import com.facebook.presto.spi.function.FunctionKind;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class BuiltInQueryAnalysis
+        implements QueryAnalysis
+{
+    private final Analysis analysis;
+
+    public BuiltInQueryAnalysis(Analysis analysis)
+    {
+        this.analysis = analysis;
+    }
+
+    public Analysis getAnalysis()
+    {
+        return analysis;
+    }
+
+    @Override
+    public String getUpdateType()
+    {
+        return analysis.getUpdateType();
+    }
+
+    @Override
+    public Optional<String> getExpandedQuery()
+    {
+        return analysis.getExpandedQuery();
+    }
+
+    @Override
+    public Map<FunctionKind, Set<String>> getInvokedFunctions()
+    {
+        return analysis.getInvokedFunctions();
+    }
+}

presto-main/src/main/java/com/facebook/presto/dispatcher/DispatchManager.java

@@ -308,6 +308,7 @@ private <C> void createQueryInternal(QueryId queryId, String slug, int retryCoun
 
             DispatchQuery dispatchQuery = dispatchQueryFactory.createDispatchQuery(
                     session,
+                    analyzerProvider,
                     query,
                     preparedQuery,
                     slug,

presto-main/src/main/java/com/facebook/presto/dispatcher/DispatchQueryFactory.java

@@ -17,6 +17,7 @@
 import com.facebook.presto.common.analyzer.PreparedQuery;
 import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.analyzer.AnalyzerProvider;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
 
 import java.util.Optional;
@@ -31,6 +32,7 @@ public interface DispatchQueryFactory
      * This interface API is defined to setting up all preparation works for query before it being executed.
      *
      * @param session the session
+     * @param analyzerProvider the analyzer provider
      * @param query the query
      * @param preparedQuery the prepared query
      * @param slug the unique query slug for each {@code Query} object
@@ -43,6 +45,7 @@ public interface DispatchQueryFactory
      */
     DispatchQuery createDispatchQuery(
             Session session,
+            AnalyzerProvider analyzerProvider,
             String query,
             PreparedQuery preparedQuery,
             String slug,

presto-main/src/main/java/com/facebook/presto/dispatcher/LocalDispatchQueryFactory.java

@@ -27,9 +27,9 @@
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.spi.PrestoException;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.analyzer.AnalyzerProvider;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
 import com.facebook.presto.spi.security.AccessControl;
-import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer;
 import com.facebook.presto.tracing.NoopTracerProvider;
 import com.facebook.presto.tracing.QueryStateTracingListener;
 import com.facebook.presto.transaction.TransactionManager;
@@ -43,7 +43,6 @@
 import java.util.function.Consumer;
 
 import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
-import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -118,6 +117,7 @@ public LocalDispatchQueryFactory(
      *  to the {@link ResourceGroupManager}. This is no-op for no disaggregated coordinator setup
      *
      * @param session the session
+     * @param analyzerProvider the analyzer provider
      * @param query the query
      * @param preparedQuery the prepared query
      * @param slug the unique query slug for each {@code Query} object
@@ -131,6 +131,7 @@ public LocalDispatchQueryFactory(
     @Override
     public DispatchQuery createDispatchQuery(
             Session session,
+            AnalyzerProvider analyzerProvider,
             String query,
             PreparedQuery preparedQuery,
             String slug,
@@ -163,9 +164,7 @@ public DispatchQuery createDispatchQuery(
                 throw new PrestoException(NOT_SUPPORTED, "Unsupported statement type: " + preparedQuery.getStatementClass().getSimpleName());
             }
 
-            //TODO: PreparedQuery should be passed all the way to analyzer
-            checkState(preparedQuery instanceof BuiltInQueryPreparer.BuiltInPreparedQuery, "Unsupported prepared query type: %s", preparedQuery.getClass().getSimpleName());
-            return queryExecutionFactory.createQueryExecution((BuiltInQueryPreparer.BuiltInPreparedQuery) preparedQuery, stateMachine, slug, retryCount, warningCollector, queryType);
+            return queryExecutionFactory.createQueryExecution(analyzerProvider, preparedQuery, stateMachine, slug, retryCount, warningCollector, queryType);
         });
 
         return new LocalDispatchQuery(

presto-main/src/main/java/com/facebook/presto/execution/DDLDefinitionExecution.java

@@ -13,10 +13,12 @@
  */
 package com.facebook.presto.execution;
 
+import com.facebook.presto.common.analyzer.PreparedQuery;
 import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.metadata.MetadataManager;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.analyzer.AnalyzerProvider;
 import com.facebook.presto.spi.security.AccessControl;
 import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer;
 import com.facebook.presto.sql.tree.Expression;
@@ -31,6 +33,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 public class DDLDefinitionExecution<T extends Statement>
@@ -82,14 +85,19 @@ public DDLDefinitionExecutionFactory(
 
         @Override
         public DDLDefinitionExecution<?> createQueryExecution(
-                BuiltInQueryPreparer.BuiltInPreparedQuery preparedQuery,
+                AnalyzerProvider analyzerProvider,
+                PreparedQuery preparedQuery,
                 QueryStateMachine stateMachine,
                 String slug,
                 int retryCount,
                 WarningCollector warningCollector,
                 Optional<QueryType> queryType)
         {
-            return createDDLDefinitionExecution(preparedQuery.getStatement(), preparedQuery.getParameters(), stateMachine, slug, retryCount);
+            //TODO: PreparedQuery should be passed all the way to analyzer
+            checkState(preparedQuery instanceof BuiltInQueryPreparer.BuiltInPreparedQuery, "Unsupported prepared query type: %s", preparedQuery.getClass().getSimpleName());
+            BuiltInQueryPreparer.BuiltInPreparedQuery builtInQueryPreparer = (BuiltInQueryPreparer.BuiltInPreparedQuery) preparedQuery;
+
+            return createDDLDefinitionExecution(builtInQueryPreparer.getStatement(), builtInQueryPreparer.getParameters(), stateMachine, slug, retryCount);
         }
 
         private <T extends Statement> DDLDefinitionExecution<T> createDDLDefinitionExecution(

presto-main/src/main/java/com/facebook/presto/execution/QueryExecution.java

@@ -13,15 +13,16 @@
  */
 package com.facebook.presto.execution;
 
+import com.facebook.presto.common.analyzer.PreparedQuery;
 import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.execution.QueryTracker.TrackedQuery;
 import com.facebook.presto.execution.StateMachine.StateChangeListener;
 import com.facebook.presto.memory.VersionedMemoryPoolId;
 import com.facebook.presto.server.BasicQueryInfo;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.analyzer.AnalyzerProvider;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupQueryLimits;
-import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer.BuiltInPreparedQuery;
 import com.facebook.presto.sql.planner.Plan;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -103,7 +104,8 @@ public interface QueryExecution
     interface QueryExecutionFactory<T extends QueryExecution>
     {
         T createQueryExecution(
-                BuiltInPreparedQuery preparedQuery,
+                AnalyzerProvider analyzerProvider,
+                PreparedQuery preparedQuery,
                 QueryStateMachine stateMachine,
                 String slug,
                 int retryCount,

presto-main/src/main/java/com/facebook/presto/execution/SessionDefinitionExecution.java

@@ -13,10 +13,12 @@
  */
 package com.facebook.presto.execution;
 
+import com.facebook.presto.common.analyzer.PreparedQuery;
 import com.facebook.presto.common.resourceGroups.QueryType;
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.metadata.MetadataManager;
 import com.facebook.presto.spi.WarningCollector;
+import com.facebook.presto.spi.analyzer.AnalyzerProvider;
 import com.facebook.presto.spi.security.AccessControl;
 import com.facebook.presto.sql.analyzer.BuiltInQueryPreparer;
 import com.facebook.presto.sql.tree.Expression;
@@ -31,6 +33,7 @@
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 public class SessionDefinitionExecution<T extends Statement>
@@ -82,14 +85,18 @@ public SessionDefinitionExecutionFactory(
 
         @Override
         public SessionDefinitionExecution<?> createQueryExecution(
-                BuiltInQueryPreparer.BuiltInPreparedQuery preparedQuery,
+                AnalyzerProvider analyzerProvider,
+                PreparedQuery preparedQuery,
                 QueryStateMachine stateMachine,
                 String slug,
                 int retryCount,
                 WarningCollector warningCollector,
                 Optional<QueryType> queryType)
         {
-            return createSessionDefinitionExecution(preparedQuery.getStatement(), preparedQuery.getParameters(), stateMachine, slug, retryCount);
+            //TODO: PreparedQuery should be passed all the way to analyzer
+            checkState(preparedQuery instanceof BuiltInQueryPreparer.BuiltInPreparedQuery, "Unsupported prepared query type: %s", preparedQuery.getClass().getSimpleName());
+            BuiltInQueryPreparer.BuiltInPreparedQuery builtInQueryPreparer = (BuiltInQueryPreparer.BuiltInPreparedQuery) preparedQuery;
+            return createSessionDefinitionExecution(builtInQueryPreparer.getStatement(), builtInQueryPreparer.getParameters(), stateMachine, slug, retryCount);
         }
 
         private <T extends Statement> SessionDefinitionExecution<T> createSessionDefinitionExecution(