Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions java/src/main/java/org/rocksdb/RocksDB.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ private enum LibraryState {

final List<ColumnFamilyHandle> ownedColumnFamilyHandles = new ArrayList<>();

/**
* Package-private accessor for {@link #defaultReadOptions_}, for testing only.
*/
ReadOptions getDefaultReadOptions() {
return defaultReadOptions_;
}

/**
* Loads the necessary library files.
* Calling this method twice will have no effect.
Expand Down Expand Up @@ -696,6 +703,7 @@ public void close() {
} catch (final RocksDBException e) {
// silently ignore the error report
} finally {
defaultReadOptions_.close();
disposeInternal();
}
}
Expand Down
11 changes: 11 additions & 0 deletions java/src/test/java/org/rocksdb/RocksDBTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,17 @@ public void createColumnFamiliesfromDescriptors() throws RocksDBException {
}
}

@Test
public void closeReleasesDefaultReadOptions() throws RocksDBException {
try (final Options options = new Options().setCreateIfMissing(true)) {
final RocksDB db = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath());
final ReadOptions defaultReadOptions = db.getDefaultReadOptions();
assertThat(defaultReadOptions.isOwningHandle()).isTrue();
db.close();
assertThat(defaultReadOptions.isOwningHandle()).isFalse();
}
}

@Test
public void put() throws RocksDBException {
try (final RocksDB db = RocksDB.open(dbFolder.getRoot().getAbsolutePath());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a native memory leak in the Java API where `RocksDB.close()` did not release the default `ReadOptions`, leaking one native object per opened DB instance.