From 7c3a673bfe57d300b4c6410793c81eb7724f53d7 Mon Sep 17 00:00:00 2001
From: "shengjun.li" <49774184+shengjun1985@users.noreply.github.com>
Date: Fri, 13 Mar 2020 11:56:12 +0800
Subject: [PATCH] check table lsn (#1622)

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>

Co-authored-by: Jin Hai <hai.jin@zilliz.com>
---
 CHANGELOG.md                   |  1 +
 core/src/db/wal/WalManager.cpp |  4 ++-
 core/unittest/db/test_wal.cpp  | 49 ++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a332f5df0..8d2398058d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Please mark all change in change log and use the issue from GitHub
 # Milvus 0.7.1 (TBD)
 
 ## Bug
+-   \#1301 Data in WAL may be accidentally inserted into a new table with the same name.
 -   \#1634 Fix search demo bug in HTTP doc
 -   \#1635 Vectors can be returned by searching after vectors deleted if `cache_insert_data` set true
 
diff --git a/core/src/db/wal/WalManager.cpp b/core/src/db/wal/WalManager.cpp
index c3f6c75bc6..aed2bd99fc 100644
--- a/core/src/db/wal/WalManager.cpp
+++ b/core/src/db/wal/WalManager.cpp
@@ -189,7 +189,9 @@ WalManager::GetNextRecord(MXLogRecord& record) {
         std::lock_guard<std::mutex> lck(mutex_);
         auto it = tables_.find(record.table_id);
         if (it != tables_.end()) {
-            break;
+            if (it->second.flush_lsn < record.lsn) {
+                break;
+            }
         }
     }
 
diff --git a/core/unittest/db/test_wal.cpp b/core/unittest/db/test_wal.cpp
index e2353d6932..9d3a35e658 100644
--- a/core/unittest/db/test_wal.cpp
+++ b/core/unittest/db/test_wal.cpp
@@ -637,6 +637,55 @@ TEST(WalTest, MANAGER_TEST) {
     ASSERT_TRUE(record.table_id.empty());
 }
 
+TEST(WalTest, MANAGER_SAME_NAME_TABLE) {
+    MakeEmptyTestPath();
+
+    milvus::engine::DBMetaOptions opt = {WAL_GTEST_PATH};
+    milvus::engine::meta::MetaPtr meta = std::make_shared<milvus::engine::meta::TestWalMeta>(opt);
+
+    milvus::engine::wal::MXLogConfiguration wal_config;
+    wal_config.mxlog_path = WAL_GTEST_PATH;
+    wal_config.buffer_size = 64;
+    wal_config.recovery_error_ignore = true;
+
+    // first run
+    std::shared_ptr<milvus::engine::wal::WalManager> manager =
+        std::make_shared<milvus::engine::wal::WalManager>(wal_config);
+    ASSERT_EQ(manager->Init(meta), milvus::WAL_SUCCESS);
+
+    // adjest the buffer size for test
+    manager->mxlog_config_.buffer_size = 16384;
+    manager->p_buffer_->mxlog_buffer_size_ = 16384;
+
+    std::string table_id_1 = "table1";
+    std::string table_id_2 = "table2";
+    std::vector<int64_t> ids(1024, 0);
+    std::vector<uint8_t> data_byte(1024 * 512, 0);
+
+    // create 2 tables
+    manager->CreateTable(table_id_1);
+    manager->CreateTable(table_id_2);
+
+    // command
+    ASSERT_TRUE(manager->Insert(table_id_1, "", ids, data_byte));
+    ASSERT_TRUE(manager->Insert(table_id_2, "", ids, data_byte));
+    ASSERT_TRUE(manager->DeleteById(table_id_1, ids));
+    ASSERT_TRUE(manager->DeleteById(table_id_2, ids));
+
+    // re-create table
+    manager->DropTable(table_id_1);
+    manager->CreateTable(table_id_1);
+
+    milvus::engine::wal::MXLogRecord record;
+    while (1) {
+        ASSERT_EQ(manager->GetNextRecord(record), milvus::WAL_SUCCESS);
+        if (record.type == milvus::engine::wal::MXLogType::None) {
+            break;
+        }
+        ASSERT_EQ(record.table_id, table_id_2);
+    }
+}
+
 #if 0
 TEST(WalTest, LargeScaleRecords) {
     std::string data_path = "/home/zilliz/workspace/data/";