Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
a64c831e
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a64c831e
编写于
2月 07, 2021
作者:
B
bigsheeper
提交者:
yefu.chen
2月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix segment replacement bug
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
7342e075
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
60 addition
and
11 deletion
+60
-11
internal/querynode/collection_replica.go
internal/querynode/collection_replica.go
+2
-2
internal/querynode/collection_replica_test.go
internal/querynode/collection_replica_test.go
+31
-0
internal/querynode/load_service.go
internal/querynode/load_service.go
+6
-2
internal/querynode/segment.go
internal/querynode/segment.go
+21
-7
未找到文件。
internal/querynode/collection_replica.go
浏览文件 @
a64c831e
...
...
@@ -513,7 +513,7 @@ func (colReplica *collectionReplicaImpl) replaceGrowingSegmentBySealedSegment(se
return
errors
.
New
(
"unexpected segment type"
)
}
targetSegment
,
err
:=
colReplica
.
getSegmentByIDPrivate
(
segment
.
ID
())
if
err
!
=
nil
&&
targetSegment
!=
nil
{
if
err
=
=
nil
&&
targetSegment
!=
nil
{
if
targetSegment
.
segmentType
!=
segTypeGrowing
{
// target segment has been a sealed segment
return
nil
...
...
@@ -521,7 +521,7 @@ func (colReplica *collectionReplicaImpl) replaceGrowingSegmentBySealedSegment(se
deleteSegment
(
targetSegment
)
}
targetSegment
=
segment
colReplica
.
segments
[
segment
.
ID
()]
=
segment
return
nil
}
...
...
internal/querynode/collection_replica_test.go
浏览文件 @
a64c831e
...
...
@@ -242,5 +242,36 @@ func TestCollectionReplica_freeAll(t *testing.T) {
err
:=
node
.
Stop
()
assert
.
NoError
(
t
,
err
)
}
func
TestReplaceGrowingSegmentBySealedSegment
(
t
*
testing
.
T
)
{
node
:=
newQueryNodeMock
()
collectionID
:=
UniqueID
(
0
)
segmentID
:=
UniqueID
(
520
)
initTestMeta
(
t
,
node
,
collectionID
,
segmentID
)
_
,
_
,
segIDs
:=
node
.
replica
.
getSealedSegmentsBySegmentType
(
segTypeGrowing
)
assert
.
Equal
(
t
,
len
(
segIDs
),
1
)
collection
,
err
:=
node
.
replica
.
getCollectionByID
(
collectionID
)
assert
.
NoError
(
t
,
err
)
ns
:=
newSegment
(
collection
,
segmentID
,
defaultPartitionID
,
collectionID
,
segTypeSealed
)
err
=
node
.
replica
.
replaceGrowingSegmentBySealedSegment
(
ns
)
assert
.
NoError
(
t
,
err
)
segmentNums
:=
node
.
replica
.
getSegmentNum
()
assert
.
Equal
(
t
,
segmentNums
,
1
)
segment
,
err
:=
node
.
replica
.
getSegmentByID
(
segmentID
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
segment
.
getType
(),
segTypeSealed
)
_
,
_
,
segIDs
=
node
.
replica
.
getSealedSegmentsBySegmentType
(
segTypeGrowing
)
assert
.
Equal
(
t
,
len
(
segIDs
),
0
)
_
,
_
,
segIDs
=
node
.
replica
.
getSealedSegmentsBySegmentType
(
segTypeSealed
)
assert
.
Equal
(
t
,
len
(
segIDs
),
1
)
err
=
node
.
Stop
()
assert
.
NoError
(
t
,
err
)
}
internal/querynode/load_service.go
浏览文件 @
a64c831e
...
...
@@ -114,6 +114,11 @@ func (s *loadService) loadSegmentInternal(collectionID UniqueID, partitionID Uni
if
err
!=
nil
{
return
err
}
// replace segment
err
=
s
.
segLoader
.
replica
.
replaceGrowingSegmentBySealedSegment
(
segment
)
if
err
!=
nil
{
return
err
}
if
errIndex
==
nil
{
fmt
.
Println
(
"loading index..."
)
indexPaths
,
err
:=
s
.
segLoader
.
indexLoader
.
getIndexPaths
(
buildID
)
...
...
@@ -125,8 +130,7 @@ func (s *loadService) loadSegmentInternal(collectionID UniqueID, partitionID Uni
return
err
}
}
// replace segment
return
s
.
segLoader
.
replica
.
replaceGrowingSegmentBySealedSegment
(
segment
)
return
nil
}
func
newLoadService
(
ctx
context
.
Context
,
masterClient
MasterServiceInterface
,
dataClient
DataServiceInterface
,
indexClient
IndexServiceInterface
,
replica
collectionReplica
,
dmStream
msgstream
.
MsgStream
)
*
loadService
{
...
...
internal/querynode/segment.go
浏览文件 @
a64c831e
...
...
@@ -12,6 +12,7 @@ package querynode
*/
import
"C"
import
(
"log"
"strconv"
"sync"
"unsafe"
...
...
@@ -23,13 +24,13 @@ import (
)
const
(
segTypeInvalid
=
C
.
Invalid
segTypeGrowing
=
C
.
Growing
segTypeSealed
=
C
.
Sealed
segTypeIndexing
=
C
.
Indexing
segTypeInvalid
=
0
segTypeGrowing
=
1
segTypeSealed
=
2
segTypeIndexing
=
3
)
type
segmentType
=
C
.
SegmentType
type
segmentType
=
int
type
indexParam
=
map
[
string
]
string
type
Segment
struct
{
...
...
@@ -45,7 +46,7 @@ type Segment struct {
recentlyModified
bool
typeMu
sync
.
Mutex
// guards builtIndex
segmentType
C
.
SegmentType
segmentType
int
paramMutex
sync
.
RWMutex
// guards index
indexParam
map
[
int64
]
indexParam
...
...
@@ -112,7 +113,20 @@ func newSegment(collection *Collection, segmentID int64, partitionID UniqueID, c
NewSegment(CCollection collection, uint64_t segment_id, SegmentType seg_type);
*/
initIndexParam
:=
make
(
map
[
int64
]
indexParam
)
segmentPtr
:=
C
.
NewSegment
(
collection
.
collectionPtr
,
C
.
ulong
(
segmentID
),
segType
)
var
segmentPtr
C
.
CSegmentInterface
switch
segType
{
case
segTypeInvalid
:
log
.
Println
(
"illegal segment type when create segment"
)
return
nil
case
segTypeSealed
:
segmentPtr
=
C
.
NewSegment
(
collection
.
collectionPtr
,
C
.
ulong
(
segmentID
),
C
.
Sealed
)
case
segTypeGrowing
:
segmentPtr
=
C
.
NewSegment
(
collection
.
collectionPtr
,
C
.
ulong
(
segmentID
),
C
.
Growing
)
default
:
log
.
Println
(
"illegal segment type when create segment"
)
return
nil
}
var
newSegment
=
&
Segment
{
segmentPtr
:
segmentPtr
,
segmentType
:
segType
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录