[fix][dingo-executor] The concat function supports composite types

Author: githubgxll

dingo-calcite/src/main/codegen/config.fmpp

@@ -150,7 +150,6 @@ data: {
       "io.dingodb.calcite.grammar.dml.SqlExecute"
       "io.dingodb.calcite.grammar.dml.SqlPrepare"
       "io.dingodb.calcite.grammar.SqlUserDefinedOperators"
-      "io.dingodb.calcite.fun.SqlConcatFunction"
       "io.dingodb.calcite.type.DingoSqlLiteral"
       "io.dingodb.calcite.type.DingoSqlCharStringLiteral"
       "io.dingodb.calcite.utils.DingoSqlParserUtil"

dingo-calcite/src/main/java/io/dingodb/calcite/fun/DingoConcatFunction.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021 DataCanvas
+ *
+ * Licensed 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 io.dingodb.calcite.fun;
+
+import lombok.EqualsAndHashCode;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlOperandTypeInference;
+import org.apache.calcite.sql.type.SqlReturnTypeInference;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorScope;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
+public class DingoConcatFunction extends DingoSqlFunction {
+    public DingoConcatFunction(
+        String name,
+        @Nullable SqlReturnTypeInference returnTypeInference,
+        @Nullable SqlOperandTypeInference operandTypeInference,
+        @Nullable SqlOperandTypeChecker operandTypeChecker,
+        SqlFunctionCategory category
+    ) {
+        super(
+            name,
+            returnTypeInference,
+            operandTypeInference,
+            operandTypeChecker,
+            category
+        );
+    }
+
+    @Override
+    public void validateCall(
+        @NonNull SqlCall call,
+        SqlValidator validator,
+        SqlValidatorScope scope,
+        SqlValidatorScope operandScope
+    ) {
+        SqlOperator operator = call.getOperator();
+        assert getClass().isAssignableFrom(operator.getClass());
+        super.validateCall(call, validator, scope, operandScope);
+    }
+
+
+    public RelDataType inferReturnType(SqlOperatorBinding opBinding) {
+        return opBinding.getTypeFactory().createSqlType(SqlTypeName.VARCHAR);
+    }
+
+}

dingo-calcite/src/main/java/io/dingodb/calcite/fun/DingoOperatorTable.java

@@ -125,7 +125,6 @@ private void init() {
         funMap.put("CURDATE", SqlStdOperatorTable.CURRENT_DATE);
         funMap.put("CURTIME", SqlStdOperatorTable.CURRENT_TIME);
         funMap.put("SUBSTR", SqlStdOperatorTable.SUBSTRING);
-        funMap.put("CONCAT", SqlConcatFunction.CONCAT);
         funMap.put("IF", SqlIfFunction.IF);
 
         // number
@@ -160,7 +159,7 @@ private void init() {
         );
 
         // string
-        registerFunction(
+        registerConcatFunction(
             ConcatFun.NAME,
             ReturnTypes.VARCHAR_2000_NULLABLE,
             DingoInferTypes.VARCHAR,
@@ -544,6 +543,22 @@ public void registerFunction(
         ));
     }
 
+    public void registerConcatFunction(
+        @NonNull String name,
+        @Nullable SqlReturnTypeInference returnTypeInference,
+        @Nullable SqlOperandTypeInference operandTypeInference,
+        @Nullable SqlOperandTypeChecker operandTypeChecker,
+        SqlFunctionCategory category
+    ) {
+        funMap.put(name.toUpperCase(), new DingoConcatFunction(
+            name.toUpperCase(),
+            returnTypeInference,
+            operandTypeInference,
+            operandTypeChecker,
+            category
+        ));
+    }
+
     @Override
     public void lookupOperatorOverloads(
         SqlIdentifier opName,

dingo-calcite/src/main/java/io/dingodb/calcite/fun/DingoSqlFunction.java

@@ -20,10 +20,8 @@
 import org.apache.calcite.sql.SqlCall;
 import org.apache.calcite.sql.SqlFunction;
 import org.apache.calcite.sql.SqlFunctionCategory;
-import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlOperator;
-import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.type.SqlOperandTypeChecker;
 import org.apache.calcite.sql.type.SqlOperandTypeInference;
 import org.apache.calcite.sql.type.SqlReturnTypeInference;

dingo-calcite/src/main/java/io/dingodb/calcite/fun/SqlConcatFunction.java

@@ -79,7 +79,6 @@ private DingoFunFactory() {
         registerUnaryFun(LastValFun.NAME, LastValFun.INSTANCE);
         registerBinaryFun(SetValFun.NAME, SetValFun.INSTANCE);
         registerUnaryFun(LengthFun.NAME, LengthFun.INSTANCE);
-        registerVariadicFun(ConcatFun.NAME, ConcatFun.INSTANCE);
         registerTertiaryFun(IfFun.NAME, IfFun.INSTANCE);
         registerBinaryFun(DateAddFun.NAME, DateAddFun.INSTANCE);
         registerBinaryFun(DateSubFun.NAME, DateSubFun.INSTANCE);