diff --git a/src/rocksdb.cc b/src/rocksdb.cc index 1ee8831..858317e 100644 --- a/src/rocksdb.cc +++ b/src/rocksdb.cc @@ -1088,7 +1088,7 @@ rocksdb__on_open(uv_work_t *handle) { auto env = NewCompositeEnv(std::make_shared()); - options.env = env.release(); + options.env = env.get(); auto handles = std::vector(req->len); @@ -1124,6 +1124,8 @@ rocksdb__on_open(uv_work_t *handle) { db->read_only = read_only; if (status.ok()) { + env.release(); + db->handle = ptr.release(); db->lock = lock; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f6200db..cd048ae 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND tests open-close open-close-immediately open-close-sync + open-locked read-only-wal-filter write-flush write-read diff --git a/test/open-locked.c b/test/open-locked.c new file mode 100644 index 0000000..d71939d --- /dev/null +++ b/test/open-locked.c @@ -0,0 +1,48 @@ +#include +#include +#include + +#include "../include/rocksdb.h" + +int +main() { + int e; + + uv_loop_t *loop = uv_default_loop(); + + rocksdb_options_t options = { + .create_if_missing = true, + }; + + rocksdb_column_family_descriptor_t descriptor = rocksdb_column_family_descriptor("default", NULL); + + rocksdb_t db; + rocksdb_column_family_t *family; + + rocksdb_open_t open; + e = rocksdb_open(loop, &db, &open, "test/fixtures/open-locked.db", &options, &descriptor, &family, 1, NULL, NULL); + assert(e == 0); + assert(open.error == NULL); + rocksdb_open_cleanup(&open); + + // Fails on the lock held by the first open. + { + rocksdb_t db; + rocksdb_column_family_t *family; + + rocksdb_open_t open; + e = rocksdb_open(loop, &db, &open, "test/fixtures/open-locked.db", &options, &descriptor, &family, 1, NULL, NULL); + assert(e == 0); + assert(open.error != NULL); + rocksdb_open_cleanup(&open); + } + + e = rocksdb_column_family_destroy(&db, family); + assert(e == 0); + + rocksdb_close_t close; + e = rocksdb_close(&db, &close, NULL, NULL); + assert(e == 0); + assert(close.error == NULL); + rocksdb_close_cleanup(&close); +}