Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce 'override' and 'final' keywords following C++ Core Guidelines #600

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Introduce 'override' and 'final' keywords following C++ Core Guidelines #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403f94a
Introduce 'override' and 'final' keywords following C++ Core Guidelines
vweevers Mar 9, 2019
85f90ab
Swap lines
vweevers Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ struct Database {
blockCache_(NULL),
filterPolicy_(leveldb::NewBloomFilterPolicy(10)),
currentIteratorId_(0),
priorityWork_(0),
pendingCloseWorker_(NULL) {}
pendingCloseWorker_(NULL),
priorityWork_(0) {}

~Database () {
if (db_ != NULL) {
Expand Down Expand Up @@ -461,7 +461,7 @@ struct PriorityWorker : public BaseWorker {
: BaseWorker(env, database, callback, resourceName) {
}

virtual ~PriorityWorker () {}
~PriorityWorker () {}

void Queue () final {
database_->IncrementPriorityWork();
Expand Down Expand Up @@ -755,7 +755,7 @@ NAPI_METHOD(db_init) {
/**
* Worker class for opening a database.
*/
struct OpenWorker : public BaseWorker {
struct OpenWorker final : public BaseWorker {
OpenWorker (napi_env env,
Database* database,
napi_value callback,
Expand Down Expand Up @@ -784,9 +784,9 @@ struct OpenWorker : public BaseWorker {
options_.max_file_size = maxFileSize;
}

virtual ~OpenWorker () {}
~OpenWorker () {}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(database_->Open(options_, location_.c_str()));
}

Expand Down Expand Up @@ -832,15 +832,15 @@ NAPI_METHOD(db_open) {
/**
* Worker class for closing a database
*/
struct CloseWorker : public BaseWorker {
struct CloseWorker final : public BaseWorker {
CloseWorker (napi_env env,
Database* database,
napi_value callback)
: BaseWorker(env, database, callback, "leveldown.db.close") {}

virtual ~CloseWorker () {}
~CloseWorker () {}

virtual void DoExecute () {
void DoExecute () override {
database_->CloseDatabase();
}
};
Expand Down Expand Up @@ -882,7 +882,7 @@ NAPI_METHOD(db_close) {
/**
* Worker class for putting key/value to the database
*/
struct PutWorker : public PriorityWorker {
struct PutWorker final : public PriorityWorker {
PutWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -894,12 +894,12 @@ struct PutWorker : public PriorityWorker {
options_.sync = sync;
}

virtual ~PutWorker () {
~PutWorker () {
DisposeSliceBuffer(key_);
DisposeSliceBuffer(value_);
}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(database_->Put(options_, key_, value_));
}

Expand Down Expand Up @@ -929,7 +929,7 @@ NAPI_METHOD(db_put) {
/**
* Worker class for getting a value from a database.
*/
struct GetWorker : public BaseWorker {
struct GetWorker final : public BaseWorker {
GetWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -942,15 +942,15 @@ struct GetWorker : public BaseWorker {
options_.fill_cache = fillCache;
}

virtual ~GetWorker () {
~GetWorker () {
DisposeSliceBuffer(key_);
}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(database_->Get(options_, key_, value_));
}

virtual void HandleOKCallback() {
void HandleOKCallback () override {
napi_value argv[2];
napi_get_null(env_, &argv[0]);

Expand Down Expand Up @@ -994,7 +994,7 @@ NAPI_METHOD(db_get) {
/**
* Worker class for deleting a value from a database.
*/
struct DelWorker : public BaseWorker {
struct DelWorker final : public BaseWorker {
DelWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -1005,11 +1005,11 @@ struct DelWorker : public BaseWorker {
options_.sync = sync;
}

virtual ~DelWorker () {
~DelWorker () {
DisposeSliceBuffer(key_);
}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(database_->Del(options_, key_));
}

Expand Down Expand Up @@ -1037,7 +1037,7 @@ NAPI_METHOD(db_del) {
/**
* Worker class for calculating the size of a range.
*/
struct ApproximateSizeWorker : public BaseWorker {
struct ApproximateSizeWorker final : public BaseWorker {
ApproximateSizeWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -1046,17 +1046,17 @@ struct ApproximateSizeWorker : public BaseWorker {
: BaseWorker(env, database, callback, "leveldown.db.approximate_size"),
start_(start), end_(end) {}

virtual ~ApproximateSizeWorker () {
~ApproximateSizeWorker () {
DisposeSliceBuffer(start_);
DisposeSliceBuffer(end_);
}

virtual void DoExecute () {
void DoExecute () override {
leveldb::Range range(start_, end_);
size_ = database_->ApproximateSize(&range);
}

virtual void HandleOKCallback() {
void HandleOKCallback () override {
napi_value argv[2];
napi_get_null(env_, &argv[0]);
napi_create_uint32(env_, (uint32_t)size_, &argv[1]);
Expand Down Expand Up @@ -1093,7 +1093,7 @@ NAPI_METHOD(db_approximate_size) {
/**
* Worker class for compacting a range in a database.
*/
struct CompactRangeWorker : public BaseWorker {
struct CompactRangeWorker final : public BaseWorker {
CompactRangeWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -1102,12 +1102,12 @@ struct CompactRangeWorker : public BaseWorker {
: BaseWorker(env, database, callback, "leveldown.db.compact_range"),
start_(start), end_(end) {}

virtual ~CompactRangeWorker () {
~CompactRangeWorker () {
DisposeSliceBuffer(start_);
DisposeSliceBuffer(end_);
}

virtual void DoExecute () {
void DoExecute () override {
database_->CompactRange(&start_, &end_);
}

Expand Down Expand Up @@ -1156,16 +1156,16 @@ NAPI_METHOD(db_get_property) {
/**
* Worker class for destroying a database.
*/
struct DestroyWorker : public BaseWorker {
struct DestroyWorker final : public BaseWorker {
DestroyWorker (napi_env env,
const std::string& location,
napi_value callback)
: BaseWorker(env, NULL, callback, "leveldown.destroy_db"),
location_(location) {}

virtual ~DestroyWorker () {}
~DestroyWorker () {}

virtual void DoExecute () {
void DoExecute () override {
leveldb::Options options;
SetStatus(leveldb::DestroyDB(location_, options));
}
Expand All @@ -1192,16 +1192,16 @@ NAPI_METHOD(destroy_db) {
/**
* Worker class for repairing a database.
*/
struct RepairWorker : public BaseWorker {
struct RepairWorker final : public BaseWorker {
RepairWorker (napi_env env,
const std::string& location,
napi_value callback)
: BaseWorker(env, NULL, callback, "leveldown.repair_db"),
location_(location) {}

virtual ~RepairWorker () {}
~RepairWorker () {}

virtual void DoExecute () {
void DoExecute () override {
leveldb::Options options;
SetStatus(leveldb::RepairDB(location_, options));
}
Expand Down Expand Up @@ -1418,20 +1418,20 @@ NAPI_METHOD(iterator_seek) {
/**
* Worker class for ending an iterator
*/
struct EndWorker : public BaseWorker {
struct EndWorker final : public BaseWorker {
EndWorker (napi_env env,
Iterator* iterator,
napi_value callback)
: BaseWorker(env, iterator->database_, callback, "leveldown.iterator.end"),
iterator_(iterator) {}

virtual ~EndWorker () {}
~EndWorker () {}

virtual void DoExecute () {
void DoExecute () override {
iterator_->IteratorEnd();
}

virtual void HandleOKCallback () {
void HandleOKCallback () override {
napi_delete_reference(env_, iterator_->Detach());
BaseWorker::HandleOKCallback();
}
Expand Down Expand Up @@ -1484,7 +1484,7 @@ void CheckEndCallback (Iterator* iterator) {
/**
* Worker class for nexting an iterator.
*/
struct NextWorker : public BaseWorker {
struct NextWorker final : public BaseWorker {
NextWorker (napi_env env,
Iterator* iterator,
napi_value callback,
Expand All @@ -1494,16 +1494,16 @@ struct NextWorker : public BaseWorker {
iterator_(iterator),
localCallback_(localCallback) {}

virtual ~NextWorker () {}
~NextWorker () {}

virtual void DoExecute () {
void DoExecute () override {
ok_ = iterator_->IteratorNext(result_);
if (!ok_) {
SetStatus(iterator_->IteratorStatus());
}
}

virtual void HandleOKCallback () {
void HandleOKCallback () override {
size_t arraySize = result_.size() * 2;
napi_value jsArray;
napi_create_array_with_length(env_, arraySize, &jsArray);
Expand Down Expand Up @@ -1579,7 +1579,7 @@ NAPI_METHOD(iterator_next) {
/**
* Worker class for batch write operation.
*/
struct BatchWorker : public BaseWorker {
struct BatchWorker final : public BaseWorker {
BatchWorker (napi_env env,
Database* database,
napi_value callback,
Expand All @@ -1590,11 +1590,11 @@ struct BatchWorker : public BaseWorker {
options_.sync = sync;
}

virtual ~BatchWorker () {
~BatchWorker () {
delete batch_;
}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(database_->WriteBatch(options_, batch_));
}

Expand Down Expand Up @@ -1772,7 +1772,7 @@ NAPI_METHOD(batch_clear) {
/**
* Worker class for batch write operation.
*/
struct BatchWriteWorker : public BaseWorker {
struct BatchWriteWorker final : public BaseWorker {
BatchWriteWorker (napi_env env,
Batch* batch,
napi_value callback,
Expand All @@ -1781,9 +1781,9 @@ struct BatchWriteWorker : public BaseWorker {
batch_(batch),
sync_(sync) {}

virtual ~BatchWriteWorker () {}
~BatchWriteWorker () {}

virtual void DoExecute () {
void DoExecute () override {
SetStatus(batch_->Write(sync_));
}

Expand Down