[Pkg-javascript-commits] [node-leveldown] 461/492: working rocksdb!
Andrew Kelley
andrewrk-guest at moszumanska.debian.org
Sun Jul 6 17:14:31 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 7199b7ca31f9218b8d7fdff15c056a32093f4df1
Author: Rod Vagg <rod at vagg.org>
Date: Fri Nov 15 14:59:18 2013 +1100
working rocksdb!
---
.gitmodules | 3 ++
binding.gyp | 19 +++++++
deps/leveldb/leveldb.gyp | 138 ++++++++++++++++++++++++-----------------------
src/async.h | 4 +-
src/batch.cc | 6 +--
src/batch.h | 8 +--
src/batch_async.cc | 2 +-
src/database.cc | 48 ++++++++---------
src/database.h | 46 ++++++++--------
src/database_async.cc | 36 ++++++-------
src/database_async.h | 34 ++++++------
src/iterator.cc | 18 +++----
src/iterator.h | 10 ++--
src/leveldown.h | 8 +--
src/leveldown_async.cc | 10 ++--
15 files changed, 208 insertions(+), 182 deletions(-)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4f5966c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "deps/leveldb/leveldb-rocksdb"]
+ path = deps/leveldb/leveldb-rocksdb
+ url = https://github.com/facebook/rocksdb.git
diff --git a/binding.gyp b/binding.gyp
index 79e6130..73e3795 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -14,6 +14,25 @@
, "DisableSpecificWarnings": [ "4355", "4530" ,"4267", "4244", "4506" ]
}
}
+ }, { # OS != "win"
+ 'cflags': [
+ '-std=gnu++0x'
+ , '-fno-omit-frame-pointer'
+ , '-momit-leaf-frame-pointer'
+ , '-Woverloaded-virtual'
+ , '-Wno-ignored-qualifiers'
+ , '-Wno-type-limits'
+ , '-Wno-unused-variable'
+ , '-fPIC'
+ ]
+ , 'cflags!': [
+ '-fno-exceptions'
+ , '-fno-rtti'
+ ]
+ , 'cflags_cc!': [
+ '-fno-exceptions'
+ , '-fno-rtti'
+ ]
}]
, ['OS == "linux"', {
'cflags': [
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 22f2d53..b8e5678 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -1,7 +1,7 @@
{'targets': [{
'target_name': 'leveldb'
, 'variables': {
- 'ldbversion': '1.14.0'
+ 'ldbversion': 'rocksdb'
}
, 'type': 'static_library'
# Overcomes an issue with the linker and thin .a files on SmartOS
@@ -57,10 +57,25 @@
, 'defines': [
'LEVELDB_PLATFORM_POSIX=1'
]
- , 'ccflags': [
- '-fno-builtin-memcmp'
+ , 'cflags': [
+ '-std=gnu++0x'
+ , '-fno-omit-frame-pointer'
+ , '-momit-leaf-frame-pointer'
+ , '-Woverloaded-virtual'
+ , '-Wno-ignored-qualifiers'
+ , '-Wno-type-limits'
+ , '-Wno-unused-variable'
+ , '-Wno-format-security'
, '-fPIC'
]
+ , 'cflags!': [
+ '-fno-exceptions'
+ , '-fno-rtti'
+ ]
+ , 'cflags_cc!': [
+ '-fno-exceptions'
+ , '-fno-rtti'
+ ]
}]
, ['OS != "win"' and 'OS != "freebsd"', {
'cflags': [
@@ -123,83 +138,72 @@
}]
]
, 'sources': [
- 'leveldb-<(ldbversion)/db/builder.cc'
- , 'leveldb-<(ldbversion)/db/builder.h'
- , 'leveldb-<(ldbversion)/db/db_impl.cc'
- , 'leveldb-<(ldbversion)/db/db_impl.h'
- , 'leveldb-<(ldbversion)/db/db_iter.cc'
- , 'leveldb-<(ldbversion)/db/db_iter.h'
- , 'leveldb-<(ldbversion)/db/filename.cc'
- , 'leveldb-<(ldbversion)/db/filename.h'
- , 'leveldb-<(ldbversion)/db/dbformat.cc'
- , 'leveldb-<(ldbversion)/db/dbformat.h'
- , 'leveldb-<(ldbversion)/db/log_format.h'
+ 'leveldb-<(ldbversion)/db/version_set_reduce_num_levels.cc'
+ , 'leveldb-<(ldbversion)/db/db_filesnapshot.cc'
+ , 'leveldb-<(ldbversion)/db/db_impl_readonly.cc'
+ , 'leveldb-<(ldbversion)/db/c.cc'
+ , 'leveldb-<(ldbversion)/db/merge_helper.cc'
, 'leveldb-<(ldbversion)/db/log_reader.cc'
- , 'leveldb-<(ldbversion)/db/log_reader.h'
- , 'leveldb-<(ldbversion)/db/log_writer.cc'
- , 'leveldb-<(ldbversion)/db/log_writer.h'
- , 'leveldb-<(ldbversion)/db/memtable.cc'
- , 'leveldb-<(ldbversion)/db/memtable.h'
, 'leveldb-<(ldbversion)/db/repair.cc'
- , 'leveldb-<(ldbversion)/db/skiplist.h'
- , 'leveldb-<(ldbversion)/db/snapshot.h'
, 'leveldb-<(ldbversion)/db/table_cache.cc'
- , 'leveldb-<(ldbversion)/db/table_cache.h'
+ , 'leveldb-<(ldbversion)/db/log_writer.cc'
+ , 'leveldb-<(ldbversion)/db/db_bench.cc'
+ , 'leveldb-<(ldbversion)/db/dbformat.cc'
+ , 'leveldb-<(ldbversion)/db/write_batch.cc'
+ , 'leveldb-<(ldbversion)/db/table_stats_collector.cc'
+ , 'leveldb-<(ldbversion)/db/memtablelist.cc'
+ , 'leveldb-<(ldbversion)/db/db_impl.cc'
+ , 'leveldb-<(ldbversion)/db/memtable.cc'
+ , 'leveldb-<(ldbversion)/db/db_stats_logger.cc'
, 'leveldb-<(ldbversion)/db/version_edit.cc'
- , 'leveldb-<(ldbversion)/db/version_edit.h'
, 'leveldb-<(ldbversion)/db/version_set.cc'
- , 'leveldb-<(ldbversion)/db/version_set.h'
- , 'leveldb-<(ldbversion)/db/write_batch.cc'
- , 'leveldb-<(ldbversion)/db/write_batch_internal.h'
+ , 'leveldb-<(ldbversion)/db/builder.cc'
+ , 'leveldb-<(ldbversion)/db/merge_operator.cc'
+ , 'leveldb-<(ldbversion)/db/filename.cc'
+ , 'leveldb-<(ldbversion)/db/db_iter.cc'
+ , 'leveldb-<(ldbversion)/db/transaction_log_impl.cc'
, 'leveldb-<(ldbversion)/helpers/memenv/memenv.cc'
- , 'leveldb-<(ldbversion)/helpers/memenv/memenv.h'
- , 'leveldb-<(ldbversion)/include/leveldb/cache.h'
- , 'leveldb-<(ldbversion)/include/leveldb/comparator.h'
- , 'leveldb-<(ldbversion)/include/leveldb/db.h'
- , 'leveldb-<(ldbversion)/include/leveldb/env.h'
- , 'leveldb-<(ldbversion)/include/leveldb/filter_policy.h'
- , 'leveldb-<(ldbversion)/include/leveldb/iterator.h'
- , 'leveldb-<(ldbversion)/include/leveldb/options.h'
- , 'leveldb-<(ldbversion)/include/leveldb/slice.h'
- , 'leveldb-<(ldbversion)/include/leveldb/status.h'
- , 'leveldb-<(ldbversion)/include/leveldb/table.h'
- , 'leveldb-<(ldbversion)/include/leveldb/table_builder.h'
- , 'leveldb-<(ldbversion)/include/leveldb/write_batch.h'
- , 'leveldb-<(ldbversion)/port/port.h'
- , 'leveldb-<(ldbversion)/table/block.cc'
- , 'leveldb-<(ldbversion)/table/block.h'
- , 'leveldb-<(ldbversion)/table/block_builder.cc'
- , 'leveldb-<(ldbversion)/table/block_builder.h'
+ , 'leveldb-<(ldbversion)/port/stack_trace.cc'
+ , 'leveldb-<(ldbversion)/table/merger.cc'
, 'leveldb-<(ldbversion)/table/filter_block.cc'
- , 'leveldb-<(ldbversion)/table/filter_block.h'
- , 'leveldb-<(ldbversion)/table/format.cc'
- , 'leveldb-<(ldbversion)/table/format.h'
+ , 'leveldb-<(ldbversion)/table/block_based_table_factory.cc'
+ , 'leveldb-<(ldbversion)/table/block_based_table_reader.cc'
+ , 'leveldb-<(ldbversion)/table/block_builder.cc'
+ , 'leveldb-<(ldbversion)/table/flush_block_policy.cc'
, 'leveldb-<(ldbversion)/table/iterator.cc'
- , 'leveldb-<(ldbversion)/table/iterator_wrapper.h'
- , 'leveldb-<(ldbversion)/table/merger.cc'
- , 'leveldb-<(ldbversion)/table/merger.h'
- , 'leveldb-<(ldbversion)/table/table.cc'
- , 'leveldb-<(ldbversion)/table/table_builder.cc'
+ , 'leveldb-<(ldbversion)/table/format.cc'
+ , 'leveldb-<(ldbversion)/table/block.cc'
, 'leveldb-<(ldbversion)/table/two_level_iterator.cc'
- , 'leveldb-<(ldbversion)/table/two_level_iterator.h'
- , 'leveldb-<(ldbversion)/util/arena.cc'
- , 'leveldb-<(ldbversion)/util/arena.h'
+ , 'leveldb-<(ldbversion)/table/table_reader_bench.cc'
+ , 'leveldb-<(ldbversion)/table/block_based_table_builder.cc'
, 'leveldb-<(ldbversion)/util/bloom.cc'
- , 'leveldb-<(ldbversion)/util/cache.cc'
- , 'leveldb-<(ldbversion)/util/coding.cc'
- , 'leveldb-<(ldbversion)/util/coding.h'
- , 'leveldb-<(ldbversion)/util/comparator.cc'
- , 'leveldb-<(ldbversion)/util/crc32c.cc'
- , 'leveldb-<(ldbversion)/util/crc32c.h'
+ , 'leveldb-<(ldbversion)/util/slice.cc'
+ , 'leveldb-<(ldbversion)/util/build_version.cc'
+ , 'leveldb-<(ldbversion)/util/vectorrep.cc'
+ , 'leveldb-<(ldbversion)/util/env_posix.cc'
, 'leveldb-<(ldbversion)/util/env.cc'
- , 'leveldb-<(ldbversion)/util/filter_policy.cc'
+ , 'leveldb-<(ldbversion)/util/statistics.cc'
+ , 'leveldb-<(ldbversion)/util/histogram.cc'
+ , 'leveldb-<(ldbversion)/util/arena_impl.cc'
+ , 'leveldb-<(ldbversion)/util/ldb_tool.cc'
+ , 'leveldb-<(ldbversion)/util/coding.cc'
+ , 'leveldb-<(ldbversion)/util/perf_context.cc'
, 'leveldb-<(ldbversion)/util/hash.cc'
- , 'leveldb-<(ldbversion)/util/hash.h'
, 'leveldb-<(ldbversion)/util/logging.cc'
- , 'leveldb-<(ldbversion)/util/logging.h'
- , 'leveldb-<(ldbversion)/util/mutexlock.h'
- , 'leveldb-<(ldbversion)/util/options.cc'
- , 'leveldb-<(ldbversion)/util/random.h'
+ , 'leveldb-<(ldbversion)/util/ldb_cmd.cc'
+ , 'leveldb-<(ldbversion)/util/hash_skiplist_rep.cc'
+ , 'leveldb-<(ldbversion)/util/auto_roll_logger.cc'
+ , 'leveldb-<(ldbversion)/util/blob_store.cc'
+ , 'leveldb-<(ldbversion)/util/transformrep.cc'
+ , 'leveldb-<(ldbversion)/util/filter_policy.cc'
+ , 'leveldb-<(ldbversion)/util/murmurhash.cc'
+ , 'leveldb-<(ldbversion)/util/cache.cc'
+ , 'leveldb-<(ldbversion)/util/comparator.cc'
+ , 'leveldb-<(ldbversion)/util/env_hdfs.cc'
+ , 'leveldb-<(ldbversion)/util/skiplistrep.cc'
, 'leveldb-<(ldbversion)/util/status.cc'
+ , 'leveldb-<(ldbversion)/util/options.cc'
+ , 'leveldb-<(ldbversion)/util/crc32c.cc'
+ , 'leveldb-<(ldbversion)/util/string_util.cc'
]
}]}
diff --git a/src/async.h b/src/async.h
index ddf5004..238bee5 100644
--- a/src/async.h
+++ b/src/async.h
@@ -26,14 +26,14 @@ public:
}
protected:
- void SetStatus(leveldb::Status status) {
+ void SetStatus(rocksdb::Status status) {
this->status = status;
if (!status.ok())
this->errmsg = strdup(status.ToString().c_str());
}
Database* database;
private:
- leveldb::Status status;
+ rocksdb::Status status;
};
} // namespace leveldown
diff --git a/src/batch.cc b/src/batch.cc
index d0205b7..6c47783 100644
--- a/src/batch.cc
+++ b/src/batch.cc
@@ -12,9 +12,9 @@ namespace leveldown {
static v8::Persistent<v8::FunctionTemplate> batch_constructor;
Batch::Batch (leveldown::Database* database, bool sync) : database(database) {
- options = new leveldb::WriteOptions();
+ options = new rocksdb::WriteOptions();
options->sync = sync;
- batch = new leveldb::WriteBatch();
+ batch = new rocksdb::WriteBatch();
hasData = false;
written = false;
}
@@ -24,7 +24,7 @@ Batch::~Batch () {
delete batch;
}
-leveldb::Status Batch::Write () {
+rocksdb::Status Batch::Write () {
return database->WriteBatchToDatabase(options, batch);
}
diff --git a/src/batch.h b/src/batch.h
index c72d790..a6d09fe 100644
--- a/src/batch.h
+++ b/src/batch.h
@@ -4,7 +4,7 @@
#include <vector>
#include <node.h>
-#include <leveldb/write_batch.h>
+#include <rocksdb/write_batch.h>
#include "database.h"
@@ -20,12 +20,12 @@ public:
Batch (leveldown::Database* database, bool sync);
~Batch ();
- leveldb::Status Write ();
+ rocksdb::Status Write ();
private:
leveldown::Database* database;
- leveldb::WriteOptions* options;
- leveldb::WriteBatch* batch;
+ rocksdb::WriteOptions* options;
+ rocksdb::WriteBatch* batch;
bool hasData; // keep track of whether we're writing data or not
bool written;
diff --git a/src/batch_async.cc b/src/batch_async.cc
index 4ff256c..35e16d5 100644
--- a/src/batch_async.cc
+++ b/src/batch_async.cc
@@ -4,7 +4,7 @@
*/
-#include <leveldb/write_batch.h>
+#include <rocksdb/write_batch.h>
#include "batch.h"
#include "batch_async.h"
diff --git a/src/database.cc b/src/database.cc
index b96da74..91660d5 100644
--- a/src/database.cc
+++ b/src/database.cc
@@ -7,8 +7,8 @@
#include <node.h>
#include <node_buffer.h>
-#include "leveldb/db.h"
-#include "leveldb/write_batch.h"
+#include "rocksdb/db.h"
+#include "rocksdb/write_batch.h"
#include "leveldown.h"
#include "database.h"
@@ -37,65 +37,65 @@ const char* Database::Location() const { return location; }
/* Calls from worker threads, NO V8 HERE *****************************/
-leveldb::Status Database::OpenDatabase (
- leveldb::Options* options
+rocksdb::Status Database::OpenDatabase (
+ rocksdb::Options* options
, std::string location
) {
- return leveldb::DB::Open(*options, location, &db);
+ return rocksdb::DB::Open(*options, location, &db);
}
-leveldb::Status Database::PutToDatabase (
- leveldb::WriteOptions* options
- , leveldb::Slice key
- , leveldb::Slice value
+rocksdb::Status Database::PutToDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::Slice key
+ , rocksdb::Slice value
) {
return db->Put(*options, key, value);
}
-leveldb::Status Database::GetFromDatabase (
- leveldb::ReadOptions* options
- , leveldb::Slice key
+rocksdb::Status Database::GetFromDatabase (
+ rocksdb::ReadOptions* options
+ , rocksdb::Slice key
, std::string& value
) {
return db->Get(*options, key, &value);
}
-leveldb::Status Database::DeleteFromDatabase (
- leveldb::WriteOptions* options
- , leveldb::Slice key
+rocksdb::Status Database::DeleteFromDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::Slice key
) {
return db->Delete(*options, key);
}
-leveldb::Status Database::WriteBatchToDatabase (
- leveldb::WriteOptions* options
- , leveldb::WriteBatch* batch
+rocksdb::Status Database::WriteBatchToDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::WriteBatch* batch
) {
return db->Write(*options, batch);
}
-uint64_t Database::ApproximateSizeFromDatabase (const leveldb::Range* range) {
+uint64_t Database::ApproximateSizeFromDatabase (const rocksdb::Range* range) {
uint64_t size;
db->GetApproximateSizes(range, 1, &size);
return size;
}
void Database::GetPropertyFromDatabase (
- const leveldb::Slice& property
+ const rocksdb::Slice& property
, std::string* value) {
db->GetProperty(property, value);
}
-leveldb::Iterator* Database::NewIterator (leveldb::ReadOptions* options) {
+rocksdb::Iterator* Database::NewIterator (rocksdb::ReadOptions* options) {
return db->NewIterator(*options);
}
-const leveldb::Snapshot* Database::NewSnapshot () {
+const rocksdb::Snapshot* Database::NewSnapshot () {
return db->GetSnapshot();
}
-void Database::ReleaseSnapshot (const leveldb::Snapshot* snapshot) {
+void Database::ReleaseSnapshot (const rocksdb::Snapshot* snapshot) {
return db->ReleaseSnapshot(snapshot);
}
@@ -406,7 +406,7 @@ NAN_METHOD(Database::Batch) {
v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(args[0]);
- leveldb::WriteBatch* batch = new leveldb::WriteBatch();
+ rocksdb::WriteBatch* batch = new rocksdb::WriteBatch();
bool hasData = false;
for (unsigned int i = 0; i < array->Length(); i++) {
diff --git a/src/database.h b/src/database.h
index 2310f83..b9d8c2f 100644
--- a/src/database.h
+++ b/src/database.h
@@ -10,7 +10,7 @@
#include <vector>
#include <node.h>
-#include "leveldb/db.h"
+#include "rocksdb/db.h"
#include "nan.h"
#include "leveldown.h"
#include "iterator.h"
@@ -21,9 +21,9 @@ NAN_METHOD(LevelDOWN);
struct Reference {
v8::Persistent<v8::Object> handle;
- leveldb::Slice slice;
+ rocksdb::Slice slice;
- Reference(v8::Local<v8::Value> obj, leveldb::Slice slice) : slice(slice) {
+ Reference(v8::Local<v8::Value> obj, rocksdb::Slice slice) : slice(slice) {
v8::Local<v8::Object> _obj = v8::Object::New();
_obj->Set(NanSymbol("obj"), obj);
NanAssignPersistent(v8::Object, handle, _obj);
@@ -45,30 +45,30 @@ public:
static void Init ();
static v8::Handle<v8::Value> NewInstance (v8::Local<v8::String> &location);
- leveldb::Status OpenDatabase (leveldb::Options* options, std::string location);
- leveldb::Status PutToDatabase (
- leveldb::WriteOptions* options
- , leveldb::Slice key
- , leveldb::Slice value
+ rocksdb::Status OpenDatabase (rocksdb::Options* options, std::string location);
+ rocksdb::Status PutToDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::Slice key
+ , rocksdb::Slice value
);
- leveldb::Status GetFromDatabase (
- leveldb::ReadOptions* options
- , leveldb::Slice key
+ rocksdb::Status GetFromDatabase (
+ rocksdb::ReadOptions* options
+ , rocksdb::Slice key
, std::string& value
);
- leveldb::Status DeleteFromDatabase (
- leveldb::WriteOptions* options
- , leveldb::Slice key
+ rocksdb::Status DeleteFromDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::Slice key
);
- leveldb::Status WriteBatchToDatabase (
- leveldb::WriteOptions* options
- , leveldb::WriteBatch* batch
+ rocksdb::Status WriteBatchToDatabase (
+ rocksdb::WriteOptions* options
+ , rocksdb::WriteBatch* batch
);
- uint64_t ApproximateSizeFromDatabase (const leveldb::Range* range);
- void GetPropertyFromDatabase (const leveldb::Slice& property, std::string* value);
- leveldb::Iterator* NewIterator (leveldb::ReadOptions* options);
- const leveldb::Snapshot* NewSnapshot ();
- void ReleaseSnapshot (const leveldb::Snapshot* snapshot);
+ uint64_t ApproximateSizeFromDatabase (const rocksdb::Range* range);
+ void GetPropertyFromDatabase (const rocksdb::Slice& property, std::string* value);
+ rocksdb::Iterator* NewIterator (rocksdb::ReadOptions* options);
+ const rocksdb::Snapshot* NewSnapshot ();
+ void ReleaseSnapshot (const rocksdb::Snapshot* snapshot);
void CloseDatabase ();
const char* Location() const;
void ReleaseIterator (uint32_t id);
@@ -77,7 +77,7 @@ public:
~Database ();
private:
- leveldb::DB* db;
+ rocksdb::DB* db;
char* location;
uint32_t currentIteratorId;
void(*pendingCloseWorker);
diff --git a/src/database_async.cc b/src/database_async.cc
index 5c7cd03..e6e14f0 100644
--- a/src/database_async.cc
+++ b/src/database_async.cc
@@ -6,8 +6,8 @@
#include <node.h>
#include <node_buffer.h>
-#include "leveldb/write_batch.h"
-#include "leveldb/filter_policy.h"
+#include "rocksdb/write_batch.h"
+#include "rocksdb/filter_policy.h"
#include "database.h"
#include "leveldown.h"
@@ -31,18 +31,18 @@ OpenWorker::OpenWorker (
, uint32_t blockRestartInterval
) : AsyncWorker(database, callback)
{
- options = new leveldb::Options();
+ options = new rocksdb::Options();
options->create_if_missing = createIfMissing;
options->error_if_exists = errorIfExists;
options->compression = compression
- ? leveldb::kSnappyCompression
- : leveldb::kNoCompression;
- options->block_cache = leveldb::NewLRUCache(cacheSize);
+ ? rocksdb::kSnappyCompression
+ : rocksdb::kNoCompression;
+ options->block_cache = rocksdb::NewLRUCache(cacheSize);
options->write_buffer_size = writeBufferSize;
options->block_size = blockSize;
options->max_open_files = maxOpenFiles;
options->block_restart_interval = blockRestartInterval;
- options->filter_policy = leveldb::NewBloomFilterPolicy(10);
+ options->filter_policy = rocksdb::NewBloomFilterPolicy(10);
};
OpenWorker::~OpenWorker () {
@@ -79,7 +79,7 @@ void CloseWorker::WorkComplete () {
IOWorker::IOWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, v8::Local<v8::Object> &keyHandle
) : AsyncWorker(database, callback)
, key(key)
@@ -103,7 +103,7 @@ void IOWorker::WorkComplete () {
ReadWorker::ReadWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, bool asBuffer
, bool fillCache
, v8::Local<v8::Object> &keyHandle
@@ -112,7 +112,7 @@ ReadWorker::ReadWorker (
{
NanScope();
- options = new leveldb::ReadOptions();
+ options = new rocksdb::ReadOptions();
options->fill_cache = fillCache;
SavePersistent("key", keyHandle);
};
@@ -146,14 +146,14 @@ void ReadWorker::HandleOKCallback () {
DeleteWorker::DeleteWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, bool sync
, v8::Local<v8::Object> &keyHandle
) : IOWorker(database, callback, key, keyHandle)
{
NanScope();
- options = new leveldb::WriteOptions();
+ options = new rocksdb::WriteOptions();
options->sync = sync;
SavePersistent("key", keyHandle);
};
@@ -171,8 +171,8 @@ void DeleteWorker::Execute () {
WriteWorker::WriteWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
- , leveldb::Slice value
+ , rocksdb::Slice key
+ , rocksdb::Slice value
, bool sync
, v8::Local<v8::Object> &keyHandle
, v8::Local<v8::Object> &valueHandle
@@ -204,12 +204,12 @@ void WriteWorker::WorkComplete () {
BatchWorker::BatchWorker (
Database *database
, NanCallback *callback
- , leveldb::WriteBatch* batch
+ , rocksdb::WriteBatch* batch
, bool sync
) : AsyncWorker(database, callback)
, batch(batch)
{
- options = new leveldb::WriteOptions();
+ options = new rocksdb::WriteOptions();
options->sync = sync;
};
@@ -227,8 +227,8 @@ void BatchWorker::Execute () {
ApproximateSizeWorker::ApproximateSizeWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice start
- , leveldb::Slice end
+ , rocksdb::Slice start
+ , rocksdb::Slice end
, v8::Local<v8::Object> &startHandle
, v8::Local<v8::Object> &endHandle
) : AsyncWorker(database, callback)
diff --git a/src/database_async.h b/src/database_async.h
index 5209de3..6a6c4f6 100644
--- a/src/database_async.h
+++ b/src/database_async.h
@@ -9,7 +9,7 @@
#include <vector>
#include <node.h>
-#include "leveldb/cache.h"
+#include "rocksdb/cache.h"
#include "async.h"
@@ -34,7 +34,7 @@ public:
virtual void Execute ();
private:
- leveldb::Options* options;
+ rocksdb::Options* options;
};
class CloseWorker : public AsyncWorker {
@@ -54,7 +54,7 @@ public:
IOWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, v8::Local<v8::Object> &keyHandle
);
@@ -62,7 +62,7 @@ public:
virtual void WorkComplete ();
protected:
- leveldb::Slice key;
+ rocksdb::Slice key;
};
class ReadWorker : public IOWorker {
@@ -70,7 +70,7 @@ public:
ReadWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, bool asBuffer
, bool fillCache
, v8::Local<v8::Object> &keyHandle
@@ -82,7 +82,7 @@ public:
private:
bool asBuffer;
- leveldb::ReadOptions* options;
+ rocksdb::ReadOptions* options;
std::string value;
};
@@ -91,7 +91,7 @@ public:
DeleteWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
+ , rocksdb::Slice key
, bool sync
, v8::Local<v8::Object> &keyHandle
);
@@ -100,7 +100,7 @@ public:
virtual void Execute ();
protected:
- leveldb::WriteOptions* options;
+ rocksdb::WriteOptions* options;
};
class WriteWorker : public DeleteWorker {
@@ -108,8 +108,8 @@ public:
WriteWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice key
- , leveldb::Slice value
+ , rocksdb::Slice key
+ , rocksdb::Slice value
, bool sync
, v8::Local<v8::Object> &keyHandle
, v8::Local<v8::Object> &valueHandle
@@ -120,7 +120,7 @@ public:
virtual void WorkComplete ();
private:
- leveldb::Slice value;
+ rocksdb::Slice value;
};
class BatchWorker : public AsyncWorker {
@@ -128,7 +128,7 @@ public:
BatchWorker (
Database *database
, NanCallback *callback
- , leveldb::WriteBatch* batch
+ , rocksdb::WriteBatch* batch
, bool sync
);
@@ -136,8 +136,8 @@ public:
virtual void Execute ();
private:
- leveldb::WriteOptions* options;
- leveldb::WriteBatch* batch;
+ rocksdb::WriteOptions* options;
+ rocksdb::WriteBatch* batch;
};
class ApproximateSizeWorker : public AsyncWorker {
@@ -145,8 +145,8 @@ public:
ApproximateSizeWorker (
Database *database
, NanCallback *callback
- , leveldb::Slice start
- , leveldb::Slice end
+ , rocksdb::Slice start
+ , rocksdb::Slice end
, v8::Local<v8::Object> &startHandle
, v8::Local<v8::Object> &endHandle
);
@@ -157,7 +157,7 @@ public:
virtual void WorkComplete ();
private:
- leveldb::Range range;
+ rocksdb::Range range;
uint64_t size;
};
diff --git a/src/iterator.cc b/src/iterator.cc
index 6a696eb..ea9ea96 100644
--- a/src/iterator.cc
+++ b/src/iterator.cc
@@ -17,7 +17,7 @@ static v8::Persistent<v8::FunctionTemplate> iterator_constructor;
Iterator::Iterator (
Database* database
, uint32_t id
- , leveldb::Slice* start
+ , rocksdb::Slice* start
, std::string* end
, bool reverse
, bool keys
@@ -53,7 +53,7 @@ Iterator::Iterator (
obj->Set(NanSymbol("start"), startHandle);
NanAssignPersistent(v8::Object, persistentHandle, obj);
- options = new leveldb::ReadOptions();
+ options = new rocksdb::ReadOptions();
options->fill_cache = fillCache;
dbIterator = NULL;
count = 0;
@@ -154,7 +154,7 @@ bool Iterator::IteratorNext (std::string& key, std::string& value) {
return false;
}
-leveldb::Status Iterator::IteratorStatus () {
+rocksdb::Status Iterator::IteratorStatus () {
return dbIterator->status();
}
@@ -283,7 +283,7 @@ NAN_METHOD(Iterator::New) {
v8::Handle<v8::Function> callback;
v8::Local<v8::Object> startHandle;
- leveldb::Slice* start = NULL;
+ rocksdb::Slice* start = NULL;
std::string* end = NULL;
int limit = -1;
@@ -318,7 +318,7 @@ NAN_METHOD(Iterator::New) {
// ignore start if it has size 0 since a Slice can't have length 0
if (StringOrBufferLength(startHandle) > 0) {
LD_STRING_OR_BUFFER_TO_SLICE(_start, startHandle, start)
- start = new leveldb::Slice(_start.data(), _start.size());
+ start = new rocksdb::Slice(_start.data(), _start.size());
}
}
@@ -353,7 +353,7 @@ NAN_METHOD(Iterator::New) {
LD_STRING_OR_BUFFER_TO_SLICE(_lt, ltBuffer, lt)
lt = new std::string(_lt.data(), _lt.size());
if (reverse)
- start = new leveldb::Slice(_lt.data(), _lt.size());
+ start = new rocksdb::Slice(_lt.data(), _lt.size());
}
}
@@ -369,7 +369,7 @@ NAN_METHOD(Iterator::New) {
LD_STRING_OR_BUFFER_TO_SLICE(_lte, lteBuffer, lte)
lte = new std::string(_lte.data(), _lte.size());
if (reverse)
- start = new leveldb::Slice(_lte.data(), _lte.size());
+ start = new rocksdb::Slice(_lte.data(), _lte.size());
}
}
@@ -385,7 +385,7 @@ NAN_METHOD(Iterator::New) {
LD_STRING_OR_BUFFER_TO_SLICE(_gt, gtBuffer, gt)
gt = new std::string(_gt.data(), _gt.size());
if (!reverse)
- start = new leveldb::Slice(_gt.data(), _gt.size());
+ start = new rocksdb::Slice(_gt.data(), _gt.size());
}
}
@@ -401,7 +401,7 @@ NAN_METHOD(Iterator::New) {
LD_STRING_OR_BUFFER_TO_SLICE(_gte, gteBuffer, gte)
gte = new std::string(_gte.data(), _gte.size());
if (!reverse)
- start = new leveldb::Slice(_gte.data(), _gte.size());
+ start = new rocksdb::Slice(_gte.data(), _gte.size());
}
}
diff --git a/src/iterator.h b/src/iterator.h
index 8309d2f..20688a4 100644
--- a/src/iterator.h
+++ b/src/iterator.h
@@ -30,7 +30,7 @@ public:
Iterator (
Database* database
, uint32_t id
- , leveldb::Slice* start
+ , rocksdb::Slice* start
, std::string* end
, bool reverse
, bool keys
@@ -49,16 +49,16 @@ public:
~Iterator ();
bool IteratorNext (std::string& key, std::string& value);
- leveldb::Status IteratorStatus ();
+ rocksdb::Status IteratorStatus ();
void IteratorEnd ();
void Release ();
private:
Database* database;
uint32_t id;
- leveldb::Iterator* dbIterator;
- leveldb::ReadOptions* options;
- leveldb::Slice* start;
+ rocksdb::Iterator* dbIterator;
+ rocksdb::ReadOptions* options;
+ rocksdb::Slice* start;
std::string* end;
bool reverse;
bool keys;
diff --git a/src/leveldown.h b/src/leveldown.h
index 2617ade..0bf7042 100644
--- a/src/leveldown.h
+++ b/src/leveldown.h
@@ -7,7 +7,7 @@
#include <node.h>
#include <node_buffer.h>
-#include <leveldb/slice.h>
+#include <rocksdb/slice.h>
#include "nan.h"
@@ -21,7 +21,7 @@ static inline size_t StringOrBufferLength(v8::Local<v8::Value> obj) {
// LD_STRING_OR_BUFFER_TO_SLICE
static inline void DisposeStringOrBufferFromSlice(
v8::Persistent<v8::Object> &handle
- , leveldb::Slice slice) {
+ , rocksdb::Slice slice) {
if (!node::Buffer::HasInstance(NanPersistentToLocal(handle)->Get(NanSymbol("obj"))))
delete[] slice.data();
@@ -30,7 +30,7 @@ static inline void DisposeStringOrBufferFromSlice(
static inline void DisposeStringOrBufferFromSlice(
v8::Local<v8::Value> handle
- , leveldb::Slice slice) {
+ , rocksdb::Slice slice) {
if (!node::Buffer::HasInstance(handle))
delete[] slice.data();
@@ -64,7 +64,7 @@ static inline void DisposeStringOrBufferFromSlice(
, NULL, v8::String::NO_NULL_TERMINATION \
); \
} \
- leveldb::Slice to(to ## Ch_, to ## Sz_);
+ rocksdb::Slice to(to ## Ch_, to ## Sz_);
#define LD_RETURN_CALLBACK_OR_ERROR(callback, msg) \
if (!callback.IsEmpty() && callback->IsFunction()) { \
diff --git a/src/leveldown_async.cc b/src/leveldown_async.cc
index db84c1f..5d0e59e 100644
--- a/src/leveldown_async.cc
+++ b/src/leveldown_async.cc
@@ -3,7 +3,7 @@
* MIT +no-false-attribs License <https://github.com/rvagg/node-leveldown/blob/master/LICENSE>
*/
-#include <leveldb/db.h>
+#include <rocksdb/db.h>
#include "leveldown.h"
#include "leveldown_async.h"
@@ -24,8 +24,8 @@ DestroyWorker::~DestroyWorker () {
}
void DestroyWorker::Execute () {
- leveldb::Options options;
- SetStatus(leveldb::DestroyDB(location, options));
+ rocksdb::Options options;
+ SetStatus(rocksdb::DestroyDB(location, options));
}
/** REPAIR WORKER **/
@@ -42,8 +42,8 @@ RepairWorker::~RepairWorker () {
}
void RepairWorker::Execute () {
- leveldb::Options options;
- SetStatus(leveldb::RepairDB(location, options));
+ rocksdb::Options options;
+ SetStatus(rocksdb::RepairDB(location, options));
}
} // namespace leveldown
--
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