IGNITE-28801 Calcite. Bump calcite dependency version to 1.42 #13274
+14,030
−13,269
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -387,6 +387,7 @@ data: { | |
| "UESCAPE" | ||
| "UNIQUE" | ||
| "UNKNOWN" | ||
| "UNSIGNED" | ||
| "UPPER" | ||
| "UPSERT" | ||
| "UUID" | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -32,13 +32,13 @@ public class IgniteExpressions { | |
| /** Make binary expression with arithmetic operations override. */ | ||
| public static Expression makeBinary(ExpressionType binaryType, Expression left, Expression right) { | ||
| switch (binaryType) { | ||
| case Add, AddChecked: | ||
|
Contributor
Author
There was a problem hiding this comment. check comment near, due to |
||
| return addExact(left, right); | ||
| case Subtract, SubtractChecked: | ||
| return subtractExact(left, right); | ||
| case Multiply, MultiplyChecked: | ||
| return multiplyExact(left, right); | ||
| case Divide, DivideChecked: | ||
| return divideExact(left, right); | ||
| default: | ||
| return Expressions.makeBinary(binaryType, left, right); | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -78,16 +78,21 @@ | |
| import static java.util.Objects.requireNonNull; | ||
| import static org.apache.calcite.adapter.enumerable.EnumUtils.generateCollatorExpression; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Add; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.AddChecked; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Divide; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.DivideChecked; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Equal; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.GreaterThan; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.GreaterThanOrEqual; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.LessThan; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.LessThanOrEqual; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Multiply; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.MultiplyChecked; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Negate; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.NegateChecked; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.NotEqual; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.Subtract; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.SubtractChecked; | ||
| import static org.apache.calcite.linq4j.tree.ExpressionType.UnaryPlus; | ||
| import static org.apache.calcite.sql.fun.SqlLibraryOperators.ACOSH; | ||
| import static org.apache.calcite.sql.fun.SqlLibraryOperators.ASINH; | ||
|
|
@@ -162,6 +167,7 @@ | |
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CEIL; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHAR_LENGTH; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHECKED_DIVIDE; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHECKED_DIVIDE_INTEGER; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHECKED_MINUS; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHECKED_MULTIPLY; | ||
| import static org.apache.calcite.sql.fun.SqlStdOperatorTable.CHECKED_PLUS; | ||
|
|
@@ -344,6 +350,13 @@ public class RexImpTable { | |
| defineUnary(UNARY_MINUS, Negate, NullPolicy.STRICT, | ||
| BuiltInMethod.BIG_DECIMAL_NEGATE.getMethodName()); | ||
| defineUnary(UNARY_PLUS, UnaryPlus, NullPolicy.STRICT, null); | ||
| // checked arithmetic | ||
| defineBinary(CHECKED_PLUS, AddChecked, NullPolicy.STRICT, "checkedPlus"); | ||
|
Contributor
Author
There was a problem hiding this comment. due to categorical CHECED type without conformance flag check |
||
| defineBinary(CHECKED_MINUS, SubtractChecked, NullPolicy.STRICT, "checkedMinus"); | ||
| defineBinary(CHECKED_MULTIPLY, MultiplyChecked, NullPolicy.STRICT, "checkedMultiply"); | ||
| defineBinary(CHECKED_DIVIDE, DivideChecked, NullPolicy.STRICT, "checkedDivide"); | ||
| defineBinary(CHECKED_DIVIDE_INTEGER, DivideChecked, NullPolicy.STRICT, "checkedDivide"); | ||
| defineUnary(CHECKED_UNARY_MINUS, NegateChecked, NullPolicy.STRICT, "checkedUnaryMinus"); | ||
|
|
||
| defineMethod(MOD, "mod", NullPolicy.STRICT); | ||
| defineMethod(EXP, "exp", NullPolicy.STRICT); | ||
|
|
@@ -1227,7 +1240,7 @@ private static class BinaryImplementor extends AbstractRexCallImplementor { | |
| @Override Expression implementSafe( | ||
| final RexToLixTranslator translator, | ||
| final RexCall call, | ||
| List<Expression> argValueList) { | ||
|
Contributor
There was a problem hiding this comment. Looks like it still final, why final was removed?
Contributor
Author
There was a problem hiding this comment. no, it`s not a final on apache calcite |
||
| // neither nullable: | ||
| // return x OP y | ||
| // x nullable | ||
|
|
@@ -1243,7 +1256,7 @@ private static class BinaryImplementor extends AbstractRexCallImplementor { | |
| // If one or both operands have ANY type, use the late-binding backup | ||
| // method. | ||
| if (anyAnyOperands(call)) | ||
| return callBackupMethodAnyType(argValueList); | ||
|
|
||
| final Type type0 = argValueList.get(0).getType(); | ||
| final Type type1 = argValueList.get(1).getType(); | ||
|
|
@@ -1272,10 +1285,6 @@ private static class BinaryImplementor extends AbstractRexCallImplementor { | |
| argValueList); | ||
| } | ||
|
|
||
| return IgniteExpressions.makeBinary(expressionType, | ||
| argValueList.get(0), argValueList.get(1)); | ||
| } | ||
|
|
@@ -1290,8 +1299,7 @@ private boolean anyAnyOperands(RexCall call) { | |
| } | ||
|
|
||
| /** */ | ||
| private Expression callBackupMethodAnyType(List<Expression> expressions) { | ||
| final String backupMethodNameForAnyType = | ||
| backupMethodName + METHOD_POSTFIX_FOR_ANY_TYPE; | ||
|
|
||
|
|
@@ -1343,6 +1351,8 @@ private static class UnaryImplementor extends AbstractRexCallImplementor { | |
| if (expressionType == ExpressionType.Negate && argVal.type == BigDecimal.class | ||
| && null != backupMethodName) | ||
| e = Expressions.call(argVal, backupMethodName); | ||
| else if (expressionType == NegateChecked && null != backupMethodName) | ||
| e = Expressions.call(SqlFunctions.class, backupMethodName, argValueList); | ||
| else | ||
| e = IgniteExpressions.makeUnary(expressionType, argVal); | ||
|
|
||
|
|
@@ -1562,12 +1572,15 @@ private static class CastImplementor extends AbstractRexCallImplementor { | |
| /** {@inheritDoc} */ | ||
| @Override Expression implementSafe(final RexToLixTranslator translator, | ||
| final RexCall call, final List<Expression> argValueList) { | ||
| assert call.operandCount() <= 2; | ||
| final RelDataType srcType = call.getOperands().get(0).getType(); | ||
|
|
||
| RexNode arg = call.getOperands().get(0); | ||
|
|
||
| // Short-circuit if no cast is required | ||
| if (call.getType().equals(srcType) | ||
| // However, do not elide casts to decimal types, they perform bounds checking | ||
| && srcType.getSqlTypeName() != SqlTypeName.DECIMAL) { | ||
| // No cast required, omit cast | ||
| return argValueList.get(0); | ||
| } | ||
|
|
@@ -1588,10 +1601,11 @@ private static class CastImplementor extends AbstractRexCallImplementor { | |
| private RelDataType nullifyType(JavaTypeFactory typeFactory, | ||
| final RelDataType type, final boolean nullable) { | ||
| if (type instanceof RelDataTypeFactoryImpl.JavaType) { | ||
| Class<?> javaCls = ((RelDataTypeFactoryImpl.JavaType)type).getJavaClass(); | ||
| final Class<?> primitive = Primitive.unbox(javaCls); | ||
| if (primitive != javaCls) { | ||
| return typeFactory.createJavaType(primitive); | ||
| } | ||
| } | ||
| return typeFactory.createTypeWithNullability(type, nullable); | ||
| } | ||
|
|
||
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
Oops, something went wrong.
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.
nullExclusionsandallowNullshave inverse logic, why herenot allowNullschanged tonot null exclusion? Shouldn't we removenot?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.
no, i understand what you mean, "not" is changed in comparator implementation side, or if you about namings - let`s discuss it
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.
I mean logic is changed here.
allowNulls.get(p)==!nullExclusions.get(p), but here both collection items processed asnot