Merge branch 'master' of github.com:facebook/rocksdb

This commit is contained in:
krad 2015-03-23 15:04:48 -07:00
commit 868968c8e5
2 changed files with 28 additions and 27 deletions

View File

@ -57,7 +57,6 @@ public class RocksDBSample {
assert(options.compressionType() == CompressionType.SNAPPY_COMPRESSION); assert(options.compressionType() == CompressionType.SNAPPY_COMPRESSION);
assert(options.compactionStyle() == CompactionStyle.UNIVERSAL); assert(options.compactionStyle() == CompactionStyle.UNIVERSAL);
try {
assert(options.memTableFactoryName().equals("SkipListFactory")); assert(options.memTableFactoryName().equals("SkipListFactory"));
options.setMemTableConfig( options.setMemTableConfig(
new HashSkipListMemTableConfig() new HashSkipListMemTableConfig()
@ -86,9 +85,7 @@ public class RocksDBSample {
options.setRateLimiterConfig(new GenericRateLimiterConfig(10000000, options.setRateLimiterConfig(new GenericRateLimiterConfig(10000000,
10000, 10)); 10000, 10));
options.setRateLimiterConfig(new GenericRateLimiterConfig(10000000)); options.setRateLimiterConfig(new GenericRateLimiterConfig(10000000));
} catch (RocksDBException e) {
assert(false);
}
Filter bloomFilter = new BloomFilter(10); Filter bloomFilter = new BloomFilter(10);
BlockBasedTableConfig table_options = new BlockBasedTableConfig(); BlockBasedTableConfig table_options = new BlockBasedTableConfig();

View File

@ -506,6 +506,10 @@ public interface ColumnFamilyOptionsInterface {
* <p><strong>Caution</strong>: this option is experimental</p> * <p><strong>Caution</strong>: this option is experimental</p>
* *
* <p>Default: false</p> * <p>Default: false</p>
*
* @param enableLevelCompactionDynamicLevelBytes boolean value indicating
* if {@code LevelCompactionDynamicLevelBytes} shall be enabled.
* @return the reference to the current option.
*/ */
Object setLevelCompactionDynamicLevelBytes( Object setLevelCompactionDynamicLevelBytes(
boolean enableLevelCompactionDynamicLevelBytes); boolean enableLevelCompactionDynamicLevelBytes);