kv/RocksDBStore: replace deprecated calls

rocksdb::DB::CompactRange(Slice*, Slice*) is deprecated, so replace
it with its equivalent.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-01-12 11:26:47 +08:00
parent 1e426be033
commit d54a747c16

View File

@ -456,7 +456,8 @@ int RocksDBStore::split_key(rocksdb::Slice in, string *prefix, string *key)
void RocksDBStore::compact() void RocksDBStore::compact()
{ {
logger->inc(l_rocksdb_compact); logger->inc(l_rocksdb_compact);
db->CompactRange(NULL, NULL); rocksdb::CompactRangeOptions options;
db->CompactRange(options, nullptr, nullptr);
} }
@ -529,9 +530,10 @@ bool RocksDBStore::check_omap_dir(string &omap_dir)
} }
void RocksDBStore::compact_range(const string& start, const string& end) void RocksDBStore::compact_range(const string& start, const string& end)
{ {
rocksdb::Slice cstart(start); rocksdb::CompactRangeOptions options;
rocksdb::Slice cend(end); rocksdb::Slice cstart(start);
db->CompactRange(&cstart, &cend); rocksdb::Slice cend(end);
db->CompactRange(options, &cstart, &cend);
} }
RocksDBStore::RocksDBWholeSpaceIteratorImpl::~RocksDBWholeSpaceIteratorImpl() RocksDBStore::RocksDBWholeSpaceIteratorImpl::~RocksDBWholeSpaceIteratorImpl()
{ {