[Pkg-javascript-commits] [node-leveldown] 158/492: minor c++ code reorg, move constructors out of .h
Andrew Kelley
andrewrk-guest at moszumanska.debian.org
Sun Jul 6 17:13:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.
commit ee364ca3b32b6fc4d40ce96528993528534d8a7d
Author: Rod Vagg <rod at vagg.org>
Date: Wed Jan 9 12:42:16 2013 +1100
minor c++ code reorg, move constructors out of .h
---
src/async.cc | 5 +++
src/async.h | 5 +--
src/database_async.cc | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/database_async.h | 51 +++++--------------------
src/iterator_async.cc | 20 ++++++++++
src/iterator_async.h | 9 +----
6 files changed, 140 insertions(+), 52 deletions(-)
diff --git a/src/async.cc b/src/async.cc
index 187f720..3642ffe 100644
--- a/src/async.cc
+++ b/src/async.cc
@@ -22,6 +22,11 @@ using namespace leveldb;
/** ASYNC BASE **/
+AsyncWorker::AsyncWorker (Database* database, Persistent<Function> callback)
+ : database(database), callback(callback) {
+ request.data = this;
+};
+
AsyncWorker::~AsyncWorker () {}
void AsyncWorker::WorkComplete () {
diff --git a/src/async.h b/src/async.h
index d9fb6f1..739b3f6 100644
--- a/src/async.h
+++ b/src/async.h
@@ -19,10 +19,7 @@ public:
AsyncWorker (
Database* database
, Persistent<Function> callback
- ) : database(database)
- , callback(callback) {
- request.data = this;
- };
+ );
virtual ~AsyncWorker ();
uv_work_t request;
diff --git a/src/database_async.cc b/src/database_async.cc
index 44adc0e..4a527ee 100644
--- a/src/database_async.cc
+++ b/src/database_async.cc
@@ -23,6 +23,24 @@ using namespace leveldb;
/** OPEN WORKER **/
+OpenWorker::OpenWorker (
+ Database* database
+ , Persistent<Function> callback
+ , string location
+ , bool createIfMissing
+ , bool errorIfExists
+ , bool compression
+ , uint32_t cacheSize
+) : AsyncWorker(database, callback)
+ , location(location)
+{
+ options = new Options();
+ options->create_if_missing = createIfMissing;
+ options->error_if_exists = errorIfExists;
+ options->compression = compression ? kSnappyCompression : kNoCompression;
+ options->block_cache = NewLRUCache(cacheSize);
+};
+
OpenWorker::~OpenWorker () {
delete options;
}
@@ -33,6 +51,12 @@ void OpenWorker::Execute () {
/** CLOSE WORKER **/
+CloseWorker::CloseWorker (
+ Database* database
+ , Persistent<Function> callback
+) : AsyncWorker(database, callback)
+{};
+
CloseWorker::~CloseWorker () {}
void CloseWorker::Execute () {
@@ -47,6 +71,16 @@ void CloseWorker::WorkComplete () {
/** IO WORKER (abstract) **/
+IOWorker::IOWorker (
+ Database* database
+ , Persistent<Function> callback
+ , Slice key
+ , Persistent<Value> keyPtr
+) : AsyncWorker(database, callback)
+ , key(key)
+ , keyPtr(keyPtr)
+{};
+
IOWorker::~IOWorker () {}
void IOWorker::WorkComplete () {
@@ -56,6 +90,20 @@ void IOWorker::WorkComplete () {
/** READ WORKER **/
+ReadWorker::ReadWorker (
+ Database* database
+ , Persistent<Function> callback
+ , Slice key
+ , bool asBuffer
+ , bool fillCache
+ , Persistent<Value> keyPtr
+) : IOWorker(database, callback, key, keyPtr)
+ , asBuffer(asBuffer)
+{
+ options = new ReadOptions();
+ options->fill_cache = fillCache;
+};
+
ReadWorker::~ReadWorker () {
delete options;
}
@@ -79,6 +127,18 @@ void ReadWorker::HandleOKCallback () {
/** DELETE WORKER **/
+DeleteWorker::DeleteWorker (
+ Database* database
+ , Persistent<Function> callback
+ , Slice key
+ , bool sync
+ , Persistent<Value> keyPtr
+) : IOWorker(database, callback, key, keyPtr)
+{
+ options = new WriteOptions();
+ options->sync = sync;
+};
+
DeleteWorker::~DeleteWorker () {
delete options;
}
@@ -89,6 +149,21 @@ void DeleteWorker::Execute () {
/** WRITE WORKER **/
+WriteWorker::WriteWorker (
+ Database* database
+ , Persistent<Function> callback
+ , Slice key
+ , Slice value
+ , bool sync
+ , Persistent<Value> keyPtr
+ , Persistent<Value> valuePtr
+) : DeleteWorker(database, callback, key, sync, keyPtr)
+ , value(value)
+ , valuePtr(valuePtr)
+{};
+
+WriteWorker::~WriteWorker () {}
+
void WriteWorker::Execute () {
status = database->PutToDatabase(options, key, value);
}
@@ -100,6 +175,18 @@ void WriteWorker::WorkComplete () {
/** BATCH WORKER **/
+BatchWorker::BatchWorker (
+ Database* database
+ , Persistent<Function> callback
+ , vector<BatchOp*>* operations
+ , bool sync
+) : AsyncWorker(database, callback)
+ , operations(operations)
+{
+ options = new WriteOptions();
+ options->sync = sync;
+};
+
BatchWorker::~BatchWorker () {
for (vector<BatchOp*>::iterator it = operations->begin(); it != operations->end();) {
delete *it;
@@ -119,6 +206,21 @@ void BatchWorker::Execute () {
/** APPROXIMATE SIZE WORKER **/
+ApproximateSizeWorker::ApproximateSizeWorker (
+ Database* database
+ , Persistent<Function> callback
+ , Slice start
+ , Slice end
+ , Persistent<Value> startPtr
+ , Persistent<Value> endPtr
+) : AsyncWorker(database, callback)
+ , range(start, end)
+ , startPtr(startPtr)
+ , endPtr(endPtr)
+{};
+
+ApproximateSizeWorker::~ApproximateSizeWorker () {}
+
void ApproximateSizeWorker::Execute () {
size = database->ApproximateSizeFromDatabase(&range);
}
diff --git a/src/database_async.h b/src/database_async.h
index fb4c419..d3f2fb2 100644
--- a/src/database_async.h
+++ b/src/database_async.h
@@ -27,15 +27,7 @@ public:
, bool errorIfExists
, bool compression
, uint32_t cacheSize
- ) : AsyncWorker(database, callback)
- , location(location)
- {
- options = new Options();
- options->create_if_missing = createIfMissing;
- options->error_if_exists = errorIfExists;
- options->compression = compression ? kSnappyCompression : kNoCompression;
- options->block_cache = NewLRUCache(cacheSize);
- };
+ );
virtual ~OpenWorker ();
virtual void Execute ();
@@ -50,8 +42,7 @@ public:
CloseWorker (
Database* database
, Persistent<Function> callback
- ) : AsyncWorker(database, callback)
- {};
+ );
virtual ~CloseWorker ();
virtual void Execute ();
@@ -65,10 +56,7 @@ public:
, Persistent<Function> callback
, Slice key
, Persistent<Value> keyPtr
- ) : AsyncWorker(database, callback)
- , key(key)
- , keyPtr(keyPtr)
- {};
+ );
virtual ~IOWorker ();
virtual void WorkComplete ();
@@ -87,12 +75,7 @@ public:
, bool asBuffer
, bool fillCache
, Persistent<Value> keyPtr
- ) : IOWorker(database, callback, key, keyPtr)
- , asBuffer(asBuffer)
- {
- options = new ReadOptions();
- options->fill_cache = fillCache;
- };
+ );
virtual ~ReadWorker ();
virtual void Execute ();
@@ -112,11 +95,7 @@ public:
, Slice key
, bool sync
, Persistent<Value> keyPtr
- ) : IOWorker(database, callback, key, keyPtr)
- {
- options = new WriteOptions();
- options->sync = sync;
- };
+ );
virtual ~DeleteWorker ();
virtual void Execute ();
@@ -135,11 +114,9 @@ public:
, bool sync
, Persistent<Value> keyPtr
, Persistent<Value> valuePtr
- ) : DeleteWorker(database, callback, key, sync, keyPtr)
- , value(value)
- , valuePtr(valuePtr)
- {};
+ );
+ virtual ~WriteWorker ();
virtual void Execute ();
virtual void WorkComplete ();
@@ -155,12 +132,7 @@ public:
, Persistent<Function> callback
, vector<BatchOp*>* operations
, bool sync
- ) : AsyncWorker(database, callback)
- , operations(operations)
- {
- options = new WriteOptions();
- options->sync = sync;
- };
+ );
virtual ~BatchWorker ();
virtual void Execute ();
@@ -179,12 +151,9 @@ public:
, Slice end
, Persistent<Value> startPtr
, Persistent<Value> endPtr
- ) : AsyncWorker(database, callback)
- , range(start, end)
- , startPtr(startPtr)
- , endPtr(endPtr)
- {};
+ );
+ virtual ~ApproximateSizeWorker ();
virtual void Execute ();
virtual void HandleOKCallback ();
virtual void WorkComplete ();
diff --git a/src/iterator_async.cc b/src/iterator_async.cc
index 38f47b3..08fd5c4 100644
--- a/src/iterator_async.cc
+++ b/src/iterator_async.cc
@@ -20,6 +20,17 @@ using namespace v8;
using namespace node;
using namespace leveldb;
+/** NEXT WORKER **/
+
+NextWorker::NextWorker (
+ levelup::Iterator* iterator
+ , Persistent<Function> dataCallback
+ , Persistent<Function> endCallback
+) : AsyncWorker(database, dataCallback)
+ , iterator(iterator)
+ , endCallback(endCallback)
+{};
+
NextWorker::~NextWorker () {}
void NextWorker::Execute () {
@@ -52,6 +63,15 @@ void NextWorker::HandleOKCallback () {
}
}
+/** END WORKER **/
+
+EndWorker::EndWorker (
+ levelup::Iterator* iterator
+ , Persistent<Function> endCallback
+) : AsyncWorker(database, endCallback)
+ , iterator(iterator)
+{};
+
EndWorker::~EndWorker () {}
void EndWorker::Execute () {
diff --git a/src/iterator_async.h b/src/iterator_async.h
index dccc890..8690730 100644
--- a/src/iterator_async.h
+++ b/src/iterator_async.h
@@ -22,10 +22,7 @@ public:
levelup::Iterator* iterator
, Persistent<Function> dataCallback
, Persistent<Function> endCallback
- ) : AsyncWorker(database, dataCallback)
- , iterator(iterator)
- , endCallback(endCallback)
- {};
+ );
virtual ~NextWorker ();
virtual void Execute ();
@@ -44,9 +41,7 @@ public:
EndWorker (
levelup::Iterator* iterator
, Persistent<Function> endCallback
- ) : AsyncWorker(database, endCallback)
- , iterator(iterator)
- {};
+ );
virtual ~EndWorker ();
virtual void Execute ();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git
More information about the Pkg-javascript-commits
mailing list