Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
kvdb
rocksdb
提交
2014915d
R
rocksdb
项目概览
kvdb
/
rocksdb
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rocksdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2014915d
编写于
4月 09, 2014
作者:
I
Igor Canadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ASAN issue
上级
e9ed28f9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
6 deletion
+7
-6
db/version_set.cc
db/version_set.cc
+7
-6
未找到文件。
db/version_set.cc
浏览文件 @
2014915d
...
...
@@ -1822,7 +1822,7 @@ Status VersionSet::Recover(
// keeps track of column families in manifest that were not found in
// column families parameters. if those column families are not dropped
// by subsequent manifest records, Recover() will return failure status
std
::
set
<
int
>
column_families_not_found
;
std
::
unordered_map
<
int
,
std
::
string
>
column_families_not_found
;
// Read "CURRENT" file, which contains a pointer to the current manifest file
std
::
string
manifest_filename
;
...
...
@@ -1924,7 +1924,8 @@ Status VersionSet::Recover(
}
auto
cf_options
=
cf_name_to_options
.
find
(
edit
.
column_family_name_
);
if
(
cf_options
==
cf_name_to_options
.
end
())
{
column_families_not_found
.
insert
(
edit
.
column_family_
);
column_families_not_found
.
insert
(
{
edit
.
column_family_
,
edit
.
column_family_name_
});
}
else
{
cfd
=
CreateColumnFamily
(
cf_options
->
second
,
&
edit
);
builders
.
insert
({
edit
.
column_family_
,
new
Builder
(
cfd
)});
...
...
@@ -2038,13 +2039,13 @@ Status VersionSet::Recover(
// in the argument. This is OK in read_only mode
if
(
read_only
==
false
&&
column_families_not_found
.
size
()
>
0
)
{
std
::
string
list_of_not_found
;
for
(
auto
cf
:
column_families_not_found
)
{
list_of_not_found
+=
", "
+
cf
;
for
(
const
auto
&
cf
:
column_families_not_found
)
{
list_of_not_found
+=
", "
+
cf
.
second
;
}
list_of_not_found
=
list_of_not_found
.
substr
(
2
);
s
=
Status
::
InvalidArgument
(
"You have to open all column families. Column families not opened:
%s"
,
list_of_not_found
.
c_str
()
);
"You have to open all column families. Column families not opened:
"
+
list_of_not_found
);
}
if
(
s
.
ok
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录