Skip to content
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

Desugar in evaluateConstantExpression #86

Open
wants to merge 1 commit into
base: hotfix-423
Choose a base branch
from
Open

Desugar in evaluateConstantExpression #86

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
31 changes: 31 additions & 0 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 @@ -3459,6 +3459,37 @@ public static ExpressionAnalysis analyzeExpression(
analyzer.getWindowFunctions());
}

public static void analyzeExpressionWithoutSubqueries(
Session session,
PlannerContext plannerContext,
AccessControl accessControl,
Scope scope,
Analysis analysis,
Expression expression,
ErrorCodeSupplier errorCode,
String message,
WarningCollector warningCollector,
CorrelationSupport correlationSupport)
{
ExpressionAnalyzer analyzer = new ExpressionAnalyzer(
plannerContext,
accessControl,
(node, ignored) -> {
throw semanticException(errorCode, node, message);
},
session,
TypeProvider.empty(),
analysis.getParameters(),
warningCollector,
analysis.isDescribe(),
analysis::getType,
analysis::getWindow);
analyzer.analyze(expression, scope, correlationSupport);

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

public static ExpressionAnalysis analyzeWindow(
Session session,
PlannerContext plannerContext,
Expand Down
27 changes: 26 additions & 1 deletion core/trino-main/src/main/java/io/trino/sql/planner/ExpressionInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
import io.trino.spi.type.VarcharType;
import io.trino.sql.InterpretedFunctionInvoker;
import io.trino.sql.PlannerContext;
import io.trino.sql.analyzer.Analysis;
import io.trino.sql.analyzer.CorrelationSupport;
import io.trino.sql.analyzer.ExpressionAnalyzer;
import io.trino.sql.analyzer.QueryType;
import io.trino.sql.analyzer.Scope;
import io.trino.sql.analyzer.TypeSignatureProvider;
import io.trino.sql.tree.ArithmeticBinaryExpression;
Expand Down Expand Up @@ -129,6 +132,7 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.Iterables.getOnlyElement;
import static io.airlift.slice.SliceUtf8.countCodePoints;
import static io.trino.spi.StandardErrorCode.EXPRESSION_NOT_CONSTANT;
import static io.trino.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static io.trino.spi.StandardErrorCode.TYPE_MISMATCH;
Expand Down Expand Up @@ -157,6 +161,7 @@
import static io.trino.sql.gen.VarArgsToMapAdapterGenerator.generateVarArgsToMapAdapter;
import static io.trino.sql.planner.DeterminismEvaluator.isDeterministic;
import static io.trino.sql.planner.FunctionCallBuilder.resolve;
import static io.trino.sql.planner.QueryPlanner.coerceIfNecessary;
import static io.trino.sql.planner.ResolvedFunctionCallRewriter.rewriteResolvedFunctions;
import static io.trino.sql.planner.iterative.rule.CanonicalizeExpressionRewriter.canonicalizeExpression;
import static io.trino.sql.tree.ArithmeticUnaryExpression.Sign.MINUS;
Expand Down Expand Up @@ -210,8 +215,28 @@ public static Object evaluateConstantExpression(
AccessControl accessControl,
Map<NodeRef<Parameter>, Expression> parameters)
{
Analysis analysis = new Analysis(null, ImmutableMap.of(), QueryType.OTHERS);
Scope scope = Scope.create();
ExpressionAnalyzer.analyzeExpressionWithoutSubqueries(
session,
plannerContext,
accessControl,
scope,
analysis,
expression,
EXPRESSION_NOT_CONSTANT,
"Constant expression cannot contain a subquery",
WarningCollector.NOOP,
CorrelationSupport.DISALLOWED);

// Apply casts, desugar expression, and preform other rewrites
TranslationMap translationMap = new TranslationMap(Optional.empty(), scope, analysis, ImmutableMap.of(), ImmutableList.of(), session, plannerContext);
expression = coerceIfNecessary(analysis, expression, translationMap.rewrite(expression));

// The expression tree has been rewritten which breaks all the identity maps, so redo the analysis
// to re-analyze coercions that might be necessary
ExpressionAnalyzer analyzer = createConstantAnalyzer(plannerContext, accessControl, session, parameters, WarningCollector.NOOP);
analyzer.analyze(expression, Scope.create());
analyzer.analyze(expression, scope);

Type actualType = analyzer.getExpressionTypes().get(NodeRef.of(expression));
if (!new TypeCoercion(plannerContext.getTypeManager()::getType).canCoerce(actualType, expectedType)) {
Expand Down