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

fix convert character not changing enum extended type info

Browse Source
This commit is contained in:
YoungYang0820
2022-11-03 14:38:05 +00:00
committed by wangzelin.wzl
parent b9c75f3c60
commit 169c793d39
2 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/rootserver/ob_ddl_service.cpp
View File

@ -3540,12 +3540,17 @@ int ObDDLService::convert_to_character(
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const bool bind_tablets = false; const bool bind_tablets = false;
bool can_convert = false; bool can_convert = false;
const ObSQLMode sql_mode = alter_table_arg.alter_table_schema_.get_sql_mode();
bool is_oracle_mode = false;
AlterTableSchema &alter_table_schema = alter_table_arg.alter_table_schema_; AlterTableSchema &alter_table_schema = alter_table_arg.alter_table_schema_;
ObCollationType collation_type = alter_table_schema.get_collation_type(); ObCollationType collation_type = alter_table_schema.get_collation_type();
new_table_schema.set_collation_type(collation_type); new_table_schema.set_collation_type(collation_type);
new_table_schema.set_charset_type(ObCharset::charset_type_by_coll(collation_type)); new_table_schema.set_charset_type(ObCharset::charset_type_by_coll(collation_type));
ObTableSchema::const_column_iterator tmp_begin = orig_table_schema.column_begin(); ObTableSchema::const_column_iterator tmp_begin = orig_table_schema.column_begin();
ObTableSchema::const_column_iterator tmp_end = orig_table_schema.column_end(); ObTableSchema::const_column_iterator tmp_end = orig_table_schema.column_end();
if (OB_FAIL(orig_table_schema.check_if_oracle_compat_mode(is_oracle_mode))) {
LOG_WARN("failed to get oracle mode", K(ret));
} else {
for (; OB_SUCC(ret) && tmp_begin != tmp_end; tmp_begin++) { for (; OB_SUCC(ret) && tmp_begin != tmp_end; tmp_begin++) {
ObColumnSchemaV2 *orig_col = (*tmp_begin); ObColumnSchemaV2 *orig_col = (*tmp_begin);
if (OB_ISNULL(orig_col)) { if (OB_ISNULL(orig_col)) {
@ -3561,6 +3566,13 @@ int ObDDLService::convert_to_character(
} else { } else {
col->set_collation_type(collation_type); col->set_collation_type(collation_type);
col->set_charset_type(ObCharset::charset_type_by_coll(collation_type)); col->set_charset_type(ObCharset::charset_type_by_coll(collation_type));
if (OB_FAIL(fill_column_collation(sql_mode,
is_oracle_mode,
new_table_schema,
alter_table_arg.allocator_,
*col))) {
LOG_WARN("failed to fill column collation", K(ret));
}
} }
} }
} }
@ -3573,6 +3585,7 @@ int ObDDLService::convert_to_character(
ddl_operator, ddl_operator,
trans, trans,
alter_table_arg.allocator_)); alter_table_arg.allocator_));
}
return ret; return ret;
} }
@ -5762,47 +5775,47 @@ int ObDDLService::fill_column_collation(
const bool is_oracle_mode, const bool is_oracle_mode,
const ObTableSchema &table_schema, const ObTableSchema &table_schema,
common::ObIAllocator &allocator, common::ObIAllocator &allocator,
AlterColumnSchema &alter_column_schema) ObColumnSchemaV2 &column_schema)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObObjTypeClass col_tc = alter_column_schema.get_data_type_class(); ObObjTypeClass col_tc = column_schema.get_data_type_class();
ObCollationType collation_type = table_schema.get_collation_type(); ObCollationType collation_type = table_schema.get_collation_type();
ObCharsetType charset_type = table_schema.get_charset_type(); ObCharsetType charset_type = table_schema.get_charset_type();
const ObCollationType cur_extended_type_info_collation = ObCharset::get_system_collation(); const ObCollationType cur_extended_type_info_collation = ObCharset::get_system_collation();
if (ObStringTC == col_tc) { if (ObStringTC == col_tc) {
if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info( if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info(
alter_column_schema, charset_type, collation_type))) { column_schema, charset_type, collation_type))) {
RS_LOG(WARN, "failed to fill column charset info", K(ret)); RS_LOG(WARN, "failed to fill column charset info", K(ret));
} else if (OB_FAIL(ObDDLResolver::check_string_column_length( } else if (OB_FAIL(ObDDLResolver::check_string_column_length(
alter_column_schema, is_oracle_mode))) { column_schema, is_oracle_mode))) {
RS_LOG(WARN, "failed to check string column length", K(ret)); RS_LOG(WARN, "failed to check string column length", K(ret));
} }
} else if (ObRawTC == col_tc) { } else if (ObRawTC == col_tc) {
if (OB_FAIL(ObDDLResolver::check_raw_column_length(alter_column_schema))) { if (OB_FAIL(ObDDLResolver::check_raw_column_length(column_schema))) {
RS_LOG(WARN, "failed to check raw column length", K(ret), K(alter_column_schema)); RS_LOG(WARN, "failed to check raw column length", K(ret), K(column_schema));
} }
} else if (ob_is_text_tc(alter_column_schema.get_data_type())) { } else if (ob_is_text_tc(column_schema.get_data_type())) {
if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info( if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info(
alter_column_schema, table_schema.get_charset_type(), table_schema.get_collation_type()))) { column_schema, table_schema.get_charset_type(), table_schema.get_collation_type()))) {
RS_LOG(WARN, "failed to fill column charset info", K(ret)); RS_LOG(WARN, "failed to fill column charset info", K(ret));
} else if (OB_FAIL(ObDDLResolver::check_text_column_length_and_promote(alter_column_schema, } else if (OB_FAIL(ObDDLResolver::check_text_column_length_and_promote(column_schema,
table_schema.get_table_id()))) { table_schema.get_table_id()))) {
RS_LOG(WARN, "failed to check text or blob column length", K(ret)); RS_LOG(WARN, "failed to check text or blob column length", K(ret));
} }
} else if (ObEnumSetTC == col_tc) { } else if (ObEnumSetTC == col_tc) {
if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info(alter_column_schema, charset_type, collation_type))) { if (OB_FAIL(ObDDLResolver::check_and_fill_column_charset_info(column_schema, charset_type, collation_type))) {
LOG_WARN("fail to check and fill column charset info", K(ret), K(alter_column_schema)); LOG_WARN("fail to check and fill column charset info", K(ret), K(column_schema));
} else if (OB_FAIL(ObResolverUtils::check_extended_type_info( } else if (OB_FAIL(ObResolverUtils::check_extended_type_info(
allocator, allocator,
alter_column_schema.get_extended_type_info(), column_schema.get_extended_type_info(),
cur_extended_type_info_collation, cur_extended_type_info_collation,
alter_column_schema.get_column_name_str(), column_schema.get_column_name_str(),
alter_column_schema.get_data_type(), column_schema.get_data_type(),
alter_column_schema.get_collation_type(), column_schema.get_collation_type(),
sql_mode))) { sql_mode))) {
LOG_WARN("fail to fill extended type info", K(ret), K(alter_column_schema)); LOG_WARN("fail to fill extended type info", K(ret), K(column_schema));
} else if (OB_FAIL(ObDDLResolver::calc_enum_or_set_data_length(alter_column_schema))) { } else if (OB_FAIL(ObDDLResolver::calc_enum_or_set_data_length(column_schema))) {
LOG_WARN("fail to calc data length", K(ret), K(alter_column_schema)); LOG_WARN("fail to calc data length", K(ret), K(column_schema));
} }
} }
return ret; return ret;

2
src/rootserver/ob_ddl_service.h
View File

@ -1462,7 +1462,7 @@ private:
const bool is_oracle_mode, const bool is_oracle_mode,
const share::schema::ObTableSchema &table_schema, const share::schema::ObTableSchema &table_schema,
common::ObIAllocator &allocator, common::ObIAllocator &allocator,
share::schema::AlterColumnSchema &alter_column_schema); share::schema::ObColumnSchemaV2 &alter_column_schema);
int resolve_orig_default_value(share::schema::ObColumnSchemaV2 &column_schema, int resolve_orig_default_value(share::schema::ObColumnSchemaV2 &column_schema,
const common::ObTimeZoneInfoWrap &tz_info_wrap, const common::ObTimeZoneInfoWrap &tz_info_wrap,
const common::ObString *nls_formats, const common::ObString *nls_formats,