mirror of https://github.com/milvus-io/milvus.git
using clang-format-6.0
Former-commit-id: 8e81b9845581c8a04a95049af635545905c4c1a2pull/191/head
parent
f8b9091f41
commit
816dce3bab
|
@ -26,9 +26,9 @@
|
|||
#include "meta/SqliteMetaImpl.h"
|
||||
#include "metrics/Metrics.h"
|
||||
#include "scheduler/SchedInst.h"
|
||||
#include "scheduler/job/BuildIndexJob.h"
|
||||
#include "scheduler/job/DeleteJob.h"
|
||||
#include "scheduler/job/SearchJob.h"
|
||||
#include "scheduler/job/BuildIndexJob.h"
|
||||
#include "utils/Log.h"
|
||||
#include "utils/TimeRecorder.h"
|
||||
|
||||
|
@ -900,8 +900,7 @@ DBImpl::BackgroundBuildIndex() {
|
|||
meta_ptr_->FilesToIndex(to_index_files);
|
||||
Status status;
|
||||
|
||||
scheduler::BuildIndexJobPtr
|
||||
job = std::make_shared<scheduler::BuildIndexJob>(0, meta_ptr_, options_);
|
||||
scheduler::BuildIndexJobPtr job = std::make_shared<scheduler::BuildIndexJob>(0, meta_ptr_, options_);
|
||||
|
||||
// step 2: put build index task to scheduler
|
||||
for (auto& file : to_index_files) {
|
||||
|
|
|
@ -15,12 +15,11 @@
|
|||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
#include <src/scheduler/tasklabel/SpecResLabel.h>
|
||||
#include "scheduler/TaskCreator.h"
|
||||
#include <src/scheduler/tasklabel/SpecResLabel.h>
|
||||
#include "SchedInst.h"
|
||||
#include "scheduler/tasklabel/BroadcastLabel.h"
|
||||
#include "tasklabel/DefaultLabel.h"
|
||||
#include "SchedInst.h"
|
||||
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
|
|
@ -30,9 +30,9 @@
|
|||
#include "job/DeleteJob.h"
|
||||
#include "job/Job.h"
|
||||
#include "job/SearchJob.h"
|
||||
#include "task/BuildIndexTask.h"
|
||||
#include "task/DeleteTask.h"
|
||||
#include "task/SearchTask.h"
|
||||
#include "task/BuildIndexTask.h"
|
||||
#include "task/Task.h"
|
||||
|
||||
namespace milvus {
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include "src/cache/GpuCacheMgr.h"
|
||||
#include "src/server/Config.h"
|
||||
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
||||
|
@ -175,8 +174,8 @@ Action::SpecifiedResourceLabelTaskScheduler(ResourceMgrWPtr res_mgr, ResourcePtr
|
|||
bool find_gpu_res = false;
|
||||
for (uint64_t i = 0; i < compute_resources.size(); ++i) {
|
||||
if (res_mgr.lock()->GetResource(ResourceType::GPU, build_index_gpu) != nullptr) {
|
||||
if (compute_resources[i]->name()
|
||||
== res_mgr.lock()->GetResource(ResourceType::GPU, build_index_gpu)->name()) {
|
||||
if (compute_resources[i]->name() ==
|
||||
res_mgr.lock()->GetResource(ResourceType::GPU, build_index_gpu)->name()) {
|
||||
find_gpu_res = true;
|
||||
Path task_path(paths[i], paths[i].size() - 1);
|
||||
task->path() = task_path;
|
||||
|
|
|
@ -15,9 +15,11 @@
|
|||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
#include "BuildIndexJob.h"
|
||||
#include "scheduler/job/BuildIndexJob.h"
|
||||
#include "utils/Log.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
||||
|
|
|
@ -16,22 +16,21 @@
|
|||
// under the License.
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <queue>
|
||||
#include <deque>
|
||||
#include <unordered_map>
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
#include <deque>
|
||||
#include <list>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <queue>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "Job.h"
|
||||
#include "db/meta/Meta.h"
|
||||
#include "scheduler/Definition.h"
|
||||
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
||||
|
|
|
@ -15,19 +15,18 @@
|
|||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
|
||||
#include "BuildIndexTask.h"
|
||||
#include "scheduler/task/BuildIndexTask.h"
|
||||
#include "db/engine/EngineFactory.h"
|
||||
#include "metrics/Metrics.h"
|
||||
#include "scheduler/job/BuildIndexJob.h"
|
||||
#include "utils/Log.h"
|
||||
#include "utils/TimeRecorder.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <utility>
|
||||
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
||||
|
@ -89,8 +88,8 @@ XBuildIndexTask::Load(milvus::scheduler::LoadType type, uint8_t device_id) {
|
|||
|
||||
size_t file_size = to_index_engine_->PhysicalSize();
|
||||
|
||||
std::string info = "Load file id:" + std::to_string(file_->id_) + " file type:" +
|
||||
std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) +
|
||||
std::string info = "Load file id:" + std::to_string(file_->id_) +
|
||||
" file type:" + std::to_string(file_->file_type_) + " size:" + std::to_string(file_size) +
|
||||
" bytes from location: " + file_->location_ + " totally cost";
|
||||
double span = rc.ElapseFromBegin(info);
|
||||
|
||||
|
@ -117,8 +116,7 @@ XBuildIndexTask::Execute() {
|
|||
engine::meta::TableFileSchema table_file;
|
||||
table_file.table_id_ = file_->table_id_;
|
||||
table_file.date_ = file_->date_;
|
||||
table_file.file_type_ =
|
||||
engine::meta::TableFileSchema::NEW_INDEX;
|
||||
table_file.file_type_ = engine::meta::TableFileSchema::NEW_INDEX;
|
||||
|
||||
engine::meta::MetaPtr meta_ptr = build_index_job->meta();
|
||||
Status status = build_index_job->meta()->CreateTableFile(table_file);
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "scheduler/Definition.h"
|
||||
#include "scheduler/job/BuildIndexJob.h"
|
||||
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
||||
|
|
Loading…
Reference in New Issue