Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
知世而放
oceanbase
提交
ad8e3075
O
oceanbase
项目概览
知世而放
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad8e3075
编写于
9月 14, 2021
作者:
H
handora
提交者:
wangzelin.wzl
9月 14, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BUG] Add miss CP to opensource
上级
f9d5fb8f
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
22 addition
and
20 deletion
+22
-20
src/storage/memtable/ob_memtable_array.cpp
src/storage/memtable/ob_memtable_array.cpp
+13
-13
src/storage/memtable/ob_memtable_array.h
src/storage/memtable/ob_memtable_array.h
+1
-1
src/storage/transaction/ob_trans_part_ctx.cpp
src/storage/transaction/ob_trans_part_ctx.cpp
+7
-5
src/storage/transaction/ob_trans_part_ctx.h
src/storage/transaction/ob_trans_part_ctx.h
+1
-1
未找到文件。
src/storage/memtable/ob_memtable_array.cpp
浏览文件 @
ad8e3075
...
...
@@ -39,7 +39,7 @@ int ObMemtableArrWrap::dec_active_trx_count_at_active_mt()
{
int
ret
=
OB_SUCCESS
;
int64_t
count
=
get_count_
();
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
;
if
(
pos
<
0
||
count
==
0
||
mt_end_
<=
0
||
mt_start_
<
0
)
{
ret
=
OB_INVALID_ARGUMENT
;
...
...
@@ -68,7 +68,7 @@ int ObMemtableArrWrap::remove_mem_ctx_for_trans_ctx(ObMemtable* mt)
TRANS_LOG
(
WARN
,
"remove mem ctx for trans ctx"
,
K
(
ret
),
K
(
mt_start_
),
K
(
mt_end_
));
}
else
{
if
(
0
!=
count
)
{
int64_t
pos
=
mt_start_
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
mt_start_
%
common
::
MAX_MEMSTORE_CNT
;
if
(
mt
==
mt_
[
pos
])
{
mt_
[
pos
]
->
dec_ref
();
mt_
[
pos
]
=
NULL
;
...
...
@@ -85,7 +85,7 @@ int ObMemtableArrWrap::clear_mt_arr()
int
ret
=
OB_SUCCESS
;
for
(
int64_t
i
=
mt_start_
;
OB_SUCCESS
==
ret
&&
i
<
mt_end_
;
i
++
)
{
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
;
if
(
NULL
!=
mt_
[
pos
])
{
mt_
[
pos
]
->
dec_active_trx_count
();
mt_
[
pos
]
=
NULL
;
...
...
@@ -108,11 +108,11 @@ int ObMemtableArrWrap::add_memtable(ObMemtable* memtable)
if
(
NULL
==
memtable
)
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"add memtable get nullptr"
,
K
(
memtable
),
K
(
ret
),
K
(
mt_start_
),
K
(
mt_end_
));
}
else
if
(
count
>=
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
)
{
}
else
if
(
count
>=
common
::
MAX_MEMSTORE_CNT
)
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"add memtable upper than allowed"
,
K
(
memtable
),
K
(
ret
),
K
(
mt_start_
),
K
(
mt_end_
));
}
else
{
int64_t
pos
=
mt_end_
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
mt_end_
%
common
::
MAX_MEMSTORE_CNT
;
mt_
[
pos
]
=
memtable
;
mt_end_
++
;
}
...
...
@@ -124,7 +124,7 @@ ObMemtable* ObMemtableArrWrap::get_active_mt() const
{
ObMemtable
*
ret
=
NULL
;
int64_t
count
=
get_count_
();
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
;
if
(
count
>
0
&&
pos
>=
0
)
{
ret
=
mt_
[
pos
];
}
...
...
@@ -134,7 +134,7 @@ ObMemtable* ObMemtableArrWrap::get_active_mt() const
int
ObMemtableArrWrap
::
inc_active_trx_count_at_active_mt
(
ObMemtable
*&
active_memtable
)
{
int
ret
=
OB_SUCCESS
;
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
(
mt_end_
-
1
)
%
common
::
MAX_MEMSTORE_CNT
;
int64_t
count
=
get_count_
();
if
(
pos
<
0
||
count
<
0
)
{
...
...
@@ -158,7 +158,7 @@ int ObMemtableArrWrap::update_max_trans_version_(const int64_t pos, const int64_
{
int
ret
=
OB_SUCCESS
;
if
(
pos
<
0
||
pos
>=
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
)
{
if
(
pos
<
0
||
pos
>=
common
::
MAX_MEMSTORE_CNT
)
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"update_max_trans_version invalid argument"
,
K
(
ret
),
K
(
pos
));
}
else
{
...
...
@@ -176,7 +176,7 @@ int ObMemtableArrWrap::update_max_schema_version_(const int64_t pos, const int64
{
int
ret
=
OB_SUCCESS
;
if
(
pos
<
0
||
pos
>=
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
)
{
if
(
pos
<
0
||
pos
>=
common
::
MAX_MEMSTORE_CNT
)
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"update_max_schema_version invalid argument"
,
K
(
ret
),
K
(
pos
));
}
else
{
...
...
@@ -193,7 +193,7 @@ int ObMemtableArrWrap::update_all_mt_max_trans_version(const int64_t trans_versi
int
ret
=
OB_SUCCESS
;
for
(
int64_t
i
=
mt_start_
;
i
<
mt_end_
;
i
++
)
{
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
;
update_max_trans_version_
(
pos
,
trans_version
);
}
...
...
@@ -205,7 +205,7 @@ int ObMemtableArrWrap::update_all_mt_max_schema_version(const int64_t schema_ver
int
ret
=
OB_SUCCESS
;
for
(
int64_t
i
=
mt_start_
;
i
<
mt_end_
;
i
++
)
{
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
;
update_max_schema_version_
(
pos
,
schema_version
);
}
...
...
@@ -217,7 +217,7 @@ bool ObMemtableArrWrap::is_contain_this_memtable(ObMemtable* memtable)
int
bool_ret
=
false
;
for
(
int64_t
i
=
mt_start_
;
!
bool_ret
&&
i
<
mt_end_
;
i
++
)
{
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
;
if
(
mt_
[
pos
]
==
memtable
)
{
bool_ret
=
true
;
}
...
...
@@ -231,7 +231,7 @@ int ObMemtableArrWrap::check_memtable_count(int64_t& count)
int
ret
=
OB_SUCCESS
;
for
(
int64_t
i
=
mt_start_
;
i
<
mt_end_
;
++
i
)
{
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
;
int64_t
pos
=
i
%
common
::
MAX_MEMSTORE_CNT
;
if
(
NULL
!=
mt_
[
pos
])
{
ATOMIC_AAF
(
&
count
,
1
);
}
...
...
src/storage/memtable/ob_memtable_array.h
浏览文件 @
ad8e3075
...
...
@@ -54,7 +54,7 @@ private:
int
update_max_schema_version_
(
const
int64_t
pos
,
const
int64_t
schema_version
);
private:
ObMemtable
*
mt_
[
common
::
MAX_MEMSTORE_CNT
_IN_STORAGE
];
ObMemtable
*
mt_
[
common
::
MAX_MEMSTORE_CNT
];
int64_t
mt_start_
;
int64_t
mt_end_
;
};
...
...
src/storage/transaction/ob_trans_part_ctx.cpp
浏览文件 @
ad8e3075
...
...
@@ -3095,12 +3095,14 @@ int ObPartTransCtx::leader_revoke(const bool first_check, bool& need_release, Ob
if
(
!
is_trans_state_sync_finished_
)
{
TRANS_LOG
(
INFO
,
"transaction is killed"
,
"context"
,
*
this
);
}
}
else
if
(
has_logged_
()
&&
!
is_in_2pc_
()
&&
!
is_trans_state_sync_finished_
&&
0
==
submit_log_count_
)
{
}
else
if
(
has_logged_
()
&&
!
is_in_2pc_
()
&&
!
is_trans_state_sync_finished_
&&
0
==
submit_log_count_
&&
FALSE_IT
(
mt_ctx_
.
clean_dirty_callbacks
()))
{
// - When leader is revoking and some non-2pc logs of txn has already been
// submitted to sliding window:
// - If no on-the-fly log and state log is not synced successfully, remove all
// marked_log_cnts
(
void
)
mt_ctx_
.
clean_dirty_callbacks
();
// - Case 2.1: We only solve the case with no on-the-fly logs(because we have no idea
// whether the on-the-fly log is paxos-choosen or not)
// - If the state is not synced successfully(txn need abort), so we remove all
// marked trans node
}
else
if
(
OB_FAIL
(
mt_ctx_
.
commit_to_replay
()))
{
TRANS_LOG
(
WARN
,
"commit to replay error"
,
KR
(
ret
),
"context"
,
*
this
);
}
else
{
...
...
src/storage/transaction/ob_trans_part_ctx.h
浏览文件 @
ad8e3075
...
...
@@ -402,7 +402,7 @@ public:
K
(
mt_ctx_
.
get_checksum_log_ts
()),
K_
(
is_changing_leader
),
K_
(
has_trans_state_log
),
K_
(
is_trans_state_sync_finished
),
K_
(
status
),
K_
(
same_leader_batch_partitions_count
),
K_
(
is_hazardous_ctx
),
K
(
mt_ctx_
.
get_callback_count
()),
K_
(
in_xa_prepare_state
),
K_
(
is_listener
),
K_
(
last_replayed_redo_log_id
),
K_
(
is_xa_trans_prepared
));
K_
(
status
),
K_
(
is_xa_trans_prepared
));
public:
static
const
int64_t
OP_LOCAL_NUM
=
16
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录