[fix][dingo-calcite] Add data validation when modifying table columns

Author: guojn1

dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java

@@ -109,6 +109,9 @@
 import io.dingodb.common.type.DingoType;
 import io.dingodb.common.type.ListType;
 import io.dingodb.common.type.MapType;
+import io.dingodb.common.type.TupleType;
+import io.dingodb.common.type.converter.DingoConverter;
+import io.dingodb.common.type.converter.StrParseConverter;
 import io.dingodb.common.type.scalar.BinaryType;
 import io.dingodb.common.type.scalar.BitType;
 import io.dingodb.common.type.scalar.BooleanType;
@@ -2122,6 +2125,9 @@ public static void validatePartitionBy(
                     throw DingoErrUtil.newStdErr("part column must be primary key");
                 }
             }
+            if ("range".equalsIgnoreCase(partDefinition.getFuncName())) {
+                checkOperandType(tableDefinition, partDefinition);
+            }
         }
 
         List<PartitionDetailDefinition> details = new ArrayList<>();
@@ -2134,6 +2140,39 @@ public static void validatePartitionBy(
         partDefinition.setDetails(details);
     }
 
+    private static void checkOperandType(@NonNull TableDefinition tableDefinition, PartitionDefinition partDefinition) {
+        DingoType keysType = tableDefinition.getKeyType();
+        if (keysType instanceof TupleType) {
+            TupleType keysType1 = (TupleType) keysType;
+            partDefinition.getDetails().forEach(detail -> {
+                if (detail.getOperand() == null) {
+                    return;
+                }
+                Object[] operand = detail.getOperand();
+                if (detail.getOperand().length > keysType1.fieldCount()) {
+                    throw new IllegalArgumentException(
+                        "Partition values count must be <= key columns count, but values count is "
+                            + detail.getOperand().length
+                    );
+                }
+                for (int i = 0; i < operand.length; i++) {
+                    DingoType type = keysType1.getChild(i);
+                    if (operand[i] != null) {
+                        Object object = type.convertTo(type.convertFrom(operand[i].toString(),
+                                StrParseConverter.INSTANCE),
+                            DingoConverter.INSTANCE);
+                        if (object == null) {
+                            throw new IllegalArgumentException(
+                                "For input string \""
+                                    + operand[i] + "\""
+                            );
+                        }
+                    }
+                }
+            });
+        }
+    }
+
     @NonNull
     private static PrivilegeDefinition getPrivilegeDefinition(
         @NonNull SqlGrant sqlGrant, CalcitePrepare.@NonNull Context context

dingo-calcite/src/main/java/io/dingodb/calcite/DingoParser.java

@@ -65,6 +65,7 @@
 import io.dingodb.calcite.grammar.ddl.SqlTruncate;
 import io.dingodb.calcite.grammar.ddl.SqlUnLockBlock;
 import io.dingodb.calcite.grammar.ddl.SqlUnLockTable;
+import io.dingodb.calcite.grammar.ddl.SqlUseSchema;
 import io.dingodb.calcite.grammar.dml.SqlExecute;
 import io.dingodb.calcite.grammar.dml.SqlInsert;
 import io.dingodb.calcite.grammar.dml.SqlPrepare;
@@ -508,7 +509,8 @@ protected static boolean compatibleMysql(SqlNode sqlNode, PlanProfile planProfil
                 || sqlNode instanceof SqlBackUpTimePoint
                 || sqlNode instanceof SqlBackUpTsoPoint
                 || sqlNode instanceof SqlTsoToTime
-                || sqlNode instanceof SqlTenantsBackUpTimePoint;
+                || sqlNode instanceof SqlTenantsBackUpTimePoint
+                || sqlNode instanceof SqlUseSchema;
         }
     }
 

dingo-calcite/src/main/java/io/dingodb/calcite/executor/InitSchemaExecutor.java

