Remove table_cache_remove_scan_count_limit because it is also removed…

… from rocksdb.
zuarbase · Apr 12, 2015 · b9f06fe · b9f06fe
1 parent 2cbeb48
commit b9f06fe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 21 deletions.
diff --git a/docs/api/options.rst b/docs/api/options.rst
@@ -394,19 +394,6 @@ Options object
         | *Type:* ``int``
         | *Default:* ``4``
 
-    .. py:attribute:: table_cache_remove_scan_count_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.
-
-        | *Type:* ``int``
-        | *Default:* ``16``
-
     .. py:attribute:: arena_block_size
 
         size of one block in arena memory allocation.

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -48,7 +48,7 @@ In newer versions of rocksdb a bunch of options were moved or removed.
 * Moved ``Options.block_size_deviation`` to ``BlockBasedTableFactory``
 * Moved ``Options.block_restart_interval`` to ``BlockBasedTableFactory``
 * Moved ``Options.whole_key_filtering`` to ``BlockBasedTableFactory``
-
+* Removed ``Options.table_cache_remove_scan_count_limit``
 
 New:
 ^^^^

diff --git a/rocksdb/_rocksdb.pyx b/rocksdb/_rocksdb.pyx
@@ -976,12 +976,6 @@ cdef class Options(object):
         def __set__(self, value):
             self.opts.table_cache_numshardbits = value
 
-    property table_cache_remove_scan_count_limit:
-        def __get__(self):
-            return self.opts.table_cache_remove_scan_count_limit
-        def __set__(self, value):
-            self.opts.table_cache_remove_scan_count_limit = value
-
     property arena_block_size:
         def __get__(self):
             return self.opts.arena_block_size

diff --git a/rocksdb/options.pxd b/rocksdb/options.pxd
@@ -75,7 +75,6 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
         unsigned int rate_limit_delay_max_milliseconds
         uint64_t max_manifest_file_size
         int table_cache_numshardbits
-        int table_cache_remove_scan_count_limit
         size_t arena_block_size
         # TODO: PrepareForBulkLoad()
         cpp_bool disable_auto_compactions