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

Add compat mode guard when alter column offline

Browse Source
This commit is contained in:
xianyu-w 2023-02-15 11:17:51 +00:00 committed by ob-robot
parent fa2b614483
commit 30eb581ae8
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rootserver/ob_ddl_service.cpp
View File

@ -7495,11 +7495,14 @@ int ObDDLService::gen_alter_column_new_table_schema_offline(
// drop column related.
int64_t new_table_cols_cnt = 0;
ObArray<int64_t> drop_cols_id_arr;
bool is_oracle_mode = false;
LOG_DEBUG("check before alter table column", K(origin_table_schema), K(alter_table_schema), K(new_table_schema));
if (OB_ISNULL(tz_info_wrap.get_time_zone_info())
|| OB_ISNULL(tz_info_wrap.get_time_zone_info()->get_tz_info_map())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("invalid tz_info_wrap", K(ret), K(tz_info_wrap));
} else if (OB_FAIL(origin_table_schema.check_if_oracle_compat_mode(is_oracle_mode))) {
RS_LOG(WARN, "failed to get oracle mode", K(ret));
} else if (OB_ISNULL(nls_formats)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("invalid nls_formats", K(ret));
@ -7508,6 +7511,9 @@ int ObDDLService::gen_alter_column_new_table_schema_offline(
ObTableSchema::const_column_iterator it_begin = alter_table_schema.column_begin();
ObTableSchema::const_column_iterator it_end = alter_table_schema.column_end();
common::hash::ObHashSet<ObColumnNameHashWrapper> update_column_name_set;
lib::Worker::CompatMode compat_mode = (is_oracle_mode ?
lib::Worker::CompatMode::ORACLE : lib::Worker::CompatMode::MYSQL);
lib::CompatModeGuard tmpCompatModeGuard(compat_mode);
if (OB_FAIL(update_column_name_set.create(32))) {
LOG_WARN("failed to create update column name set", K(ret));
} else if (OB_FAIL(get_all_dropped_column_ids(alter_table_arg,
@ -14092,6 +14098,9 @@ int ObDDLService::reconstruct_index_schema(const ObTableSchema &orig_table_schem
} else if (OB_FAIL(orig_table_schema.check_if_oracle_compat_mode(is_oracle_mode))) {
LOG_WARN("failed to check if oralce compat mode", K(ret));
}
lib::Worker::CompatMode compat_mode = (is_oracle_mode ?
lib::Worker::CompatMode::ORACLE : lib::Worker::CompatMode::MYSQL);
lib::CompatModeGuard tmpCompatModeGuard(compat_mode);
for (int64_t i = 0; OB_SUCC(ret) && i < simple_index_infos.count(); ++i) {
const ObTableSchema *index_table_schema = NULL;
bool need_rebuild = true;

3
src/share/schema/ob_schema_printer.cpp
View File

@ -267,6 +267,9 @@ int ObSchemaPrinter::print_table_definition_columns(const ObTableSchema &table_s
}
}
if (OB_SUCC(ret) && col->is_generated_column()) {
lib::Worker::CompatMode compat_mode = (is_oracle_mode ?
lib::Worker::CompatMode::ORACLE : lib::Worker::CompatMode::MYSQL);
lib::CompatModeGuard tmpCompatModeGuard(compat_mode);
if (OB_FAIL(print_generated_column_definition(*col, buf, buf_len, table_schema, pos))) {
SHARE_SCHEMA_LOG(WARN, "print generated column definition fail", K(ret));
}