@@ -0,0 +1,38 @@
+/*
+ * 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.executor;
+
+import io.dingodb.tool.api.QueryManager;
+
+import java.sql.Connection;
+
+public class InitSchemaExecutor implements DdlExecutor {
+
+    private final Connection connection;
+
+    private final String schema;
+
+    public InitSchemaExecutor(Connection connection, String schema) {
+        this.connection = connection;
+        this.schema = schema;
+    }
+
+    @Override
+    public void execute() {
+        QueryManager.getDefault().initSchema(connection, schema);
+    }
+}

dingo-calcite/src/main/java/io/dingodb/calcite/executor/SqlToExecutorConverter.java

@@ -31,6 +31,7 @@
 import io.dingodb.calcite.grammar.ddl.SqlRollback;
 import io.dingodb.calcite.grammar.ddl.SqlUnLockBlock;
 import io.dingodb.calcite.grammar.ddl.SqlUnLockTable;
+import io.dingodb.calcite.grammar.ddl.SqlUseSchema;
 import io.dingodb.calcite.grammar.dql.SqlBackUpTimePoint;
 import io.dingodb.calcite.grammar.dql.SqlBackUpTsoPoint;
 import io.dingodb.calcite.grammar.dql.SqlDescTable;
@@ -284,6 +285,9 @@ public static Optional<Executor> convert(SqlNode sqlNode, Connection connection,
         } else if (sqlNode instanceof SqlShowExecutorVariables) {
             SqlShowExecutorVariables sqlShowExecutorVariables = (SqlShowExecutorVariables) sqlNode;
             return Optional.of(new ShowExecutorVariablesExecutor(sqlShowExecutorVariables.sqlLikePattern));
+        } else if (sqlNode instanceof SqlUseSchema) {
+            SqlUseSchema sqlUseSchema = (SqlUseSchema) sqlNode;
+            return Optional.of(new InitSchemaExecutor(connection, sqlUseSchema.schema));
         } else {
             return Optional.empty();
         }

dingo-calcite/src/main/java/io/dingodb/calcite/rel/DingoGetByIndex.java

@@ -175,12 +175,17 @@ public double estimateRowCount(RelMetadataQuery mq) {
         }
         Table indexTd = getIndexTdMap().get(commonId);
         Table td = Objects.requireNonNull(getTable().unwrap(DingoTable.class)).getTable();
-        List<Integer> indexSelectionList = td.getColumnIndices2(indexTd.getColumns());
-        Mapping mapping = Mappings.target(indexSelectionList, td.getColumns().size());
-        Pair<RexNode, RexNode> res = DingoFilterUtils.splitRexFilter(filter, mapping, getCluster().getRexBuilder());
         RexNode indexFilter;
-        if (res != null && res.getKey() != null) {
-            indexFilter = res.getKey();
+        if (lookup) {
+            List<Integer> indexSelectionList = td.getColumnIndices2(indexTd.getColumns());
+            Mapping mapping = Mappings.target(indexSelectionList, td.getColumns().size());
+            Pair<RexNode, RexNode> res = DingoFilterUtils.splitRexFilter(filter, mapping, getCluster().getRexBuilder());
+
+            if (res != null && res.getKey() != null) {
+                indexFilter = res.getKey();
+            } else {
+                indexFilter = filter;
+            }
         } else {
             indexFilter = filter;
         }

dingo-calcite/src/main/java/io/dingodb/calcite/rule/DingoIndexNonLeftMatchRule.java

@@ -75,6 +75,7 @@
 import static org.apache.calcite.sql.SqlKind.IS_NULL;
 import static org.apache.calcite.sql.SqlKind.LESS_THAN;
 import static org.apache.calcite.sql.SqlKind.LESS_THAN_OR_EQUAL;
+import static org.apache.calcite.sql.SqlKind.OR;
 
 @Slf4j
 @Value.Enclosing
@@ -85,7 +86,7 @@ public class DingoIndexNonLeftMatchRule extends RelRule<DingoIndexNonLeftMatchRu
             IN, EQUALS, AND,
             LESS_THAN, GREATER_THAN,
             GREATER_THAN_OR_EQUAL, LESS_THAN_OR_EQUAL,
-            IS_NULL);
+            IS_NULL, OR);
 
     protected DingoIndexNonLeftMatchRule(Config config) {
         super(config);
@@ -273,6 +274,9 @@ private static RelNode getIndexFullScanRelNode(LogicalProject project, LogicalDi
             }
             return null;
         }
+        if (scan.getFilter().isA(OR)) {
+            return null;
+        }
         LogicalIndexFullScan indexFullScan = new LogicalIndexFullScan(
             scan.getCluster(),
             scan.getTraitSet(),

dingo-common/src/main/java/io/dingodb/common/ddl/DdlJob.java

@@ -25,7 +25,6 @@
 import io.dingodb.common.mysql.DingoErr;
 import io.dingodb.common.partition.PartitionDetailDefinition;
 import io.dingodb.common.sequence.SequenceDefinition;
-import io.dingodb.common.table.ColumnDefinition;
 import io.dingodb.common.table.IndexDefinition;
 import io.dingodb.common.table.TableDefinition;
 import lombok.Builder;

dingo-common/src/main/java/io/dingodb/common/mysql/error/ErrorMessage.java

@@ -63,6 +63,7 @@ public final class ErrorMessage {
             + "this is incompatible with sql_mode=only_full_group_by");
         errorMap.put(ErrMixOfGroupFuncAndFields, "In aggregated query without GROUP BY, expression #%d of "
             + "SELECT list contains nonaggregated column '%s'; this is incompatible with sql_mode=only_full_group_by");
+        errorMap.put(ErrWarnDataOutOfRange, "Out of range value for column 'age' at row 1");
     }
 
     private ErrorMessage() {

dingo-common/src/main/java/io/dingodb/common/session/SessionUtil.java

@@ -94,18 +94,19 @@ public String exeUpdateInTxn(String sql, int retry) {
         }
     }
 
-    public long exeUpdate(String sql, int retry) throws Exception {
+    public long exeUpdate(String sql, int retry, String schema) throws Exception {
         Session session = null;
         try {
             session = getSession();
+            session.executeUpdate("use " + schema);
             return session.executeUpdate1(sql);
         } catch (Exception e) {
             LogUtils.error(log, e.getMessage());
             retry --;
             if (retry == 0) {
                 throw e;
             } else {
-                return exeUpdate(sql, retry);
+                return exeUpdate(sql, retry, schema);
             }
         } finally {
             closeSession(session);

dingo-common/src/main/java/io/dingodb/common/type/DingoTypeFactory.java

@@ -30,6 +30,7 @@
 import io.dingodb.common.type.scalar.StringType;
 import io.dingodb.common.type.scalar.TimeType;
 import io.dingodb.common.type.scalar.TimestampType;
+import io.dingodb.common.type.scalar.TinyIntType;
 import io.dingodb.expr.common.type.Type;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -51,7 +52,7 @@ public final class DingoTypeFactory {
     private DingoTypeFactory() {
         scalarGenerators = new TreeMap<>(String::compareToIgnoreCase);
         intervalGenerators = new TreeMap<>(String::compareToIgnoreCase);
-        scalarGenerators.put("TINYINT", IntegerType::new);
+        scalarGenerators.put("TINYINT", TinyIntType::new);
         scalarGenerators.put("INT", IntegerType::new);
         scalarGenerators.put("INTEGER", IntegerType::new);
         scalarGenerators.put("LONG", LongType::new);