Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_35024513
milvus
提交
fdb7decd
milvus
项目概览
qq_35024513
/
milvus
与 Fork 源项目一致
Fork自
milvus / milvus
通知
14
Star
0
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,发现更多精彩内容 >>
提交
fdb7decd
编写于
11月 19, 2019
作者:
F
fishpenguin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove DefaultLabel
上级
c451f8cb
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
26 addition
and
219 deletion
+26
-219
core/src/scheduler/JobMgr.cpp
core/src/scheduler/JobMgr.cpp
+4
-4
core/src/scheduler/JobMgr.h
core/src/scheduler/JobMgr.h
+3
-2
core/src/scheduler/Scheduler.cpp
core/src/scheduler/Scheduler.cpp
+0
-4
core/src/scheduler/TaskCreator.cpp
core/src/scheduler/TaskCreator.cpp
+2
-7
core/src/scheduler/Utils.cpp
core/src/scheduler/Utils.cpp
+0
-1
core/src/scheduler/action/Action.h
core/src/scheduler/action/Action.h
+0
-4
core/src/scheduler/action/PushTaskToNeighbour.cpp
core/src/scheduler/action/PushTaskToNeighbour.cpp
+0
-32
core/src/scheduler/tasklabel/DefaultLabel.h
core/src/scheduler/tasklabel/DefaultLabel.h
+0
-36
core/src/scheduler/tasklabel/TaskLabel.h
core/src/scheduler/tasklabel/TaskLabel.h
+0
-1
core/unittest/scheduler/CMakeLists.txt
core/unittest/scheduler/CMakeLists.txt
+0
-1
core/unittest/scheduler/test_normal.cpp
core/unittest/scheduler/test_normal.cpp
+0
-72
core/unittest/scheduler/test_resource.cpp
core/unittest/scheduler/test_resource.cpp
+13
-5
core/unittest/scheduler/test_resource_mgr.cpp
core/unittest/scheduler/test_resource_mgr.cpp
+1
-3
core/unittest/scheduler/test_scheduler.cpp
core/unittest/scheduler/test_scheduler.cpp
+0
-41
core/unittest/scheduler/test_tasktable.cpp
core/unittest/scheduler/test_tasktable.cpp
+3
-6
未找到文件。
core/src/scheduler/JobMgr.cpp
浏览文件 @
fdb7decd
...
...
@@ -85,7 +85,7 @@ JobMgr::worker_function() {
}
for
(
auto
&
task
:
tasks
)
{
calculate_path
(
task
);
calculate_path
(
res_mgr_
,
task
);
}
// disk resources NEVER be empty.
...
...
@@ -103,7 +103,7 @@ JobMgr::build_task(const JobPtr& job) {
}
void
JobMgr
::
calculate_path
(
const
TaskPtr
&
task
)
{
JobMgr
::
calculate_path
(
const
ResourceMgrPtr
&
res_mgr
,
const
TaskPtr
&
task
)
{
if
(
task
->
type_
!=
TaskType
::
SearchTask
&&
task
->
type_
!=
TaskType
::
BuildIndexTask
)
{
return
;
}
...
...
@@ -114,9 +114,9 @@ JobMgr::calculate_path(const TaskPtr& task) {
std
::
vector
<
std
::
string
>
path
;
auto
spec_label
=
std
::
static_pointer_cast
<
SpecResLabel
>
(
task
->
label
());
auto
src
=
res_mgr
_
->
GetDiskResources
()[
0
];
auto
src
=
res_mgr
->
GetDiskResources
()[
0
];
auto
dest
=
spec_label
->
resource
();
ShortestPath
(
src
.
lock
(),
dest
.
lock
(),
res_mgr
_
,
path
);
ShortestPath
(
src
.
lock
(),
dest
.
lock
(),
res_mgr
,
path
);
task
->
path
()
=
Path
(
path
,
path
.
size
()
-
1
);
}
...
...
core/src/scheduler/JobMgr.h
浏览文件 @
fdb7decd
...
...
@@ -59,8 +59,9 @@ class JobMgr : public interface::dumpable {
static
std
::
vector
<
TaskPtr
>
build_task
(
const
JobPtr
&
job
);
void
calculate_path
(
const
TaskPtr
&
task
);
public:
static
void
calculate_path
(
const
ResourceMgrPtr
&
res_mgr
,
const
TaskPtr
&
task
);
private:
bool
running_
=
false
;
...
...
core/src/scheduler/Scheduler.cpp
浏览文件 @
fdb7decd
...
...
@@ -108,10 +108,6 @@ Scheduler::OnLoadCompleted(const EventPtr& event) {
auto
task_table_type
=
load_completed_event
->
task_table_item_
->
task
->
label
()
->
Type
();
switch
(
task_table_type
)
{
case
TaskLabelType
::
DEFAULT
:
{
Action
::
DefaultLabelTaskScheduler
(
res_mgr_
,
resource
,
load_completed_event
);
break
;
}
case
TaskLabelType
::
SPECIFIED_RESOURCE
:
{
Action
::
SpecifiedResourceLabelTaskScheduler
(
res_mgr_
,
resource
,
load_completed_event
);
break
;
...
...
core/src/scheduler/TaskCreator.cpp
浏览文件 @
fdb7decd
...
...
@@ -18,7 +18,6 @@
#include "scheduler/TaskCreator.h"
#include "SchedInst.h"
#include "tasklabel/BroadcastLabel.h"
#include "tasklabel/DefaultLabel.h"
#include "tasklabel/SpecResLabel.h"
namespace
milvus
{
...
...
@@ -47,8 +46,7 @@ std::vector<TaskPtr>
TaskCreator
::
Create
(
const
SearchJobPtr
&
job
)
{
std
::
vector
<
TaskPtr
>
tasks
;
for
(
auto
&
index_file
:
job
->
index_files
())
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
();
auto
task
=
std
::
make_shared
<
XSearchTask
>
(
index_file
.
second
,
label
);
auto
task
=
std
::
make_shared
<
XSearchTask
>
(
index_file
.
second
,
nullptr
);
task
->
job_
=
job
;
tasks
.
emplace_back
(
task
);
}
...
...
@@ -70,11 +68,8 @@ TaskCreator::Create(const DeleteJobPtr& job) {
std
::
vector
<
TaskPtr
>
TaskCreator
::
Create
(
const
BuildIndexJobPtr
&
job
)
{
std
::
vector
<
TaskPtr
>
tasks
;
ResourcePtr
res_ptr
=
ResMgrInst
::
GetInstance
()
->
GetResource
(
"cpu"
);
for
(
auto
&
to_index_file
:
job
->
to_index_files
())
{
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
std
::
weak_ptr
<
Resource
>
(
res_ptr
));
auto
task
=
std
::
make_shared
<
XBuildIndexTask
>
(
to_index_file
.
second
,
label
);
auto
task
=
std
::
make_shared
<
XBuildIndexTask
>
(
to_index_file
.
second
,
nullptr
);
task
->
job_
=
job
;
tasks
.
emplace_back
(
task
);
}
...
...
core/src/scheduler/Utils.cpp
浏览文件 @
fdb7decd
...
...
@@ -16,7 +16,6 @@
// under the License.
#include "scheduler/Utils.h"
#include "server/Config.h"
#ifdef MILVUS_GPU_VERSION
#include <cuda_runtime.h>
...
...
core/src/scheduler/action/Action.h
浏览文件 @
fdb7decd
...
...
@@ -36,10 +36,6 @@ class Action {
static
void
PushTaskToResource
(
TaskTableItemPtr
task_item
,
const
ResourcePtr
&
dest
);
static
void
DefaultLabelTaskScheduler
(
const
ResourceMgrPtr
&
res_mgr
,
ResourcePtr
resource
,
std
::
shared_ptr
<
LoadCompletedEvent
>
event
);
static
void
SpecifiedResourceLabelTaskScheduler
(
const
ResourceMgrPtr
&
res_mgr
,
ResourcePtr
resource
,
std
::
shared_ptr
<
LoadCompletedEvent
>
event
);
...
...
core/src/scheduler/action/PushTaskToNeighbour.cpp
浏览文件 @
fdb7decd
...
...
@@ -101,38 +101,6 @@ Action::PushTaskToResource(TaskTableItemPtr task_item, const ResourcePtr& dest)
dest
->
task_table
().
Put
(
task_item
->
task
,
task_item
);
}
void
Action
::
DefaultLabelTaskScheduler
(
const
ResourceMgrPtr
&
res_mgr
,
ResourcePtr
resource
,
std
::
shared_ptr
<
LoadCompletedEvent
>
event
)
{
if
(
not
resource
->
HasExecutor
()
&&
event
->
task_table_item_
->
Move
())
{
auto
task_item
=
event
->
task_table_item_
;
auto
task
=
event
->
task_table_item_
->
task
;
auto
search_task
=
std
::
static_pointer_cast
<
XSearchTask
>
(
task
);
bool
moved
=
false
;
// to support test task, REFACTOR
if
(
resource
->
type
()
==
ResourceType
::
CPU
)
{
if
(
auto
index_engine
=
search_task
->
index_engine_
)
{
auto
location
=
index_engine
->
GetLocation
();
for
(
auto
i
=
0
;
i
<
res_mgr
->
GetNumGpuResource
();
++
i
)
{
auto
index
=
milvus
::
cache
::
GpuCacheMgr
::
GetInstance
(
i
)
->
GetIndex
(
location
);
if
(
index
!=
nullptr
)
{
moved
=
true
;
auto
dest_resource
=
res_mgr
->
GetResource
(
ResourceType
::
GPU
,
i
);
PushTaskToResource
(
event
->
task_table_item_
,
dest_resource
);
break
;
}
}
}
}
if
(
not
moved
)
{
PushTaskToNeighbourRandomly
(
task_item
,
resource
);
}
}
}
void
Action
::
SpecifiedResourceLabelTaskScheduler
(
const
ResourceMgrPtr
&
res_mgr
,
ResourcePtr
resource
,
std
::
shared_ptr
<
LoadCompletedEvent
>
event
)
{
...
...
core/src/scheduler/tasklabel/DefaultLabel.h
已删除
100644 → 0
浏览文件 @
c451f8cb
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
#pragma once
#include "TaskLabel.h"
#include <memory>
namespace
milvus
{
namespace
scheduler
{
class
DefaultLabel
:
public
TaskLabel
{
public:
DefaultLabel
()
:
TaskLabel
(
TaskLabelType
::
DEFAULT
)
{
}
};
using
DefaultLabelPtr
=
std
::
shared_ptr
<
DefaultLabel
>
;
}
// namespace scheduler
}
// namespace milvus
core/src/scheduler/tasklabel/TaskLabel.h
浏览文件 @
fdb7decd
...
...
@@ -23,7 +23,6 @@ namespace milvus {
namespace
scheduler
{
enum
class
TaskLabelType
{
DEFAULT
,
// means can be executed in any resource
SPECIFIED_RESOURCE
,
// means must executing in special resource
BROADCAST
,
// means all enable-executor resource must execute task
};
...
...
core/unittest/scheduler/CMakeLists.txt
浏览文件 @
fdb7decd
...
...
@@ -21,7 +21,6 @@ set(test_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_algorithm.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_event.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_node.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_normal.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_resource.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_resource_factory.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/test_resource_mgr.cpp
...
...
core/unittest/scheduler/test_normal.cpp
已删除
100644 → 0
浏览文件 @
c451f8cb
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
#include <gtest/gtest.h>
#include "scheduler/ResourceFactory.h"
#include "scheduler/ResourceMgr.h"
#include "scheduler/SchedInst.h"
#include "scheduler/Scheduler.h"
#include "scheduler/task/TestTask.h"
#include "scheduler/tasklabel/DefaultLabel.h"
#include "utils/Log.h"
namespace
{
namespace
ms
=
milvus
::
scheduler
;
}
// namespace
TEST
(
NormalTest
,
INST_TEST
)
{
// ResourceMgr only compose resources, provide unified event
auto
res_mgr
=
ms
::
ResMgrInst
::
GetInstance
();
res_mgr
->
Add
(
ms
::
ResourceFactory
::
Create
(
"disk"
,
"DISK"
,
0
,
true
,
false
));
res_mgr
->
Add
(
ms
::
ResourceFactory
::
Create
(
"cpu"
,
"CPU"
,
0
,
true
,
true
));
auto
IO
=
ms
::
Connection
(
"IO"
,
500.0
);
res_mgr
->
Connect
(
"disk"
,
"cpu"
,
IO
);
auto
scheduler
=
ms
::
SchedInst
::
GetInstance
();
res_mgr
->
Start
();
scheduler
->
Start
();
const
uint64_t
NUM_TASK
=
2
;
std
::
vector
<
std
::
shared_ptr
<
ms
::
TestTask
>>
tasks
;
ms
::
TableFileSchemaPtr
dummy
=
nullptr
;
auto
disks
=
res_mgr
->
GetDiskResources
();
ASSERT_FALSE
(
disks
.
empty
());
if
(
auto
observe
=
disks
[
0
].
lock
())
{
for
(
uint64_t
i
=
0
;
i
<
NUM_TASK
;
++
i
)
{
auto
label
=
std
::
make_shared
<
ms
::
DefaultLabel
>
();
auto
task
=
std
::
make_shared
<
ms
::
TestTask
>
(
dummy
,
label
);
task
->
label
()
=
std
::
make_shared
<
ms
::
DefaultLabel
>
();
tasks
.
push_back
(
task
);
observe
->
task_table
().
Put
(
task
);
}
}
for
(
auto
&
task
:
tasks
)
{
task
->
Wait
();
ASSERT_EQ
(
task
->
load_count_
,
1
);
ASSERT_EQ
(
task
->
exec_count_
,
1
);
}
scheduler
->
Stop
();
res_mgr
->
Stop
();
}
core/unittest/scheduler/test_resource.cpp
浏览文件 @
fdb7decd
...
...
@@ -24,7 +24,7 @@
#include "scheduler/resource/TestResource.h"
#include "scheduler/task/Task.h"
#include "scheduler/task/TestTask.h"
#include "scheduler/tasklabel/
Default
Label.h"
#include "scheduler/tasklabel/
SpecRes
Label.h"
namespace
milvus
{
namespace
scheduler
{
...
...
@@ -182,8 +182,10 @@ TEST_F(ResourceAdvanceTest, DISK_RESOURCE_TEST) {
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
(
);
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
disk_resource_
);
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
,
label
);
std
::
vector
<
std
::
string
>
path
{
disk_resource_
->
name
()};
task
->
path
()
=
Path
(
path
,
0
);
tasks
.
push_back
(
task
);
disk_resource_
->
task_table
().
Put
(
task
);
}
...
...
@@ -208,8 +210,10 @@ TEST_F(ResourceAdvanceTest, CPU_RESOURCE_TEST) {
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
(
);
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
cpu_resource_
);
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
,
label
);
std
::
vector
<
std
::
string
>
path
{
cpu_resource_
->
name
()};
task
->
path
()
=
Path
(
path
,
0
);
tasks
.
push_back
(
task
);
cpu_resource_
->
task_table
().
Put
(
task
);
}
...
...
@@ -234,8 +238,10 @@ TEST_F(ResourceAdvanceTest, GPU_RESOURCE_TEST) {
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
(
);
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
gpu_resource_
);
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
,
label
);
std
::
vector
<
std
::
string
>
path
{
gpu_resource_
->
name
()};
task
->
path
()
=
Path
(
path
,
0
);
tasks
.
push_back
(
task
);
gpu_resource_
->
task_table
().
Put
(
task
);
}
...
...
@@ -260,8 +266,10 @@ TEST_F(ResourceAdvanceTest, TEST_RESOURCE_TEST) {
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
(
);
auto
label
=
std
::
make_shared
<
SpecResLabel
>
(
test_resource_
);
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
,
label
);
std
::
vector
<
std
::
string
>
path
{
test_resource_
->
name
()};
task
->
path
()
=
Path
(
path
,
0
);
tasks
.
push_back
(
task
);
test_resource_
->
task_table
().
Put
(
task
);
}
...
...
core/unittest/scheduler/test_resource_mgr.cpp
浏览文件 @
fdb7decd
...
...
@@ -22,7 +22,6 @@
#include "scheduler/resource/GpuResource.h"
#include "scheduler/resource/TestResource.h"
#include "scheduler/task/TestTask.h"
#include "scheduler/tasklabel/DefaultLabel.h"
namespace
milvus
{
namespace
scheduler
{
...
...
@@ -187,8 +186,7 @@ TEST_F(ResourceMgrAdvanceTest, REGISTER_SUBSCRIBER) {
auto
callback
=
[
&
](
EventPtr
event
)
{
flag
=
true
;
};
mgr1_
->
RegisterSubscriber
(
callback
);
TableFileSchemaPtr
dummy
=
nullptr
;
auto
label
=
std
::
make_shared
<
DefaultLabel
>
();
disk_res
->
task_table
().
Put
(
std
::
make_shared
<
TestTask
>
(
dummy
,
label
));
disk_res
->
task_table
().
Put
(
std
::
make_shared
<
TestTask
>
(
dummy
,
nullptr
));
sleep
(
1
);
ASSERT_TRUE
(
flag
);
}
...
...
core/unittest/scheduler/test_scheduler.cpp
浏览文件 @
fdb7decd
...
...
@@ -23,7 +23,6 @@
#include "scheduler/Scheduler.h"
#include "scheduler/resource/Resource.h"
#include "scheduler/task/TestTask.h"
#include "scheduler/tasklabel/DefaultLabel.h"
#include "scheduler/tasklabel/SpecResLabel.h"
#include "utils/Error.h"
#include "wrapper/VecIndex.h"
...
...
@@ -150,46 +149,6 @@ insert_dummy_index_into_gpu_cache(uint64_t device_id) {
cache
::
GpuCacheMgr
::
GetInstance
(
device_id
)
->
InsertItem
(
"location"
,
obj
);
}
TEST_F
(
SchedulerTest
,
ON_LOAD_COMPLETED
)
{
const
uint64_t
NUM
=
10
;
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy
=
std
::
make_shared
<
TableFileSchema
>
();
dummy
->
location_
=
"location"
;
insert_dummy_index_into_gpu_cache
(
1
);
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
();
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy
,
label
);
task
->
label
()
=
std
::
make_shared
<
DefaultLabel
>
();
tasks
.
push_back
(
task
);
cpu_resource_
.
lock
()
->
task_table
().
Put
(
task
);
}
sleep
(
3
);
ASSERT_EQ
(
res_mgr_
->
GetResource
(
ResourceType
::
GPU
,
1
)
->
task_table
().
size
(),
NUM
);
}
TEST_F
(
SchedulerTest
,
PUSH_TASK_TO_NEIGHBOUR_RANDOMLY_TEST
)
{
const
uint64_t
NUM
=
10
;
std
::
vector
<
std
::
shared_ptr
<
TestTask
>>
tasks
;
TableFileSchemaPtr
dummy1
=
std
::
make_shared
<
TableFileSchema
>
();
dummy1
->
location_
=
"location"
;
tasks
.
clear
();
for
(
uint64_t
i
=
0
;
i
<
NUM
;
++
i
)
{
auto
label
=
std
::
make_shared
<
DefaultLabel
>
();
auto
task
=
std
::
make_shared
<
TestTask
>
(
dummy1
,
label
);
task
->
label
()
=
std
::
make_shared
<
DefaultLabel
>
();
tasks
.
push_back
(
task
);
cpu_resource_
.
lock
()
->
task_table
().
Put
(
task
);
}
sleep
(
3
);
// ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
}
class
SchedulerTest2
:
public
testing
::
Test
{
protected:
void
...
...
core/unittest/scheduler/test_tasktable.cpp
浏览文件 @
fdb7decd
...
...
@@ -18,7 +18,6 @@
#include <gtest/gtest.h>
#include "scheduler/TaskTable.h"
#include "scheduler/task/TestTask.h"
#include "scheduler/tasklabel/DefaultLabel.h"
/************ TaskTableBaseTest ************/
...
...
@@ -162,9 +161,8 @@ class TaskTableBaseTest : public ::testing::Test {
SetUp
()
override
{
milvus
::
scheduler
::
TableFileSchemaPtr
dummy
=
nullptr
;
invalid_task_
=
nullptr
;
auto
label
=
std
::
make_shared
<
milvus
::
scheduler
::
DefaultLabel
>
();
task1_
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
label
);
task2_
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
label
);
task1_
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
nullptr
);
task2_
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
nullptr
);
}
milvus
::
scheduler
::
TaskPtr
invalid_task_
;
...
...
@@ -320,8 +318,7 @@ class TaskTableAdvanceTest : public ::testing::Test {
SetUp
()
override
{
milvus
::
scheduler
::
TableFileSchemaPtr
dummy
=
nullptr
;
for
(
uint64_t
i
=
0
;
i
<
8
;
++
i
)
{
auto
label
=
std
::
make_shared
<
milvus
::
scheduler
::
DefaultLabel
>
();
auto
task
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
label
);
auto
task
=
std
::
make_shared
<
milvus
::
scheduler
::
TestTask
>
(
dummy
,
nullptr
);
table1_
.
Put
(
task
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录