andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BackupableDB: don't keep a reference to the RocksDB object now that we have disOwnNativeObject

Browse Source
This commit is contained in:
Bob Potter 2014-05-27 13:54:02 -05:00
parent 5fe176d8f6
commit 05dd018353
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/org/rocksdb/BackupableDB.java
View File

@ -25,15 +25,14 @@ public class BackupableDB extends RocksDB {
public static BackupableDB open( public static BackupableDB open(
Options opt, BackupableDBOptions bopt, String db_path) Options opt, BackupableDBOptions bopt, String db_path)
throws RocksDBException { throws RocksDBException {
// since BackupableDB c++ will handle the life cycle of
// the returned RocksDB of RocksDB.open(), here we store RocksDB db = RocksDB.open(opt, db_path);
// it as a BackupableDB member variable to avoid GC. BackupableDB bdb = new BackupableDB();
BackupableDB bdb = new BackupableDB(RocksDB.open(opt, db_path)); bdb.open(db.nativeHandle_, bopt.nativeHandle_);
bdb.open(bdb.db_.nativeHandle_, bopt.nativeHandle_);
// Prevent the RocksDB object from attempting to delete // Prevent the RocksDB object from attempting to delete
// the underly C++ DB object. // the underly C++ DB object.
bdb.db_.disOwnNativeObject(); db.disOwnNativeObject();
return bdb; return bdb;
} }
@ -68,9 +67,8 @@ public class BackupableDB extends RocksDB {
* A protected construction that will be used in the static factory * A protected construction that will be used in the static factory
* method BackupableDB.open(). * method BackupableDB.open().
*/ */
protected BackupableDB(RocksDB db) { protected BackupableDB() {
super(); super();
db_ = db;
} }
@Override protected void finalize() { @Override protected void finalize() {
@ -79,6 +77,4 @@ public class BackupableDB extends RocksDB {
protected native void open(long rocksDBHandle, long backupDBOptionsHandle); protected native void open(long rocksDBHandle, long backupDBOptionsHandle);
protected native void createNewBackup(long handle, boolean flag); protected native void createNewBackup(long handle, boolean flag);
private final RocksDB db_;
} }