[RocksJava] Integrated changes from D33417

main
fyrz 10 years ago
parent 819e787bb9
commit 7f0c77cb31
  1. 2
      java/src/main/java/org/rocksdb/BackupInfo.java
  2. 2
      java/src/main/java/org/rocksdb/BackupableDB.java
  3. 2
      java/src/main/java/org/rocksdb/BackupableDBOptions.java
  4. 2
      java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
  5. 2
      java/src/main/java/org/rocksdb/BloomFilter.java
  6. 2
      java/src/main/java/org/rocksdb/Checkpoint.java
  7. 2
      java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java
  8. 2
      java/src/main/java/org/rocksdb/ColumnFamilyHandle.java
  9. 2
      java/src/main/java/org/rocksdb/ColumnFamilyOptions.java
  10. 2
      java/src/main/java/org/rocksdb/DBOptions.java
  11. 2
      java/src/main/java/org/rocksdb/FlushOptions.java
  12. 2
      java/src/main/java/org/rocksdb/HashLinkedListMemTableConfig.java
  13. 2
      java/src/main/java/org/rocksdb/HashSkipListMemTableConfig.java
  14. 2
      java/src/main/java/org/rocksdb/Options.java
  15. 2
      java/src/main/java/org/rocksdb/PlainTableConfig.java
  16. 2
      java/src/main/java/org/rocksdb/ReadOptions.java
  17. 2
      java/src/main/java/org/rocksdb/RestoreBackupableDB.java
  18. 2
      java/src/main/java/org/rocksdb/RestoreOptions.java
  19. 2
      java/src/main/java/org/rocksdb/SkipListMemTableConfig.java
  20. 2
      java/src/main/java/org/rocksdb/Snapshot.java
  21. 2
      java/src/main/java/org/rocksdb/TransactionLogIterator.java
  22. 2
      java/src/main/java/org/rocksdb/VectorMemTableConfig.java
  23. 2
      java/src/main/java/org/rocksdb/WriteOptions.java
  24. 2
      java/src/main/java/org/rocksdb/util/Environment.java
  25. 2
      java/src/main/java/org/rocksdb/util/SizeUnit.java

