1) fix some bugs introduced when we ported the code from v5.12.4 to v…

…6.2.2. 2) update test script. 3) split dcpmm pool into 16 files to speed up pmemobj_free()

.gitignore

@@ -74,3 +74,5 @@ tp2/
 fbcode/
 fbcode
 buckifier/*.pyc
+
+.vscode/*

db/db_impl.cc

@@ -567,10 +567,7 @@ Status DBImpl::CloseHelper() {
   }
 
 #ifdef KVS_ON_DCPMM
-  if (env_->pm_pool) {
-    pmemobj_close(env_->pm_pool);
-    env_->pm_pool = nullptr;
-  }
+  KVSClose();
 #endif
 
   ROCKS_LOG_INFO(immutable_db_options_.info_log, "Shutdown complete");

db/db_impl_open.cc

@@ -1203,21 +1203,20 @@ Status DBImpl::Open(const DBOptions& db_options, const std::string& dbname,
   }
 
 #ifdef KVS_ON_DCPMM
-  if (impl->immutable_db_options_.dcpmm_kvs_mmapped_file_fullpath != "" &&
-    impl->env_->pm_pool == NULL) {
-    impl->env_->pm_pool = KVSOpen(
+  if (impl->immutable_db_options_.dcpmm_kvs_mmapped_file_fullpath != "") {
+    int err = KVSOpen(
         impl->immutable_db_options_.dcpmm_kvs_mmapped_file_fullpath.data(),
         impl->immutable_db_options_.dcpmm_kvs_mmapped_file_size);
-    if (impl->env_->pm_pool == NULL) {
-      exit(1);
+    if (err != 0) {
+      return Status::IOError(std::string("failed to open '")
+        .append(impl->immutable_db_options_.dcpmm_kvs_mmapped_file_fullpath)
+        .append("'"));
     }
-    impl->env_->pool_uuid_lo = KVSGetUUID();
     KVSSetKVSValueThres(impl->immutable_db_options_.dcpmm_kvs_value_thres);
     KVSSetCompressKnob(impl->immutable_db_options_.dcpmm_compress_value);
   }
 #endif
 
-
   s = impl->CreateArchivalDirectory();
   if (!s.ok()) {
     delete impl;

db/write_batch.cc

@@ -652,14 +652,15 @@ Status WriteBatchInternal::Put(WriteBatch* b, uint32_t column_family_id,
 #ifdef KVS_ON_DCPMM
   static size_t thres = KVSGetKVSValueThres();
   static bool compress = KVSGetCompressKnob();
-  struct KVSHdr hdr;
+  struct KVSRef ref;
+  struct pobj_action* pact;
   if (KVSEnabled() && (value.size() >= thres) &&
-      KVSEncodeValue(value, compress, &hdr)) {
-    b->act_.push_back(hdr.pact);
-    PutLengthPrefixedSlice(&b->rep_, Slice((char*)(&hdr), sizeof(hdr)));
+      KVSEncodeValue(value, compress, &ref, &pact)) {
+    b->act_.push_back(pact);
+    PutLengthPrefixedSlice(&b->rep_, Slice((char*)(&ref), sizeof(ref)));
   } else {
-    hdr.base.encoding = kEncodingRawUncompressed;
-    PutLengthHdrPrefixedSlice(&b->rep_, &(hdr.base), value);
+    ref.hdr.encoding = kEncodingRawUncompressed;
+    PutLengthHdrPrefixedSlice(&b->rep_, &(ref.hdr), value);
   }
 #else
   PutLengthPrefixedSlice(&b->rep_, value);

db/write_batch_internal.h

@@ -81,13 +81,9 @@ class WriteBatchInternal {
 
   // Publish all the actions of a grouped batch
   static void DCPMMPublishActions(const WriteBatch* batch) {
-    std::vector<pobj_action *> a = batch->act_;
-    std::vector<pobj_action *>::iterator it;
-    for (it = a.begin(); it != a.end(); ++it) {
-      KVSPublish((struct pobj_action *)*it, 1);
-      free((void *)*it);
-    }
-    batch->act_.clear();
+    auto& pacts = batch->act_;
+    KVSPublish(pacts.data(), pacts.size());
+    pacts.clear();
   }
 #endif