From f0b15b95b28a226c4ce7482fe8f3ca2b12fc8aee Mon Sep 17 00:00:00 2001
From: seuwebber <webber_code@163.com>
Date: Thu, 7 Nov 2024 03:14:30 +0000
Subject: [PATCH] [CP] [to #2024093000104623258]fix bug dbms_sql in non-utf8
 tenant

---
 src/pl/sys_package/ob_dbms_sql.cpp | 24 +++++++++++++++++++-----
 src/pl/sys_package/ob_dbms_sql.h   |  3 ++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/pl/sys_package/ob_dbms_sql.cpp b/src/pl/sys_package/ob_dbms_sql.cpp
index f90f4861e..aa0e244eb 100644
--- a/src/pl/sys_package/ob_dbms_sql.cpp
+++ b/src/pl/sys_package/ob_dbms_sql.cpp
@@ -731,6 +731,7 @@ int ObPLDbmsSql::parse_6p(ObExecContext &exec_ctx, ParamStore &params, ObObj &re
   CK (sql_arr->get_count() >= upper_bound - low_bound);
   CK (low_bound <= upper_bound);
   ObSqlString sql_txt;
+  ObCollationType coll_type = CS_TYPE_INVALID;
   if (OB_SUCC(ret)) {
     ObString elem_txt;
     ObPLAssocArray *assoc_arr = static_cast<ObPLAssocArray *>(sql_arr);
@@ -796,6 +797,7 @@ int ObPLDbmsSql::parse_6p(ObExecContext &exec_ctx, ParamStore &params, ObObj &re
             if (elem.is_null()) {
               ret = OB_READ_NOTHING;
             } else {
+              coll_type = elem.get_collation_type();
               OZ (elem.get_varchar(elem_txt), elem);
               OZ (sql_txt.append(elem_txt));
               if (linefeed) {
@@ -814,7 +816,7 @@ int ObPLDbmsSql::parse_6p(ObExecContext &exec_ctx, ParamStore &params, ObObj &re
   OZ (get_cursor(exec_ctx, params, cursor));// 这儿只用了params的第一个参数，cursor id
   OZ (ob_write_string(exec_ctx.get_allocator(), sql_txt.string(), sql_stmt));
   LOG_DEBUG("parse 6p, concated sql stmt", K(sql_stmt), K(sql_txt.string()));
-  OZ (do_parse(exec_ctx, cursor, sql_stmt));
+  OZ (do_parse(exec_ctx, cursor, sql_stmt, coll_type));
   return ret;
 }
 
@@ -837,7 +839,7 @@ int ObPLDbmsSql::parse(ObExecContext &exec_ctx, ParamStore &params, ObObj &resul
       OZ (params.at(1).get_varchar(sql_stmt), params.at(1));
 
       OZ (get_cursor(exec_ctx, params, cursor));
-      OZ (do_parse(exec_ctx, cursor, sql_stmt));
+      OZ (do_parse(exec_ctx, cursor, sql_stmt, params.at(1).get_collation_type()));
     } else if (6 == param_count) {
       OZ (parse_6p(exec_ctx, params, result));
     } else {
@@ -848,13 +850,25 @@ int ObPLDbmsSql::parse(ObExecContext &exec_ctx, ParamStore &params, ObObj &resul
   return ret;
 }
 
-int ObPLDbmsSql::do_parse(ObExecContext &exec_ctx, ObDbmsCursorInfo *cursor, ObString &sql_stmt)
+int ObPLDbmsSql::do_parse(ObExecContext &exec_ctx,
+                          ObDbmsCursorInfo *cursor,
+                          ObString &sql_stmt,
+                          ObCollationType coll_type)
 {
   int ret = OB_SUCCESS;
   CK (OB_NOT_NULL(cursor));
   // do parse.
   ObSQLSessionInfo *session = exec_ctx.get_my_session();
-  OZ (cursor->parse(sql_stmt, *session), sql_stmt);
+  ObCollationType conn_coll_type = CS_TYPE_INVALID;
+  ObString sql_cs;
+  CK (OB_NOT_NULL(session));
+  OX (conn_coll_type = session->get_local_collation_connection());
+  OZ (ObCharset::charset_convert(exec_ctx.get_allocator(),
+                                 sql_stmt,
+                                 coll_type,
+                                 conn_coll_type,
+                                 sql_cs));
+  OZ (cursor->parse(sql_cs, *session), sql_cs);
   if (OB_SUCC(ret)) {
     ObString ps_sql;
     stmt::StmtType stmt_type = stmt::StmtType::T_NONE;
@@ -867,7 +881,7 @@ int ObPLDbmsSql::do_parse(ObExecContext &exec_ctx, ObDbmsCursorInfo *cursor, ObS
     ObPLExecCtx pl_ctx(cursor->get_allocator(), &exec_ctx, &dummy_params,
                      NULL/*result*/, &ret, NULL/*func*/, true);
     CK (OB_NOT_NULL(exec_ctx.get_my_session()));
-    OZ (sql_str.append(sql_stmt));
+    OZ (sql_str.append(sql_cs));
     OX (cursor->get_field_columns().set_allocator(&cursor->get_dbms_entity()->get_arena_allocator()));
     OZ (ObSPIService::prepare_dynamic(&pl_ctx,
                                       cursor->get_dbms_entity()->get_arena_allocator(),
diff --git a/src/pl/sys_package/ob_dbms_sql.h b/src/pl/sys_package/ob_dbms_sql.h
index 6f56beb90..0ba1b635f 100644
--- a/src/pl/sys_package/ob_dbms_sql.h
+++ b/src/pl/sys_package/ob_dbms_sql.h
@@ -349,7 +349,8 @@ private:
   static int do_describe(sql::ObExecContext &exec_ctx, ParamStore &params, DescribeType type);
   static int do_parse(sql::ObExecContext &exec_ctx,
                       ObDbmsCursorInfo *cursor,
-                      common::ObString &sql_stmt);
+                      common::ObString &sql_stmt,
+                      ObCollationType coll_type);
   static int parse_6p(sql::ObExecContext &exec_ctx,
                    ParamStore &params,
                    common::ObObj &result);