review rework, added serverassert default switch case,removed debug p…

…rints, removed unwanted reset of pointers
Snapchat · Nov 17, 2023 · 1d59efb · 1d59efb
1 parent b6b7b1b
commit 1d59efb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/db.cpp b/src/db.cpp
@@ -3472,11 +3472,8 @@ void redisDbPersistentData::processStorageToken(StorageToken *tok) {
         tok->db->m_spstorage->complete_endWriteBatch(tok);
         break;
     }
-    case StorageToken::TokenType::SingleWrite:
-    {
-        break;
-    }
     default:
+        serverAssert((tok->type == StorageToken::TokenType::SingleRead) || (tok->type == StorageToken::TokenType::BatchWrite));
         break;
     } //switch end
 

diff --git a/src/storage/rocksdb.cpp b/src/storage/rocksdb.cpp
@@ -258,15 +258,9 @@ void RocksDBStorageProvider::endWriteBatch()
 struct BatchStorageToken : public StorageToken {
     std::shared_ptr<rocksdb::DB> tspdb;    // Note: This must be first so it is deleted last
     std::unique_ptr<rocksdb::WriteBatchWithIndex> tspbatch;
-    ~BatchStorageToken(){
-        tspdb.reset();
-        tspdb = nullptr;
-        tspbatch = nullptr;
-    }
 };
 
 StorageToken* RocksDBStorageProvider::begin_endWriteBatch(struct aeEventLoop *el, aePostFunctionTokenProc* callback){
-    serverLog(LL_WARNING, "RocksDBStorageProvider::begin_endWriteBatch");
     BatchStorageToken *tok = new BatchStorageToken();
     tok->tspbatch = std::move(m_spbatch);
     tok->tspdb = m_spdb;
@@ -281,7 +275,6 @@ StorageToken* RocksDBStorageProvider::begin_endWriteBatch(struct aeEventLoop *el
 }
 
 void RocksDBStorageProvider::complete_endWriteBatch(StorageToken* tok){
-    serverLog(LL_WARNING, "RocksDBStorageProvider::complete_endWriteBatch");
     delete tok;
     tok = nullptr;
 }