LBRYCommunity/lbry-rocksdb
1
0
Fork 0
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity

Merge options source_compaction_factor, max_grandparent_overlap_bytes and expanded_compaction_factor into max_compaction_bytes

Browse source
This commit is contained in:
twmht 2017-04-08 00:18:38 +08:00
parent 9e5f600150
commit 58ba17ac90
4 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -1,6 +1,6 @@
Note
=========
The original pyrocksdb has not been updated for long time. I update the pyrocksdb to support the latest rocksdb. Please open the issues in github if you have any problem.
The original pyrocksdb (https://pypi.python.org/pypi/pyrocksdb/0.4) has not been updated for long time. I update pyrocksdb to support the latest rocksdb. Please open issues in github if you have any problem.
pyrocksdb

34
rocksdb/_rocksdb.pyx
View file

@ -36,6 +36,8 @@ from universal_compaction cimport kCompactionStopStyleTotalSize
from options cimport kCompactionStyleLevel
from options cimport kCompactionStyleUniversal
from options cimport kCompactionStyleFIFO
from options cimport kCompactionStyleNone
from slice_ cimport Slice
from status cimport Status
@ -700,6 +702,10 @@ cdef class CompressionType(object):
bzip2_compression = u'bzip2_compression'
lz4_compression = u'lz4_compression'
lz4hc_compression = u'lz4hc_compression'
xpress_compression = u'xpress_compression'
zstd_compression = u'zstd_compression'
zstdnotfinal_compression = u'zstdnotfinal_compression'
disable_compression = u'disable_compression'
cdef class Options(object):
cdef options.Options* opts
@ -763,6 +769,12 @@ cdef class Options(object):
def __set__(self, value):
self.opts.max_write_buffer_number = value
property max_compaction_bytes:
def __get__(self):
return self.opts.max_compaction_bytes
def __set__(self, value):
self.opts.max_compaction_bytes = value
property min_write_buffer_number_to_merge:
def __get__(self):
return self.opts.min_write_buffer_number_to_merge
@ -789,6 +801,14 @@ cdef class Options(object):
return CompressionType.lz4_compression
elif self.opts.compression == options.kLZ4HCCompression:
return CompressionType.lz4hc_compression
elif self.opts.compression == options.kXpressCompression:
return CompressionType.xpress_compression
elif self.opts.compression == options.kZSTD:
return CompressionType.zstd_compression
elif self.opts.compression == options.kZSTDNotFinalCompression:
return CompressionType.zstdnotfinal_compression
elif self.opts.compression == options.kDisableCompressionOption:
return CompressionType.disable_compression
else:
raise Exception("Unknonw type: %s" % self.opts.compression)
@ -805,6 +825,12 @@ cdef class Options(object):
self.opts.compression = options.kLZ4Compression
elif value == CompressionType.lz4hc_compression:
self.opts.compression = options.kLZ4HCCompression
elif value == CompressionType.zstd_compression:
self.opts.compression = options.kZSTD
elif value == CompressionType.zstdnotfinal_compression:
self.opts.compression = options.kZSTDNotFinalCompression
elif value == CompressionType.disable_compression:
self.opts.compression = options.kDisableCompressionOption
else:
raise TypeError("Unknown compression: %s" % value)
@ -1049,6 +1075,10 @@ cdef class Options(object):
return 'level'
if self.opts.compaction_style == kCompactionStyleUniversal:
return 'universal'
if self.opts.compaction_style == kCompactionStyleFIFO:
return 'fifo'
if self.opts.compaction_style == kCompactionStyleNone:
return 'none'
raise Exception("Unknown compaction_style")
def __set__(self, str value):
@ -1056,6 +1086,10 @@ cdef class Options(object):
self.opts.compaction_style = kCompactionStyleLevel
elif value == 'universal':
self.opts.compaction_style = kCompactionStyleUniversal
elif value == 'fifo':
self.opts.compaction_style = kCompactionStyleFIFO
elif value == 'none':
self.opts.compaction_style = kCompactionStyleNone
else:
raise Exception("Unknown compaction style")

17
rocksdb/options.pxd
View file

@ -19,6 +19,8 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
ctypedef enum CompactionStyle:
kCompactionStyleLevel
kCompactionStyleUniversal
kCompactionStyleFIFO
kCompactionStyleNone
ctypedef enum CompressionType:
kNoCompression
@ -27,11 +29,21 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
kBZip2Compression
kLZ4Compression
kLZ4HCCompression
kXpressCompression
kZSTD
kZSTDNotFinalCompression
kDisableCompressionOption
ctypedef enum ReadTier:
kReadAllTier
kBlockCacheTier
ctypedef enum CompactionPri:
kByCompensatedSize
kOldestLargestSeqFirst
kOldestSmallestSeqFirst
kMinOverlappingRatio
cdef cppclass Options:
const Comparator* comparator
shared_ptr[MergeOperator] merge_operator
@ -47,6 +59,7 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
int min_write_buffer_number_to_merge
int max_open_files
CompressionType compression
CompactionPri compaction_pri
# TODO: compression_per_level
# TODO: compression_opts
shared_ptr[SliceTransform] prefix_extractor
@ -58,7 +71,7 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
uint64_t target_file_size_base
int target_file_size_multiplier
uint64_t max_bytes_for_level_base
int max_bytes_for_level_multiplier
double max_bytes_for_level_multiplier
vector[int] max_bytes_for_level_multiplier_additional
int expanded_compaction_factor
int source_compaction_factor
@ -107,6 +120,8 @@ cdef extern from "rocksdb/options.h" namespace "rocksdb":
cpp_bool inplace_update_support
size_t inplace_update_num_locks
shared_ptr[Cache] row_cache
# TODO: remove options source_compaction_factor, max_grandparent_overlap_bytes and expanded_compaction_factor from document
uint64_t max_compaction_bytes;
cdef cppclass WriteOptions:
cpp_bool sync

7
rocksdb/tests/test_options.py
View file

@ -37,9 +37,10 @@ class TestOptions(unittest.TestCase):
opts.comparator,
rocksdb.BytewiseComparator)
self.assertEqual('snappy_compression', opts.compression)
opts.compression = rocksdb.CompressionType.no_compression
self.assertEqual('no_compression', opts.compression)
self.assertEqual(rocksdb.CompressionType.no_compression, opts.compression)
opts.compression = rocksdb.CompressionType.zstd_compression
self.assertEqual(rocksdb.CompressionType.zstd_compression, opts.compression)
def test_block_options(self):
rocksdb.BlockBasedTableFactory(