code cleaning

kkli08 · Nov 2, 2024 · b290653 · b290653
1 parent 46efcd5
commit b290653
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/Memory/Memtable/Memtable.h b/Memory/Memtable/Memtable.h
@@ -39,9 +39,6 @@ class Memtable {
     // Flush the memtable to disk (SST file)
     void flushToDisk();
 
-    // set sstFileManager degree
-    void setSstFileManager_BTree_Degree(int degree) {sstFileManager->setDegree(degree);};
-
     // get current size
     int get_currentSize() const {return currentSize;};
 

diff --git a/Storage/SstFileManager/SstFileManager.cpp b/Storage/SstFileManager/SstFileManager.cpp
@@ -16,7 +16,7 @@ namespace fs = std::filesystem;
 
 // Constructor
 SSTFileManager::SSTFileManager(const std::string& dbDirectory)
-    : dbDirectory(dbDirectory), degree(degree) {
+    : dbDirectory(dbDirectory) {
     // std::cout << "SSTFileManager initialized with directory: " << dbDirectory << " and degree: " << degree << std::endl;
     // Ensure the database directory exists
     if (!fs::exists(dbDirectory)) {

diff --git a/Storage/SstFileManager/SstFileManager.h b/Storage/SstFileManager/SstFileManager.h
@@ -28,8 +28,6 @@ class SSTFileManager {
     // Scan keys within a range across all SST files
     void scan(const KeyValueWrapper& startKey, const KeyValueWrapper& endKey, std::vector<KeyValueWrapper>& result);
 
-    // set degree
-    void setDegree(int _degree) {degree = _degree;};
     // set path
     void setPath(string _path) {dbDirectory = _path;};
 
@@ -41,8 +39,6 @@ class SSTFileManager {
     // Directory where SST files are stored
     std::string dbDirectory;
 
-    // B+ tree degree
-    int degree;
 
     // List of SST files (DiskBTree instances)
     std::vector<std::shared_ptr<DiskBTree>> sstFiles;

diff --git a/kv/KeyValue.cpp b/kv/KeyValue.cpp
@@ -244,7 +244,8 @@ std::string KeyValueWrapper::keyValueTypeToString(KeyValue::KeyValueType type) c
 }
 
 size_t KeyValueWrapper::getSerializedSize() const {
-    return sizeof(kv.key_case()) + sizeof(kv.value_case()) + sizeof(kv.key_type()) + sizeof(kv.value_type()) + sizeof(size_t);
+    // sizeof kv pair + sequence number + tombstone
+    return sizeof(kv.key_case()) + sizeof(kv.value_case()) + sizeof(kv.key_type()) + sizeof(kv.value_type()) + sizeof(size_t) + sizeof(uint64_t);
 }