Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
2cdad522
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,发现更多精彩内容 >>
提交
2cdad522
编写于
8月 25, 2019
作者:
Y
Yu Kun
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: f78a5585bb008923d73094670deb083706c2170a
上级
0883b476
ab79ea72
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
55 addition
and
30 deletion
+55
-30
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+5
-0
cpp/conf/server_config.template
cpp/conf/server_config.template
+5
-5
cpp/src/config/YamlConfigMgr.cpp
cpp/src/config/YamlConfigMgr.cpp
+15
-15
cpp/src/config/YamlConfigMgr.h
cpp/src/config/YamlConfigMgr.h
+4
-4
cpp/src/db/engine/ExecutionEngineImpl.cpp
cpp/src/db/engine/ExecutionEngineImpl.cpp
+2
-0
cpp/src/scheduler/task/DeleteTask.cpp
cpp/src/scheduler/task/DeleteTask.cpp
+1
-1
cpp/src/scheduler/task/SearchTask.cpp
cpp/src/scheduler/task/SearchTask.cpp
+3
-2
cpp/src/scheduler/task/Task.h
cpp/src/scheduler/task/Task.h
+12
-1
cpp/src/scheduler/task/TestTask.cpp
cpp/src/scheduler/task/TestTask.cpp
+2
-0
cpp/src/scheduler/task/TestTask.h
cpp/src/scheduler/task/TestTask.h
+1
-1
cpp/src/server/grpc_impl/GrpcRequestTask.cpp
cpp/src/server/grpc_impl/GrpcRequestTask.cpp
+5
-1
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
2cdad522
...
...
@@ -7,6 +7,8 @@ Please mark all change in change log and use the ticket from JIRA.
## Bug
-
MS-411 - Fix metric unittest linking error
-
MS-412 - Fix gpu cache logical error
-
MS-416 - ExecutionEngineImpl::GpuCache has not return value cause crash
-
MS-417 - YAML sequence load disable cause scheduler startup failed
## Improvement
-
MS-327 - Clean code for milvus
...
...
@@ -51,6 +53,9 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-409 - Using new scheduler
-
MS-413 - Remove thrift dependency
-
MS-410 - Add resource config comment
-
MS-414 - Add TaskType in Scheduler::Task
-
MS-415 - Add command tasktable to dump all tasktables
-
MS-418 - Update server_config.template file, set CPU compute only default
-
MS-419 - Move index_file_size from IndexParam to TableSchema
## New Feature
...
...
cpp/conf/server_config.template
浏览文件 @
2cdad522
...
...
@@ -64,21 +64,21 @@ resource_config:
memory: 64
device_id: 0
enable_loader: true
enable_executor:
fals
e
enable_executor:
tru
e
gtx1060:
type: GPU
memory: 6
device_id: 0
enable_loader:
tru
e
enable_executor:
tru
e
enable_loader:
fals
e
enable_executor:
fals
e
gtx1660:
type: GPU
memory: 6
device_id: 1
enable_loader:
tru
e
enable_executor:
tru
e
enable_loader:
fals
e
enable_executor:
fals
e
# connection list, length: 0~N
# format: -${resource_name}===${resource_name}
...
...
cpp/src/config/YamlConfigMgr.cpp
浏览文件 @
2cdad522
...
...
@@ -73,19 +73,19 @@ YamlConfigMgr::SetChildConfig(const YAML::Node& node,
return
false
;
}
//
bool
//
YamlConfigMgr::SetSequence(const YAML::Node &node,
//
const std::string &child_name,
//
ConfigNode &config) {
//
if(node[child_name].IsDefined ()) {
//
size_t cnt = node[child_name].size();
//
for(size_t i = 0; i < cnt; i++){
//
config.AddSequenceItem(child_name, node[child_name][i].as<std::string>());
//
}
//
return true;
//
}
//
return false;
//
}
bool
YamlConfigMgr
::
SetSequence
(
const
YAML
::
Node
&
node
,
const
std
::
string
&
child_name
,
ConfigNode
&
config
)
{
if
(
node
[
child_name
].
IsDefined
())
{
size_t
cnt
=
node
[
child_name
].
size
();
for
(
size_t
i
=
0
;
i
<
cnt
;
i
++
){
config
.
AddSequenceItem
(
child_name
,
node
[
child_name
][
i
].
as
<
std
::
string
>
());
}
return
true
;
}
return
false
;
}
void
YamlConfigMgr
::
LoadConfigNode
(
const
YAML
::
Node
&
node
,
ConfigNode
&
config
)
{
...
...
@@ -98,8 +98,8 @@ YamlConfigMgr::LoadConfigNode(const YAML::Node& node, ConfigNode& config) {
SetConfigValue
(
node
,
key
,
config
);
}
else
if
(
node
[
key
].
IsMap
()){
SetChildConfig
(
node
,
key
,
config
);
//
} else if(node[key].IsSequence()){
//
SetSequence(node, key, config);
}
else
if
(
node
[
key
].
IsSequence
()){
SetSequence
(
node
,
key
,
config
);
}
}
}
...
...
cpp/src/config/YamlConfigMgr.h
浏览文件 @
2cdad522
...
...
@@ -33,10 +33,10 @@ class YamlConfigMgr : public IConfigMgr {
const
std
::
string
&
name
,
ConfigNode
&
config
);
//
bool
//
SetSequence(const YAML::Node &node,
//
const std::string &child_name,
//
ConfigNode &config);
bool
SetSequence
(
const
YAML
::
Node
&
node
,
const
std
::
string
&
child_name
,
ConfigNode
&
config
);
void
LoadConfigNode
(
const
YAML
::
Node
&
node
,
ConfigNode
&
config
);
...
...
cpp/src/db/engine/ExecutionEngineImpl.cpp
浏览文件 @
2cdad522
...
...
@@ -273,6 +273,8 @@ Status ExecutionEngineImpl::Cache() {
Status
ExecutionEngineImpl
::
GpuCache
(
uint64_t
gpu_id
)
{
zilliz
::
milvus
::
cache
::
GpuCacheMgr
::
GetInstance
(
gpu_id
)
->
InsertItem
(
location_
,
index_
);
return
Status
::
OK
();
}
// TODO(linxj): remove.
...
...
cpp/src/scheduler/task/DeleteTask.cpp
浏览文件 @
2cdad522
...
...
@@ -12,7 +12,7 @@ namespace milvus {
namespace
engine
{
XDeleteTask
::
XDeleteTask
(
DeleteContextPtr
&
delete_context
)
:
delete_context_ptr_
(
delete_context
)
{}
:
Task
(
TaskType
::
DeleteTask
),
delete_context_ptr_
(
delete_context
)
{}
void
XDeleteTask
::
Load
(
LoadType
type
,
uint8_t
device_id
)
{
...
...
cpp/src/scheduler/task/SearchTask.cpp
浏览文件 @
2cdad522
...
...
@@ -81,11 +81,12 @@ CollectFileMetrics(int file_type, size_t file_size) {
}
}
XSearchTask
::
XSearchTask
(
TableFileSchemaPtr
file
)
:
file_
(
file
)
{
XSearchTask
::
XSearchTask
(
TableFileSchemaPtr
file
)
:
Task
(
TaskType
::
SearchTask
),
file_
(
file
)
{
index_engine_
=
EngineFactory
::
Build
(
file_
->
dimension_
,
file_
->
location_
,
(
EngineType
)
file_
->
engine_type_
,
(
MetricType
)
file_
->
metric_type_
,
(
MetricType
)
file_
->
metric_type_
,
file_
->
nlist_
);
}
...
...
cpp/src/scheduler/task/Task.h
浏览文件 @
2cdad522
...
...
@@ -21,13 +21,20 @@ enum class LoadType {
GPU2CPU
,
};
enum
class
TaskType
{
SearchTask
,
DeleteTask
,
TestTask
,
};
class
Task
;
using
TaskPtr
=
std
::
shared_ptr
<
Task
>
;
class
Task
{
public:
Task
()
=
default
;
explicit
Task
(
TaskType
type
)
:
type_
(
type
)
{}
virtual
void
Load
(
LoadType
type
,
uint8_t
device_id
)
=
0
;
...
...
@@ -39,9 +46,13 @@ public:
virtual
TaskPtr
Clone
()
=
0
;
inline
TaskType
Type
()
const
{
return
type_
;
}
public:
std
::
vector
<
SearchContextPtr
>
search_contexts_
;
ScheduleTaskPtr
task_
;
TaskType
type_
;
};
...
...
cpp/src/scheduler/task/TestTask.cpp
浏览文件 @
2cdad522
...
...
@@ -11,6 +11,8 @@ namespace zilliz {
namespace
milvus
{
namespace
engine
{
TestTask
::
TestTask
()
:
Task
(
TaskType
::
TestTask
)
{}
void
TestTask
::
Load
(
LoadType
type
,
uint8_t
device_id
)
{
load_count_
++
;
...
...
cpp/src/scheduler/task/TestTask.h
浏览文件 @
2cdad522
...
...
@@ -14,7 +14,7 @@ namespace engine {
class
TestTask
:
public
Task
{
public:
TestTask
()
=
default
;
TestTask
();
public:
void
...
...
cpp/src/server/grpc_impl/GrpcRequestTask.cpp
浏览文件 @
2cdad522
...
...
@@ -13,6 +13,7 @@
#include "version.h"
#include "GrpcMilvusServer.h"
#include "db/Utils.h"
#include "scheduler/SchedInst.h"
#include "src/server/Server.h"
...
...
@@ -753,7 +754,10 @@ ServerError
CmdTask
::
OnExecute
()
{
if
(
cmd_
==
"version"
)
{
result_
=
MILVUS_VERSION
;
}
else
{
}
else
if
(
cmd_
==
"tasktable"
)
{
result_
=
engine
::
ResMgrInst
::
GetInstance
()
->
DumpTaskTables
();
}
else
{
result_
=
"OK"
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录