Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
e3956ad1
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
e3956ad1
编写于
5月 26, 2021
作者:
C
congqixia
提交者:
zhenshan.cao
6月 15, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change SaveBinLogPaths field2Path to repeated (#8)
Signed-off-by:
N
Congqi Xia
<
congqi.xia@zilliz.com
>
上级
ef563fda
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
15 deletion
+22
-15
internal/datanode/data_node.go
internal/datanode/data_node.go
+3
-3
internal/dataservice/server.go
internal/dataservice/server.go
+9
-6
internal/dataservice/server_test.go
internal/dataservice/server_test.go
+10
-6
未找到文件。
internal/datanode/data_node.go
浏览文件 @
e3956ad1
...
@@ -313,12 +313,12 @@ func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmen
...
@@ -313,12 +313,12 @@ func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmen
waitReceive
:=
func
(
wg
*
sync
.
WaitGroup
,
flushedCh
interface
{},
req
*
datapb
.
SaveBinlogPathsRequest
)
{
waitReceive
:=
func
(
wg
*
sync
.
WaitGroup
,
flushedCh
interface
{},
req
*
datapb
.
SaveBinlogPathsRequest
)
{
defer
wg
.
Done
()
defer
wg
.
Done
()
switch
flushedCh
.
(
type
)
{
switch
Ch
:=
flushedCh
.
(
type
)
{
case
chan
[]
*
datapb
.
ID2PathList
:
case
chan
[]
*
datapb
.
ID2PathList
:
select
{
select
{
case
<-
time
.
After
(
300
*
time
.
Second
)
:
case
<-
time
.
After
(
300
*
time
.
Second
)
:
return
return
case
meta
:=
<-
flushedCh
.
(
chan
[]
*
datapb
.
ID2PathList
)
:
case
meta
:=
<-
Ch
:
if
meta
==
nil
{
if
meta
==
nil
{
log
.
Info
(
"Dml messages flush failed!"
)
log
.
Info
(
"Dml messages flush failed!"
)
// Modify req to confirm failure
// Modify req to confirm failure
...
@@ -333,7 +333,7 @@ func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmen
...
@@ -333,7 +333,7 @@ func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmen
select
{
select
{
case
<-
time
.
After
(
300
*
time
.
Second
)
:
case
<-
time
.
After
(
300
*
time
.
Second
)
:
return
return
case
meta
:=
<-
flushedCh
.
(
chan
[]
*
datapb
.
DDLBinlogMeta
)
:
case
meta
:=
<-
Ch
:
if
meta
==
nil
{
if
meta
==
nil
{
log
.
Info
(
"Ddl messages flush failed!"
)
log
.
Info
(
"Ddl messages flush failed!"
)
// Modify req to confirm failure
// Modify req to confirm failure
...
...
internal/dataservice/server.go
浏览文件 @
e3956ad1
...
@@ -538,13 +538,16 @@ func (s *Server) prepareBinlogAndPos(req *datapb.SaveBinlogPathsRequest) (map[st
...
@@ -538,13 +538,16 @@ func (s *Server) prepareBinlogAndPos(req *datapb.SaveBinlogPathsRequest) (map[st
}
}
log
.
Debug
(
"segment"
,
zap
.
Int64
(
"segment"
,
segInfo
.
CollectionID
))
log
.
Debug
(
"segment"
,
zap
.
Int64
(
"segment"
,
segInfo
.
CollectionID
))
fieldMeta
,
err
:=
s
.
prepareField2PathMeta
(
req
.
SegmentID
,
req
.
Field2BinlogPaths
)
for
_
,
fieldBlp
:=
range
req
.
Field2BinlogPaths
{
if
err
!=
nil
{
fieldMeta
,
err
:=
s
.
prepareField2PathMeta
(
req
.
SegmentID
,
fieldBlp
)
return
nil
,
err
if
err
!=
nil
{
}
return
nil
,
err
for
k
,
v
:=
range
fieldMeta
{
}
meta
[
k
]
=
v
for
k
,
v
:=
range
fieldMeta
{
meta
[
k
]
=
v
}
}
}
ddlMeta
,
err
:=
s
.
prepareDDLBinlogMeta
(
req
.
CollectionID
,
req
.
GetDdlBinlogPaths
())
ddlMeta
,
err
:=
s
.
prepareDDLBinlogMeta
(
req
.
CollectionID
,
req
.
GetDdlBinlogPaths
())
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
...
internal/dataservice/server_test.go
浏览文件 @
e3956ad1
...
@@ -537,9 +537,11 @@ func TestSaveBinlogPaths(t *testing.T) {
...
@@ -537,9 +537,11 @@ func TestSaveBinlogPaths(t *testing.T) {
},
},
SegmentID
:
2
,
SegmentID
:
2
,
CollectionID
:
0
,
CollectionID
:
0
,
Field2BinlogPaths
:
&
datapb
.
ID2PathList
{
Field2BinlogPaths
:
[]
*
datapb
.
ID2PathList
{
ID
:
1
,
{
Paths
:
[]
string
{
"/by-dev/test/0/1/2/1/Allo1"
,
"/by-dev/test/0/1/2/1/Allo2"
},
ID
:
1
,
Paths
:
[]
string
{
"/by-dev/test/0/1/2/1/Allo1"
,
"/by-dev/test/0/1/2/1/Allo2"
},
},
},
},
DdlBinlogPaths
:
[]
*
datapb
.
DDLBinlogMeta
{
DdlBinlogPaths
:
[]
*
datapb
.
DDLBinlogMeta
{
{
{
...
@@ -588,9 +590,11 @@ func TestSaveBinlogPaths(t *testing.T) {
...
@@ -588,9 +590,11 @@ func TestSaveBinlogPaths(t *testing.T) {
resp
,
err
:=
svr
.
SaveBinlogPaths
(
ctx
,
&
datapb
.
SaveBinlogPathsRequest
{
resp
,
err
:=
svr
.
SaveBinlogPaths
(
ctx
,
&
datapb
.
SaveBinlogPathsRequest
{
SegmentID
:
10
,
SegmentID
:
10
,
CollectionID
:
5
,
CollectionID
:
5
,
Field2BinlogPaths
:
&
datapb
.
ID2PathList
{
Field2BinlogPaths
:
[]
*
datapb
.
ID2PathList
{
ID
:
1
,
{
Paths
:
[]
string
{
"/by-dev/test/0/1/2/1/Allo1"
,
"/by-dev/test/0/1/2/1/Allo2"
},
ID
:
1
,
Paths
:
[]
string
{
"/by-dev/test/0/1/2/1/Allo1"
,
"/by-dev/test/0/1/2/1/Allo2"
},
},
},
},
DdlBinlogPaths
:
[]
*
datapb
.
DDLBinlogMeta
{
DdlBinlogPaths
:
[]
*
datapb
.
DDLBinlogMeta
{
{
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录