(doris) branch branch-3.0 updated: branch-3.0: [opt](identifier) let column's name format more flexable #47840 (#47902)

[dataroaring]

This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new ee534dfaf10 branch-3.0: [opt](identifier) let column's name format 
more flexable #47840 (#47902)
ee534dfaf10 is described below

commit ee534dfaf10bea1e6f76347db4bd3954eb3a64ac
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 25 19:10:18 2025 +0800

    branch-3.0: [opt](identifier) let column's name format more flexable #47840 
(#47902)
    
    Cherry-picked from #47840
    
    Co-authored-by: morrySnow <zhangwen...@selectdb.com>
---
 .../src/main/java/org/apache/doris/common/ColumnAliasGenerator.java  | 2 +-
 fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java   | 4 ++--
 .../src/test/java/org/apache/doris/common/FeNameFormatTest.java      | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java 
b/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java
index 57291002c13..eb5d341c0f6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/ColumnAliasGenerator.java
@@ -25,7 +25,7 @@ import com.google.common.base.Preconditions;
 import java.util.List;
 
 public class ColumnAliasGenerator extends AliasGenerator {
-    private static final String DEFAULT_COL_ALIAS_PREFIX = "$c$";
+    private static final String DEFAULT_COL_ALIAS_PREFIX = "!c!";
 
     public ColumnAliasGenerator(List<String> existingLabels, String prefix) {
         Preconditions.checkNotNull(existingLabels);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java 
b/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
index 18dfce2fc08..8c1bc162ad7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/FeNameFormat.java
@@ -36,7 +36,7 @@ public class FeNameFormat {
     private static final String UNDERSCORE_COMMON_NAME_REGEX = 
"^[_a-zA-Z][a-zA-Z0-9-_]{0,63}$";
     private static final String TABLE_NAME_REGEX = "^[a-zA-Z][a-zA-Z0-9-_]*$";
     private static final String USER_NAME_REGEX = "^[a-zA-Z][a-zA-Z0-9.-_]*$";
-    private static final String COLUMN_NAME_REGEX = 
"^[_a-zA-Z@0-9\\s/][.a-zA-Z0-9_+-/?@#$%^&*\"\\s,:]{0,255}$";
+    private static final String COLUMN_NAME_REGEX = 
"^[.a-zA-Z0-9_+-/?@#$%^&*\"\\s,:]{0,256}$";
 
     private static final String UNICODE_LABEL_REGEX = 
"^[-_A-Za-z0-9:\\p{L}]{1,128}$";
     private static final String UNICODE_COMMON_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9-_\\p{L}]{0,63}$";
@@ -44,7 +44,7 @@ public class FeNameFormat {
     private static final String UNICODE_TABLE_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9-_\\p{L}]*$";
     private static final String UNICODE_USER_NAME_REGEX = 
"^[a-zA-Z\\p{L}][a-zA-Z0-9.-_\\p{L}]*$";
     private static final String UNICODE_COLUMN_NAME_REGEX
-            = "^[_a-zA-Z@0-9\\p{L}][.a-zA-Z0-9_+-/?@#$%^&*\\p{L}]{0,255}$";
+            = "^[.a-zA-Z0-9_+-/?@#$%^&*\\s,:\\p{L}]{0,256}$";
 
     public static final String FORBIDDEN_PARTITION_NAME = "placeholder_";
 
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/common/FeNameFormatTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/common/FeNameFormatTest.java
index 3edb6a33e96..b6e5e68ee83 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/FeNameFormatTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/FeNameFormatTest.java
@@ -35,8 +35,9 @@ public class FeNameFormatTest {
         ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("timestamp*"));
         ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("timestamp.1"));
         ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("timestamp.#"));
-        ExceptionChecker.expectThrows(AnalysisException.class, () -> 
FeNameFormat.checkColumnName("?id_"));
-        ExceptionChecker.expectThrows(AnalysisException.class, () -> 
FeNameFormat.checkColumnName("#id_"));
+        ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("?id_"));
+        ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("#id_"));
+        ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkColumnName("$id_"));
         // length 64
         String tblName = 
"test_sys_partition_list_basic_test_list_partition_bigint_tb-uniq";
         ExceptionChecker.expectThrowsNoException(() -> 
FeNameFormat.checkTableName(tblName));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org