Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
5bc6ec72
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,发现更多精彩内容 >>
未验证
提交
5bc6ec72
编写于
1月 24, 2022
作者:
Z
zhenshan.cao
提交者:
GitHub
1月 24, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixbug: QueryNode search exceptions will cause memory leak (#15305)
Signed-off-by:
N
zhenshan.cao
<
zhenshan.cao@zilliz.com
>
上级
788ff294
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
9 addition
and
8 deletion
+9
-8
internal/querynode/query_collection.go
internal/querynode/query_collection.go
+9
-8
未找到文件。
internal/querynode/query_collection.go
浏览文件 @
5bc6ec72
...
@@ -1011,6 +1011,9 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1011,6 +1011,9 @@ func (q *queryCollection) search(msg queryMsg) error {
return
err
return
err
}
}
}
}
defer
plan
.
delete
()
topK
:=
plan
.
getTopK
()
topK
:=
plan
.
getTopK
()
if
topK
==
0
{
if
topK
==
0
{
return
fmt
.
Errorf
(
"limit must be greater than 0, msgID = %d"
,
searchMsg
.
ID
())
return
fmt
.
Errorf
(
"limit must be greater than 0, msgID = %d"
,
searchMsg
.
ID
())
...
@@ -1023,6 +1026,8 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1023,6 +1026,8 @@ func (q *queryCollection) search(msg queryMsg) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
defer
searchReq
.
delete
()
queryNum
:=
searchReq
.
getNumOfQuery
()
queryNum
:=
searchReq
.
getNumOfQuery
()
searchRequests
:=
make
([]
*
searchRequest
,
0
)
searchRequests
:=
make
([]
*
searchRequest
,
0
)
searchRequests
=
append
(
searchRequests
,
searchReq
)
searchRequests
=
append
(
searchRequests
,
searchReq
)
...
@@ -1048,7 +1053,9 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1048,7 +1053,9 @@ func (q *queryCollection) search(msg queryMsg) error {
}
}
searchResults
:=
make
([]
*
SearchResult
,
0
)
searchResults
:=
make
([]
*
SearchResult
,
0
)
defer
func
()
{
deleteSearchResults
(
searchResults
)
}()
// historical search
// historical search
log
.
Debug
(
"historical search start"
,
zap
.
Int64
(
"msgID"
,
searchMsg
.
ID
()))
log
.
Debug
(
"historical search start"
,
zap
.
Int64
(
"msgID"
,
searchMsg
.
ID
()))
hisSearchResults
,
sealedSegmentSearched
,
sealedPartitionSearched
,
err
:=
q
.
historical
.
search
(
searchRequests
,
collection
.
id
,
searchMsg
.
PartitionIDs
,
plan
,
travelTimestamp
)
hisSearchResults
,
sealedSegmentSearched
,
sealedPartitionSearched
,
err
:=
q
.
historical
.
search
(
searchRequests
,
collection
.
id
,
searchMsg
.
PartitionIDs
,
plan
,
travelTimestamp
)
...
@@ -1061,7 +1068,6 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1061,7 +1068,6 @@ func (q *queryCollection) search(msg queryMsg) error {
log
.
Debug
(
"streaming search start"
,
zap
.
Int64
(
"msgID"
,
searchMsg
.
ID
()))
log
.
Debug
(
"streaming search start"
,
zap
.
Int64
(
"msgID"
,
searchMsg
.
ID
()))
for
_
,
channel
:=
range
collection
.
getVChannels
()
{
for
_
,
channel
:=
range
collection
.
getVChannels
()
{
var
strSearchResults
[]
*
SearchResult
strSearchResults
,
growingSegmentSearched
,
growingPartitionSearched
,
err
:=
q
.
streaming
.
search
(
searchRequests
,
collection
.
id
,
searchMsg
.
PartitionIDs
,
channel
,
plan
,
travelTimestamp
)
strSearchResults
,
growingSegmentSearched
,
growingPartitionSearched
,
err
:=
q
.
streaming
.
search
(
searchRequests
,
collection
.
id
,
searchMsg
.
PartitionIDs
,
channel
,
plan
,
travelTimestamp
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
@@ -1128,6 +1134,7 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1128,6 +1134,7 @@ func (q *queryCollection) search(msg queryMsg) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
defer
deleteMarshaledHits
(
marshaledHits
)
hitsBlob
,
err
:=
marshaledHits
.
getHitsBlob
()
hitsBlob
,
err
:=
marshaledHits
.
getHitsBlob
()
sp
.
LogFields
(
oplog
.
String
(
"statistical time"
,
"getHitsBlob end"
))
sp
.
LogFields
(
oplog
.
String
(
"statistical time"
,
"getHitsBlob end"
))
...
@@ -1216,13 +1223,7 @@ func (q *queryCollection) search(msg queryMsg) error {
...
@@ -1216,13 +1223,7 @@ func (q *queryCollection) search(msg queryMsg) error {
}
}
tr
.
Record
(
fmt
.
Sprintf
(
"publish search result, msgID = %d"
,
searchMsg
.
ID
()))
tr
.
Record
(
fmt
.
Sprintf
(
"publish search result, msgID = %d"
,
searchMsg
.
ID
()))
}
}
sp
.
LogFields
(
oplog
.
String
(
"statistical time"
,
"before free c++ memory"
))
deleteSearchResults
(
searchResults
)
deleteMarshaledHits
(
marshaledHits
)
sp
.
LogFields
(
oplog
.
String
(
"statistical time"
,
"stats done"
))
sp
.
LogFields
(
oplog
.
String
(
"statistical time"
,
"stats done"
))
plan
.
delete
()
searchReq
.
delete
()
tr
.
Elapse
(
fmt
.
Sprintf
(
"all done, msgID = %d"
,
searchMsg
.
ID
()))
tr
.
Elapse
(
fmt
.
Sprintf
(
"all done, msgID = %d"
,
searchMsg
.
ID
()))
return
nil
return
nil
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录