Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_35024513
milvus
提交
4625bf37
milvus
项目概览
qq_35024513
/
milvus
与 Fork 源项目一致
Fork自
milvus / milvus
通知
14
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
4625bf37
编写于
3月 10, 2020
作者:
Z
Zhiru Zhu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update
Signed-off-by:
N
Zhiru Zhu
<
zzhu@fandm.edu
>
上级
442bf434
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
5 deletion
+9
-5
CHANGELOG.md
CHANGELOG.md
+1
-0
core/src/scheduler/task/SearchTask.cpp
core/src/scheduler/task/SearchTask.cpp
+8
-5
未找到文件。
CHANGELOG.md
浏览文件 @
4625bf37
...
@@ -57,6 +57,7 @@ Please mark all change in change log and use the issue from GitHub
...
@@ -57,6 +57,7 @@ Please mark all change in change log and use the issue from GitHub
-
\#
1577 Row count incorrect if delete vectors then create index
-
\#
1577 Row count incorrect if delete vectors then create index
-
\#
1580 Old segment folder not removed after merge/compact if create_index is called before adding data
-
\#
1580 Old segment folder not removed after merge/compact if create_index is called before adding data
-
\#
1590 Server down caused by failure to write file during concurrent mixed operations
-
\#
1590 Server down caused by failure to write file during concurrent mixed operations
-
\#
1598 Server down during mixed operations
## Feature
## Feature
-
\#
216 Add CLI to get server info
-
\#
216 Add CLI to get server info
...
...
core/src/scheduler/task/SearchTask.cpp
浏览文件 @
4625bf37
...
@@ -264,13 +264,16 @@ XSearchTask::Execute() {
...
@@ -264,13 +264,16 @@ XSearchTask::Execute() {
// step 3: pick up topk result
// step 3: pick up topk result
auto
spec_k
=
file_
->
row_count_
<
topk
?
file_
->
row_count_
:
topk
;
auto
spec_k
=
file_
->
row_count_
<
topk
?
file_
->
row_count_
:
topk
;
if
(
search_job
->
GetResultIds
().
front
()
==
-
1
&&
search_job
->
GetResultIds
().
size
()
>
spec_k
)
{
// initialized results set
search_job
->
GetResultIds
().
resize
(
spec_k
);
search_job
->
GetResultDistances
().
resize
(
spec_k
);
}
{
{
std
::
unique_lock
<
std
::
mutex
>
lock
(
search_job
->
mutex
());
std
::
unique_lock
<
std
::
mutex
>
lock
(
search_job
->
mutex
());
if
(
search_job
->
GetResultIds
().
front
()
==
-
1
&&
search_job
->
GetResultIds
().
size
()
>
spec_k
)
{
// initialized results set
search_job
->
GetResultIds
().
resize
(
spec_k
);
search_job
->
GetResultDistances
().
resize
(
spec_k
);
}
XSearchTask
::
MergeTopkToResultSet
(
output_ids
,
output_distance
,
spec_k
,
nq
,
topk
,
ascending_reduce
,
XSearchTask
::
MergeTopkToResultSet
(
output_ids
,
output_distance
,
spec_k
,
nq
,
topk
,
ascending_reduce
,
search_job
->
GetResultIds
(),
search_job
->
GetResultDistances
());
search_job
->
GetResultIds
(),
search_job
->
GetResultDistances
());
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录