[fix][store] Fixup the dead loop

Author: visualYJD

src/engine/concurrency_manager.cc

@@ -22,11 +22,13 @@ namespace dingodb {
 // lock_entry.rw_lock has already write locked
 void ConcurrencyManager::LockKey(const std::string& key, LockEntryPtr lock_entry) {
   RWLockWriteGuard guard(&rw_lock_);
+
   lock_table_[key] = lock_entry;
 }
 
 void ConcurrencyManager::UnlockKeys(const std::vector<std::string>& keys) {
   RWLockWriteGuard guard(&rw_lock_);
+
   for (auto const& key : keys) {
     auto it = lock_table_.find(key);
     if (it != lock_table_.end()) {
@@ -42,6 +44,7 @@ bool ConcurrencyManager::CheckKeys(const std::vector<std::string>& keys, pb::sto
   std::vector<LockEntryPtr> lock_entrys;
   {
     RWLockReadGuard guard(&rw_lock_);
+
     for (auto const& key : keys) {
       auto it = lock_table_.find(key);
       if (it != lock_table_.end()) {
@@ -55,6 +58,7 @@ bool ConcurrencyManager::CheckKeys(const std::vector<std::string>& keys, pb::sto
       continue;
     }
     RWLockReadGuard guard(&lock_entry->rw_lock);
+
     if (TxnEngineHelper::CheckLockConflict(lock_entry->lock_info, isolation_level, start_ts, resolved_locks,
                                            txn_result_info)) {
       return true;
@@ -71,9 +75,11 @@ bool ConcurrencyManager::CheckRange(const std::string& start_key, const std::str
   std::vector<LockEntryPtr> lock_entrys;
   {
     RWLockReadGuard guard(&rw_lock_);
+
     auto it = lock_table_.lower_bound(start_key);
-    while (it != lock_table_.end() && it->first <= end_key) {
+    while (it != lock_table_.end() && it->first < end_key) {
       lock_entrys.push_back(it->second);
+      ++it;
     }
   }
 

src/engine/concurrency_manager.h

@@ -24,6 +24,7 @@
 #include "proto/store.pb.h"
 
 namespace dingodb {
+
 class ConcurrencyManager {
  public:
   ConcurrencyManager() = default;
@@ -43,7 +44,7 @@ class ConcurrencyManager {
     RWLock rw_lock;
     std::atomic<bool> is_deleted{false};  // Whether the marker has been is_deleted (i.e., removed from the map)
   };
-  
+
   using LockEntryPtr = std::shared_ptr<LockEntry>;
 
   void LockKey(const std::string& key, LockEntryPtr lock_entry);
@@ -58,9 +59,8 @@ class ConcurrencyManager {
                   int64_t start_ts, const std::set<int64_t>& resolved_locks, pb::store::TxnResultInfo& txn_result_info);
 
  private:
-  // key->lock_info  pb::store::LockInfo
-  std::map<std::string, LockEntryPtr>
-      lock_table_;  // Ordered storage of locked keys (supporting range queries)
+  // key->lock_info  Ordered storage of locked keys (supporting range queries)
+  std::map<std::string, LockEntryPtr> lock_table_;
   RWLock rw_lock_;
 };