Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
oceanbase
oceanbase
提交
5f02c08d
O
oceanbase
项目概览
oceanbase
/
oceanbase
大约 1 年 前同步成功
通知
261
Star
6084
Fork
1301
代码
文件
提交
分支
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5f02c08d
编写于
2月 20, 2024
作者:
S
simonjoylet
提交者:
ob-robot
2月 20, 2024
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ddl memtable use allocator from ddl kv
上级
4116c8fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
7 deletion
+7
-7
mittest/mtlenv/storage/blocksstable/ob_index_block_data_prepare.h
...mtlenv/storage/blocksstable/ob_index_block_data_prepare.h
+2
-2
src/storage/ddl/ob_tablet_ddl_kv.cpp
src/storage/ddl/ob_tablet_ddl_kv.cpp
+4
-4
src/storage/ddl/ob_tablet_ddl_kv.h
src/storage/ddl/ob_tablet_ddl_kv.h
+1
-1
未找到文件。
mittest/mtlenv/storage/blocksstable/ob_index_block_data_prepare.h
浏览文件 @
5f02c08d
...
...
@@ -724,7 +724,7 @@ void TestIndexBlockDataPrepare::prepare_ddl_kv()
share
::
SCN
ddl_start_scn
;
ddl_start_scn
.
convert_from_ts
(
ObTimeUtility
::
current_time
());
ASSERT_EQ
(
OB_SUCCESS
,
ddl_kv_
.
init
(
*
tablet_handle
.
get_obj
(),
sstable_
.
get_key
(),
ddl_start_scn
,
DATA_CURRENT_VERSION
));
ASSERT_EQ
(
OB_SUCCESS
,
ddl_kv_
.
init
(
allocator_
,
*
tablet_handle
.
get_obj
(),
sstable_
.
get_key
(),
ddl_start_scn
,
DATA_CURRENT_VERSION
));
SMART_VAR
(
ObSSTableSecMetaIterator
,
meta_iter
)
{
ObDatumRange
query_range
;
...
...
@@ -1223,7 +1223,7 @@ void TestIndexBlockDataPrepare::prepare_merge_ddl_kvs()
void
*
buf
=
allocator_
.
alloc
(
sizeof
(
ObDDLMemtable
));
ASSERT_NE
(
nullptr
,
buf
);
ObDDLMemtable
*
new_ddl_table
=
new
(
buf
)
ObDDLMemtable
;
ASSERT_EQ
(
OB_SUCCESS
,
new_ddl_table
->
init
(
*
tablet_handle
.
get_obj
(),
ddl_key
,
ddl_start_scn
,
4000
));
ASSERT_EQ
(
OB_SUCCESS
,
new_ddl_table
->
init
(
allocator_
,
*
tablet_handle
.
get_obj
(),
ddl_key
,
ddl_start_scn
,
4000
));
ASSERT_EQ
(
OB_SUCCESS
,
ddl_kvs_
.
get_obj
()
->
get_ddl_memtables
().
push_back
(
new_ddl_table
));
}
ObDDLKVHandle
kv_handle
;
...
...
src/storage/ddl/ob_tablet_ddl_kv.cpp
浏览文件 @
5f02c08d
...
...
@@ -805,7 +805,7 @@ int64_t ObBlockMetaTree::get_memory_used() const
/****************** ObDDLKV **********************/
ObDDLMemtable
::
ObDDLMemtable
()
:
is_inited_
(
false
),
allocator_
(
"ddl_mem_sst"
,
OB_MALLOC_NORMAL_BLOCK_SIZE
,
MTL_ID
()),
block_meta_tree_
()
:
is_inited_
(
false
),
block_meta_tree_
()
{
}
...
...
@@ -816,6 +816,7 @@ ObDDLMemtable::~ObDDLMemtable()
}
int
ObDDLMemtable
::
init
(
ObArenaAllocator
&
allocator
,
ObTablet
&
tablet
,
const
ObITable
::
TableKey
&
table_key
,
const
share
::
SCN
&
ddl_start_scn
,
...
...
@@ -841,7 +842,7 @@ int ObDDLMemtable::init(
LOG_WARN
(
"init mem index sstable failed"
,
K
(
ret
),
K
(
table_key
),
K
(
ddl_start_scn
));
}
else
if
(
OB_FAIL
(
init_sstable_param
(
tablet
,
table_key
,
ddl_start_scn
,
sstable_param
)))
{
LOG_WARN
(
"init sstable param failed"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObSSTable
::
init
(
sstable_param
,
&
allocator
_
)))
{
}
else
if
(
OB_FAIL
(
ObSSTable
::
init
(
sstable_param
,
&
allocator
)))
{
LOG_WARN
(
"init sstable failed"
,
K
(
ret
));
}
else
{
is_inited_
=
true
;
...
...
@@ -856,7 +857,6 @@ void ObDDLMemtable::reset()
is_inited_
=
false
;
ObSSTable
::
reset
();
block_meta_tree_
.
destroy
();
allocator_
.
reset
();
}
void
ObDDLMemtable
::
set_scn_range
(
...
...
@@ -982,7 +982,7 @@ int ObDDLKV::create_ddl_memtable(ObTablet &tablet, const ObITable::TableKey &tab
LOG_WARN
(
"allocate memory failed"
,
K
(
ret
),
K
(
sizeof
(
ObDDLMemtable
)));
}
else
{
ddl_memtable
=
new
(
buf
)
ObDDLMemtable
;
if
(
OB_FAIL
(
ddl_memtable
->
init
(
tablet
,
table_key
,
ddl_start_scn_
,
data_format_version_
)))
{
if
(
OB_FAIL
(
ddl_memtable
->
init
(
arena_allocator_
,
tablet
,
table_key
,
ddl_start_scn_
,
data_format_version_
)))
{
LOG_WARN
(
"init ddl memtable failed"
,
K
(
ret
),
K
(
table_key
));
}
else
if
(
OB_FAIL
(
ddl_memtables_
.
push_back
(
ddl_memtable
)))
{
LOG_WARN
(
"push back ddl memtable failed"
,
K
(
ret
));
...
...
src/storage/ddl/ob_tablet_ddl_kv.h
浏览文件 @
5f02c08d
...
...
@@ -168,6 +168,7 @@ public:
ObDDLMemtable
();
virtual
~
ObDDLMemtable
();
int
init
(
ObArenaAllocator
&
allocator
,
ObTablet
&
tablet
,
const
ObITable
::
TableKey
&
table_key
,
const
share
::
SCN
&
ddl_start_scn
,
...
...
@@ -194,7 +195,6 @@ private:
ObTabletCreateSSTableParam
&
sstable_param
);
private:
bool
is_inited_
;
ObArenaAllocator
allocator_
;
ObBlockMetaTree
block_meta_tree_
;
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录