From: Haomai Wang <haomai@xsky.com>
Date: Wed, 26 Apr 2017 02:24:45 +0000 (+0800)
Subject: kv/RocksDBStore: make non-contiguous bl calls with SliceParts to avoid copy
X-Git-Tag: v12.1.0~57^2~5^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=021f0605ed281bf8cf7673501569a27919b81d22;p=ceph.git

kv/RocksDBStore: make non-contiguous bl calls with SliceParts to avoid copy

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index 81577401f124..fa138e029320 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -34,6 +34,17 @@ using std::string;
 #undef dout_prefix
 #define dout_prefix *_dout << "rocksdb: "
 
+static rocksdb::SliceParts prepare_sliceparts(const bufferlist &bl, rocksdb::Slice *slices)
+{
+  unsigned n = 0;
+  for (std::list<buffer::ptr>::const_iterator p = bl.buffers().begin();
+       p != bl.buffers().end(); ++p, ++n) {
+    slices[n].data_ = p->c_str();
+    slices[n].size_ = p->length();
+  }
+  return rocksdb::SliceParts(slices, n);
+}
+
 //
 // One of these per rocksdb instance, implements the merge operator prefix stuff
 //
@@ -556,10 +567,10 @@ void RocksDBStore::RocksDBTransactionImpl::set(
 	     rocksdb::Slice(to_set_bl.buffers().front().c_str(),
 			    to_set_bl.length()));
   } else {
-    // make a copy
-    bufferlist val = to_set_bl;
-    bat.Put(rocksdb::Slice(key),
-	     rocksdb::Slice(val.c_str(), val.length()));
+    rocksdb::Slice key_slice(key);
+    rocksdb::Slice value_slices[to_set_bl.buffers().size()];
+    bat.Put(nullptr, rocksdb::SliceParts(&key_slice, 1),
+            prepare_sliceparts(to_set_bl, value_slices));
   }
 }
 
@@ -577,10 +588,10 @@ void RocksDBStore::RocksDBTransactionImpl::set(
 	     rocksdb::Slice(to_set_bl.buffers().front().c_str(),
 			    to_set_bl.length()));
   } else {
-    // make a copy
-    bufferlist val = to_set_bl;
-    bat.Put(rocksdb::Slice(key),
-	     rocksdb::Slice(val.c_str(), val.length()));
+    rocksdb::Slice key_slice(key);
+    rocksdb::Slice value_slices[to_set_bl.buffers().size()];
+    bat.Put(nullptr, rocksdb::SliceParts(&key_slice, 1),
+            prepare_sliceparts(to_set_bl, value_slices));
   }
 }
 
@@ -648,9 +659,10 @@ void RocksDBStore::RocksDBTransactionImpl::merge(
 			    to_set_bl.length()));
   } else {
     // make a copy
-    bufferlist val = to_set_bl;
-    bat.Merge(rocksdb::Slice(key),
-	     rocksdb::Slice(val.c_str(), val.length()));
+    rocksdb::Slice key_slice(key);
+    rocksdb::Slice value_slices[to_set_bl.buffers().size()];
+    bat.Merge(nullptr, rocksdb::SliceParts(&key_slice, 1),
+              prepare_sliceparts(to_set_bl, value_slices));
   }
 }