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

[RocksJava] Integrated review comments

Browse Source 
Parameter types for BackupID are now aligned to int.
This commit is contained in:
fyrz 2014-10-28 18:42:30 +01:00
parent 7e12ae5a21
commit f7c9730696
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ public class BackupableDB extends RocksDB {
* @param backupId of backup to delete. * @param backupId of backup to delete.
* @throws org.rocksdb.RocksDBException * @throws org.rocksdb.RocksDBException
*/ */
public void deleteBackup(long backupId) throws RocksDBException { public void deleteBackup(int backupId) throws RocksDBException {
deleteBackup0(nativeHandle_, backupId); deleteBackup0(nativeHandle_, backupId);
} }
@ -114,7 +114,7 @@ public class BackupableDB extends RocksDB {
throws RocksDBException; throws RocksDBException;
protected native void purgeOldBackups(long handle, int numBackupsToKeep) protected native void purgeOldBackups(long handle, int numBackupsToKeep)
throws RocksDBException; throws RocksDBException;
private native void deleteBackup0(long nativeHandle, long backupId) private native void deleteBackup0(long nativeHandle, int backupId)
throws RocksDBException; throws RocksDBException;
protected native List<BackupInfo> getBackupInfo(long handle); protected native List<BackupInfo> getBackupInfo(long handle);
} }

4
java/org/rocksdb/RestoreBackupableDB.java
View File

@ -79,7 +79,7 @@ public class RestoreBackupableDB extends RocksObject {
* @param backupId of backup to delete. * @param backupId of backup to delete.
* @throws org.rocksdb.RocksDBException * @throws org.rocksdb.RocksDBException
*/ */
public void deleteBackup(long backupId) throws RocksDBException { public void deleteBackup(int backupId) throws RocksDBException {
deleteBackup0(nativeHandle_, backupId); deleteBackup0(nativeHandle_, backupId);
} }
@ -111,7 +111,7 @@ public class RestoreBackupableDB extends RocksObject {
throws RocksDBException; throws RocksDBException;
private native void purgeOldBackups0(long nativeHandle, int numBackupsToKeep) private native void purgeOldBackups0(long nativeHandle, int numBackupsToKeep)
throws RocksDBException; throws RocksDBException;
private native void deleteBackup0(long nativeHandle, long backupId) private native void deleteBackup0(long nativeHandle, int backupId)
throws RocksDBException; throws RocksDBException;
protected native List<BackupInfo> getBackupInfo(long handle); protected native List<BackupInfo> getBackupInfo(long handle);
private native void dispose(long nativeHandle); private native void dispose(long nativeHandle);

4
java/rocksjni/backupablejni.cc
View File

@ -66,10 +66,10 @@ void Java_org_rocksdb_BackupableDB_purgeOldBackups(
/* /*
* Class: org_rocksdb_BackupableDB * Class: org_rocksdb_BackupableDB
* Method: deleteBackup0 * Method: deleteBackup0
* Signature: (JJ)V * Signature: (JI)V
*/ */
void Java_org_rocksdb_BackupableDB_deleteBackup0(JNIEnv* env, void Java_org_rocksdb_BackupableDB_deleteBackup0(JNIEnv* env,
jobject jobj, jlong jhandle, jlong jbackup_id) { jobject jobj, jlong jhandle, jint jbackup_id) {
auto rdb = reinterpret_cast<rocksdb::BackupableDB*>(jhandle); auto rdb = reinterpret_cast<rocksdb::BackupableDB*>(jhandle);
rocksdb::Status s = rdb->DeleteBackup(jbackup_id); rocksdb::Status s = rdb->DeleteBackup(jbackup_id);

4
java/rocksjni/restorejni.cc
View File

@ -119,10 +119,10 @@ void Java_org_rocksdb_RestoreBackupableDB_purgeOldBackups0(JNIEnv* env,
/* /*
* Class: org_rocksdb_RestoreBackupableDB * Class: org_rocksdb_RestoreBackupableDB
* Method: deleteBackup0 * Method: deleteBackup0
* Signature: (JJ)V * Signature: (JI)V
*/ */
void Java_org_rocksdb_RestoreBackupableDB_deleteBackup0(JNIEnv* env, void Java_org_rocksdb_RestoreBackupableDB_deleteBackup0(JNIEnv* env,
jobject jobj, jlong jhandle, jlong jbackup_id) { jobject jobj, jlong jhandle, jint jbackup_id) {
auto rdb = reinterpret_cast<rocksdb::RestoreBackupableDB*>(jhandle); auto rdb = reinterpret_cast<rocksdb::RestoreBackupableDB*>(jhandle);
rocksdb::Status s = rdb->DeleteBackup(jbackup_id); rocksdb::Status s = rdb->DeleteBackup(jbackup_id);