Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
d3d110b7
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看板
提交
d3d110b7
编写于
6月 16, 2021
作者:
M
ms
提交者:
MizuhaHimuraki
6月 16, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove memstore limit for inner table
上级
d1138322
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
2 deletion
+5
-2
src/share/allocator/ob_gmemstore_allocator.cpp
src/share/allocator/ob_gmemstore_allocator.cpp
+3
-1
src/storage/memtable/ob_memtable.cpp
src/storage/memtable/ob_memtable.cpp
+1
-1
src/storage/memtable/ob_memtable.h
src/storage/memtable/ob_memtable.h
+1
-0
未找到文件。
src/share/allocator/ob_gmemstore_allocator.cpp
浏览文件 @
d3d110b7
...
@@ -93,7 +93,9 @@ void* ObGMemstoreAllocator::alloc(AllocHandle& handle, int64_t size)
...
@@ -93,7 +93,9 @@ void* ObGMemstoreAllocator::alloc(AllocHandle& handle, int64_t size)
hlist_
.
set_active
(
handle
);
hlist_
.
set_active
(
handle
);
}
}
}
}
if
(
OB_FAIL
(
ObTenantManager
::
get_instance
().
check_tenant_out_of_memstore_limit
(
tenant_id
,
is_out_of_mem
)))
{
if
(
handle
.
mt_
.
is_inner_table
())
{
// inner table memory not limited by memstore
}
else
if
(
OB_FAIL
(
ObTenantManager
::
get_instance
().
check_tenant_out_of_memstore_limit
(
tenant_id
,
is_out_of_mem
)))
{
COMMON_LOG
(
ERROR
,
"fail to check tenant out of mem limit"
,
K
(
ret
),
K
(
tenant_id
));
COMMON_LOG
(
ERROR
,
"fail to check tenant out of mem limit"
,
K
(
ret
),
K
(
tenant_id
));
is_out_of_mem
=
true
;
is_out_of_mem
=
true
;
}
else
if
(
is_out_of_mem
&&
REACH_TIME_INTERVAL
(
1
*
1000
*
1000
))
{
}
else
if
(
is_out_of_mem
&&
REACH_TIME_INTERVAL
(
1
*
1000
*
1000
))
{
...
...
src/storage/memtable/ob_memtable.cpp
浏览文件 @
d3d110b7
...
@@ -2634,7 +2634,7 @@ int ObMemtable::check_standby_cluster_schema_condition_(
...
@@ -2634,7 +2634,7 @@ int ObMemtable::check_standby_cluster_schema_condition_(
// user tables of normal tenants(not sys tenant) need to be checked by schema version of
// user tables of normal tenants(not sys tenant) need to be checked by schema version of
// itself;
// itself;
// sys tables of normal tenants(not sys tenant) need to be checked by schema version of sys tenent;
// sys tables of normal tenants(not sys tenant) need to be checked by schema version of sys tenent;
uint64_t
referred_tenant_id
=
is_inner_table
(
table_id
)
?
OB_SYS_TENANT_ID
:
tenant_id
;
uint64_t
referred_tenant_id
=
common
::
is_inner_table
(
table_id
)
?
OB_SYS_TENANT_ID
:
tenant_id
;
int64_t
tenant_schema_version
=
0
;
int64_t
tenant_schema_version
=
0
;
if
(
OB_FAIL
(
GSCHEMASERVICE
.
get_tenant_refreshed_schema_version
(
referred_tenant_id
,
tenant_schema_version
)))
{
if
(
OB_FAIL
(
GSCHEMASERVICE
.
get_tenant_refreshed_schema_version
(
referred_tenant_id
,
tenant_schema_version
)))
{
TRANS_LOG
(
WARN
,
TRANS_LOG
(
WARN
,
...
...
src/storage/memtable/ob_memtable.h
浏览文件 @
d3d110b7
...
@@ -256,6 +256,7 @@ class ObMemtable : public ObIMemtable {
...
@@ -256,6 +256,7 @@ class ObMemtable : public ObIMemtable {
virtual
int
get_frozen_schema_version
(
int64_t
&
schema_version
)
const
override
;
virtual
int
get_frozen_schema_version
(
int64_t
&
schema_version
)
const
override
;
virtual
bool
is_frozen_memtable
()
const
override
;
virtual
bool
is_frozen_memtable
()
const
override
;
virtual
bool
is_active_memtable
()
const
override
;
virtual
bool
is_active_memtable
()
const
override
;
virtual
bool
is_inner_table
()
const
{
return
common
::
is_inner_table
(
key_
.
table_id_
);
}
int
set_snapshot_version
(
const
int64_t
snapshot_version
);
int
set_snapshot_version
(
const
int64_t
snapshot_version
);
int
set_base_version
(
const
int64_t
base_version
);
int
set_base_version
(
const
int64_t
base_version
);
int
set_start_log_ts
(
const
int64_t
start_ts
);
int
set_start_log_ts
(
const
int64_t
start_ts
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录