Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
8dddff22
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8dddff22
编写于
10月 13, 2021
作者:
Y
YoungYang0820
提交者:
wangzelin.wzl
10月 13, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix unexpected error log in ObMacroBlockWriter when creating unique index
上级
a1b06baa
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
11 addition
and
2 deletion
+11
-2
src/storage/blocksstable/ob_macro_block.cpp
src/storage/blocksstable/ob_macro_block.cpp
+2
-0
src/storage/blocksstable/ob_macro_block.h
src/storage/blocksstable/ob_macro_block.h
+2
-1
src/storage/blocksstable/ob_macro_block_writer.cpp
src/storage/blocksstable/ob_macro_block_writer.cpp
+6
-1
src/storage/ob_build_index_task.cpp
src/storage/ob_build_index_task.cpp
+1
-0
未找到文件。
src/storage/blocksstable/ob_macro_block.cpp
浏览文件 @
8dddff22
...
...
@@ -264,6 +264,7 @@ void ObDataStoreDesc::reset()
progressive_merge_round_
=
0
;
major_working_cluster_version_
=
0
;
iter_complement_
=
false
;
is_unique_index_
=
false
;
}
int
ObDataStoreDesc
::
assign
(
const
ObDataStoreDesc
&
desc
)
...
...
@@ -303,6 +304,7 @@ int ObDataStoreDesc::assign(const ObDataStoreDesc& desc)
pg_key_
=
desc
.
pg_key_
;
need_check_order_
=
desc
.
need_check_order_
;
major_working_cluster_version_
=
desc
.
major_working_cluster_version_
;
is_unique_index_
=
desc
.
is_unique_index_
;
if
(
OB_FAIL
(
file_handle_
.
assign
(
desc
.
file_handle_
)))
{
STORAGE_LOG
(
WARN
,
"failed to assign file handle"
,
K
(
ret
),
K
(
desc
.
file_handle_
));
}
...
...
src/storage/blocksstable/ob_macro_block.h
浏览文件 @
8dddff22
...
...
@@ -74,6 +74,7 @@ struct ObDataStoreDesc {
// which still use freezeinfo without cluster version
int64_t
major_working_cluster_version_
;
bool
iter_complement_
;
bool
is_unique_index_
;
common
::
ObArenaAllocator
allocator_
;
ObDataStoreDesc
()
...
...
@@ -103,7 +104,7 @@ struct ObDataStoreDesc {
K_
(
store_micro_block_column_checksum
),
K_
(
snapshot_version
),
K_
(
need_calc_physical_checksum
),
K_
(
need_index_tree
),
K_
(
need_prebuild_bloomfilter
),
K_
(
bloomfilter_rowkey_prefix
),
KP_
(
rowkey_helper
),
"column_types"
,
common
::
ObArrayWrap
<
common
::
ObObjMeta
>
(
column_types_
,
row_column_count_
),
K_
(
pg_key
),
K_
(
file_handle
),
K_
(
need_check_order
),
K_
(
need_index_tree
),
K_
(
major_working_cluster_version
),
K_
(
iter_complement
));
K_
(
need_check_order
),
K_
(
need_index_tree
),
K_
(
major_working_cluster_version
),
K_
(
iter_complement
)
,
K_
(
is_unique_index
)
);
private:
int
cal_row_store_type
(
const
share
::
schema
::
ObTableSchema
&
table_schema
,
const
storage
::
ObMergeType
merge_type
);
...
...
src/storage/blocksstable/ob_macro_block_writer.cpp
浏览文件 @
8dddff22
...
...
@@ -851,8 +851,13 @@ int ObMacroBlockWriter::check_order(const ObStoreRow& row)
}
else
{
// baseline data
ret
=
OB_ERR_PRIMARY_KEY_DUPLICATE
;
if
(
data_store_desc_
->
is_unique_index_
)
{
STORAGE_LOG
(
WARN
,
"input rowkey is equal with last rowkey in unique index"
,
K
(
cur_key
),
K
(
last_key
),
K
(
ret
));
}
else
{
STORAGE_LOG
(
ERROR
,
"input rowkey is equal with last rowkey"
,
K
(
cur_key
),
K
(
last_key
),
K
(
ret
));
}
}
}
else
{
// normal case
if
(
need_deletion_check_
)
{
...
...
src/storage/ob_build_index_task.cpp
浏览文件 @
8dddff22
...
...
@@ -825,6 +825,7 @@ int ObIndexMergeTask::add_build_index_sstable(const ObBuildIndexParam& param,
pg
->
get_partition_key
(),
pg
->
get_storage_file_handle
())))
{
STORAGE_LOG
(
WARN
,
"Fail to init data store desc, "
,
K
(
ret
));
}
else
if
(
FALSE_IT
(
data_desc_
.
is_unique_index_
=
param
.
index_schema_
->
is_unique_index
()))
{
}
else
if
(
OB_FAIL
(
writer_
.
open
(
data_desc_
,
macro_start_seq
)))
{
STORAGE_LOG
(
WARN
,
"Fail to open macro block writer, "
,
K
(
ret
));
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录