Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
81d767ea
M
milvus
项目概览
milvus
/
milvus
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
81d767ea
编写于
3月 11, 2020
作者:
J
Jin Hai
提交者:
GitHub
3月 11, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1612 from youny626/fix#1598
Fix #1598
上级
d0ee264b
50804eca
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
8 deletion
+15
-8
core/src/db/DBImpl.cpp
core/src/db/DBImpl.cpp
+2
-2
core/src/scheduler/job/BuildIndexJob.cpp
core/src/scheduler/job/BuildIndexJob.cpp
+4
-2
core/src/scheduler/task/SearchTask.cpp
core/src/scheduler/task/SearchTask.cpp
+9
-4
未找到文件。
core/src/db/DBImpl.cpp
浏览文件 @
81d767ea
...
@@ -664,9 +664,9 @@ DBImpl::Compact(const std::string& table_id) {
...
@@ -664,9 +664,9 @@ DBImpl::Compact(const std::string& table_id) {
ENGINE_LOG_DEBUG
<<
"Before compacting, wait for build index thread to finish..."
;
ENGINE_LOG_DEBUG
<<
"Before compacting, wait for build index thread to finish..."
;
WaitBuildIndexFinish
();
//
WaitBuildIndexFinish();
std
::
lock_guard
<
std
::
mutex
>
index_lock
(
index_result
_mutex_
);
const
std
::
lock_guard
<
std
::
mutex
>
index_lock
(
build_index
_mutex_
);
const
std
::
lock_guard
<
std
::
mutex
>
merge_lock
(
flush_merge_compact_mutex_
);
const
std
::
lock_guard
<
std
::
mutex
>
merge_lock
(
flush_merge_compact_mutex_
);
ENGINE_LOG_DEBUG
<<
"Compacting table: "
<<
table_id
;
ENGINE_LOG_DEBUG
<<
"Compacting table: "
<<
table_id
;
...
...
core/src/scheduler/job/BuildIndexJob.cpp
浏览文件 @
81d767ea
...
@@ -10,10 +10,11 @@
...
@@ -10,10 +10,11 @@
// or implied. See the License for the specific language governing permissions and limitations under the License.
// or implied. See the License for the specific language governing permissions and limitations under the License.
#include "scheduler/job/BuildIndexJob.h"
#include "scheduler/job/BuildIndexJob.h"
#include "utils/Log.h"
#include <utility>
#include <utility>
#include "utils/Log.h"
namespace
milvus
{
namespace
milvus
{
namespace
scheduler
{
namespace
scheduler
{
...
@@ -34,7 +35,8 @@ BuildIndexJob::AddToIndexFiles(const engine::meta::TableFileSchemaPtr& to_index_
...
@@ -34,7 +35,8 @@ BuildIndexJob::AddToIndexFiles(const engine::meta::TableFileSchemaPtr& to_index_
return
false
;
return
false
;
}
}
SERVER_LOG_DEBUG
<<
"BuildIndexJob "
<<
id
()
<<
" add to_index file: "
<<
to_index_file
->
id_
;
SERVER_LOG_DEBUG
<<
"BuildIndexJob "
<<
id
()
<<
" add to_index file: "
<<
to_index_file
->
id_
<<
", location: "
<<
to_index_file
->
location_
;
to_index_files_
[
to_index_file
->
id_
]
=
to_index_file
;
to_index_files_
[
to_index_file
->
id_
]
=
to_index_file
;
}
}
...
...
core/src/scheduler/task/SearchTask.cpp
浏览文件 @
81d767ea
...
@@ -266,14 +266,19 @@ XSearchTask::Execute() {
...
@@ -266,14 +266,19 @@ 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
(
spec_k
==
0
)
{
ENGINE_LOG_WARNING
<<
"Searching in an empty file. file location = "
<<
file_
->
location_
;
}
{
{
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
)
{
if
(
search_job
->
GetResultIds
().
size
()
>
spec_k
)
{
// initialized results set
if
(
search_job
->
GetResultIds
().
front
()
==
-
1
)
{
search_job
->
GetResultIds
().
resize
(
spec_k
);
// initialized results set
search_job
->
GetResultDistances
().
resize
(
spec_k
);
search_job
->
GetResultIds
().
resize
(
spec_k
*
nq
);
search_job
->
GetResultDistances
().
resize
(
spec_k
*
nq
);
}
}
}
XSearchTask
::
MergeTopkToResultSet
(
output_ids
,
output_distance
,
spec_k
,
nq
,
topk
,
ascending_reduce
,
XSearchTask
::
MergeTopkToResultSet
(
output_ids
,
output_distance
,
spec_k
,
nq
,
topk
,
ascending_reduce
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录