[doris] 01/01: fix chinese sub column name

[eldenmoon]

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

eldenmoon pushed a commit to branch branch-2.0-var
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 1fdb66b00a7d30555ba540e318cc89d4d9f92b53
Author: eldenmoon <15605149...@163.com>
AuthorDate: Sun Oct 22 21:23:00 2023 +0800

    fix chinese sub column name
---
 be/src/vec/columns/column_object.cpp          | 11 +++++------
 regression-test/suites/variant_p0/desc.groovy |  4 ++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/be/src/vec/columns/column_object.cpp 
b/be/src/vec/columns/column_object.cpp
index 13dfe477303..38a93b37086 100644
--- a/be/src/vec/columns/column_object.cpp
+++ b/be/src/vec/columns/column_object.cpp
@@ -904,10 +904,10 @@ bool ColumnObject::is_finalized() const {
                        [](const auto& entry) { return 
entry->data.is_finalized(); });
 }
 
-static bool check_if_valid_column_name(const PathInData& path) {
-    static const std::regex 
COLUMN_NAME_REGEX("^[_a-zA-Z@0-9][.a-zA-Z0-9_+-/><?@#$%^&*]{0,255}$");
-    return std::regex_match(path.get_path(), COLUMN_NAME_REGEX);
-}
+// static bool check_if_valid_column_name(const PathInData& path) {
+//     static const std::regex 
COLUMN_NAME_REGEX("^[_a-zA-Z@0-9][.a-zA-Z0-9_+-/><?@#$%^&*]{0,255}$");
+//     return std::regex_match(path.get_path(), COLUMN_NAME_REGEX);
+// }
 
 void ColumnObject::Subcolumn::wrapp_array_nullable() {
     // Wrap array with nullable, treat empty array as null to elimate conflict 
at present
@@ -1186,8 +1186,7 @@ void ColumnObject::finalize(bool ignore_sparse) {
         }
 
         // Check and spilit sparse subcolumns
-        if (!ignore_sparse && (entry->data.check_if_sparse_column(num_rows) ||
-                               !check_if_valid_column_name(entry->path))) {
+        if (!ignore_sparse && (entry->data.check_if_sparse_column(num_rows))) {
             // TODO seperate ambiguous path
             sparse_columns.add(entry->path, entry->data);
             continue;
diff --git a/regression-test/suites/variant_p0/desc.groovy 
b/regression-test/suites/variant_p0/desc.groovy
index c5918c56629..bef263aabda 100644
--- a/regression-test/suites/variant_p0/desc.groovy
+++ b/regression-test/suites/variant_p0/desc.groovy
@@ -187,6 +187,10 @@ suite("regression_test_variant_desc", "variant_type_desc"){
         sql """set describe_extend_variant_column = true"""
         qt_sql_9_1 """desc ${table_name}"""
         sql "truncate table ${table_name}"
+        sql """insert into  ${table_name} values (1, '{"中文": "这是中文"}')"""
+        sql """insert into  ${table_name} values (1, '{"英文": "This is 
english"}')"""
+        qt_sql_9_2 """desc ${table_name}"""
+        qt_sql_9_2 """select v:中文 from ${table_name}"""
     } finally {
         // reset flags
         set_be_config.call("ratio_of_defaults_as_sparse_column", "0.95")


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