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

fix create empty ddl sstable

Browse Source
This commit is contained in:
simonjoylet
2023-03-06 11:11:06 +00:00
committed by ob-robot
parent 33dd4ba133
commit d761f60d4b
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/ddl_task/ob_column_redefinition_task.cpp
View File

@ -56,7 +56,7 @@ int ObColumnRedefinitionTask::init(const uint64_t tenant_id, const int64_t task_
LOG_WARN("deep copy alter table arg failed", K(ret)); LOG_WARN("deep copy alter table arg failed", K(ret));
} else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) { } else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) {
LOG_WARN("set ddl stmt str failed", K(ret)); LOG_WARN("set ddl stmt str failed", K(ret));
} else if (OB_FAIL(GET_MIN_DATA_VERSION(tenant_id, tenant_data_format_version))) { } else if (OB_FAIL(ObShareUtil::fetch_current_data_version(*GCTX.sql_proxy_, tenant_id, tenant_data_format_version))) {
LOG_WARN("get min data version failed", K(ret), K(tenant_id)); LOG_WARN("get min data version failed", K(ret), K(tenant_id));
} else { } else {
task_type_ = ddl_type; task_type_ = ddl_type;

2
src/rootserver/ddl_task/ob_index_build_task.cpp
View File

@ -340,7 +340,7 @@ int ObIndexBuildTask::init(
} else if (OB_ISNULL(index_schema)) { } else if (OB_ISNULL(index_schema)) {
ret = OB_TABLE_NOT_EXIST; ret = OB_TABLE_NOT_EXIST;
LOG_WARN("fail to get table schema", K(ret)); LOG_WARN("fail to get table schema", K(ret));
} else if (OB_FAIL(GET_MIN_DATA_VERSION(tenant_id, tenant_data_format_version))) { } else if (OB_FAIL(ObShareUtil::fetch_current_data_version(*GCTX.sql_proxy_, tenant_id, tenant_data_format_version))) {
LOG_WARN("get min data version failed", K(ret), K(tenant_id)); LOG_WARN("get min data version failed", K(ret), K(tenant_id));
} else { } else {
is_global_index_ = index_schema->is_global_index_table(); is_global_index_ = index_schema->is_global_index_table();

2
src/rootserver/ddl_task/ob_table_redefinition_task.cpp
View File

@ -60,7 +60,7 @@ int ObTableRedefinitionTask::init(const uint64_t tenant_id, const int64_t task_i
LOG_WARN("deep copy alter table arg failed", K(ret)); LOG_WARN("deep copy alter table arg failed", K(ret));
} else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) { } else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) {
LOG_WARN("set ddl stmt str failed", K(ret)); LOG_WARN("set ddl stmt str failed", K(ret));
} else if (OB_FAIL(GET_MIN_DATA_VERSION(tenant_id, tenant_data_format_version))) { } else if (OB_FAIL(ObShareUtil::fetch_current_data_version(*GCTX.sql_proxy_, tenant_id, tenant_data_format_version))) {
LOG_WARN("get min data version failed", K(ret), K(tenant_id)); LOG_WARN("get min data version failed", K(ret), K(tenant_id));
} else { } else {
task_type_ = ddl_type; task_type_ = ddl_type;

2
src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp
View File

@ -779,8 +779,6 @@ int ObTabletDDLKvMgr::create_empty_ddl_sstable(ObTableHandleV2 &table_handle)
ObArray<const ObDataMacroBlockMeta *> empty_meta_array; ObArray<const ObDataMacroBlockMeta *> empty_meta_array;
if (OB_FAIL(ObTabletDDLUtil::create_ddl_sstable(ddl_param, empty_meta_array, nullptr/*first_ddl_sstable*/, table_handle))) { if (OB_FAIL(ObTabletDDLUtil::create_ddl_sstable(ddl_param, empty_meta_array, nullptr/*first_ddl_sstable*/, table_handle))) {
LOG_WARN("create empty ddl sstable failed", K(ret)); LOG_WARN("create empty ddl sstable failed", K(ret));
} else if (OB_FAIL(ObTabletDDLUtil::update_ddl_table_store(ddl_param, table_handle))) {
LOG_WARN("update ddl table store failed", K(ret), K(ddl_param), K(table_handle));
} }
} }
return ret; return ret;