@ -8,7 +8,7 @@ package org.rocksdb;
* Instances of this class describe a Backup made by
* {@link org.rocksdb.BackupableDB}.
*/
public final class BackupInfo {
public class BackupInfo {
/**
* Package private constructor used to create instances

@ -13,7 +13,7 @@ import java.util.List;
*
* @see org.rocksdb.BackupableDBOptions
*/
public final class BackupableDB extends RocksDB {
public class BackupableDB extends RocksDB {
/**
* <p>Open a {@code BackupableDB} under the specified path.
* Note that the backup path should be set properly in the

@ -17,7 +17,7 @@ import java.nio.file.Path;
*
* @see org.rocksdb.BackupableDB
*/
public final class BackupableDBOptions extends RocksObject {
public class BackupableDBOptions extends RocksObject {
/**
* <p>BackupableDBOptions constructor.</p>

@ -9,7 +9,7 @@ package org.rocksdb;
*
* BlockBasedTable is a RocksDB's default SST file format.
*/
public final class BlockBasedTableConfig extends TableFormatConfig {
public class BlockBasedTableConfig extends TableFormatConfig {
public BlockBasedTableConfig() {
noBlockCache_ = false;

@ -18,7 +18,7 @@ package org.rocksdb;
* FilterPolicy (like {@code BloomFilter}) that does not ignore
* trailing spaces in keys.</p>
*/
public final class BloomFilter extends Filter {
public class BloomFilter extends Filter {
private static final int DEFAULT_BITS_PER_KEY = 10;
private static final boolean DEFAULT_MODE = true;

@ -9,7 +9,7 @@ package org.rocksdb;
* Provides Checkpoint functionality. Checkpoints
* provide persistent snapshots of RocksDB databases.
*/
public final class Checkpoint extends RocksObject {
public class Checkpoint extends RocksObject {
/**
* Creates a Checkpoint object to be used for creating open-able

@ -9,7 +9,7 @@ package org.rocksdb;
* <p>Describes a column family with a
* name and respective Options.</p>
*/
public final class ColumnFamilyDescriptor {
public class ColumnFamilyDescriptor {
/**
* <p>Creates a new Column Family using a name and default

@ -9,7 +9,7 @@ package org.rocksdb;
* ColumnFamilyHandle class to hold handles to underlying rocksdb
* ColumnFamily Pointers.
*/
public final class ColumnFamilyHandle extends RocksObject {
public class ColumnFamilyHandle extends RocksObject {
ColumnFamilyHandle(final RocksDB rocksDB,
final long nativeHandle) {
super();

@ -14,7 +14,7 @@ import java.util.Properties;
* If {@link #dispose()} function is not called, then it will be GC'd automatically
* and native resources will be released as part of the process.
*/
public final class ColumnFamilyOptions extends RocksObject
public class ColumnFamilyOptions extends RocksObject
implements ColumnFamilyOptionsInterface {
static {
RocksDB.loadLibrary();

@ -14,7 +14,7 @@ import java.util.Properties;
* If {@link #dispose()} function is not called, then it will be GC'd automatically
* and native resources will be released as part of the process.
*/
public final class DBOptions extends RocksObject implements DBOptionsInterface {
public class DBOptions extends RocksObject implements DBOptionsInterface {
static {
RocksDB.loadLibrary();
}

@ -4,7 +4,7 @@ package org.rocksdb;
* FlushOptions to be passed to flush operations of
* {@link org.rocksdb.RocksDB}.
*/
public final class FlushOptions extends RocksObject {
public class FlushOptions extends RocksObject {
/**
* Construct a new instance of FlushOptions.

@ -13,7 +13,7 @@ package org.rocksdb;
* use the default memtable representation (SkipList) instead
* and post a warning in the LOG.
*/
public final class HashLinkedListMemTableConfig extends MemTableConfig {
public class HashLinkedListMemTableConfig extends MemTableConfig {
public static final long DEFAULT_BUCKET_COUNT = 50000;
public static final long DEFAULT_HUGE_PAGE_TLB_SIZE = 0;
public static final int DEFAULT_BUCKET_ENTRIES_LOG_THRES = 4096;

@ -13,7 +13,7 @@ package org.rocksdb;
* use the default memtable representation (SkipList) instead
* and post a warning in the LOG.
*/
public final class HashSkipListMemTableConfig extends MemTableConfig {
public class HashSkipListMemTableConfig extends MemTableConfig {
public static final int DEFAULT_BUCKET_COUNT = 1000000;
public static final int DEFAULT_BRANCHING_FACTOR = 4;
public static final int DEFAULT_HEIGHT = 4;

@ -12,7 +12,7 @@ package org.rocksdb;
* If {@link #dispose()} function is not called, then it will be GC'd automatically
* and native resources will be released as part of the process.
*/
public final class Options extends RocksObject
public class Options extends RocksObject
implements DBOptionsInterface, ColumnFamilyOptionsInterface {
static {
RocksDB.loadLibrary();

@ -12,7 +12,7 @@ package org.rocksdb;
*
* <p>It also support prefix hash feature.</p>
*/
public final class PlainTableConfig extends TableFormatConfig {
public class PlainTableConfig extends TableFormatConfig {
public static final int VARIABLE_LENGTH = 0;
public static final int DEFAULT_BLOOM_BITS_PER_KEY = 10;
public static final double DEFAULT_HASH_TABLE_RATIO = 0.75;

@ -11,7 +11,7 @@ package org.rocksdb;
* Note that dispose() must be called before an Options instance
* become out-of-scope to release the allocated memory in c++.
*/
public final class ReadOptions extends RocksObject {
public class ReadOptions extends RocksObject {
public ReadOptions() {
super();
newReadOptions();

@ -16,7 +16,7 @@ import java.util.List;
* memory in c++.</p>
*
*/
public final class RestoreBackupableDB extends RocksObject {
public class RestoreBackupableDB extends RocksObject {
/**
* <p>Construct new estoreBackupableDB instance.</p>
*

@ -12,7 +12,7 @@ package org.rocksdb;
* to release the allocated memory in c++.
*
*/
public final class RestoreOptions extends RocksObject {
public class RestoreOptions extends RocksObject {
/**
* Constructor
*

@ -3,7 +3,7 @@ package org.rocksdb;
/**
* The config for skip-list memtable representation.
*/
public final class SkipListMemTableConfig extends MemTableConfig {
public class SkipListMemTableConfig extends MemTableConfig {
public static final long DEFAULT_LOOKAHEAD = 0;

@ -8,7 +8,7 @@ package org.rocksdb;
/**
* Snapshot of database
*/
public final class Snapshot extends RocksObject {
public class Snapshot extends RocksObject {
Snapshot(final long nativeHandle) {
super();
nativeHandle_ = nativeHandle;

@ -5,7 +5,7 @@ package org.rocksdb;
* One run of the iterator is continuous, i.e. the iterator will stop at the
* beginning of any gap in sequences.</p>
*/
public final class TransactionLogIterator extends RocksObject {
public class TransactionLogIterator extends RocksObject {
/**
* <p>An iterator is either positioned at a WriteBatch

@ -3,7 +3,7 @@ package org.rocksdb;
/**
* The config for vector memtable representation.
*/
public final class VectorMemTableConfig extends MemTableConfig {
public class VectorMemTableConfig extends MemTableConfig {
public static final int DEFAULT_RESERVED_SIZE = 0;
/**

@ -11,7 +11,7 @@ package org.rocksdb;
* Note that developers should call WriteOptions.dispose() to release the
* c++ side memory before a WriteOptions instance runs out of scope.
*/
public final class WriteOptions extends RocksObject {
public class WriteOptions extends RocksObject {
/**
* Construct WriteOptions instance.
*/

@ -1,6 +1,6 @@
package org.rocksdb.util;
public final class Environment {
public class Environment {
private static String OS = System.getProperty("os.name").toLowerCase();
private static String ARCH = System.getProperty("os.arch").toLowerCase();

@ -5,7 +5,7 @@
package org.rocksdb.util;
public final class SizeUnit {
public class SizeUnit {
public static final long KB = 1024L;
public static final long MB = KB * KB;
public static final long GB = KB * MB;

Loading…
Cancel
Save