matriv commented on a change in pull request #17771: URL: https://github.com/apache/flink/pull/17771#discussion_r749431588
########## File path: flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/ImplicitConversionEqualsFunctionITCase.java ########## @@ -0,0 +1,227 @@ +/* + * 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.flink.table.planner.functions; + +import org.apache.flink.table.functions.BuiltInFunctionDefinitions; +import org.apache.flink.table.types.AbstractDataType; +import org.apache.flink.table.types.DataType; + +import org.junit.runners.Parameterized; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.flink.table.api.DataTypes.BIGINT; +import static org.apache.flink.table.api.DataTypes.BOOLEAN; +import static org.apache.flink.table.api.DataTypes.DATE; +import static org.apache.flink.table.api.DataTypes.DECIMAL; +import static org.apache.flink.table.api.DataTypes.DOUBLE; +import static org.apache.flink.table.api.DataTypes.FLOAT; +import static org.apache.flink.table.api.DataTypes.INT; +import static org.apache.flink.table.api.DataTypes.SMALLINT; +import static org.apache.flink.table.api.DataTypes.STRING; +import static org.apache.flink.table.api.DataTypes.TIME; +import static org.apache.flink.table.api.DataTypes.TIMESTAMP; +import static org.apache.flink.table.api.DataTypes.TINYINT; + +/** Tests for type conversions in '='. */ Review comment: Please expand this comment that is only for SQL, and maybe point to a FLINK issue for the future improvement in this area. ########## File path: flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/ImplicitConversionEqualsFunctionITCase.java ########## @@ -0,0 +1,227 @@ +/* + * 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.flink.table.planner.functions; + +import org.apache.flink.table.functions.BuiltInFunctionDefinitions; +import org.apache.flink.table.types.AbstractDataType; +import org.apache.flink.table.types.DataType; + +import org.junit.runners.Parameterized; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.flink.table.api.DataTypes.BIGINT; +import static org.apache.flink.table.api.DataTypes.BOOLEAN; +import static org.apache.flink.table.api.DataTypes.DATE; +import static org.apache.flink.table.api.DataTypes.DECIMAL; +import static org.apache.flink.table.api.DataTypes.DOUBLE; +import static org.apache.flink.table.api.DataTypes.FLOAT; +import static org.apache.flink.table.api.DataTypes.INT; +import static org.apache.flink.table.api.DataTypes.SMALLINT; +import static org.apache.flink.table.api.DataTypes.STRING; +import static org.apache.flink.table.api.DataTypes.TIME; +import static org.apache.flink.table.api.DataTypes.TIMESTAMP; +import static org.apache.flink.table.api.DataTypes.TINYINT; + +/** Tests for type conversions in '='. */ +public class ImplicitConversionEqualsFunctionITCase extends BuiltInFunctionTestBase { + + // numeric data + private static final byte TINY_INT_DATA = (byte) 1; + private static final short SMALL_INT_DATA = (short) 1; + private static final int INT_DATA = 1; + private static final long BIG_INT_DATA = 1L; + private static final float FLOAT_DATA = 1.0f; + private static final double DOUBLE_DATA = 1.0d; + private static final BigDecimal DECIMAL_DATA = new BigDecimal(1); + + // time data + private static final String DATE_DATA = "2001-01-01"; + private static final String TIME_DATA = "00:00:00"; + private static final String TIMESTAMP_DATA = ("2001-01-01 00:00:00"); + + // string data + private static final String STRING_DATA_EQUALS_NUMERIC = "1"; + private static final String STRING_DATA_EQUALS_DATE = "2001-01-01"; + private static final String STRING_DATA_EQUALS_TIME = "00:00:00"; + private static final String STRING_DATA_EQUALS_TIMESTAMP = "2001-01-01 00:00:00"; + + @Parameterized.Parameters(name = "{index}: {0}") + public static List<TestSpec> testData() { + final List<TestSpec> specs = new ArrayList<>(); + specs.addAll(implicitConversionBetweenNumeric()); + specs.addAll(implicitConversionBetweenTimeAndString()); + specs.addAll(unsupportedImplicitConversionBetweenNumericAndString()); + return specs; + } + + private static List<TestSpec> implicitConversionBetweenNumeric() { + return Arrays.asList( + TypeConversionTestBuilder.left(TINYINT(), TINY_INT_DATA) + .right(TINYINT(), TINY_INT_DATA) + .right(SMALLINT(), SMALL_INT_DATA) + .right(INT(), INT_DATA) + .right(BIGINT(), BIG_INT_DATA) + .right(FLOAT(), FLOAT_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build(), + TypeConversionTestBuilder.left(SMALLINT(), SMALL_INT_DATA) + .right(SMALLINT(), SMALL_INT_DATA) + .right(INT(), INT_DATA) + .right(BIGINT(), BIG_INT_DATA) + .right(FLOAT(), FLOAT_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build(), + TypeConversionTestBuilder.left(INT(), INT_DATA) + .right(INT(), INT_DATA) + .right(BIGINT(), BIG_INT_DATA) + .right(FLOAT(), FLOAT_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build(), + TypeConversionTestBuilder.left(BIGINT(), BIG_INT_DATA) + .right(BIGINT(), BIG_INT_DATA) + .right(FLOAT(), FLOAT_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build(), + TypeConversionTestBuilder.left(FLOAT(), FLOAT_DATA) + .right(FLOAT(), FLOAT_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build(), + TypeConversionTestBuilder.left(DOUBLE(), DOUBLE_DATA) + .right(DOUBLE(), DOUBLE_DATA) + .right(DECIMAL(1, 0), DECIMAL_DATA) + .build()); + } + + private static List<TestSpec> implicitConversionBetweenTimeAndString() { + return Arrays.asList( + TypeConversionTestBuilder.left(DATE(), DATE_DATA) + .right(DATE(), DATE_DATA) + .right(STRING(), STRING_DATA_EQUALS_DATE) + .build(), + TypeConversionTestBuilder.left(TIME(), TIME_DATA) + .right(STRING(), STRING_DATA_EQUALS_TIME) + .build(), + TypeConversionTestBuilder.left(TIMESTAMP(), TIMESTAMP_DATA) + .right(STRING(), STRING_DATA_EQUALS_TIMESTAMP) + .build()); + } + + // unsupported temporarily + private static List<TestSpec> unsupportedImplicitConversionBetweenNumericAndString() { + return Arrays.asList( + TypeConversionTestBuilder.left(STRING(), STRING_DATA_EQUALS_NUMERIC) + .right(STRING(), STRING_DATA_EQUALS_NUMERIC) + .fail(TINYINT(), TINY_INT_DATA) + .fail(SMALLINT(), SMALL_INT_DATA) + .fail(INT(), INT_DATA) + .fail(BIGINT(), BIG_INT_DATA) + .fail(FLOAT(), FLOAT_DATA) + .fail(DOUBLE(), DOUBLE_DATA) + .fail(DECIMAL(1, 0), DECIMAL_DATA) + .build()); + } + + static class TypeConversionTestBuilder { + private TestSpec testSpec; + private DataType leftType; + private final List<Object> columnData = new ArrayList<>(); + private final List<DataType> columnTypes = new ArrayList<>(); + private final List<Boolean> isSuccessResults = new ArrayList<>(); + + private static TypeConversionTestBuilder left(DataType leftType, Object leftValue) { + TypeConversionTestBuilder builder = new TypeConversionTestBuilder(); + builder.leftType = leftType; + builder.columnData.add(leftValue); + builder.columnTypes.add(leftType); + builder.testSpec = + TestSpec.forFunction( + BuiltInFunctionDefinitions.EQUALS, + "The left type in type conversion is " + leftType.toString()); Review comment: You could simplify the description, like: `"left: " + leftType.toString()` ########## File path: flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java ########## @@ -500,6 +509,11 @@ public static ResultSpec resultSpec( return resultSpec(tableApiExpression, sqlExpression, result, dataType, dataType); } + public static ResultSpec resultSpecOnlyContainsSqlExpression( Review comment: You could simplify the name like `resultSpecSQL` or `sqlResultSpec`. ########## File path: flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInFunctionTestBase.java ########## @@ -342,9 +341,19 @@ TestSpec testResult( List<Object> result, List<AbstractDataType<?>> tableApiDataType, List<AbstractDataType<?>> sqlDataType) { - testItems.add(new TableApiResultTestItem(expression, result, tableApiDataType)); - testItems.add( - new SqlResultTestItem(String.join(",", sqlExpression), result, sqlDataType)); + + expression = expression.stream().filter(Objects::nonNull).collect(Collectors.toList()); Review comment: I'm not a big fan of this, imho it would more clear to use directly the `testSqlResult()` & `testSqlValidationError()` directly and not go through the `ResultSpec` Pojo for this test. What do you think? -- 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]
