Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
2af41317
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,发现更多精彩内容 >>
提交
2af41317
编写于
9月 09, 2019
作者:
W
wxyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-530 Add unittest for SearchTask->Load
Former-commit-id: dff97021943c200ca003d766af221c008e5f0ac2
上级
082867e1
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
42 addition
and
24 deletion
+42
-24
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/src/scheduler/task/SearchTask.cpp
cpp/src/scheduler/task/SearchTask.cpp
+18
-20
cpp/unittest/scheduler/normal_test.cpp
cpp/unittest/scheduler/normal_test.cpp
+1
-1
cpp/unittest/scheduler/task_test.cpp
cpp/unittest/scheduler/task_test.cpp
+22
-3
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
2af41317
...
...
@@ -107,6 +107,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-525 - Disable parallel reduce in SearchTask
-
MS-527 - Update scheduler_test and enable it
-
MS-528 - Hide some config used future
-
MS-530 - Add unittest for SearchTask->Load
## New Feature
-
MS-343 - Implement ResourceMgr
...
...
cpp/src/scheduler/task/SearchTask.cpp
浏览文件 @
2af41317
...
...
@@ -96,33 +96,31 @@ XSearchTask::XSearchTask(TableFileSchemaPtr file)
void
XSearchTask
::
Load
(
LoadType
type
,
uint8_t
device_id
)
{
server
::
TimeRecorder
rc
(
""
);
Status
stat
=
Status
::
OK
();
std
::
string
error_msg
;
try
{
if
(
type
==
LoadType
::
DISK2CPU
)
{
auto
stat
=
index_engine_
->
Load
();
if
(
!
stat
.
ok
())
{
//typical error: file not available
ENGINE_LOG_ERROR
<<
"Failed to load index file: file not available"
;
for
(
auto
&
context
:
search_contexts_
)
{
context
->
IndexSearchDone
(
file_
->
id_
);
//mark as done avoid dead lock, even failed
}
return
;
}
stat
=
index_engine_
->
Load
();
}
else
if
(
type
==
LoadType
::
CPU2GPU
)
{
index_engine_
->
CopyToGpu
(
device_id
);
stat
=
index_engine_
->
CopyToGpu
(
device_id
);
}
else
if
(
type
==
LoadType
::
GPU2CPU
)
{
index_engine_
->
CopyToCpu
();
stat
=
index_engine_
->
CopyToCpu
();
}
else
{
// TODO: exception
std
::
string
msg
=
"Wrong load type"
;
ENGINE_LOG_ERROR
<<
msg
;
error_msg
=
"Wrong load type"
;
stat
=
Status
(
SERVER_UNEXPECTED_ERROR
,
error_msg
);
}
}
catch
(
std
::
exception
&
ex
)
{
//typical error: out of disk space or permition denied
std
::
string
msg
=
"Failed to load index file: "
+
std
::
string
(
ex
.
what
());
ENGINE_LOG_ERROR
<<
msg
;
error_msg
=
"Failed to load index file: "
+
std
::
string
(
ex
.
what
());
stat
=
Status
(
SERVER_UNEXPECTED_ERROR
,
error_msg
);
}
if
(
!
stat
.
ok
())
{
if
(
error_msg
.
empty
())
error_msg
=
std
::
string
(
"Failed to load index file: file not available"
);
//typical error: file not available
ENGINE_LOG_ERROR
<<
error_msg
;
for
(
auto
&
context
:
search_contexts_
)
{
context
->
IndexSearchDone
(
file_
->
id_
);
//mark as done avoid dead lock, even failed
...
...
cpp/unittest/scheduler/normal_test.cpp
浏览文件 @
2af41317
...
...
@@ -11,7 +11,7 @@
using
namespace
zilliz
::
milvus
::
engine
;
TEST
(
normal_test
,
DISABLED_
inst_test
)
{
TEST
(
normal_test
,
inst_test
)
{
// ResourceMgr only compose resources, provide unified event
auto
res_mgr
=
ResMgrInst
::
GetInstance
();
...
...
cpp/unittest/scheduler/task_test.cpp
浏览文件 @
2af41317
//
// Created by wxyu on 19-9-9.
//
/*******************************************************************************
* Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
* Unauthorized copying of this file, via any medium is strictly prohibited.
* Proprietary and confidential.
******************************************************************************/
#include "scheduler/task/SearchTask.h"
#include <gtest/gtest.h>
namespace
zilliz
{
namespace
milvus
{
namespace
engine
{
TEST
(
TaskTest
,
invalid_index
)
{
auto
search_task
=
std
::
make_shared
<
XSearchTask
>
(
nullptr
);
search_task
->
Load
(
LoadType
::
TEST
,
10
);
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录