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

6
src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp
View File

@ -2495,6 +2495,9 @@ int ObRawExprResolverImpl::process_char_charset_node(const ParseNode *node, ObRa
ret = OB_ERR_UNKNOWN_CHARSET;
LOG_WARN("invalid character set", K(charset_str), K(ret));
LOG_USER_ERROR(OB_ERR_UNKNOWN_CHARSET, charset_str.length(), charset_str.ptr());
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(charset_type,
ctx_.session_info_->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else {
ObCollationType coll_type = ObCharset::get_system_collation();
ObObj val;
@ -4482,6 +4485,9 @@ int ObRawExprResolverImpl::process_collation_node(const ParseNode *node, ObRawEx
if (CS_TYPE_INVALID == collation_type) {
ret = OB_ERR_UNKNOWN_COLLATION;
LOG_USER_ERROR(OB_ERR_UNKNOWN_COLLATION, (int)node->str_len_, node->str_value_);
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(common::ObCharset::charset_type_by_coll(collation_type),
ctx_.session_info_->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else if (OB_FAIL(ctx_.expr_factory_.create_raw_expr(T_INT, c_expr))) {
LOG_WARN("fail to create raw expr", K(ret));
} else if (OB_ISNULL(c_expr)) {