[fix](user_var)fix integer typing and prefer Variable.realExpression for argument/type resolution #62524
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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 org.apache.doris.nereids.rules.analysis; | ||
|
|
||
| import org.apache.doris.analysis.IntLiteral; | ||
| import org.apache.doris.analysis.LargeIntLiteral; | ||
| import org.apache.doris.nereids.types.BigIntType; | ||
| import org.apache.doris.nereids.types.IntegerType; | ||
| import org.apache.doris.nereids.types.LargeIntType; | ||
| import org.apache.doris.nereids.types.SmallIntType; | ||
| import org.apache.doris.nereids.types.TinyIntType; | ||
| import org.apache.doris.nereids.util.MemoTestUtils; | ||
| import org.apache.doris.qe.ConnectContext; | ||
|
|
||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** Tests for user variable handling in expression analysis. */ | ||
| public class UserVariableAnalysisTest { | ||
|
|
||
| @Test | ||
| public void testUserVarIntegerType() { | ||
| ConnectContext ctx = MemoTestUtils.createConnectContext(); | ||
| // set user var @a = TINY_INT_MAX (tiny int) | ||
| ctx.setUserVar("a", new IntLiteral(Byte.MAX_VALUE)); | ||
| // set user var @a = SMALL_INT_MAX (small int) | ||
| ctx.setUserVar("b", new IntLiteral(Short.MAX_VALUE)); | ||
| // set user var @b = Long.MAX_VALUE (bigint) | ||
| ctx.setUserVar("c", new IntLiteral(Integer.MAX_VALUE)); | ||
| // set user var @b = Long.MAX_VALUE (bigint) | ||
| ctx.setUserVar("d", new IntLiteral(Long.MAX_VALUE)); | ||
| // set user var @b = Long.MAX_VALUE (bigint) | ||
| ctx.setUserVar("e", new LargeIntLiteral(LargeIntLiteral.LARGE_INT_MAX)); | ||
|
|
||
| Assertions.assertEquals(TinyIntType.INSTANCE, ConnectContext.get().getLiteralForUserVar("a").getDataType()); | ||
| Assertions.assertEquals(SmallIntType.INSTANCE, ConnectContext.get().getLiteralForUserVar("b").getDataType()); | ||
| Assertions.assertEquals(IntegerType.INSTANCE, ConnectContext.get().getLiteralForUserVar("c").getDataType()); | ||
| Assertions.assertEquals(BigIntType.INSTANCE, ConnectContext.get().getLiteralForUserVar("d").getDataType()); | ||
| Assertions.assertEquals(LargeIntType.INSTANCE, ConnectContext.get().getLiteralForUserVar("e").getDataType()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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 org.apache.doris.nereids.trees.expressions.functions; | ||
|
|
||
| import org.apache.doris.nereids.analyzer.UnboundVariable.VariableType; | ||
| import org.apache.doris.nereids.trees.expressions.Expression; | ||
| import org.apache.doris.nereids.trees.expressions.Variable; | ||
| import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral; | ||
| import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; | ||
| import org.apache.doris.nereids.types.DataType; | ||
|
|
||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Tests for ExpressionTrait behaviors when children are `Variable`. | ||
| */ | ||
| public class ExpressionTraitTest { | ||
|
|
||
| static class DummyFunction extends Expression { | ||
| protected DummyFunction(List<Expression> children) { | ||
| super(children); | ||
| } | ||
|
|
||
| protected DummyFunction(Expression... children) { | ||
| super(children); | ||
| } | ||
|
|
||
| @Override | ||
| public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public Expression withChildren(List<Expression> children) { | ||
| return new DummyFunction(children); | ||
| } | ||
|
|
||
| @Override | ||
| protected String computeToSql() { | ||
| return "dummy"; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean nullable() { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testVariableWithRealExpression() { | ||
| IntegerLiteral lit = new IntegerLiteral(42); | ||
| Variable var = new Variable("v", VariableType.USER, lit); | ||
|
|
||
| DummyFunction func = new DummyFunction(var); | ||
|
|
||
| List<Expression> args = func.getArguments(); | ||
| Assertions.assertEquals(1, args.size()); | ||
| Assertions.assertEquals(lit, args.get(0)); | ||
|
|
||
| Assertions.assertEquals(lit, func.getArgument(0)); | ||
|
|
||
| List<DataType> types = func.getArgumentsTypes(); | ||
| Assertions.assertEquals(1, types.size()); | ||
| Assertions.assertEquals(lit.getDataType(), types.get(0)); | ||
|
|
||
| Assertions.assertEquals(lit.getDataType(), func.getArgumentType(0)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testVariableWithoutRealExpression() { | ||
| IntegerLiteral lit = new IntegerLiteral(100); | ||
| // create a Variable but override getRealExpression to simulate a missing real expression | ||
| Variable var = new Variable("v", VariableType.USER, lit) { | ||
| @Override | ||
| public Expression getRealExpression() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| DummyFunction func = new DummyFunction(var); | ||
|
|
||
| List<Expression> args = func.getArguments(); | ||
| Assertions.assertEquals(1, args.size()); | ||
| // when Variable.getRealExpression() returns null, ExpressionTrait should return the Variable itself | ||
| Assertions.assertSame(var, args.get(0)); | ||
|
|
||
| Assertions.assertSame(var, func.getArgument(0)); | ||
|
|
||
| List<DataType> types = func.getArgumentsTypes(); | ||
| Assertions.assertEquals(1, types.size()); | ||
| // fallback to variable.getDataType() | ||
| Assertions.assertEquals(var.getDataType(), types.get(0)); | ||
|
|
||
| Assertions.assertEquals(var.getDataType(), func.getArgumentType(0)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,3 +20,6 @@ true false | |
| -- !select7 -- | ||
| 1 | ||
|
|
||
| -- !select_user_var -- | ||
| 2 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unwrapping
Variablehere only fixes callers that already usegetArgument*()/getArguments*(). A lot of function legality/signature code still reads rawchild()nodes before the laterVariableToLiteralanalyzer rule runs, so the same user-variable bug is still present there. Concrete example:SELECT UTC_TIMESTAMP(@p)with@p = 3still fails, becausevisitUnboundVariable()returnsVariable(realExpression=literal),visitUnboundFunction()buildsUtcTimestamp(Variable), and thenTypeCoercionUtils.processBoundFunction()immediately callsUtcTimestamp.checkLegalityBeforeTypeCoercion(), which rejects!child(0).isLiteral(). The same pattern exists inutc_time,uniform,width_bucket, etc. I think this needs to be fixed earlier in the bind/type-check path, or those raw-child checks need to be updated as well; otherwise this patch only fixes thewindow_funnel-style subset of functions.