Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ankit Gupta
2014-05-29 18:33:11 -07:00
18 changed files with 145 additions and 135 deletions

View File

@@ -59,15 +59,14 @@ public class BackupableDBOptions extends RocksObject {
* Release the memory allocated for the current instance
* in the c++ side.
*/
@Override public synchronized void dispose() {
if (isInitialized()) {
dispose(nativeHandle_);
}
@Override protected void disposeInternal() {
assert(isInitialized());
disposeInternal(nativeHandle_);
}
private native void newBackupableDBOptions(String path,
boolean shareTableFiles, boolean sync, boolean destroyOldData,
boolean backupLogFiles, long backupRateLimit, long restoreRateLimit);
private native String backupDir(long handle);
private native void dispose(long handle);
private native void disposeInternal(long handle);
}