From 08d52078a97f591aba9a49f264b66e56be544b01 Mon Sep 17 00:00:00 2001 From: wxyu Date: Sun, 18 Aug 2019 20:01:44 +0800 Subject: [PATCH] MS-375 Add Dump implementation for Event Former-commit-id: 20e570af1fb681f848a6fa49449e53f4fb777f34 --- cpp/CHANGELOG.md | 1 + cpp/src/scheduler/event/CopyCompletedEvent.h | 8 ++++ cpp/src/scheduler/event/Event.h | 9 ++++ cpp/src/scheduler/event/EventDump.cpp | 45 +++++++++++++++++++ cpp/src/scheduler/event/FinishTaskEvent.h | 7 +++ cpp/src/scheduler/event/StartUpEvent.h | 7 +++ .../scheduler/event/TaskTableUpdatedEvent.h | 7 +++ 7 files changed, 84 insertions(+) create mode 100644 cpp/src/scheduler/event/EventDump.cpp diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 07f8ba34..2f565857 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -26,6 +26,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-371 - Add TaskTableUpdatedEvent - MS-373 - Add resource test - MS-374 - Add action definition +- MS-375 - Add Dump implementation for Event ## New Feature - MS-343 - Implement ResourceMgr diff --git a/cpp/src/scheduler/event/CopyCompletedEvent.h b/cpp/src/scheduler/event/CopyCompletedEvent.h index c84c5933..d2f5ddb0 100644 --- a/cpp/src/scheduler/event/CopyCompletedEvent.h +++ b/cpp/src/scheduler/event/CopyCompletedEvent.h @@ -18,6 +18,14 @@ public: CopyCompletedEvent(std::weak_ptr resource, TaskTableItemPtr task_table_item) : Event(EventType::COPY_COMPLETED, std::move(resource)), task_table_item_(std::move(task_table_item)) {} + + inline std::string + Dump() const override { + return ""; + } + + friend std::ostream &operator<<(std::ostream &out, const CopyCompletedEvent &event); + public: TaskTableItemPtr task_table_item_; }; diff --git a/cpp/src/scheduler/event/Event.h b/cpp/src/scheduler/event/Event.h index 4b04d540..788cfd6a 100644 --- a/cpp/src/scheduler/event/Event.h +++ b/cpp/src/scheduler/event/Event.h @@ -5,6 +5,8 @@ ******************************************************************************/ #pragma once +#include + namespace zilliz { namespace milvus { namespace engine { @@ -30,6 +32,13 @@ public: return type_; } + inline virtual std::string + Dump() const { + return ""; + } + + friend std::ostream &operator<<(std::ostream &out, const Event &event); + public: EventType type_; std::weak_ptr resource_; diff --git a/cpp/src/scheduler/event/EventDump.cpp b/cpp/src/scheduler/event/EventDump.cpp new file mode 100644 index 00000000..0d10f6f7 --- /dev/null +++ b/cpp/src/scheduler/event/EventDump.cpp @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited. + * Proprietary and confidential. + ******************************************************************************/ + +#include "Event.h" +#include "StartUpEvent.h" +#include "CopyCompletedEvent.h" +#include "FinishTaskEvent.h" +#include "TaskTableUpdatedEvent.h" + + +namespace zilliz { +namespace milvus { +namespace engine { + +std::ostream &operator<<(std::ostream &out, const Event &event) { + out << event.Dump(); + return out; +} + +std::ostream &operator<<(std::ostream &out, const StartUpEvent &event) { + out << event.Dump(); + return out; +} + +std::ostream &operator<<(std::ostream &out, const CopyCompletedEvent &event) { + out << event.Dump(); + return out; +} + +std::ostream &operator<<(std::ostream &out, const FinishTaskEvent &event) { + out << event.Dump(); + return out; +} + +std::ostream &operator<<(std::ostream &out, const TaskTableUpdatedEvent &event) { + out << event.Dump(); + return out; +} + +} +} +} diff --git a/cpp/src/scheduler/event/FinishTaskEvent.h b/cpp/src/scheduler/event/FinishTaskEvent.h index 2739bb2f..14daa9b5 100644 --- a/cpp/src/scheduler/event/FinishTaskEvent.h +++ b/cpp/src/scheduler/event/FinishTaskEvent.h @@ -18,6 +18,13 @@ public: : Event(EventType::FINISH_TASK, std::move(resource)), task_table_item_(std::move(task_table_item)) {} + inline std::string + Dump() const override { + return ""; + } + + friend std::ostream &operator<<(std::ostream &out, const FinishTaskEvent &event); + public: TaskTableItemPtr task_table_item_; }; diff --git a/cpp/src/scheduler/event/StartUpEvent.h b/cpp/src/scheduler/event/StartUpEvent.h index 04bc462d..4b5ec78c 100644 --- a/cpp/src/scheduler/event/StartUpEvent.h +++ b/cpp/src/scheduler/event/StartUpEvent.h @@ -17,6 +17,13 @@ public: explicit StartUpEvent(std::weak_ptr resource) : Event(EventType::START_UP, std::move(resource)) {} + + inline std::string + Dump() const override { + return ""; + } + + friend std::ostream &operator<<(std::ostream &out, const StartUpEvent &event); }; } diff --git a/cpp/src/scheduler/event/TaskTableUpdatedEvent.h b/cpp/src/scheduler/event/TaskTableUpdatedEvent.h index 86583162..f96c3067 100644 --- a/cpp/src/scheduler/event/TaskTableUpdatedEvent.h +++ b/cpp/src/scheduler/event/TaskTableUpdatedEvent.h @@ -17,6 +17,13 @@ public: explicit TaskTableUpdatedEvent(std::weak_ptr resource) : Event(EventType::TASK_TABLE_UPDATED, std::move(resource)) {} + + inline std::string + Dump() const override { + return ""; + } + + friend std::ostream &operator<<(std::ostream &out, const TaskTableUpdatedEvent &event); }; -- GitLab