dingodb · githubgxll · May 22, 2025 · May 22, 2025
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java b/dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java
@@ -2335,9 +2335,9 @@ private static List<IndexDefinition> getIndexDefinitions(
             .filter(col -> col.getKind() == SqlKind.CREAT
10000
E_INDEX)
             .map(col -> fromSqlIndexDeclaration((SqlIndexDeclaration) col, tableDefinition))
             .collect(Collectors.toCollection(ArrayList::new)));
-        long count = tableDefList.stream().map(TableDefinition::getName).distinct().count();
+        long count = tableDefList.stream().map(c -> c.getName().toUpperCase()).distinct().count();
         if (tableDefList.size() > count) {
-            throw new IllegalArgumentException("Duplicate index name");
+            throw DINGO_RESOURCE.duplicateColumn().ex();
         }
         return tableDefList;
     }

diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/DingoSqlToRelConverter.java b/dingo-calcite/src/main/java/io/dingodb/calcite/DingoSqlToRelConverter.java
@@ -247,7 +247,7 @@ private Blackboard createInsertBlackboard(
                         rexBuilder.makeFieldAccess(sourceRef, j++));
             }
         }
-        return createBlackboard(null, nameToNameMap, false);
+        return createBlackboard(validator().getEmptyScope(), nameToNameMap, false);
     }
 
     private SqlValidator validator() {

diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/grammar/ddl/SqlGrant.java b/dingo-calcite/src/main/java/io/dingodb/calcite/grammar/ddl/SqlGrant.java
@@ -99,11 +99,11 @@ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
             writer.keyword("USAGE");
         }
         writer.keyword("ON");
-        writer.keyword(schema);
+        writer.literal(schema);
         writer.keyword(".");
-        writer.keyword(table);
+        writer.literal(table);
         writer.keyword("TO");
