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

[FEAT MERGE]charset revise

Browse Source
This commit is contained in:
akaError
2023-11-27 08:52:01 +00:00
committed by ob-robot
parent 654e89bbe1
commit e4f7452b2d
50 changed files with 2188803 additions and 6328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/cmd/ob_variable_set_executor.cpp
View File

@ -566,6 +566,9 @@ int ObVariableSetExecutor::update_global_variables(ObExecContext &ctx,
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(common::ObCharset::charset_type_by_coll(static_cast<ObCollationType>(coll_int64)),
session->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else if (OB_FAIL(sql::ObSQLUtils::is_collation_data_version_valid(static_cast<ObCollationType>(coll_int64),
session->get_effective_tenant_id()))) {
LOG_WARN("failed to check collation data version valid", K(ret));
} else if (FALSE_IT(coll_str = ObString::make_string(ObCharset::collation_name(static_cast<ObCollationType>(coll_int64))))) {
//do nothing
} else if (OB_FAIL(ObBasicSysVar::get_charset_var_and_val_by_collation(
@ -591,6 +594,9 @@ int ObVariableSetExecutor::update_global_variables(ObExecContext &ctx,
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(common::ObCharset::charset_type_by_coll(static_cast<ObCollationType>(coll_int64)),
session->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else if (OB_FAIL(sql::ObSQLUtils::is_collation_data_version_valid(static_cast<ObCollationType>(coll_int64),
session->get_effective_tenant_id()))) {
LOG_WARN("failed to check collation data version valid", K(ret));
} else if (FALSE_IT(cs_str = ObString::make_string(ObCharset::charset_name(
ObCharset::charset_type_by_coll(static_cast<ObCollationType>(coll_int64)))))) {
//do nothing