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

java/samples/src/main/java/RocksDBSample.java

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

java/src/main/java/org/rocksdb/ColumnFamilyOptionsInterface.java

@@ -506,6 +506,10 @@ public interface ColumnFamilyOptionsInterface {
    * <p><strong>Caution</strong>: this option is experimental</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(
       boolean enableLevelCompactionDynamicLevelBytes);