完成对batch的拆解

andrewbytecoder · andrewbytecoder · commit ca5ff82e3d33 · 2023-12-29T11:09:51.000+08:00
diff --git a/demo/batch_test/write_batch_demo.cpp b/demo/batch_test/write_batch_demo.cpp
@@ -108,7 +108,7 @@ namespace WRITE_BATCH_DEMO {
 
 
     WriteBatch::WriteBatch() {
-        //Clear();
+        Clear();
     }
 
     WriteBatch::~WriteBatch() = default;
@@ -155,6 +155,7 @@ namespace WRITE_BATCH_DEMO {
         }
 
         // 2. 剔除序列化相关的无用数据
+        input.remove_prefix(kHeader);
         leveldb::Slice key, value;
         int32_t found = 0;
 
diff --git a/demo/batch_test/write_batch_internal_demo.cpp b/demo/batch_test/write_batch_internal_demo.cpp
@@ -21,7 +21,7 @@ uint32_t WriteBatchInternal::Count(const WriteBatch *batch) {
 void WriteBatchInternal::SetCount(WriteBatch *batch, uint32_t n) {
     // 前面8byte sequence number
     // 这里和上边的去比啊，这里使用[]取值是因为[]取出的非const 引用
-    auto *const buffer =  reinterpret_cast<uint8_t *>(batch->rep_[8]);
+    auto *const buffer =  reinterpret_cast<uint8_t *>(&batch->rep_[8]);
     // 将uint32_t类型数据每8个字节存储到一个chat里面
     buffer[0] = static_cast<uint8_t>(n);
     buffer[1] = static_cast<uint8_t>(n >> 8);
diff --git a/demo/batch_test/write_batch_main.cpp b/demo/batch_test/write_batch_main.cpp
@@ -17,34 +17,35 @@ class HandlerDemo : public WRITE_BATCH_DEMO::WriteBatch::Handler {
     }
 
     void Delete(const leveldb::Slice &key) override {
-        std::cout << "put : " << key.ToString() << std::endl;
+        std::cout << "Delete : " << key.ToString() << std::endl;
 
     }
 };
 
 
 int main(int argc, char **argv) {
 
-
-    int x = 12;
-
     WRITE_BATCH_DEMO::WriteBatch batch;
+    WRITE_BATCH_DEMO::WriteBatch batch1;
     HandlerDemo handler;
 
     //
     auto key = leveldb::Slice("xiaoming");
     auto value = leveldb::Slice("21");
     batch.Put(key, value);
-    //batch.Put(leveldb::Slice("xiaohong"), leveldb::Slice("21"));
-    //batch.Put(leveldb::Slice("wanger"), leveldb::Slice("21"));
-    //batch.Put(leveldb::Slice("daxiong"), leveldb::Slice("21"));
-    //
-    //batch.Delete("xiaoming");
-    //
-    //batch.Iterate(&handler);
+    batch.Put(leveldb::Slice("xiaohong"), leveldb::Slice("21"));
+    batch.Put(leveldb::Slice("wanger"), leveldb::Slice("22"));
+    batch.Put(leveldb::Slice("daxiong"), leveldb::Slice("24"));
+
+    batch1.Put(leveldb::Slice("Batch1ForTest"), leveldb::Slice("18"));
 
+    batch.Delete("xiaoming");
 
+    std::cout << batch.ApproximateSize() << std::endl;
+    batch.Append(batch1);
+    std::cout << batch.ApproximateSize() << std::endl;
 
+    std::cout << batch.Iterate(&handler).ToString() << std::endl;
 
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace WRITE_BATCH_DEMO {`
`108`	`108`
`109`	`109`
`110`	`110`	`WriteBatch::WriteBatch() {`
`111`		`- //Clear();`
	`111`	`+ Clear();`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`WriteBatch::~WriteBatch() = default;`
`@@ -155,6 +155,7 @@ namespace WRITE_BATCH_DEMO {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`// 2. 剔除序列化相关的无用数据`
	`158`	`+ input.remove_prefix(kHeader);`
`158`	`159`	`leveldb::Slice key, value;`
`159`	`160`	`int32_t found = 0;`
`160`	`161`