Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lihongda1002
oceanbase
提交
e49ecdcc
O
oceanbase
项目概览
lihongda1002
/
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,发现更多精彩内容 >>
提交
e49ecdcc
编写于
11月 02, 2022
作者:
C
chinaxing
提交者:
wangzelin.wzl
11月 02, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[4.0] remove unused savepoint logic in RedoLog's mutatorRow
上级
109c3518
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
35 deletion
+7
-35
src/storage/memtable/mvcc/ob_mvcc_trans_ctx.h
src/storage/memtable/mvcc/ob_mvcc_trans_ctx.h
+1
-1
src/storage/memtable/ob_memtable_mutator.cpp
src/storage/memtable/ob_memtable_mutator.cpp
+3
-28
src/storage/memtable/ob_memtable_mutator.h
src/storage/memtable/ob_memtable_mutator.h
+3
-5
src/storage/memtable/ob_redo_log_generator.cpp
src/storage/memtable/ob_redo_log_generator.cpp
+0
-1
未找到文件。
src/storage/memtable/mvcc/ob_mvcc_trans_ctx.h
浏览文件 @
e49ecdcc
...
...
@@ -57,7 +57,7 @@ struct RedoDataNode
uint32_t
modify_count_
;
uint32_t
acc_checksum_
;
int64_t
version_
;
int32_t
flag_
;
int32_t
flag_
;
// currently, unused
int64_t
seq_no_
;
ObITransCallback
*
callback_
;
common
::
ObTabletID
tablet_id_
;
...
...
src/storage/memtable/ob_memtable_mutator.cpp
浏览文件 @
e49ecdcc
...
...
@@ -39,7 +39,7 @@ ObMemtableMutatorMeta::ObMemtableMutatorMeta():
data_crc_
(
0
),
data_size_
(
0
),
row_count_
(
0
),
have_rollback_to_savepoint_
(
1
)
unused_
(
0
)
{
}
...
...
@@ -159,8 +159,8 @@ int64_t ObMemtableMutatorMeta::to_string(char *buffer, const int64_t length) con
{
int64_t
pos
=
0
;
common
::
databuff_printf
(
buffer
,
length
,
pos
,
"%p data_crc=%x meta_size=%d data_size=%d row_count=%d
have_rollback_to_savepoint=%d
"
,
this
,
data_crc_
,
meta_size_
,
data_size_
,
row_count_
,
have_rollback_to_savepoint_
);
"%p data_crc=%x meta_size=%d data_size=%d row_count=%d"
,
this
,
data_crc_
,
meta_size_
,
data_size_
,
row_count_
);
return
pos
;
}
...
...
@@ -169,23 +169,6 @@ bool ObMemtableMutatorMeta::is_row_start() const
return
ObTransRowFlag
::
is_row_start
(
flags_
);
}
int
ObMemtableMutatorMeta
::
set_savepoint
(
const
uint32_t
flag
)
{
int
ret
=
OB_SUCCESS
;
if
(
flag
!=
0
&&
flag
!=
1
)
{
TRANS_LOG
(
WARN
,
"invalid argument"
,
K
(
flag
));
ret
=
OB_INVALID_ARGUMENT
;
}
else
{
have_rollback_to_savepoint_
=
flag
;
}
return
ret
;
}
uint32_t
ObMemtableMutatorMeta
::
get_savepoint
()
const
{
return
have_rollback_to_savepoint_
;
}
//only meta_crc is newly generated here, other information will keep unchanged
void
ObMemtableMutatorMeta
::
generate_new_header
()
{
...
...
@@ -863,7 +846,6 @@ int ObMutatorWriter::append_row_kv(
const
ObMemtableKey
*
mtk
=
&
redo
.
key_
;
uint64_t
cluster_version
=
0
;
bool
is_with_head
=
true
;
uint32
have_rollback_to_savepoint
=
redo
.
flag_
;
if
(
OB_ISNULL
(
redo
.
callback_
))
{
is_with_head
=
false
;
}
else
if
(
OB_FAIL
(
redo
.
callback_
->
get_cluster_version
(
cluster_version
)))
{
...
...
@@ -918,9 +900,6 @@ int ObMutatorWriter::append_row_kv(
}
}
else
if
(
OB_FAIL
(
meta_
.
inc_row_count
()))
{
TRANS_LOG
(
WARN
,
"meta inc_row_count failed"
,
K
(
ret
));
}
else
if
(
have_rollback_to_savepoint
==
1
&&
OB_FAIL
(
meta_
.
set_savepoint
(
have_rollback_to_savepoint
)))
{
TRANS_LOG
(
WARN
,
"set savepoint flag failed"
,
K
(
ret
));
}
else
{
buf_
.
get_position
()
=
tmp_pos
;
}
...
...
@@ -938,7 +917,6 @@ int ObMutatorWriter::append_row(
const
bool
is_with_head
)
{
int
ret
=
OB_SUCCESS
;
uint32
have_rollback_to_savepoint
=
row
.
get_savepoint_flag
();
ObMutatorRowHeader
row_header
;
row_header
.
mutator_type_
=
MutatorType
::
MUTATOR_ROW
;
//TODO replace pkey with tablet_id for clog_encrypt_info
...
...
@@ -964,9 +942,6 @@ int ObMutatorWriter::append_row(
}
}
else
if
(
OB_FAIL
(
meta_
.
inc_row_count
()))
{
TRANS_LOG
(
WARN
,
"meta inc_row_count failed"
,
K
(
ret
));
}
else
if
(
have_rollback_to_savepoint
==
1
&&
OB_FAIL
(
meta_
.
set_savepoint
(
have_rollback_to_savepoint
)))
{
TRANS_LOG
(
WARN
,
"set savepoint flag failed"
,
K
(
ret
));
}
else
{
buf_
.
get_position
()
=
tmp_pos
;
}
...
...
src/storage/memtable/ob_memtable_mutator.h
浏览文件 @
e49ecdcc
...
...
@@ -66,8 +66,6 @@ public:
int64_t
get_meta_size
()
const
{
return
meta_size_
;
}
int64_t
get_data_size
()
const
{
return
data_size_
;
}
bool
is_row_start
()
const
;
int
set_savepoint
(
const
uint32_t
is_savepoint
);
uint32_t
get_savepoint
()
const
;
public:
int64_t
get_serialize_size
()
const
;
...
...
@@ -87,7 +85,7 @@ private:
uint32_t
data_crc_
;
uint32_t
data_size_
;
uint32_t
row_count_
;
uint32_t
have_rollback_to_savepoint
_
;
uint32_t
unused
_
;
DISALLOW_COPY_AND_ASSIGN
(
ObMemtableMutatorMeta
);
};
...
...
@@ -190,7 +188,7 @@ public:
share
::
ObEncryptMeta
&
final_encrypt_meta
,
share
::
ObCLogEncryptStatMap
&
encrypt_stat_map
,
const
bool
is_big_row
=
false
);
uint32_t
get_
savepoint_
flag
()
const
{
return
flag_
;
};
uint32_t
get_flag
()
const
{
return
flag_
;
};
TO_STRING_KV
(
K_
(
row_size
),
K_
(
table_id
),
...
...
@@ -212,7 +210,7 @@ public:
ObRowData
old_row_
;
uint32_t
acc_checksum_
;
int64_t
version_
;
int32_t
flag_
;
//
savepoint flag
int32_t
flag_
;
//
currently, unused
uint8_t
rowid_version_
;
};
...
...
src/storage/memtable/ob_redo_log_generator.cpp
浏览文件 @
e49ecdcc
...
...
@@ -74,7 +74,6 @@ int ObRedoLogGenerator::fill_redo_log(char *buf,
}
else
{
helper
.
reset
();
ObMutatorWriter
mmw
;
mmw
.
get_meta
().
set_savepoint
(
0
);
mmw
.
set_buffer
(
buf
,
buf_len
-
buf_pos
);
RedoDataNode
redo
;
TableLockRedoDataNode
table_lock_redo
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录