diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 19e96e96629635d55e87c0a62498b434080db67d..485602157984749aa7d2d0a23d0b39bb8794d2fc 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -68,6 +68,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-428 - Add PushTaskByDataLocality in scheduler - MS-440 - Add DumpTaskTables in sdk - MS-442 - Merge Knowhere +- MS-445 - Rename CopyCompleted to LoadCompleted ## New Feature - MS-343 - Implement ResourceMgr diff --git a/cpp/src/scheduler/Scheduler.cpp b/cpp/src/scheduler/Scheduler.cpp index 4c7f0ce6f7912bbbb727c12584561a8d3f86371e..03fa479df68a9a99e0002e67bd73dc976e2aa9e1 100644 --- a/cpp/src/scheduler/Scheduler.cpp +++ b/cpp/src/scheduler/Scheduler.cpp @@ -76,8 +76,8 @@ Scheduler::Process(const EventPtr &event) { OnStartUp(event); break; } - case EventType::COPY_COMPLETED: { - OnCopyCompleted(event); + case EventType::LOAD_COMPLETED: { + OnLoadCompleted(event); break; } case EventType::FINISH_TASK: { @@ -108,8 +108,8 @@ Scheduler::OnFinishTask(const EventPtr &event) { } void -Scheduler::OnCopyCompleted(const EventPtr &event) { - auto load_completed_event = std::static_pointer_cast(event); +Scheduler::OnLoadCompleted(const EventPtr &event) { + auto load_completed_event = std::static_pointer_cast(event); if (auto resource = event->resource_.lock()) { resource->WakeupExecutor(); diff --git a/cpp/src/scheduler/Scheduler.h b/cpp/src/scheduler/Scheduler.h index 012a479a824aafac9aad46c82a1e6190fd09da54..e2d51ee31dae02268f345bc9bf8cc4ea49604bca 100644 --- a/cpp/src/scheduler/Scheduler.h +++ b/cpp/src/scheduler/Scheduler.h @@ -82,7 +82,7 @@ private: * Pull task from neighbours; */ void - OnCopyCompleted(const EventPtr &event); + OnLoadCompleted(const EventPtr &event); /* * Process task table updated events, which happened on task_table->put; diff --git a/cpp/src/scheduler/event/Event.h b/cpp/src/scheduler/event/Event.h index 788cfd6a73f2c958b500372952839a02ea12ca8c..777bede842d6a9cba225672db9a8e6749fca6cbd 100644 --- a/cpp/src/scheduler/event/Event.h +++ b/cpp/src/scheduler/event/Event.h @@ -13,7 +13,7 @@ namespace engine { enum class EventType { START_UP, - COPY_COMPLETED, + LOAD_COMPLETED, FINISH_TASK, TASK_TABLE_UPDATED }; diff --git a/cpp/src/scheduler/event/EventDump.cpp b/cpp/src/scheduler/event/EventDump.cpp index 0d10f6f7b4fa4af451e4fffc613f1f1825ebf688..ceee63ba9d226a8e5faf3abe76052ad8f1311123 100644 --- a/cpp/src/scheduler/event/EventDump.cpp +++ b/cpp/src/scheduler/event/EventDump.cpp @@ -6,7 +6,7 @@ #include "Event.h" #include "StartUpEvent.h" -#include "CopyCompletedEvent.h" +#include "LoadCompletedEvent.h" #include "FinishTaskEvent.h" #include "TaskTableUpdatedEvent.h" @@ -25,7 +25,7 @@ std::ostream &operator<<(std::ostream &out, const StartUpEvent &event) { return out; } -std::ostream &operator<<(std::ostream &out, const CopyCompletedEvent &event) { +std::ostream &operator<<(std::ostream &out, const LoadCompletedEvent &event) { out << event.Dump(); return out; } diff --git a/cpp/src/scheduler/event/CopyCompletedEvent.h b/cpp/src/scheduler/event/LoadCompletedEvent.h similarity index 69% rename from cpp/src/scheduler/event/CopyCompletedEvent.h rename to cpp/src/scheduler/event/LoadCompletedEvent.h index d2f5ddb0ff22f11e391bcb3a95605c0ad42d2c51..c59b6256cb030dc7e30e74e492b7732c7ede1d79 100644 --- a/cpp/src/scheduler/event/CopyCompletedEvent.h +++ b/cpp/src/scheduler/event/LoadCompletedEvent.h @@ -13,18 +13,18 @@ namespace zilliz { namespace milvus { namespace engine { -class CopyCompletedEvent : public Event { +class LoadCompletedEvent : public Event { public: - CopyCompletedEvent(std::weak_ptr resource, TaskTableItemPtr task_table_item) - : Event(EventType::COPY_COMPLETED, std::move(resource)), + LoadCompletedEvent(std::weak_ptr resource, TaskTableItemPtr task_table_item) + : Event(EventType::LOAD_COMPLETED, std::move(resource)), task_table_item_(std::move(task_table_item)) {} inline std::string Dump() const override { - return ""; + return ""; } - friend std::ostream &operator<<(std::ostream &out, const CopyCompletedEvent &event); + friend std::ostream &operator<<(std::ostream &out, const LoadCompletedEvent &event); public: TaskTableItemPtr task_table_item_; diff --git a/cpp/src/scheduler/resource/Resource.cpp b/cpp/src/scheduler/resource/Resource.cpp index 6789d00c8927ca59120c03e4730636ec32050a1b..75c3b4d78456bf6a42eba2b0acd5d67e5126f21c 100644 --- a/cpp/src/scheduler/resource/Resource.cpp +++ b/cpp/src/scheduler/resource/Resource.cpp @@ -113,10 +113,9 @@ void Resource::loader_function() { break; } LoadFile(task_item->task); - // TODO: wrapper loaded task_item->Loaded(); if (subscriber_) { - auto event = std::make_shared(shared_from_this(), task_item); + auto event = std::make_shared(shared_from_this(), task_item); subscriber_(std::static_pointer_cast(event)); } } diff --git a/cpp/src/scheduler/resource/Resource.h b/cpp/src/scheduler/resource/Resource.h index 76c0b007bf2f2631ec68165757f4b5fdeff02ddb..dcd5fb5d8f9db407194f88412fe2603570782010 100644 --- a/cpp/src/scheduler/resource/Resource.h +++ b/cpp/src/scheduler/resource/Resource.h @@ -14,7 +14,7 @@ #include "../event/Event.h" #include "../event/StartUpEvent.h" -#include "../event/CopyCompletedEvent.h" +#include "../event/LoadCompletedEvent.h" #include "../event/FinishTaskEvent.h" #include "../event/TaskTableUpdatedEvent.h" #include "../TaskTable.h"