Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
7b839d45
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,发现更多精彩内容 >>
提交
7b839d45
编写于
9月 09, 2019
作者:
W
wxyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-524 Add some unittest in event_test and resource_test
Former-commit-id: 7ed6988953724f2105da11ffaa4254c0276955d7
上级
bf52f6ec
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
16 deletion
+41
-16
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/src/scheduler/event/Event.h
cpp/src/scheduler/event/Event.h
+2
-4
cpp/unittest/scheduler/event_test.cpp
cpp/unittest/scheduler/event_test.cpp
+8
-12
cpp/unittest/scheduler/resource_test.cpp
cpp/unittest/scheduler/resource_test.cpp
+30
-0
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
7b839d45
...
...
@@ -103,6 +103,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-518 - Add schedinst_test in scheduler
-
MS-519 - Add event_test in scheduler
-
MS-520 - Update resource_test in scheduler
-
MS-524 - Add some unittest in event_test and resource_test
## New Feature
-
MS-343 - Implement ResourceMgr
...
...
cpp/src/scheduler/event/Event.h
浏览文件 @
7b839d45
...
...
@@ -32,10 +32,8 @@ public:
return
type_
;
}
inline
virtual
std
::
string
Dump
()
const
{
return
"<Event>"
;
}
virtual
std
::
string
Dump
()
const
=
0
;
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
out
,
const
Event
&
event
);
...
...
cpp/unittest/scheduler/event_test.cpp
浏览文件 @
7b839d45
...
...
@@ -19,27 +19,24 @@ TEST(EventTest, start_up_event) {
ResourceWPtr
res
(
ResourcePtr
(
nullptr
));
auto
event
=
std
::
make_shared
<
StartUpEvent
>
(
res
);
ASSERT_FALSE
(
event
->
Dump
().
empty
());
std
::
stringstream
ss
;
ss
<<
event
;
ASSERT_FALSE
(
ss
.
str
().
empty
());
std
::
cout
<<
*
event
;
std
::
cout
<<
*
EventPtr
(
event
);
}
TEST
(
EventTest
,
load_completed_event
)
{
ResourceWPtr
res
(
ResourcePtr
(
nullptr
));
auto
event
=
std
::
make_shared
<
LoadCompletedEvent
>
(
res
,
nullptr
);
ASSERT_FALSE
(
event
->
Dump
().
empty
());
std
::
stringstream
ss
;
ss
<<
event
;
ASSERT_FALSE
(
ss
.
str
().
empty
());
std
::
cout
<<
*
event
;
std
::
cout
<<
*
EventPtr
(
event
);
}
TEST
(
EventTest
,
finish_task_event
)
{
ResourceWPtr
res
(
ResourcePtr
(
nullptr
));
auto
event
=
std
::
make_shared
<
FinishTaskEvent
>
(
res
,
nullptr
);
ASSERT_FALSE
(
event
->
Dump
().
empty
());
std
::
stringstream
ss
;
ss
<<
event
;
ASSERT_FALSE
(
ss
.
str
().
empty
());
std
::
cout
<<
*
event
;
std
::
cout
<<
*
EventPtr
(
event
);
}
...
...
@@ -47,9 +44,8 @@ TEST(EventTest, tasktable_updated_event) {
ResourceWPtr
res
(
ResourcePtr
(
nullptr
));
auto
event
=
std
::
make_shared
<
TaskTableUpdatedEvent
>
(
res
);
ASSERT_FALSE
(
event
->
Dump
().
empty
());
std
::
stringstream
ss
;
ss
<<
event
;
ASSERT_FALSE
(
ss
.
str
().
empty
());
std
::
cout
<<
*
event
;
std
::
cout
<<
*
EventPtr
(
event
);
}
}
...
...
cpp/unittest/scheduler/resource_test.cpp
浏览文件 @
7b839d45
...
...
@@ -100,9 +100,11 @@ protected:
disk_resource_
=
ResourceFactory
::
Create
(
"ssd"
,
"DISK"
,
0
);
cpu_resource_
=
ResourceFactory
::
Create
(
"cpu"
,
"CPU"
,
0
);
gpu_resource_
=
ResourceFactory
::
Create
(
"gpu"
,
"GPU"
,
0
);
test_resource_
=
std
::
make_shared
<
TestResource
>
(
"test"
,
0
,
true
,
true
);
resources_
.
push_back
(
disk_resource_
);
resources_
.
push_back
(
cpu_resource_
);
resources_
.
push_back
(
gpu_resource_
);
resources_
.
push_back
(
test_resource_
);
auto
subscriber
=
[
&
](
EventPtr
event
)
{
if
(
event
->
Type
()
==
EventType
::
LOAD_COMPLETED
)
{
...
...
@@ -125,10 +127,12 @@ protected:
disk_resource_
->
RegisterSubscriber
(
subscriber
);
cpu_resource_
->
RegisterSubscriber
(
subscriber
);
gpu_resource_
->
RegisterSubscriber
(
subscriber
);
test_resource_
->
RegisterSubscriber
(
subscriber
);
disk_resource_
->
Start
();
cpu_resource_
->
Start
();
gpu_resource_
->
Start
();
test_resource_
->
Start
();
}
void
...
...
@@ -136,6 +140,7 @@ protected:
disk_resource_
->
Stop
();
cpu_resource_
->
Stop
();
gpu_resource_
->
Stop
();
test_resource_
->
Stop
();
}
void
...
...
@@ -153,6 +158,7 @@ protected:
ResourcePtr
disk_resource_
;
ResourcePtr
cpu_resource_
;
ResourcePtr
gpu_resource_
;
ResourcePtr
test_resource_
;
std
::
vector
<
ResourcePtr
>
resources_
;
uint64_t
load_count_
=
0
;
uint64_t
exec_count_
=
0
;
...
...
@@ -236,6 +242,30 @@ TEST_F(ResourceAdvanceTest, gpu_resource_test) {
}
}
TEST_F
(
ResourceAdvanceTest
,
test_resource_test
)
{
const
uint64_t
NUM
=
100
;
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
);
tasks
.
push_back
(
task
);
test_resource_
->
task_table
().
Put
(
task
);
}
test_resource_
->
WakeupLoader
();
WaitLoader
(
NUM
);
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
ASSERT_EQ
(
tasks
[
i
]
->
load_count_
,
1
);
}
test_resource_
->
WakeupExecutor
();
WaitExecutor
(
NUM
);
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
ASSERT_EQ
(
tasks
[
i
]
->
exec_count_
,
1
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录