Skip to content

Add query clause information to function analysis #13885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
assaf2 wants to merge 1 commit into from
Closed

Add query clause information to function analysis #13885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/trino-main/src/main/java/io/trino/execution/CallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.connector.ConnectorAccessControl;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.eventlistener.ClauseInfo;
import io.trino.spi.eventlistener.RoutineInfo;
import io.trino.spi.procedure.Procedure;
import io.trino.spi.procedure.Procedure.Argument;
Expand Down Expand Up @@ -202,7 +203,7 @@ else if (ConnectorAccessControl.class.equals(type)) {
}

accessControl.checkCanExecuteProcedure(session.toSecurityContext(), procedureName);
stateMachine.setRoutines(ImmutableList.of(new RoutineInfo(procedureName.getObjectName(), session.getUser())));
stateMachine.setRoutines(ImmutableList.of(new RoutineInfo(procedureName.getObjectName(), session.getUser(), ClauseInfo.CALL)));

try {
procedure.getMethodHandle().invokeWithArguments(arguments);
Expand Down
16 changes: 12 additions & 4 deletions core/trino-main/src/main/java/io/trino/sql/analyzer/Analysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import io.trino.spi.connector.ColumnSchema;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.ConnectorTransactionHandle;
import io.trino.spi.eventlistener.ClauseInfo;
import io.trino.spi.eventlistener.ColumnDetail;
import io.trino.spi.eventlistener.ColumnInfo;
import io.trino.spi.eventlistener.RoutineInfo;
Expand Down Expand Up @@ -644,9 +645,9 @@ public ResolvedFunction getResolvedFunction(Expression node)
return resolvedFunctions.get(NodeRef.of(node)).getFunction();
}

public void addResolvedFunction(Expression node, ResolvedFunction function, String authorization)
public void addResolvedFunction(Expression node, ResolvedFunction function, String authorization, ClauseInfo clauseInfo)
{
resolvedFunctions.put(NodeRef.of(node), new RoutineEntry(function, authorization));
resolvedFunctions.put(NodeRef.of(node), new RoutineEntry(function, authorization, clauseInfo));
}

public Set<NodeRef<Expression>> getColumnReferences()
Expand Down Expand Up @@ -1136,7 +1137,7 @@ public List<TableInfo> getReferencedTables()
public List<RoutineInfo> getRoutines()
{
return resolvedFunctions.entrySet().stream()
.map(entry -> new RoutineInfo(entry.getValue().function.getSignature().getName(), entry.getValue().getAuthorization()))
.map(entry -> new RoutineInfo(entry.getValue().function.getSignature().getName(), entry.getValue().getAuthorization(), entry.getValue().getClauseInfo()))
.collect(toImmutableList());
}

Expand Down Expand Up @@ -1959,11 +1960,13 @@ private static class RoutineEntry
{
private final ResolvedFunction function;
private final String authorization;
private final ClauseInfo clauseInfo;

public RoutineEntry(ResolvedFunction function, String authorization)
public RoutineEntry(ResolvedFunction function, String authorization, ClauseInfo clauseInfo)
{
this.function = requireNonNull(function, "function is null");
this.authorization = requireNonNull(authorization, "authorization is null");
this.clauseInfo = requireNonNull(clauseInfo, "clauseInfo is null");
}

public ResolvedFunction getFunction()
Expand All @@ -1975,6 +1978,11 @@ public String getAuthorization()
{
return authorization;
}

public ClauseInfo getClauseInfo()
{
return clauseInfo;
}
}

private static class UpdateTarget
Expand Down
14 changes: 8 additions & 6 deletions core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.trino.spi.ErrorCodeSupplier;
import io.trino.spi.TrinoException;
import io.trino.spi.TrinoWarning;
import io.trino.spi.eventlistener.ClauseInfo;
import io.trino.spi.function.BoundSignature;
import io.trino.spi.function.FunctionMetadata;
import io.trino.spi.function.OperatorType;
Expand Down Expand Up @@ -3379,7 +3380,7 @@ public static ExpressionAnalysis analyzePatternRecognitionExpression(
ExpressionAnalyzer analyzer = new ExpressionAnalyzer(plannerContext, accessControl, statementAnalyzerFactory, analysis, session, TypeProvider.empty(), warningCollector);
analyzer.analyze(expression, scope, labels);

updateAnalysis(analysis, analyzer, session, accessControl);
updateAnalysis(analysis, analyzer, session, accessControl, ClauseInfo.PATTERN_RECOGNITION);

return new ExpressionAnalysis(
analyzer.getExpressionTypes(),
Expand Down Expand Up @@ -3435,12 +3436,13 @@ public static ExpressionAnalysis analyzeExpression(
Analysis analysis,
Expression expression,
WarningCollector warningCollector,
CorrelationSupport correlationSupport)
CorrelationSupport correlationSupport,
ClauseInfo clauseInfo)
{
ExpressionAnalyzer analyzer = new ExpressionAnalyzer(plannerContext, accessControl, statementAnalyzerFactory, analysis, session, TypeProvider.empty(), warningCollector);
analyzer.analyze(expression, scope, correlationSupport);

updateAnalysis(analysis, analyzer, session, accessControl);
updateAnalysis(analysis, analyzer, session, accessControl, clauseInfo);
analysis.addExpressionFields(expression, analyzer.getSourceFields());

return new ExpressionAnalysis(
Expand Down Expand Up @@ -3470,7 +3472,7 @@ public static ExpressionAnalysis analyzeWindow(
ExpressionAnalyzer analyzer = new ExpressionAnalyzer(plannerContext, accessControl, statementAnalyzerFactory, analysis, session, TypeProvider.empty(), warningCollector);
analyzer.analyzeWindow(window, scope, originalNode, correlationSupport);

updateAnalysis(analysis, analyzer, session, accessControl);
updateAnalysis(analysis, analyzer, session, accessControl, ClauseInfo.WINDOW);

return new ExpressionAnalysis(
analyzer.getExpressionTypes(),
Expand All @@ -3484,7 +3486,7 @@ public static ExpressionAnalysis analyzeWindow(
analyzer.getWindowFunctions());
}

private static void updateAnalysis(Analysis analysis, ExpressionAnalyzer analyzer, Session session, AccessControl accessControl)
private static void updateAnalysis(Analysis analysis, ExpressionAnalyzer analyzer, Session session, AccessControl accessControl, ClauseInfo clauseInfo)
{
analysis.addTypes(analyzer.getExpressionTypes());
analysis.addCoercions(
Expand All @@ -3493,7 +3495,7 @@ private static void updateAnalysis(Analysis analysis, ExpressionAnalyzer analyze
analyzer.getSortKeyCoercionsForFrameBoundCalculation(),
analyzer.getSortKeyCoercionsForFrameBoundComparison());
analysis.addFrameBoundCalculations(analyzer.getFrameBoundCalculations());
analyzer.getResolvedFunctions().forEach((key, value) -> analysis.addResolvedFunction(key.getNode(), value, session.getUser()));
analyzer.getResolvedFunctions().forEach((key, value) -> analysis.addResolvedFunction(key.getNode(), value, session.getUser(), clauseInfo));
analysis.addColumnReferences(analyzer.getColumnReferences());
analysis.addLambdaArgumentReferences(analyzer.getLambdaArgumentReferences());
analysis.addTableColumnReferences(accessControl, session.getIdentity(), analyzer.getTableColumnReferences());
Expand Down
Loading