Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
067905be
O
oceanbase
项目概览
Metz
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
067905be
编写于
7月 27, 2021
作者:
Y
ym0
提交者:
wangzelin.wzl
7月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix recyclebin related problems
上级
63cb67d6
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
14 addition
and
19 deletion
+14
-19
src/rootserver/ob_ddl_operator.cpp
src/rootserver/ob_ddl_operator.cpp
+14
-19
未找到文件。
src/rootserver/ob_ddl_operator.cpp
浏览文件 @
067905be
...
@@ -4023,26 +4023,21 @@ int ObDDLOperator::drop_table_for_inspection(const ObTableSchema& orig_table_sch
...
@@ -4023,26 +4023,21 @@ int ObDDLOperator::drop_table_for_inspection(const ObTableSchema& orig_table_sch
}
else
if
(
OB_RECYCLEBIN_SCHEMA_ID
==
extract_pure_id
(
orig_table_schema
.
get_database_id
()))
{
}
else
if
(
OB_RECYCLEBIN_SCHEMA_ID
==
extract_pure_id
(
orig_table_schema
.
get_database_id
()))
{
// FIXME: remove [!is_dropped_schema()] from ObSimpleTableSchemaV2::is_in_recyclebin()
// FIXME: remove [!is_dropped_schema()] from ObSimpleTableSchemaV2::is_in_recyclebin()
ObRecycleObject
::
RecycleObjType
recycle_type
=
ObRecycleObject
::
get_type_by_table_schema
(
orig_table_schema
);
ObRecycleObject
::
RecycleObjType
recycle_type
=
ObRecycleObject
::
get_type_by_table_schema
(
orig_table_schema
);
const
ObRecycleObject
*
recycle_obj
=
NULL
;
ObArray
<
ObRecycleObject
>
recycle_objs
;
ObArray
<
ObRecycleObject
>
recycle_objs
;
if
(
NULL
==
recycle_obj
)
{
if
(
OB_FAIL
(
schema_service
->
fetch_recycle_object
(
orig_table_schema
.
get_tenant_id
(),
if
(
OB_FAIL
(
schema_service
->
fetch_recycle_object
(
orig_table_schema
.
get_tenant_id
(),
orig_table_schema
.
get_table_name_str
(),
orig_table_schema
.
get_table_name_str
(),
recycle_type
,
recycle_type
,
trans
,
trans
,
recycle_objs
)))
{
recycle_objs
)))
{
LOG_WARN
(
"get_recycle_object failed"
,
K
(
ret
),
K
(
recycle_type
));
LOG_WARN
(
"get_recycle_object failed"
,
K
(
ret
),
K
(
recycle_type
));
}
else
if
(
0
==
recycle_objs
.
size
())
{
// bugfix: https://work.aone.alibaba-inc.com/issue/35723010
}
else
if
(
recycle_objs
.
size
()
!=
1
)
{
}
else
if
(
recycle_objs
.
size
()
!=
1
)
{
ret
=
OB_ERR_UNEXPECTED
;
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"unexpected recycle object num"
,
K
(
ret
),
K
(
recycle_objs
.
size
()));
LOG_WARN
(
"unexpected recycle object num"
,
K
(
ret
),
K
(
recycle_objs
.
size
()));
}
else
{
}
else
if
(
OB_FAIL
(
schema_service
->
delete_recycle_object
(
recycle_obj
=
&
recycle_objs
.
at
(
0
);
orig_table_schema
.
get_tenant_id
(),
recycle_objs
.
at
(
0
),
trans
)))
{
}
LOG_WARN
(
"delete_recycle_object failed"
,
K
(
ret
),
K
(
recycle_objs
.
at
(
0
)));
}
if
(
OB_SUCC
(
ret
))
{
if
(
OB_FAIL
(
schema_service
->
delete_recycle_object
(
orig_table_schema
.
get_tenant_id
(),
*
recycle_obj
,
trans
)))
{
LOG_WARN
(
"delete_recycle_object failed"
,
K
(
ret
),
K
(
*
recycle_obj
));
}
}
}
}
}
if
(
OB_FAIL
(
ret
))
{
if
(
OB_FAIL
(
ret
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录