File tree 4 files changed +7
-3
lines changed
4 files changed +7
-3
lines changed Original file line number Diff line number Diff line change 1
- lmdb
1
+ rocksdb
Original file line number Diff line number Diff line change 223
223
ifeq ($(storage_engine ) , rocksdb)
224
224
STORAGE_ENGINE =$(ROCKSDB_LIBA )
225
225
STORAGE_ENGINE_PATH =$(ROCKSDB_PATH )
226
- INCS+ =-I${ROCKSDB_PATH}/include
226
+ INCS+ =-I${ROCKSDB_PATH}/include -I${ROCKSDB_PATH}
227
227
LIBS: = ${ROCKSDB_LIBA} ${SNAPPY_LIBA} ${LIBS} -lz -lbz2
228
228
CXXFLAGS+ =-D__USE_ROCKSDB__ -std=c++11
229
229
else
Original file line number Diff line number Diff line change @@ -299,7 +299,9 @@ OP_NAMESPACE_BEGIN
299
299
{
300
300
if (k.GetType () != KEY_META)
301
301
{
302
- iter->Next ();
302
+ // iter->Next();
303
+ KeyObject next (ctx.ns , KEY_END, k.GetKey ());
304
+ iter->Jump (next);
303
305
continue ;
304
306
}
305
307
k.GetKey ().ToString (match_element);
Original file line number Diff line number Diff line change 36
36
#include " thread/spin_mutex_lock.hpp"
37
37
#include " db/db.hpp"
38
38
39
+
39
40
OP_NAMESPACE_BEGIN
40
41
41
42
static inline rocksdb::Slice to_rocksdb_slice (const Slice& slice)
@@ -1309,6 +1310,7 @@ OP_NAMESPACE_BEGIN
1309
1310
std::map<rocksdb::MemoryUtil::UsageType, uint64_t > usage_by_type;
1310
1311
std::unordered_set<const rocksdb::Cache*> cache_set;
1311
1312
std::vector<rocksdb::DB*> dbs (1 , m_db);
1313
+ cache_set.insert (m_db->GetDBOptions ().row_cache .get ());
1312
1314
rocksdb::MemoryUtil::GetApproximateMemoryUsageByType (dbs, cache_set, &usage_by_type);
1313
1315
for (size_t i = 0 ; i < rocksdb::MemoryUtil::kNumUsageTypes ; ++i)
1314
1316
{
You can’t perform that action at this time.
0 commit comments