Merge branch 'merge-pr35'

martyanov · Feb 1, 2019 · 209ba91 · 209ba91
2 parents 0fbacaf + 0c809e1
commit 209ba91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/rocksdb/_rocksdb.pyx b/rocksdb/_rocksdb.pyx
@@ -657,8 +657,7 @@ cdef class PlainTableFactory(PyTableFactory):
             index_sparseness=10,
             huge_page_tlb_size=0,
             encoding_type='plain',
-            py_bool full_scan_mode=False,
-            py_bool store_index_in_file=False):
+            py_bool full_scan_mode=False):
 
         cdef table_factory.PlainTableOptions table_options
 
@@ -676,7 +675,6 @@ cdef class PlainTableFactory(PyTableFactory):
             raise ValueError("Unknown encoding_type: %s" % encoding_type)
 
         table_options.full_scan_mode = full_scan_mode
-        table_options.store_index_in_file = store_index_in_file
 
         self.factory.reset( table_factory.NewPlainTableFactory(table_options))
 #############################################

diff --git a/rocksdb/tests/test_options.py b/rocksdb/tests/test_options.py
@@ -39,7 +39,8 @@ class TestOptions(unittest.TestCase):
     def test_compaction_pri(self):
         opts = rocksdb.Options()
         # default compaction_pri
-        self.assertEqual(opts.compaction_pri, rocksdb.CompactionPri.by_compensated_size)
+        #  self.assertEqual(opts.compaction_pri, rocksdb.CompactionPri.by_compensated_size)
+        self.assertEqual(opts.compaction_pri, rocksdb.CompactionPri.min_overlapping_ratio)
         opts.compaction_pri = rocksdb.CompactionPri.by_compensated_size
         self.assertEqual(opts.compaction_pri, rocksdb.CompactionPri.by_compensated_size)
         opts.compaction_pri = rocksdb.CompactionPri.oldest_largest_seq_first