hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[FEAT MERGE]charset latin1

Browse Source
This commit is contained in:
akaError
2023-01-28 15:43:48 +08:00
committed by ob-robot
parent 2663894581
commit af2506b14c
42 changed files with 1215 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/aggregate/ob_aggregate_function.cpp
View File

@ -27,6 +27,8 @@
#include "sql/engine/expr/ob_expr_operator.h"
#include "sql/engine/expr/ob_expr_json_func_helper.h"
#include "common/ob_smart_call.h"
#include "lib/charset/ob_charset.h"
namespace oceanbase
{
using namespace common;
@ -2170,7 +2172,7 @@ int ObAggregateFunction::get_result(ObNewRow &row, const common::ObTimeZoneInfo
} else if (ObCharset::charset_type_by_coll(sep_obj.get_collation_type())
!= ObCharset::charset_type_by_coll(cexpr->get_collation_type())) {
// Four bytes for one character at most
int64_t buf_len = sep_str.length() * 4;
int64_t buf_len = sep_str.length() * ObCharset::CharConvertFactorNum;
char *buf = static_cast<char *>(expr_ctx_.calc_buf_->alloc(buf_len));
uint32_t res_len = 0;
if (OB_ISNULL(buf)) {