Merge remote-tracking branch 'origin/master'

db/vlog_set.h

@@ -65,7 +65,7 @@ friend class gc_executor;
   int counter = 0;
   std::mutex counter_latch_;
   std::mutex finished_latch_;
-  bool finished = false;
+  bool finished = true;
 
   VlogGC *vlog_gc;  // 仅声明为指针，具体定义放在 vlog_set.cpp
 };

test/db_test3.cc

@@ -104,7 +104,7 @@ std::vector FindKeysByField(leveldb::DB* db, const Field& field) {
   for (it->SeekToFirst(); it->Valid()   ; it->Next()) {
     std::string key = it->key().ToString();
     FieldArray fields;
-    db->Get_Fields(leveldb::ReadOptions(), key, &fields);
+    db->Get_Fields(leveldb::ReadOptions(), key, fields);
     for (const auto& f : fields) {
       if (f.name == field.name && f.value == field.value) {
         keys.push_back(key);
@@ -150,7 +150,7 @@ void TestLatency(leveldb::DB* db, int num_operations, std::vector& lat_
     std::string key = "key_" + std::to_string(i);
     FieldArray fields = {{"name", "Customer" + std::to_string(i)}, {"address", "Address" + std::to_string(i)}, {"phone", "1234567890"}};
     db->Put_Fields(writeOptions, key, fields);
-    db->Get_Fields(leveldb::ReadOptions(), key, &fields);
+    db->Get_Fields(leveldb::ReadOptions(), key, fields);
 
     end_time = std::chrono::steady_clock::now();
     latency = std::chrono::duration_cast<std::chrono::milliseconds>(
@@ -210,8 +210,8 @@ TEST(TestSchema, Basic) {
   // 读取并反序列化
   FieldArray fields_ret_0;
   FieldArray fields_ret_1;
-  db->Get_Fields(leveldb::ReadOptions(), key0, &fields_ret_0);
-  db->Get_Fields(leveldb::ReadOptions(), key1, &fields_ret_1);
+  db->Get_Fields(leveldb::ReadOptions(), key0, fields_ret_0);
+  db->Get_Fields(leveldb::ReadOptions(), key1, fields_ret_1);
 
 
   // 检查反序列化结果