Fix BlobDB::Get which only get out the value offset

Blob db use StackableDB::get which only get out the value offset, but not the value. Fix by making BlobDB::Get override the designated getter.
facebook · Jul 12, 2017 · 14ad364 · 14ad364
1 parent f2af4f7
commit 14ad364
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/utilities/blob_db/blob_db.h b/utilities/blob_db/blob_db.h
@@ -134,7 +134,7 @@ class BlobDB : public StackableDB {
   using rocksdb::StackableDB::Get;
   virtual Status Get(const ReadOptions& options,
                      ColumnFamilyHandle* column_family, const Slice& key,
-                     std::string* value) override = 0;
+                     PinnableSlice* value) override = 0;
 
   using rocksdb::StackableDB::MultiGet;
   virtual std::vector<Status> MultiGet(

diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc
@@ -1326,7 +1326,7 @@ Status BlobDBImpl::CommonGet(const ColumnFamilyData* cfd, const Slice& key,
 
 Status BlobDBImpl::Get(const ReadOptions& options,
                        ColumnFamilyHandle* column_family, const Slice& key,
-                       std::string* value) {
+                       PinnableSlice* value) {
   auto cfh = reinterpret_cast<ColumnFamilyHandleImpl*>(column_family);
   auto cfd = cfh->cfd();
 
@@ -1341,7 +1341,8 @@ Status BlobDBImpl::Get(const ReadOptions& options,
     return s;
   }
 
-  s = CommonGet(cfd, key, index_entry, value);
+  s = CommonGet(cfd, key, index_entry, value->GetSelf());
+  value->PinSelf();
   return s;
 }
 

diff --git a/utilities/blob_db/blob_db_impl.h b/utilities/blob_db/blob_db_impl.h
@@ -162,7 +162,7 @@ class BlobDBImpl : public BlobDB {
 
   using rocksdb::StackableDB::Get;
   Status Get(const ReadOptions& options, ColumnFamilyHandle* column_family,
-             const Slice& key, std::string* value) override;
+             const Slice& key, PinnableSlice* value) override;
 
   using rocksdb::StackableDB::NewIterator;
   virtual Iterator* NewIterator(const ReadOptions& opts,