Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
8b764a08
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
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,发现更多精彩内容 >>
提交
8b764a08
编写于
10月 15, 2019
作者:
Y
Yu Kun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-650 SQ8H index create issue
Former-commit-id: 7601736f54a3d46d1f477b3d5dfad17e06824c09
上级
fc5a6b3c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
18 deletion
+20
-18
core/CHANGELOG.md
core/CHANGELOG.md
+1
-0
core/src/scheduler/Scheduler.cpp
core/src/scheduler/Scheduler.cpp
+1
-1
core/src/scheduler/action/PushTaskToNeighbour.cpp
core/src/scheduler/action/PushTaskToNeighbour.cpp
+3
-3
core/src/scheduler/resource/Resource.cpp
core/src/scheduler/resource/Resource.cpp
+15
-14
未找到文件。
core/CHANGELOG.md
浏览文件 @
8b764a08
...
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
...
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-644 - Search crashed with index-type: flat
-
MS-644 - Search crashed with index-type: flat
-
MS-624 - Search vectors failed if time ranges long enough
-
MS-624 - Search vectors failed if time ranges long enough
-
MS-652 - IVFSQH quantization double free
-
MS-652 - IVFSQH quantization double free
-
MS-650 - SQ8H index create issue
## Improvement
## Improvement
-
MS-552 - Add and change the easylogging library
-
MS-552 - Add and change the easylogging library
...
...
core/src/scheduler/Scheduler.cpp
浏览文件 @
8b764a08
...
@@ -97,7 +97,7 @@ void
...
@@ -97,7 +97,7 @@ void
Scheduler
::
OnLoadCompleted
(
const
EventPtr
&
event
)
{
Scheduler
::
OnLoadCompleted
(
const
EventPtr
&
event
)
{
auto
load_completed_event
=
std
::
static_pointer_cast
<
LoadCompletedEvent
>
(
event
);
auto
load_completed_event
=
std
::
static_pointer_cast
<
LoadCompletedEvent
>
(
event
);
if
(
auto
resource
=
event
->
resource_
.
lock
())
{
if
(
auto
resource
=
event
->
resource_
.
lock
())
{
//
resource->WakeupExecutor();
resource
->
WakeupExecutor
();
auto
task_table_type
=
load_completed_event
->
task_table_item_
->
task
->
label
()
->
Type
();
auto
task_table_type
=
load_completed_event
->
task_table_item_
->
task
->
label
()
->
Type
();
switch
(
task_table_type
)
{
switch
(
task_table_type
)
{
...
...
core/src/scheduler/action/PushTaskToNeighbour.cpp
浏览文件 @
8b764a08
...
@@ -209,9 +209,9 @@ Action::SpecifiedResourceLabelTaskScheduler(ResourceMgrWPtr res_mgr, ResourcePtr
...
@@ -209,9 +209,9 @@ Action::SpecifiedResourceLabelTaskScheduler(ResourceMgrWPtr res_mgr, ResourcePtr
}
else
{
}
else
{
auto
next_res_name
=
task
->
path
().
Next
();
auto
next_res_name
=
task
->
path
().
Next
();
auto
next_res
=
res_mgr
.
lock
()
->
GetResource
(
next_res_name
);
auto
next_res
=
res_mgr
.
lock
()
->
GetResource
(
next_res_name
);
// if (event->task_table_item_->Move()) {
// if (event->task_table_item_->Move()) {
// next_res->task_table().Put(task);
// next_res->task_table().Put(task);
// }
// }
event
->
task_table_item_
->
Move
();
event
->
task_table_item_
->
Move
();
next_res
->
task_table
().
Put
(
task
);
next_res
->
task_table
().
Put
(
task
);
}
}
...
...
core/src/scheduler/resource/Resource.cpp
浏览文件 @
8b764a08
...
@@ -116,23 +116,23 @@ Resource::pick_task_execute() {
...
@@ -116,23 +116,23 @@ Resource::pick_task_execute() {
auto
indexes
=
task_table_
.
PickToExecute
(
std
::
numeric_limits
<
uint64_t
>::
max
());
auto
indexes
=
task_table_
.
PickToExecute
(
std
::
numeric_limits
<
uint64_t
>::
max
());
for
(
auto
index
:
indexes
)
{
for
(
auto
index
:
indexes
)
{
// try to set one task executing, then return
// try to set one task executing, then return
// if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
// if (task_table_[index]->task->path().Last() != name()) {
// continue;
// }
// }
//
// if (task_table_.Execute(index)) {
// return task_table_.Get(index);
// }
if
(
task_table_
[
index
]
->
task
->
label
()
->
Type
()
==
TaskLabelType
::
SPECIFIED_RESOURCE
)
{
if
(
task_table_
[
index
]
->
task
->
label
()
->
Type
()
==
TaskLabelType
::
SPECIFIED_RESOURCE
)
{
if
(
task_table_
.
Get
(
index
)
->
task
->
path
().
Current
()
==
task_table_
.
Get
(
index
)
->
task
->
path
().
Last
()
&&
if
(
task_table_
[
index
]
->
task
->
path
().
Last
()
!=
name
())
{
task_table_
.
Get
(
index
)
->
task
->
path
().
Last
()
==
name
())
{
continue
;
if
(
task_table_
.
Execute
(
index
))
{
return
task_table_
.
Get
(
index
);
}
}
}
}
}
if
(
task_table_
.
Execute
(
index
))
{
return
task_table_
.
Get
(
index
);
}
// if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
// if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() &&
// task_table_.Get(index)->task->path().Last() == name()) {
// if (task_table_.Execute(index)) {
// return task_table_.Get(index);
// }
// }
// }
// else try next
// else try next
}
}
return
nullptr
;
return
nullptr
;
...
@@ -188,6 +188,7 @@ Resource::executor_function() {
...
@@ -188,6 +188,7 @@ Resource::executor_function() {
if
(
task_item
->
task
->
Type
()
==
TaskType
::
BuildIndexTask
)
{
if
(
task_item
->
task
->
Type
()
==
TaskType
::
BuildIndexTask
)
{
BuildMgrInst
::
GetInstance
()
->
Put
();
BuildMgrInst
::
GetInstance
()
->
Put
();
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
)
->
WakeupLoader
();
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
)
->
WakeupLoader
();
ResMgrInst
::
GetInstance
()
->
GetResource
(
"disk"
)
->
WakeupLoader
();
}
}
if
(
subscriber_
)
{
if
(
subscriber_
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录