fix

924060929 · Aug 5, 2024 · 3a730fd · 3a730fd
1 parent bda2cfe
commit 3a730fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
@@ -320,9 +320,9 @@ public void analyze(Analyzer analyzer) throws UserException {
                 throw new AnalysisException("Disable to create table with `ALL` type columns.");
             }
             String columnNameUpperCase = columnDef.getName().toUpperCase();
-            if (columnNameUpperCase.startsWith("__DORIS_") && columnNameUpperCase.endsWith("_SIGN__")) {
+            if (columnNameUpperCase.startsWith("__DORIS_")) {
                 throw new AnalysisException(
-                        "Disable to create table column with name __DORIS_[.]*_SIGN__: " + columnNameUpperCase);
+                        "Disable to create table column with name start with __DORIS_: " + columnNameUpperCase);
             }
             if (Objects.equals(columnDef.getType(), Type.DATE) && Config.disable_datev1) {
                 throw new AnalysisException("Disable to create table with `DATE` type columns, please use `DATEV2`.");

diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java b/...ore/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
@@ -294,9 +294,9 @@ public void validate(ConnectContext ctx) {
         //check datev1 and decimalv2
         for (ColumnDefinition columnDef : columns) {
             String columnNameUpperCase = columnDef.getName().toUpperCase();
-            if (columnNameUpperCase.startsWith("__DORIS_") && columnNameUpperCase.endsWith("_SIGN__")) {
+            if (columnNameUpperCase.startsWith("__DORIS_")) {
                 throw new AnalysisException(
-                        "Disable to create table column with name __DORIS_[.]*_SIGN__: " + columnNameUpperCase);
+                        "Disable to create table column with name start with __DORIS_: " + columnNameUpperCase);
             }
             if (columnDef.getType().isDateType() && Config.disable_datev1) {
                 throw new AnalysisException(

diff --git a/regression-test/suites/show_p0/test_show_create_table_and_views.groovy b/regression-test/suites/show_p0/test_show_create_table_and_views.groovy
@@ -34,7 +34,7 @@ suite("test_show_create_table_and_views", "show") {
 
             test {
                 sql "create table table_with_hidden_sign(id int, __DORIS_DELETE_SIGN__ int) distributed by hash(id) properties('replication_num'='1')"
-                exception "Disable to create table column with name __DORIS_"
+                exception "Disable to create table column with name start with __DORIS_: "
             }
         }
     }()

diff --git a/regression-test/suites/show_p0/test_show_create_table_and_views_nereids.groovy b/regression-test/suites/show_p0/test_show_create_table_and_views_nereids.groovy
@@ -31,7 +31,7 @@ suite("test_show_create_table_and_views_nereids", "show") {
 
             test {
                 sql "create table table_with_hidden_sign(id int, __DORIS_DELETE_SIGN__ int) distributed by hash(id) properties('replication_num'='1')"
-                exception "Disable to create table column with name __DORIS_"
+                exception "Disable to create table column with name start with __DORIS_: "
             }
         }
     }()
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ suite("test_show_create_table_and_views", "show") { @@
                 test {
                     sql "create table table_with_hidden_sign(id int, __DORIS_DELETE_SIGN__ int) distributed by hash(id) properties('replication_num'='1')"
-                    exception "Disable to create table column with name __DORIS_"
+                    exception "Disable to create table column with name start with __DORIS_: "
                 }
             }
         }()
@@ Expand Down @@