alex-plekhanov commented on code in PR #11659: URL: https://github.com/apache/ignite/pull/11659#discussion_r1850864843
########## modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlCallRewriteTable.java: ########## @@ -0,0 +1,117 @@ +/* + * 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.prepare; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiFunction; +import org.apache.calcite.sql.SqlCall; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlNodeList; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.fun.SqlCase; +import org.apache.calcite.sql.fun.SqlLibraryOperators; +import org.apache.calcite.sql.fun.SqlStdOperatorTable; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.validate.SqlValidator; + +import static org.apache.calcite.util.Static.RESOURCE; + +/** + * Ignite SQL call rewrite table. Performs unconditional rewrites for some predefined Calcite SQL operators, + * which can't be extended other ways by Ignite. + */ +public class IgniteSqlCallRewriteTable { + /** Instance. */ + public static final IgniteSqlCallRewriteTable INSTANCE = new IgniteSqlCallRewriteTable(); + + /** Registered rewriters map. */ + private final Map<SqlOperator, BiFunction<SqlValidator, SqlCall, SqlCall>> map = new HashMap<>(); + + /** */ + private IgniteSqlCallRewriteTable() { + register(SqlLibraryOperators.NVL, IgniteSqlCallRewriteTable::nvlRewriter); + register(SqlLibraryOperators.DECODE, IgniteSqlCallRewriteTable::decodeRewriter); + } + + /** Registers rewriter for SQL operator. */ + public void register(SqlOperator operator, BiFunction<SqlValidator, SqlCall, SqlCall> rewriter) { + map.put(operator, rewriter); + } + + /** Rewrites SQL call. */ + public SqlCall rewrite(SqlValidator validator, SqlCall call) { Review Comment: Fixed ########## modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/FunctionsTest.java: ########## @@ -301,4 +301,48 @@ public void testCastToBoolean() { assertQuery("SELECT CAST(CAST(? AS DECIMAL(2, 1)) AS BOOLEAN)") .withParams(NULL_RESULT).returns(NULL_RESULT).check(); } + + /** Tests NVL with different parameters data types. */ + @Test + public void testNvl() { + // Result type is the least restrictive type for parameters. + assertQuery("select nvl('1', 2)").returns("1").check(); + assertQuery("select nvl(1, '2')").returns("1").check(); + assertQuery("select nvl(1, 2.0)").returns(new BigDecimal("1.0")).check(); + assertQuery("select nvl(1, 2::DOUBLE)").returns(1d).check(); + assertQuery("select nvl(1::TINYINT, 2::SMALLINT)").returns((short)1).check(); + assertQuery("select nvl(1.0, '2')").returns("1.0").check(); + assertQuery("select nvl(null, 2)").returns(2).check(); + assertQuery("select nvl(null, '2')").returns("2").check(); + assertQuery("select nvl(null, null)").returns(NULL_RESULT).check(); + assertQuery("select nvl(?, ?)").withParams("1", 2).returns("1").check(); + assertQuery("select nvl(?, ?)").withParams(1, "2").returns("1").check(); + assertQuery("select nvl(?, ?)").withParams(1, 2d).returns(1d).check(); + assertQuery("select nvl(?, ?)").withParams(null, 2).returns(2).check(); + assertQuery("select nvl(?, ?)").withParams(null, "2").returns("2").check(); + assertQuery("select nvl(?, ?)").withParams(null, null).returns(NULL_RESULT).check(); + } + + /** Tests DECODE with different parameters data types. */ + @Test + public void testDecode() { Review Comment: Fixed -- 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: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
