diff --git a/core/src/scheduler/CircleQueue.h b/core/src/scheduler/CircleQueue.h
index 174ca0880e9a29120f5ee1e4cfb9193ed6a48742..1bdfcdcfb5f0bbe30bd04a7cc35d8a7b15c691a4 100644
--- a/core/src/scheduler/CircleQueue.h
+++ b/core/src/scheduler/CircleQueue.h
@@ -44,27 +44,27 @@ class CircleQueue {
     CircleQueue(CircleQueue&& q) = delete;
 
  public:
-    const_reference operator[](size_type n) {
+    const_reference operator[](size_type n) const {
         return data_[n % capacity_];
     }
 
     size_type
-    front() {
+    front() const {
         return front_.load(MEMORY_ORDER);
     }
 
     size_type
-    rear() {
+    rear() const {
         return rear_;
     }
 
     size_type
-    size() {
+    size() const {
         return size_;
     }
 
     size_type
-    capacity() {
+    capacity() const {
         return capacity_;
     }
 
diff --git a/core/src/scheduler/ResourceMgr.cpp b/core/src/scheduler/ResourceMgr.cpp
index ea5e3171d2e74b1fcb1eb8b39802f33ab368f056..63ead95ec3a3fa2dd10668e1a8861983044875ce 100644
--- a/core/src/scheduler/ResourceMgr.cpp
+++ b/core/src/scheduler/ResourceMgr.cpp
@@ -186,7 +186,7 @@ ResourceMgr::DumpTaskTables() {
     ss << ">>>>>>>>>>>>>>>ResourceMgr::DumpTaskTable<<<<<<<<<<<<<<<" << std::endl;
     for (auto& resource : resources_) {
         ss << resource->name() << std::endl;
-        ss << resource->task_table().Dump().dump();
+        ss << resource->task_table().Dump().dump() << std::endl;
         ss << resource->name() << std::endl << std::endl;
     }
     return ss.str();
diff --git a/core/src/scheduler/TaskTable.cpp b/core/src/scheduler/TaskTable.cpp
index 2f2874dc6ef933c7e76f19c067ed006504a425ed..370889ecd9ecdb771d5673e97b8be3f9c9dbe910 100644
--- a/core/src/scheduler/TaskTable.cpp
+++ b/core/src/scheduler/TaskTable.cpp
@@ -17,6 +17,7 @@
 #include "utils/Log.h"
 #include "utils/TimeRecorder.h"
 
+#include <src/scheduler/task/SearchTask.h>
 #include <ctime>
 #include <sstream>
 #include <vector>
@@ -170,7 +171,6 @@ TaskTable::PickToLoad(uint64_t limit) {
         }
         if (not cross && table_[index]->IsFinish()) {
             table_.set_front(index);
-            table_[index]->SetFinished(FinishedTask::Create());
         } else if (table_[index]->state == TaskTableItemState::LOADED) {
             cross = true;
             ++loaded_count;
@@ -258,7 +258,6 @@ TaskTable::PickToExecute(uint64_t limit) {
 
         if (not cross && table_[index]->IsFinish()) {
             table_.set_front(index);
-            table_[index]->SetFinished(FinishedTask::Create());
         } else if (table_[index]->state == TaskTableItemState::LOADED) {
             cross = true;
             indexes.push_back(index);
diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp
index e9bac9e2d4721a013b32546f9ab6bf5d04a87a27..f9ccaa9abbad509ad877dd77edda6561d7f1ae0b 100644
--- a/core/src/scheduler/resource/Resource.cpp
+++ b/core/src/scheduler/resource/Resource.cpp
@@ -12,6 +12,7 @@
 #include "scheduler/resource/Resource.h"
 #include "scheduler/SchedInst.h"
 #include "scheduler/Utils.h"
+#include "scheduler/task/FinishedTask.h"
 
 #include <iostream>
 #include <limits>
@@ -173,6 +174,7 @@ Resource::loader_function() {
             task_item->Loaded();
             if (task_item->from) {
                 task_item->from->Moved();
+                //                task_item->from->task = FinishedTask::Create();
                 task_item->from = nullptr;
             }
             if (subscriber_) {
@@ -202,6 +204,7 @@ Resource::executor_function() {
             }
             auto start = get_current_timestamp();
             Process(task_item->task);
+            //            task_item->task = FinishedTask::Create();
             auto finish = get_current_timestamp();
             ++total_task_;
             total_cost_ += finish - start;
diff --git a/core/src/scheduler/resource/Resource.h b/core/src/scheduler/resource/Resource.h
index d2a5cfa4333892ce8b92b35d0e1f6eac6e5e25f9..60e79b033d15e6c32e24e8006e853a71ddf20eae 100644
--- a/core/src/scheduler/resource/Resource.h
+++ b/core/src/scheduler/resource/Resource.h
@@ -29,8 +29,7 @@
 #include "Connection.h"
 #include "Node.h"
 
-namespace milvus {
-namespace scheduler {
+namespace milvus::scheduler {
 
 // TODO(wxyu): Storage, Route, Executor
 enum class ResourceType {
@@ -197,5 +196,4 @@ class Resource : public Node, public std::enable_shared_from_this<Resource> {
 using ResourcePtr = std::shared_ptr<Resource>;
 using ResourceWPtr = std::weak_ptr<Resource>;
 
-}  // namespace scheduler
-}  // namespace milvus
+}  // namespace milvus::scheduler
diff --git a/core/src/storage/ExtraFileInfo.cpp b/core/src/storage/ExtraFileInfo.cpp
index 77bf4acfbb845cbe86ca2987f9a8b887bb699ab2..7e647239d14538889cd1b64e01091c9a6825768e 100644
--- a/core/src/storage/ExtraFileInfo.cpp
+++ b/core/src/storage/ExtraFileInfo.cpp
@@ -44,6 +44,7 @@ CheckMagic(const storage::FSHandlerPtr& fs_ptr, const std::string& file_path) {
     bool result = !strcmp(ch, MAGIC);
 
     fs_ptr->reader_ptr_->Close();
+    free(ch);
     return result;
 }
 
@@ -83,7 +84,7 @@ ReadHeaderValues(const storage::FSHandlerPtr& fs_ptr, const std::string& file_pa
         result.insert(std::make_pair(pair[0], pair[1]));
     }
     fs_ptr->reader_ptr_->Close();
-
+    free(ch);
     return result;
 }
 
@@ -109,7 +110,7 @@ CalculateSum(const storage::FSHandlerPtr& fs_ptr, const std::string& file_path,
     fs_ptr->reader_ptr_->Read(ch, size);
     std::uint8_t result = crc32c::Crc32c(ch, size);
     fs_ptr->reader_ptr_->Close();
-
+    free(ch);
     return result;
 }
 
@@ -148,6 +149,7 @@ CheckSum(const storage::FSHandlerPtr& fs_ptr, const std::string& file_path) {
     fs_ptr->reader_ptr_->Close();
 
     auto sum = static_cast<uint8_t>(atoi(record));
+    free(record);
     return sum == result;
 }