-        writer.keyword(user);
+        writer.literal(user);
         writer.keyword("@");
         writer.keyword(host);
         if (withGrantOption) {

diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/rel/DingoGetDocumentPreFilter.java b/dingo-calcite/src/main/java/io/dingodb/calcite/rel/DingoGetDocumentPreFilter.java
@@ -35,6 +35,7 @@
 import org.apache.calcite.rel.type.RelDataTypeFieldImpl;
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.util.IndexColumnName;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -117,7 +118,7 @@ public RelDataType getTableType() {
         RelDataTypeFactory.Builder builder = getCluster().getTypeFactory().builder();
         builder.addAll(relDataType.getFieldList());
         builder.add(new RelDataTypeFieldImpl(
-            indexTable.getName() + "$rank_bm25",
+            indexTable.getName() + IndexColumnName.TEXT_INDEX_COLUMN,
             relDataType.getFieldCount(),
             getCluster().getTypeFactory().createSqlType(SqlTypeName.get("FLOAT"))));
         return builder.build();

diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/rel/LogicalDingoDocument.java b/dingo-calcite/src/main/java/io/dingodb/calcite/rel/LogicalDingoDocument.java
@@ -43,6 +43,7 @@
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.SqlCharStringLiteral;
 import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.util.IndexColumnName;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -186,7 +187,7 @@ public RelDataType getTableType() {
         RelDataTypeFactory.Builder builder = getCluster().getTypeFactory().builder();
         builder.addAll(relDataType.getFieldList());
         builder.add(new RelDataTypeFieldImpl(
-            indexTable.getName() + "$rank_bm25",
+            indexTable.getName() + IndexColumnName.TEXT_INDEX_COLUMN,
             relDataType.getFieldCount(),
             getCluster().getTypeFactory().createSqlType(SqlTypeName.get("FLOAT"))));
         return builder.build();
@@ -199,7 +200,7 @@ public TupleType tupleType() {
         cols.addAll(dingoTable.getTable().columns);
         cols.add(Column
             .builder()
-            .name(indexTable.getName().concat("$rank_bm25"))
+            .name(indexTable.getName().concat(IndexColumnName.VECTOR_INDEX_COLUMN))
             .sqlTypeName("FLOAT")
             .type(new FloatType(false))
             .precision(-1)

diff --git a/dingo-calcite/src/main/java/org/apache/calcite/sql/validate/TableFunctionNamespace.java b/dingo-calcite/src/main/java/org/apache/calcite/sql/validate/TableFunctionNamespace.java
@@ -36,6 +36,7 @@
 import org.apache.calcite.sql2rel.SqlDocumentOperator;
 import org.apache.calcite.sql2rel.SqlFunctionScanOperator;
 import org.apache.calcite.sql2rel.SqlVectorOperator;
+import org.apache.calcite.util.IndexColumnName;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
@@ -102,7 +103,7 @@ protected RelDataType validateImpl(RelDataType targetRowType) {
             }
             cols.add(Column
                 .builder()
-                .name(index.getName().concat("$distance"))
+                .name(index.getName().concat(IndexColumnName.VECTOR_INDEX_COLUMN))
                 .sqlTypeName("FLOAT")
                 .type(new FloatType(false))
                 .precision(-1)
@@ -128,7 +129,7 @@ protected RelDataType validateImpl(RelDataType targetRowType) {
             this.index = getDocumentIndexTable(table, columnIdentifier.getSimple().toUpperCase());
             cols.add(Column
                 .builder()
-                .name(index.getName().concat("$rank_bm25"))
+                .name(index.getName().concat(IndexColumnName.TEXT_INDEX_COLUMN))
                 .sqlTypeName("FLOAT")
                 .type(new FloatType(false))
                 .precision(-1)

diff --git a/...o-calcite/src/main/java/org/apache/calcite/sql/validate/TableHybridFunctionNamespace.java b/...o-calcite/src/main/java/org/apache/calcite/sql/validate/TableHybridFunctionNamespace.java
@@ -36,6 +36,7 @@
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNumericLiteral;
 import org.apache.calcite.sql2rel.SqlHybridSearchOperator;
+import org.apache.calcite.util.IndexColumnName;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.math.BigDecimal;
@@ -168,11 +169,11 @@ protected RelDataType validateImpl(RelDataType targetRowType) {
             //    throw new RuntimeException("Multiple hybridSearch in SQL is not supported");
             //}
             String documentId = documentIndex.getColumns().get(0).getName();
-            String documentRankBm25 = documentIndex.getName() + "$rank_bm25";
+            String documentRankBm25 = documentIndex.getName() + IndexColumnName.TEXT_INDEX_COLUMN;
             String documentSelect = this.function.operand(0).toString();
             String vectorSelect = this.function.operand(1).toString();
             String vectorId = vectorIndex.getColumns().get(0).getName();
-            String vectorDistance = vectorIndex.getName() + "$distance";
+            String vectorDistance = vectorIndex.getName() + IndexColumnName.VECTOR_INDEX_COLUMN;
             String sql = HybridSearchSqlUtils.hybridSearchSqlReplace(
                 vectorWeight,
                 documentWeight,

diff --git a/dingo-executor/src/main/java/io/dingodb/server/executor/service/UserService.java b/dingo-executor/src/main/java/io/dingodb/server/executor/service/UserService.java
@@ -162,7 +162,7 @@ public void createUser(UserDefinition userDefinition) {
 
     @Override
     public void dropUser(UserDefinition userDefinition) {
-        String condition = "user ='" + userDefinition.getUser() + "' and host ='" + userDefinition.getHost() + "'";
+        String condition = "User ='" + userDefinition.getUser() + "' and Host ='" + userDefinition.getHost() + "'";
         String delUserSql = "delete from mysql.user where " + condition;
         String delDbSql = "delete from mysql.db where " + condition;
         String delTablesPrivSql = "delete from mysql.tables_priv where " + condition;