Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
484f255f
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,发现更多精彩内容 >>
提交
484f255f
编写于
8月 16, 2019
作者:
W
wxyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-366 Implement TaskTable
Former-commit-id: e6d189c5c63b0477384353bf6f75482eeb196c7d
上级
404bc88b
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
46 addition
and
8 deletion
+46
-8
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/src/scheduler/TaskTable.cpp
cpp/src/scheduler/TaskTable.cpp
+45
-5
cpp/src/scheduler/TaskTable.h
cpp/src/scheduler/TaskTable.h
+0
-3
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
484f255f
...
@@ -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-361 - Add event in resource
-
MS-361 - Add event in resource
-
MS-364 - Modify tasktableitem in tasktable
-
MS-364 - Modify tasktableitem in tasktable
-
MS-365 - Use tasktableitemptr instead in event
-
MS-365 - Use tasktableitemptr instead in event
-
MS-366 - Implement TaskTable
## New Feature
## New Feature
-
MS-343 - Implement ResourceMgr
-
MS-343 - Implement ResourceMgr
...
...
cpp/src/scheduler/TaskTable.cpp
浏览文件 @
484f255f
...
@@ -12,18 +12,23 @@ namespace zilliz {
...
@@ -12,18 +12,23 @@ namespace zilliz {
namespace
milvus
{
namespace
milvus
{
namespace
engine
{
namespace
engine
{
TaskTable
::
TaskTable
(
std
::
vector
<
TaskPtr
>
&&
tasks
)
{
}
void
void
TaskTable
::
Put
(
TaskPtr
task
)
{
TaskTable
::
Put
(
TaskPtr
task
)
{
auto
item
=
std
::
make_shared
<
TaskTableItem
>
();
item
->
task
=
std
::
move
(
task
);
item
->
state
=
TaskTableItemState
::
LOADED
;
table_
.
push_back
(
item
);
}
}
void
void
TaskTable
::
Put
(
std
::
vector
<
TaskPtr
>
&
tasks
)
{
TaskTable
::
Put
(
std
::
vector
<
TaskPtr
>
&
tasks
)
{
for
(
auto
&
task
:
tasks
)
{
auto
item
=
std
::
make_shared
<
TaskTableItem
>
();
item
->
task
=
std
::
move
(
task
);
item
->
state
=
TaskTableItemState
::
LOADED
;
table_
.
push_back
(
item
);
}
}
}
...
@@ -56,26 +61,61 @@ TaskTable::Move(uint64_t index) {
...
@@ -56,26 +61,61 @@ TaskTable::Move(uint64_t index) {
bool
bool
TaskTable
::
Moved
(
uint64_t
index
)
{
TaskTable
::
Moved
(
uint64_t
index
)
{
auto
&
task
=
table_
[
index
];
std
::
lock_guard
<
std
::
mutex
>
lock
(
task
->
mutex
);
if
(
task
->
state
==
TaskTableItemState
::
MOVING
)
{
task
->
state
=
TaskTableItemState
::
MOVED
;
return
true
;
}
return
false
;
return
false
;
}
}
bool
bool
TaskTable
::
Load
(
uint64_t
index
)
{
TaskTable
::
Load
(
uint64_t
index
)
{
auto
&
task
=
table_
[
index
];
std
::
lock_guard
<
std
::
mutex
>
lock
(
task
->
mutex
);
if
(
task
->
state
==
TaskTableItemState
::
START
)
{
task
->
state
=
TaskTableItemState
::
LOADING
;
return
true
;
}
return
false
;
return
false
;
}
}
bool
bool
TaskTable
::
Loaded
(
uint64_t
index
)
{
TaskTable
::
Loaded
(
uint64_t
index
)
{
auto
&
task
=
table_
[
index
];
std
::
lock_guard
<
std
::
mutex
>
lock
(
task
->
mutex
);
if
(
task
->
state
==
TaskTableItemState
::
LOADING
)
{
task
->
state
=
TaskTableItemState
::
LOADED
;
return
true
;
}
return
false
;
return
false
;
}
}
bool
bool
TaskTable
::
Execute
(
uint64_t
index
)
{
TaskTable
::
Execute
(
uint64_t
index
)
{
auto
&
task
=
table_
[
index
];
std
::
lock_guard
<
std
::
mutex
>
lock
(
task
->
mutex
);
if
(
task
->
state
==
TaskTableItemState
::
LOADED
)
{
task
->
state
=
TaskTableItemState
::
EXECUTING
;
return
true
;
}
return
false
;
return
false
;
}
}
bool
bool
TaskTable
::
Executed
(
uint64_t
index
)
{
TaskTable
::
Executed
(
uint64_t
index
)
{
auto
&
task
=
table_
[
index
];
std
::
lock_guard
<
std
::
mutex
>
lock
(
task
->
mutex
);
if
(
task
->
state
==
TaskTableItemState
::
EXECUTING
)
{
task
->
state
=
TaskTableItemState
::
EXECUTED
;
return
true
;
}
return
false
;
return
false
;
}
}
...
...
cpp/src/scheduler/TaskTable.h
浏览文件 @
484f255f
...
@@ -48,9 +48,6 @@ class TaskTable {
...
@@ -48,9 +48,6 @@ class TaskTable {
public:
public:
TaskTable
()
=
default
;
TaskTable
()
=
default
;
explicit
TaskTable
(
std
::
vector
<
TaskPtr
>
&&
tasks
);
/*
/*
* Put one task;
* Put one task;
*/
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录