Merge pull request #585 from fyrz/RocksJava-RemoveDeprecatedStuff

[RocksJava] Remove deprecated methods

java/rocksjni/options.cc

@@ -695,27 +695,6 @@ void Java_org_rocksdb_Options_setTableCacheNumshardbits(
       static_cast<int>(table_cache_numshardbits);
 }
 
-/*
- * Class:     org_rocksdb_Options
- * Method:    tableCacheRemoveScanCountLimit
- * Signature: (J)I
- */
-jint Java_org_rocksdb_Options_tableCacheRemoveScanCountLimit(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  // deprecated
-  return 0;
-}
-
-/*
- * Class:     org_rocksdb_Options
- * Method:    setTableCacheRemoveScanCountLimit
- * Signature: (JI)V
- */
-void Java_org_rocksdb_Options_setTableCacheRemoveScanCountLimit(
-    JNIEnv* env, jobject jobj, jlong jhandle, jint limit) {
-  // deprecated
-}
-
 /*
  * Method:    useFixedLengthPrefixExtractor
  * Signature: (JI)V
@@ -890,28 +869,6 @@ void Java_org_rocksdb_Options_setIsFdCloseOnExec(
       static_cast<bool>(is_fd_close_on_exec);
 }
 
-/*
- * Class:     org_rocksdb_Options
- * Method:    skipLogErrorOnRecovery
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_Options_skipLogErrorOnRecovery(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  return reinterpret_cast<rocksdb::Options*>(jhandle)
-      ->skip_log_error_on_recovery;
-}
-
-/*
- * Class:     org_rocksdb_Options
- * Method:    setSkipLogErrorOnRecovery
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_Options_setSkipLogErrorOnRecovery(
-    JNIEnv* env, jobject jobj, jlong jhandle, jboolean skip) {
-  reinterpret_cast<rocksdb::Options*>(jhandle)->skip_log_error_on_recovery =
-      static_cast<bool>(skip);
-}
-
 /*
  * Class:     org_rocksdb_Options
  * Method:    statsDumpPeriodSec
@@ -3523,27 +3480,6 @@ jint Java_org_rocksdb_DBOptions_tableCacheNumshardbits(
       table_cache_numshardbits;
 }
 
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    setTableCacheRemoveScanCountLimit
- * Signature: (JI)V
- */
-void Java_org_rocksdb_DBOptions_setTableCacheRemoveScanCountLimit(
-    JNIEnv* env, jobject jobj, jlong jhandle, jint limit) {
-  // deprecated
-}
-
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    tableCacheRemoveScanCountLimit
- * Signature: (J)I
- */
-jint Java_org_rocksdb_DBOptions_tableCacheRemoveScanCountLimit(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  // deprecated
-  return 0;
-}
-
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setWalTtlSeconds
@@ -3697,28 +3633,6 @@ jboolean Java_org_rocksdb_DBOptions_isFdCloseOnExec(
   return reinterpret_cast<rocksdb::DBOptions*>(jhandle)->is_fd_close_on_exec;
 }
 
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    setSkipLogErrorOnRecovery
- * Signature: (JZ)V
- */
-void Java_org_rocksdb_DBOptions_setSkipLogErrorOnRecovery(
-    JNIEnv* env, jobject jobj, jlong jhandle, jboolean skip) {
-  reinterpret_cast<rocksdb::DBOptions*>(jhandle)->skip_log_error_on_recovery =
-      static_cast<bool>(skip);
-}
-
-/*
- * Class:     org_rocksdb_DBOptions
- * Method:    skipLogErrorOnRecovery
- * Signature: (J)Z
- */
-jboolean Java_org_rocksdb_DBOptions_skipLogErrorOnRecovery(
-    JNIEnv* env, jobject jobj, jlong jhandle) {
-  return reinterpret_cast<rocksdb::DBOptions*>(jhandle)
-      ->skip_log_error_on_recovery;
-}
-
 /*
  * Class:     org_rocksdb_DBOptions
  * Method:    setStatsDumpPeriodSec

java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java

@@ -11,19 +11,6 @@ package org.rocksdb;
  */
 public class ColumnFamilyDescriptor {
 
-  /**
-   * <p>Creates a new Column Family using a name and default
-   * options,</p>
-   *
-   * @param columnFamilyName name of column family.
-   * @deprecated will be removed in RocksDB 3.10.0. Use
-   * {@link #ColumnFamilyDescriptor(byte[])} instead.
-   */
-  @Deprecated
-  public ColumnFamilyDescriptor(final String columnFamilyName){
-    this(columnFamilyName.getBytes(), new ColumnFamilyOptions());
-  }
-
   /**
    * <p>Creates a new Column Family using a name and default
    * options,</p>
@@ -35,22 +22,6 @@ public class ColumnFamilyDescriptor {
     this(columnFamilyName, new ColumnFamilyOptions());
   }
 
-  /**
-   * <p>Creates a new Column Family using a name and custom
-   * options.</p>
-   *
-   * @param columnFamilyName name of column family.
-   * @param columnFamilyOptions options to be used with
-   *     column family.
-   * @deprecated will be removed in RocksDB 3.10.0. Use
-   * {@link #ColumnFamilyDescriptor(byte[], ColumnFamilyOptions)} instead.
-   */
-  @Deprecated
-  public ColumnFamilyDescriptor(final String columnFamilyName,
-      final ColumnFamilyOptions columnFamilyOptions) {
-    this(columnFamilyName.getBytes(), columnFamilyOptions);
-  }
-
   /**
    * <p>Creates a new Column Family using a name and custom
    * options.</p>

java/src/main/java/org/rocksdb/DBOptions.java

@@ -382,20 +382,6 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
     return tableCacheNumshardbits(nativeHandle_);
   }
 
-  @Override
-  public DBOptions setTableCacheRemoveScanCountLimit(
-      final int limit) {
-    assert(isInitialized());
-    setTableCacheRemoveScanCountLimit(nativeHandle_, limit);
-    return this;
-  }
-
-  @Override
-  public int tableCacheRemoveScanCountLimit() {
-    assert(isInitialized());
-    return tableCacheRemoveScanCountLimit(nativeHandle_);
-  }
-
   @Override
   public DBOptions setWalTtlSeconds(
       final long walTtlSeconds) {
@@ -494,22 +480,6 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
     return isFdCloseOnExec(nativeHandle_);
   }
 
-  @Override
-  @Deprecated
-  public DBOptions setSkipLogErrorOnRecovery(
-      final boolean skip) {
-    assert(isInitialized());
-    setSkipLogErrorOnRecovery(nativeHandle_, skip);
-    return this;
-  }
-
-  @Override
-  @Deprecated
-  public boolean skipLogErrorOnRecovery() {
-    assert(isInitialized());
-    return skipLogErrorOnRecovery(nativeHandle_);
-  }
-
   @Override
   public DBOptions setStatsDumpPeriodSec(
       final int statsDumpPeriodSec) {
@@ -648,9 +618,6 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
   private native void setTableCacheNumshardbits(
       long handle, int tableCacheNumshardbits);
   private native int tableCacheNumshardbits(long handle);
-  private native void setTableCacheRemoveScanCountLimit(
-      long handle, int limit);
-  private native int tableCacheRemoveScanCountLimit(long handle);
   private native void setWalTtlSeconds(long handle, long walTtlSeconds);
   private native long walTtlSeconds(long handle);
   private native void setWalSizeLimitMB(long handle, long sizeLimitMB);
@@ -670,9 +637,6 @@ public class DBOptions extends RocksObject implements DBOptionsInterface {
   private native void setIsFdCloseOnExec(
       long handle, boolean isFdCloseOnExec);
   private native boolean isFdCloseOnExec(long handle);
-  private native void setSkipLogErrorOnRecovery(
-      long handle, boolean skip);
-  private native boolean skipLogErrorOnRecovery(long handle);
   private native void setStatsDumpPeriodSec(
       long handle, int statsDumpPeriodSec);
   private native int statsDumpPeriodSec(long handle);

java/src/main/java/org/rocksdb/DBOptionsInterface.java

@@ -505,39 +505,6 @@ public interface DBOptionsInterface {
    */
   int tableCacheNumshardbits();
 
-  /**
-   * During data eviction of table's LRU cache, it would be inefficient
-   * to strictly follow LRU because this piece of memory will not really
-   * be released unless its refcount falls to zero. Instead, make two
-   * passes: the first pass will release items with refcount = 1,
-   * and if not enough space releases after scanning the number of
-   * elements specified by this parameter, we will remove items in LRU
-   * order.
-   *
-   * @param limit scan count limit
-   * @return the instance of the current Object.
-   *
-   * @deprecated This function is depreciated.
-   */
-  @Deprecated
-  Object setTableCacheRemoveScanCountLimit(int limit);
-
-  /**
-   * During data eviction of table's LRU cache, it would be inefficient
-   * to strictly follow LRU because this piece of memory will not really
-   * be released unless its refcount falls to zero. Instead, make two
-   * passes: the first pass will release items with refcount = 1,
-   * and if not enough space releases after scanning the number of
-   * elements specified by this parameter, we will remove items in LRU
-   * order.
-   *
-   * @return scan count limit
-   *
-   * @deprecated This function is depreciated.
-   */
-  @Deprecated
-  int tableCacheRemoveScanCountLimit();
-
   /**
    * {@link #walTtlSeconds()} and {@link #walSizeLimitMB()} affect how archived logs
    * will be deleted.
@@ -715,31 +682,6 @@ public interface DBOptionsInterface {
    */
   boolean isFdCloseOnExec();
 
-  /**
-   * Skip log corruption error on recovery (If client is ok with
-   * losing most recent changes)
-   * Default: false
-   *
-   * @param skip true if log corruption errors are skipped during recovery.
-   * @return the instance of the current Object.
-   *
-   * @deprecated will be removed in RocksDB 3.11.0. Not used anymore.
-   */
-  @Deprecated
-  Object setSkipLogErrorOnRecovery(boolean skip);
-
-  /**
-   * Skip log corruption error on recovery (If client is ok with
-   * losing most recent changes)
-   * Default: false
-   *
-   * @return true if log corruption errors are skipped during recovery.
-   *
-   * @deprecated will be removed in RocksDB 3.11.0. Not used anymore.
-   */
-  @Deprecated
-  boolean skipLogErrorOnRecovery();
-
   /**
    * if not zero, dump rocksdb.stats to LOG every stats_dump_period_sec
    * Default: 3600 (1 hour)

java/src/main/java/org/rocksdb/Options.java

@@ -451,20 +451,6 @@ public class Options extends RocksObject
     return this;
   }
 
-  @Override
-  public int tableCacheRemoveScanCountLimit() {
-    assert(isInitialized());
-    return tableCacheRemoveScanCountLimit(nativeHandle_);
-  }
-
-  @Override
-  public Options setTableCacheRemoveScanCountLimit(
-      final int limit) {
-    assert(isInitialized());
-    setTableCacheRemoveScanCountLimit(nativeHandle_, limit);
-    return this;
-  }
-
   @Override
   public long walTtlSeconds() {
     assert(isInitialized());
@@ -556,21 +542,6 @@ public class Options extends RocksObject
     return this;
   }
 
-  @Override
-  @Deprecated
-  public boolean skipLogErrorOnRecovery() {
-    assert(isInitialized());
-    return skipLogErrorOnRecovery(nativeHandle_);
-  }
-
-  @Override
-  @Deprecated
-  public Options setSkipLogErrorOnRecovery(final boolean skip) {
-    assert(isInitialized());
-    setSkipLogErrorOnRecovery(nativeHandle_, skip);
-    return this;
-  }
-
   @Override
   public int statsDumpPeriodSec() {
     assert(isInitialized());
@@ -1167,9 +1138,6 @@ public class Options extends RocksObject
   private native void setTableCacheNumshardbits(
       long handle, int tableCacheNumshardbits);
   private native int tableCacheNumshardbits(long handle);
-  private native void setTableCacheRemoveScanCountLimit(
-      long handle, int limit);
-  private native int tableCacheRemoveScanCountLimit(long handle);
   private native void setWalTtlSeconds(long handle, long walTtlSeconds);
   private native long walTtlSeconds(long handle);
   private native void setWalSizeLimitMB(long handle, long sizeLimitMB);
@@ -1189,9 +1157,6 @@ public class Options extends RocksObject
   private native void setIsFdCloseOnExec(
       long handle, boolean isFdCloseOnExec);
   private native boolean isFdCloseOnExec(long handle);
-  private native void setSkipLogErrorOnRecovery(
-      long handle, boolean skip);
-  private native boolean skipLogErrorOnRecovery(long handle);
   private native void setStatsDumpPeriodSec(
       long handle, int statsDumpPeriodSec);
   private native int statsDumpPeriodSec(long handle);

java/src/test/java/org/rocksdb/DBOptionsTest.java

@@ -473,21 +473,6 @@ public class DBOptionsTest {
     }
   }
 
-  @Test
-  public void skipLogErrorOnRecovery() {
-    DBOptions opt = null;
-    try {
-      opt = new DBOptions();
-      boolean boolValue = rand.nextBoolean();
-      opt.setSkipLogErrorOnRecovery(boolValue);
-      assertThat(opt.skipLogErrorOnRecovery()).isEqualTo(boolValue);
-    } finally {
-      if (opt != null) {
-        opt.dispose();
-      }
-    }
-  }
-
   @Test
   public void statsDumpPeriodSec() {
     DBOptions opt = null;

java/src/test/java/org/rocksdb/OptionsTest.java

@@ -920,21 +920,6 @@ public class OptionsTest {
     }
   }
 
-  @Test
-  public void skipLogErrorOnRecovery() {
-    Options opt = null;
-    try {
-      opt = new Options();
-      boolean boolValue = rand.nextBoolean();
-      opt.setSkipLogErrorOnRecovery(boolValue);
-      assertThat(opt.skipLogErrorOnRecovery()).isEqualTo(boolValue);
-    } finally {
-      if (opt != null) {
-        opt.dispose();
-      }
-    }
-  }
-
   @Test
   public void statsDumpPeriodSec() {
     Options opt = null;