[RocksJava] Integrated review comments

Parameter types for BackupID are now aligned to int.
wpc · Oct 28, 2014 · f7c9730 · f7c9730
1 parent 7e12ae5
commit f7c9730
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/java/org/rocksdb/BackupableDB.java b/java/org/rocksdb/BackupableDB.java
@@ -69,7 +69,7 @@ public void purgeOldBackups(int numBackupsToKeep)
    * @param backupId of backup to delete.
    * @throws org.rocksdb.RocksDBException
    */
-  public void deleteBackup(long backupId) throws RocksDBException {
+  public void deleteBackup(int backupId) throws RocksDBException {
     deleteBackup0(nativeHandle_, backupId);
   }
 
@@ -114,7 +114,7 @@ protected native void createNewBackup(long handle, boolean flag)
       throws RocksDBException;
   protected native void purgeOldBackups(long handle, int numBackupsToKeep)
       throws RocksDBException;
-  private native void deleteBackup0(long nativeHandle, long backupId)
+  private native void deleteBackup0(long nativeHandle, int backupId)
       throws RocksDBException;
   protected native List<BackupInfo> getBackupInfo(long handle);
 }
diff --git a/java/org/rocksdb/RestoreBackupableDB.java b/java/org/rocksdb/RestoreBackupableDB.java
@@ -79,7 +79,7 @@ public void purgeOldBackups(int numBackupsToKeep) throws RocksDBException {
    * @param backupId of backup to delete.
    * @throws org.rocksdb.RocksDBException
    */
-  public void deleteBackup(long backupId) throws RocksDBException {
+  public void deleteBackup(int backupId) throws RocksDBException {
     deleteBackup0(nativeHandle_, backupId);
   }
 
@@ -111,7 +111,7 @@ private native void restoreDBFromLatestBackup0(long nativeHandle,
       throws RocksDBException;
   private native void purgeOldBackups0(long nativeHandle, int numBackupsToKeep)
       throws RocksDBException;
-  private native void deleteBackup0(long nativeHandle, long backupId)
+  private native void deleteBackup0(long nativeHandle, int backupId)
       throws RocksDBException;
   protected native List<BackupInfo> getBackupInfo(long handle);
   private native void dispose(long nativeHandle);

diff --git a/java/rocksjni/backupablejni.cc b/java/rocksjni/backupablejni.cc
@@ -66,10 +66,10 @@ void Java_org_rocksdb_BackupableDB_purgeOldBackups(
 /*
  * Class:     org_rocksdb_BackupableDB
  * Method:    deleteBackup0
- * Signature: (JJ)V
+ * Signature: (JI)V
  */
 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);
   rocksdb::Status s = rdb->DeleteBackup(jbackup_id);
 

diff --git a/java/rocksjni/restorejni.cc b/java/rocksjni/restorejni.cc
@@ -119,10 +119,10 @@ void Java_org_rocksdb_RestoreBackupableDB_purgeOldBackups0(JNIEnv* env,
 /*
  * Class:     org_rocksdb_RestoreBackupableDB
  * Method:    deleteBackup0
- * Signature: (JJ)V
+ * Signature: (JI)V
  */
 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);
   rocksdb::Status s = rdb->DeleteBackup(jbackup_id);