From 14ba38b465691d8e43fea63479d27ca37f063e7c Mon Sep 17 00:00:00 2001 From: Gordon Hall Date: Wed, 1 Feb 2017 12:52:18 -0500 Subject: [PATCH] get compactRange working --- src/database.cc | 1 - src/database_async.cc | 13 ++++++++----- src/database_async.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/database.cc b/src/database.cc index 647960a5..30ce9ffe 100644 --- a/src/database.cc +++ b/src/database.cc @@ -441,7 +441,6 @@ NAN_METHOD(Database::CompactRange) { v8::Local endHandle = info[1].As(); LD_METHOD_SETUP_COMMON(compactRange, -1, 2) - LD_STRING_OR_BUFFER_TO_SLICE(start, startHandle, start) LD_STRING_OR_BUFFER_TO_SLICE(end, endHandle, end) diff --git a/src/database_async.cc b/src/database_async.cc index 0408c072..b2a7798a 100644 --- a/src/database_async.cc +++ b/src/database_async.cc @@ -280,21 +280,24 @@ CompactRangeWorker::CompactRangeWorker ( { Nan::HandleScope scope; - SaveToPersistent("start", startHandle); - SaveToPersistent("end", endHandle); + rangeStart = start; + rangeEnd = end; + + SaveToPersistent("compactStart", startHandle); + SaveToPersistent("compactEnd", endHandle); }; CompactRangeWorker::~CompactRangeWorker () {} void CompactRangeWorker::Execute () { - database->CompactRangeFromDatabase(&start, &end); + database->CompactRangeFromDatabase(&rangeStart, &rangeEnd); } void CompactRangeWorker::WorkComplete() { Nan::HandleScope scope; - DisposeStringOrBufferFromSlice(GetFromPersistent("start"), start); - DisposeStringOrBufferFromSlice(GetFromPersistent("end"), end); + DisposeStringOrBufferFromSlice(GetFromPersistent("compactStart"), rangeStart); + DisposeStringOrBufferFromSlice(GetFromPersistent("compactEnd"), rangeEnd); AsyncWorker::WorkComplete(); } diff --git a/src/database_async.h b/src/database_async.h index 09b6205a..3ea29d14 100644 --- a/src/database_async.h +++ b/src/database_async.h @@ -179,8 +179,8 @@ class CompactRangeWorker : public AsyncWorker { virtual void WorkComplete (); private: - leveldb::Slice start; - leveldb::Slice end; + leveldb::Slice rangeStart; + leveldb::Slice rangeEnd; };