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

[RocksJava] DefaultColumnFamily Memory Fix

Browse Source 
In the current implementation DefaultColumnFamily will not disown
the native handle. As the database handles the lease on the native
handle this should be the case.
This commit is contained in:
fyrz 2015-03-02 21:58:11 +01:00
parent 22c73d15b2
commit a01b592597
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/main/java/org/rocksdb/RocksDB.java
View File

@ -1270,7 +1270,10 @@ public class RocksDB extends RocksObject {
* @return The handle of the default column family
*/
public ColumnFamilyHandle getDefaultColumnFamily() {
return new ColumnFamilyHandle(this, getDefaultColumnFamily(nativeHandle_));
ColumnFamilyHandle cfHandle = new ColumnFamilyHandle(this,
getDefaultColumnFamily(nativeHandle_));
cfHandle.disOwnNativeHandle();
return cfHandle;
}
/**

9
java/src/test/java/org/rocksdb/ColumnFamilyTest.java
View File

@ -58,11 +58,7 @@ public class ColumnFamilyTest {
Options options = null;
ColumnFamilyHandle cfh = null;
try {
options = new Options();
options.setCreateIfMissing(true);
DBOptions dbOptions = new DBOptions();
dbOptions.setCreateIfMissing(true);
options = new Options().setCreateIfMissing(true);
db = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath());
cfh = db.getDefaultColumnFamily();
@ -78,9 +74,6 @@ public class ColumnFamilyTest {
assertThat(cfh).isNotNull();
assertThat(actualValue).isEqualTo(value);
} finally {
if (cfh != null) {
cfh.dispose();
}
if (db != null) {
db.close();
}