Skip to content

Commit

Permalink
Remove orphaned Java classes
Browse files Browse the repository at this point in the history
Summary:
Remove orphaned Java classes that were missed from commit 9385fd7
Closes facebook#2210
Closes facebook#2212

Differential Revision: D4986199

Pulled By: maysamyabandeh

fbshipit-source-id: 74e866cd8661c172a4754c2c945e30d650f6fa05
  • Loading branch information
adamretter authored and facebook-github-bot committed May 3, 2017
1 parent 5e2ebf2 commit 498693c
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 341 deletions.
2 changes: 0 additions & 2 deletions java/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ set(NATIVE_JAVA_CLASSES
org.rocksdb.AbstractRocksIterator
org.rocksdb.AbstractSlice
org.rocksdb.AbstractWriteBatch
org.rocksdb.BackupableDB
org.rocksdb.BackupableDBOptions
org.rocksdb.BackupEngine
org.rocksdb.BackupEngineTest
Expand Down Expand Up @@ -84,7 +83,6 @@ set(NATIVE_JAVA_CLASSES
org.rocksdb.RateLimiter
org.rocksdb.ReadOptions
org.rocksdb.RemoveEmptyValueCompactionFilter
org.rocksdb.RestoreBackupableDB
org.rocksdb.RestoreOptions
org.rocksdb.RocksDB
org.rocksdb.RocksDBExceptionTest
Expand Down
2 changes: 1 addition & 1 deletion java/rocksjni/backupablejni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
//
// This file implements the "bridge" between Java and C++ and enables
// calling c++ rocksdb::BackupableDB and rocksdb::BackupableDBOptions methods
// calling c++ rocksdb::BackupEnginge and rocksdb::BackupableDBOptions methods
// from Java side.

#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion java/rocksjni/env_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
//
// This file implements the "bridge" between Java and C++ and enables
// calling c++ rocksdb::BackupableDB and rocksdb::BackupableDBOptions methods
// calling C++ rocksdb::EnvOptions methods
// from Java side.

#include <jni.h>
Expand Down
2 changes: 1 addition & 1 deletion java/rocksjni/external_sst_file_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
//
// This file implements the "bridge" between Java and C++ and enables
// calling c++ rocksdb::BackupableDB and rocksdb::BackupableDBOptions methods
// calling C++ rocksdb::ExternalSstFileInfo methods
// from Java side.

#include <jni.h>
Expand Down
2 changes: 1 addition & 1 deletion java/rocksjni/restorejni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
//
// This file implements the "bridge" between Java and C++ and enables
// calling c++ rocksdb::RestoreBackupableDB and rocksdb::RestoreOptions methods
// calling C++ rocksdb::RestoreOptions methods
// from Java side.

#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion java/rocksjni/sst_file_writerjni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
//
// This file implements the "bridge" between Java and C++ and enables
// calling c++ rocksdb::BackupableDB and rocksdb::BackupableDBOptions methods
// calling C++ rocksdb::SstFileWriter methods
// from Java side.

#include <jni.h>
Expand Down
5 changes: 2 additions & 3 deletions java/src/main/java/org/rocksdb/BackupInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@

/**
* Instances of this class describe a Backup made by
* {@link org.rocksdb.BackupableDB}.
* {@link org.rocksdb.BackupEngine}.
*/
public class BackupInfo {

/**
* Package private constructor used to create instances
* of BackupInfo by {@link org.rocksdb.BackupableDB} and
* {@link org.rocksdb.RestoreBackupableDB}.
* of BackupInfo by {@link org.rocksdb.BackupEngine}
*
* @param backupId id of backup
* @param timestamp timestamp of backup
Expand Down
167 changes: 0 additions & 167 deletions java/src/main/java/org/rocksdb/BackupableDB.java

This file was deleted.

12 changes: 6 additions & 6 deletions java/src/main/java/org/rocksdb/BackupableDBOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

/**
* <p>BackupableDBOptions to control the behavior of a backupable database.
* It will be used during the creation of a {@link org.rocksdb.BackupableDB}.
* It will be used during the creation of a {@link org.rocksdb.BackupEngine}.
* </p>
* <p>Note that dispose() must be called before an Options instance
* become out-of-scope to release the allocated memory in c++.</p>
*
* @see org.rocksdb.BackupableDB
* @see org.rocksdb.BackupEngine
*/
public class BackupableDBOptions extends RocksObject {

Expand Down Expand Up @@ -375,8 +375,8 @@ public boolean shareFilesWithChecksum() {

/**
* Up to this many background threads will copy files for
* {@link BackupableDB#createNewBackup(boolean)} and
* {@link RestoreBackupableDB#restoreDBFromBackup(long, String, String, RestoreOptions)}
* {@link BackupEngine#createNewBackup(RocksDB, boolean)} and
* {@link BackupEngine#restoreDbFromBackup(int, String, String, RestoreOptions)}
*
* Default: 1
*
Expand All @@ -392,8 +392,8 @@ public BackupableDBOptions setMaxBackgroundOperations(

/**
* Up to this many background threads will copy files for
* {@link BackupableDB#createNewBackup(boolean)} and
* {@link RestoreBackupableDB#restoreDBFromBackup(long, String, String, RestoreOptions)}
* {@link BackupEngine#createNewBackup(RocksDB, boolean)} and
* {@link BackupEngine#restoreDbFromBackup(int, String, String, RestoreOptions)}
*
* Default: 1
*
Expand Down
Loading

0 comments on commit 498693c

Please sign in to comment.