Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-445 Rename CopyCompleted to LoadCompleted

See merge request megasearch/milvus!451

Former-commit-id: e4807d77b2046b6f8009c650540ceb5ed232c86c

cpp/CHANGELOG.md

@@ -69,6 +69,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

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<CopyCompletedEvent>(event);
+Scheduler::OnLoadCompleted(const EventPtr &event) {
+    auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);
     if (auto resource = event->resource_.lock()) {
         resource->WakeupExecutor();
 

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;

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
 };

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;
 }

cpp/src/scheduler/event/CopyCompletedEvent.h → 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> resource, TaskTableItemPtr task_table_item)
-        : Event(EventType::COPY_COMPLETED, std::move(resource)),
+    LoadCompletedEvent(std::weak_ptr<Resource> 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 "<CopyCompletedEvent>";
+        return "<LoadCompletedEvent>";
     }
 
-    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_;

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<CopyCompletedEvent>(shared_from_this(), task_item);
+                auto event = std::make_shared<LoadCompletedEvent>(shared_from_this(), task_item);
                 subscriber_(std::static_pointer_cast<Event>(event));
             }
         }

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"