check memory buffer first and add test case

vesoft-inc · Jul 2, 2021 · 17290e1 · 17290e1
1 parent 046b522
commit 17290e1
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/src/kvstore/raftex/RaftPart.cpp b/src/kvstore/raftex/RaftPart.cpp
@@ -1584,7 +1584,7 @@ void RaftPart::processAppendLogRequest(
                                             req.get_log_str_list().end());
 
     // may be need to rollback wal_
-    if (!( req.get_last_log_id_sent() == wal_->lastLogId() && req.get_last_log_term_sent() == wal_->lastLogTerm())) {
+    if (!(req.get_last_log_id_sent() == lastLogId_ && req.get_last_log_term_sent() == lastLogTerm_)) {
         // check the diff index in log
         size_t diffIndex = 0;
         {

diff --git a/src/kvstore/wal/FileBasedWal.cpp b/src/kvstore/wal/FileBasedWal.cpp
@@ -793,6 +793,14 @@ size_t FileBasedWal::accessAllBuffers(std::function<bool(BufferPtr buffer)> fn)
 }
 
 TermID FileBasedWal::getLogTerm(LogID id) {
+    // check the memory log buffer
+    for (auto it = buffers_.rbegin(); it != buffers_.rend(); ++it) {
+        auto buffer = *it;
+        if (id >= buffer->firstLogId() && id <= buffer->lastLogId()) {
+            return buffer->getTerm(id - buffer->firstLogId());
+        }
+    }
+    // check the log file
     TermID term = -1;
     auto walIter = std::make_unique<FileBasedWalIterator>(shared_from_this(), id, id);
     if (walIter->valid()) {

diff --git a/src/kvstore/wal/test/FileBasedWalTest.cpp b/src/kvstore/wal/test/FileBasedWalTest.cpp
@@ -578,6 +578,44 @@ TEST(FileBasedWal, LinkTest) {
     EXPECT_EQ(num + 1, wal->walFiles_.size());
 }
 
+TEST(FileBasedWal, getLogTermTest) {
+    FileBasedWalPolicy policy;
+    policy.fileSize = 1024L * 1024L;
+    policy.bufferSize = 1024L * 1024L;
+    policy.numBuffers = 2;
+
+    TempDir walDir("/tmp/testWal.XXXXXX");
+    auto wal = FileBasedWal::getWal(walDir.path(),
+                                    "",
+                                    policy,
+                                    [](LogID, TermID, ClusterID, const std::string&) {
+                                        return true;
+                                    });
+
+    // Append > 10MB logs in total
+    for (int i = 1; i <= 10000; i++) {
+        ASSERT_TRUE(wal->appendLog(i /*id*/, i /*term*/, 0 /*cluster*/,
+                                   folly::stringPrintf(kLongMsg, i)));
+    }
+
+    // in the memory buffer
+    ASSERT_EQ(10000, wal->getLogTerm(10000));
+    // in the file
+    ASSERT_EQ(4, wal->getLogTerm(4));
+
+    // Close the wal
+    wal.reset();
+
+    // Now let's open it to read
+    wal = FileBasedWal::getWal(walDir.path(),
+                               "",
+                               policy,
+                               [](LogID, TermID, ClusterID, const std::string&) {
+                                   return true;
+                               });
+    EXPECT_EQ(10, wal->getLogTerm(10));
+}
+
 }  // namespace wal
 }  // namespace nebula