From 019ecd19329ee895284e9b040df0ffe4c08b35d8 Mon Sep 17 00:00:00 2001 From: fyrz Date: Wed, 15 Apr 2015 23:43:30 +0200 Subject: [PATCH] [RocksJava] Remove deprecated methods Summary: - Removed deprecated ColumnFamilyDescript constructor methods - Removed deprecated skipLogErrorOnRecovery methods - Removed deprecated tableCacheRemoveScanCountLimit methods Test Plan: make rocksdbjava make jtest Reviewers: yhchiang, adamretter, ankgup87 Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D37191 --- java/rocksjni/options.cc | 42 ------------------- java/src/main/java/org/rocksdb/DBOptions.java | 17 -------- .../java/org/rocksdb/DBOptionsInterface.java | 33 --------------- java/src/main/java/org/rocksdb/Options.java | 17 -------- 4 files changed, 109 deletions(-) diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc index ee236645f..2186d0ce7 100644 --- a/java/rocksjni/options.cc +++ b/java/rocksjni/options.cc @@ -695,27 +695,6 @@ void Java_org_rocksdb_Options_setTableCacheNumshardbits( static_cast(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 @@ -3501,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 diff --git a/java/src/main/java/org/rocksdb/DBOptions.java b/java/src/main/java/org/rocksdb/DBOptions.java index 4d81a40bd..85aad1e72 100644 --- a/java/src/main/java/org/rocksdb/DBOptions.java +++ b/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) { @@ -632,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); diff --git a/java/src/main/java/org/rocksdb/DBOptionsInterface.java b/java/src/main/java/org/rocksdb/DBOptionsInterface.java index 6050c29c0..f710105a6 100644 --- a/java/src/main/java/org/rocksdb/DBOptionsInterface.java +++ b/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. diff --git a/java/src/main/java/org/rocksdb/Options.java b/java/src/main/java/org/rocksdb/Options.java index 0ed9bfa88..75e5b1822 100644 --- a/java/src/main/java/org/rocksdb/Options.java +++ b/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()); @@ -1152,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);