From 13518d268048f541198bec6e392632735c57e448 Mon Sep 17 00:00:00 2001 From: hofmockel Date: Fri, 22 Aug 2014 19:15:46 +0200 Subject: [PATCH] Remove TotalOrderPlainTableFactory. It was also removed in rocksdb. --- docs/api/options.rst | 21 --------------------- docs/tutorial/index.rst | 4 ++-- rocksdb/_rocksdb.pyx | 14 -------------- rocksdb/table_factory.pxd | 1 - 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/docs/api/options.rst b/docs/api/options.rst index c66ee28..c328768 100644 --- a/docs/api/options.rst +++ b/docs/api/options.rst @@ -930,27 +930,6 @@ https://github.com/facebook/rocksdb/wiki/A-Tutorial-of-RocksDB-SST-formats Inside each prefix, need to build one index record for how many keys for binary search inside each hash bucket. -.. py:class:: rocksdb.TotalOrderPlainTableFactory - - This factory of plain table ignores Options.prefix_extractor and assumes no - hashable prefix available to the key structure. Lookup will be based on - binary search index only. Total order seek() can be issued. - - .. py:method:: __init__(user_key_len=0, bloom_bits_per_key=0, index_sparseness=16) - - :param int user_key_len: - Plain table has optimization for fix-sized keys, which can be - specified via user_key_len. - Alternatively, you can pass `0` if your keys have variable lengths. - - :param int bloom_bits_per_key: - The number of bits used for bloom filer per key. - You may disable it by passing a zero. - - :param int index_sparseness: - Need to build one index record for how many keys for binary search. - - .. _memtable_factories_label: MemtableFactories diff --git a/docs/tutorial/index.rst b/docs/tutorial/index.rst index 0617d01..9527542 100644 --- a/docs/tutorial/index.rst +++ b/docs/tutorial/index.rst @@ -320,10 +320,10 @@ For initial bulk loads the Vector-MemtableFactory makes sense. :: As noted here :ref:`table_factories_label`, it is also possible to change the representation of the final data files. -Here is an example how to use one of the 'PlainTables'. :: +Here is an example how to use a 'PlainTable'. :: opts = rocksdb.Options() - opts.table_factory = rocksdb.TotalOrderPlainTableFactory() + opts.table_factory = rocksdb.PlainTableFactory() opts.create_if_missing = True db = rocksdb.DB("test.db", opts) diff --git a/rocksdb/_rocksdb.pyx b/rocksdb/_rocksdb.pyx index 31cfac2..581faef 100644 --- a/rocksdb/_rocksdb.pyx +++ b/rocksdb/_rocksdb.pyx @@ -578,20 +578,6 @@ cdef class PlainTableFactory(PyTableFactory): bloom_bits_per_prefix, hash_table_ratio, index_sparseness)) - -cdef class TotalOrderPlainTableFactory(PyTableFactory): - def __init__( - self, - user_key_len=0, - bloom_bits_per_key=0, - index_sparseness=16): - - self.factory.reset( - table_factory.NewTotalOrderPlainTableFactory( - user_key_len, - bloom_bits_per_key, - index_sparseness)) - ############################################# ### Here are the MemtableFactories diff --git a/rocksdb/table_factory.pxd b/rocksdb/table_factory.pxd index 418cb9e..0a61726 100644 --- a/rocksdb/table_factory.pxd +++ b/rocksdb/table_factory.pxd @@ -6,4 +6,3 @@ cdef extern from "rocksdb/table.h" namespace "rocksdb": cdef TableFactory* NewBlockBasedTableFactory() cdef TableFactory* NewPlainTableFactory(uint32_t, int, double, size_t) - cdef TableFactory* NewTotalOrderPlainTableFactory(uint32_t, int, size_t)