zstan commented on code in PR #13543:
URL: https://github.com/apache/ignite/pull/13543#discussion_r3988193352
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java:
##########
@@ -230,6 +276,12 @@ public static Expression convert(Expression operand, Type
fromType, Type toType)
if (toType == BigDecimal.class)
throw new AssertionError("For conversion to decimal,
ConverterUtils#convertToDecimal method should be used instead.");
+ if (fromType == byte[].class && toType == ByteString.class)
+ return
Expressions.call(BuiltInMethod.BYTE_ARRAY_TO_BYTE_STRING.method, operand);
+
+ if (fromType == ByteString.class && toType == byte[].class)
+ return
Expressions.call(BuiltInMethod.BYTE_STRING_TO_BYTE_ARRAY.method, operand);
Review Comment:
these conversion still has no test coverage, isn\`t it ?
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/IgniteFunctionParameter.java:
##########
@@ -0,0 +1,75 @@
+/*
+ * 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.ignite.internal.processors.query.calcite.exec.exp;
+
+import java.util.List;
+import org.apache.calcite.adapter.java.JavaTypeFactory;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.schema.FunctionParameter;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.ignite.internal.processors.query.calcite.type.OtherType;
+
+/**
+ * Reflective Java function parameter represented with a SQL type.
+ *
+ * <p>The SQL representation is required to validate user-defined function
arguments and to convert literal arguments
+ * while deriving a table function row type.
+ */
+final class IgniteFunctionParameter implements FunctionParameter {
Review Comment:
seems all tests are passed if you completelly remote this class, am i right ?
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java:
##########
@@ -123,28 +124,73 @@ else if (targetType == java.sql.Timestamp.class) {
/** */
static List<Expression> fromInternal(Class<?>[] targetTypes,
List<Expression> expressions) {
- final List<Expression> list = new ArrayList<>();
+ return fromInternal(null, targetTypes, expressions);
+ }
+
+ /** */
+ static List<Expression> fromInternal(@Nullable Expression root,
+ Class<?>[] targetTypes,
+ List<Expression> expressions
+ ) {
+ final List<Expression> list = new ArrayList<>(expressions.size());
+
if (targetTypes.length == expressions.size()) {
for (int i = 0; i < expressions.size(); i++)
- list.add(fromInternal(expressions.get(i), targetTypes[i]));
+ list.add(fromInternal(root, expressions.get(i),
targetTypes[i]));
}
else {
int j = 0;
- for (int i = 0; i < expressions.size(); i++) {
- Class<?> type;
+
+ for (Expression expression : expressions) {
+ Class<?> targetType;
+
if (!targetTypes[j].isArray()) {
- type = targetTypes[j];
+ targetType = targetTypes[j];
j++;
}
else
- type = targetTypes[j].getComponentType();
+ targetType = targetTypes[j].getComponentType();
- list.add(fromInternal(expressions.get(i), type));
+ list.add(fromInternal(root, expression, targetType));
}
}
+
return list;
}
+ /** */
+ private static Expression fromInternal(@Nullable Expression root,
Expression operand, Type targetType) {
+ // Preserve Calcite conversions when no execution context is
available, including temporal conversions.
+ if (root == null)
+ return fromInternal(operand, operand.getType(), targetType);
+
+ // Let the Java method call box compatible primitives instead of
generating a reference cast.
+ if (Types.isAssignableFrom(targetType, operand.getType())
+ || Types.isAssignableFrom(targetType,
Primitive.box(operand.getType())))
+ return operand;
+
+ if (!TypeUtils.isConvertableType(targetType))
+ return targetType == BigDecimal.class ? fromInternal(operand,
operand.getType(), targetType) :
+ convert(operand, operand.getType(), targetType);
+
+ if (Primitive.is(operand.getType()))
+ operand = Expressions.box(operand);
+
+ Expression converted = Expressions.call(
+ TypeUtils.class,
+ "fromInternal",
+ root,
+ operand,
+ Expressions.constant(targetType)
+ );
+
+ Primitive primitive = Primitive.of(targetType);
+
+ return primitive == null
+ ? Expressions.convert_(converted, targetType)
+ : Expressions.unbox(Expressions.convert_(converted,
primitive.boxClass), primitive);
Review Comment:
redundant ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
