From 0c7c4586c059a5fcb4f46bf0003a6bfce596d043 Mon Sep 17 00:00:00 2001
From: groot <yihua.mo@zilliz.com>
Date: Mon, 25 Nov 2019 16:41:48 +0800
Subject: [PATCH] #513 DELETE_BY_RANGE sometimes failed

---
 CHANGELOG.md           |  1 +
 core/src/db/DBImpl.cpp | 14 +++++++++-----
 core/src/db/DBImpl.h   |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53e427dcb9..84bd8aed51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#440 - Server cannot startup with gpu_resource_config.enable=false in GPU version
 - \#458 - Index data is not compatible between 0.5 and 0.6
 - \#486 - gpu no usage during index building
+- \#513 - DELETE_BY_RANGE sometimes failed
 
 ## Feature
 - \#12 - Pure CPU version for Milvus
diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp
index 51ea665064..1c18c22409 100644
--- a/core/src/db/DBImpl.cpp
+++ b/core/src/db/DBImpl.cpp
@@ -105,7 +105,8 @@ DBImpl::Stop() {
     shutting_down_.store(true, std::memory_order_release);
 
     // makesure all memory data serialized
-    MemSerialize();
+    std::set<std::string> sync_table_ids;
+    SyncMemData(sync_table_ids);
 
     // wait compaction/buildindex finish
     bg_timer_thread_.join();
@@ -329,7 +330,10 @@ DBImpl::CreateIndex(const std::string& table_id, const TableIndex& index) {
         return SHUTDOWN_ERROR;
     }
 
-    Status status;
+    // serialize memory data
+    std::set<std::string> sync_table_ids;
+    auto status = SyncMemData(sync_table_ids);
+
     {
         std::unique_lock<std::mutex> lock(build_index_mutex_);
 
@@ -588,12 +592,12 @@ DBImpl::StartMetricTask() {
 }
 
 Status
-DBImpl::MemSerialize() {
+DBImpl::SyncMemData(std::set<std::string>& sync_table_ids) {
     std::lock_guard<std::mutex> lck(mem_serialize_mutex_);
     std::set<std::string> temp_table_ids;
     mem_mgr_->Serialize(temp_table_ids);
     for (auto& id : temp_table_ids) {
-        compact_table_ids_.insert(id);
+        sync_table_ids.insert(id);
     }
 
     if (!temp_table_ids.empty()) {
@@ -612,7 +616,7 @@ DBImpl::StartCompactionTask() {
     }
 
     // serialize memory data
-    MemSerialize();
+    SyncMemData(compact_table_ids_);
 
     // compactiong has been finished?
     {
diff --git a/core/src/db/DBImpl.h b/core/src/db/DBImpl.h
index bff56efded..82a5d3096b 100644
--- a/core/src/db/DBImpl.h
+++ b/core/src/db/DBImpl.h
@@ -150,7 +150,7 @@ class DBImpl : public DB {
     BackgroundBuildIndex();
 
     Status
-    MemSerialize();
+    SyncMemData(std::set<std::string>& sync_table_ids);
 
     Status
     GetFilesToBuildIndex(const std::string& table_id, const std::vector<int>& file_types,