diff --git a/src/rootserver/ddl_task/ob_column_redefinition_task.cpp b/src/rootserver/ddl_task/ob_column_redefinition_task.cpp index d447eb724..9e037d0a7 100644 --- a/src/rootserver/ddl_task/ob_column_redefinition_task.cpp +++ b/src/rootserver/ddl_task/ob_column_redefinition_task.cpp @@ -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)); } else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) { 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)); } else { task_type_ = ddl_type; diff --git a/src/rootserver/ddl_task/ob_index_build_task.cpp b/src/rootserver/ddl_task/ob_index_build_task.cpp index 419f9e330..96d845295 100644 --- a/src/rootserver/ddl_task/ob_index_build_task.cpp +++ b/src/rootserver/ddl_task/ob_index_build_task.cpp @@ -340,7 +340,7 @@ int ObIndexBuildTask::init( } else if (OB_ISNULL(index_schema)) { ret = OB_TABLE_NOT_EXIST; 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)); } else { is_global_index_ = index_schema->is_global_index_table(); diff --git a/src/rootserver/ddl_task/ob_table_redefinition_task.cpp b/src/rootserver/ddl_task/ob_table_redefinition_task.cpp index 4c822a097..e4f055690 100644 --- a/src/rootserver/ddl_task/ob_table_redefinition_task.cpp +++ b/src/rootserver/ddl_task/ob_table_redefinition_task.cpp @@ -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)); } else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) { 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)); } else { task_type_ = ddl_type; diff --git a/src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp b/src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp index 407fe76fd..4d5b19167 100644 --- a/src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp +++ b/src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp @@ -779,8 +779,6 @@ int ObTabletDDLKvMgr::create_empty_ddl_sstable(ObTableHandleV2 &table_handle) ObArray empty_meta_array; 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)); - } 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;