diff --git a/rocksdb/_rocksdb.pyx b/rocksdb/_rocksdb.pyx
index 63899cf815093a2babee8657affeb76f41d3c8a4..8b3e0553b583459b4d80a2ed06ab401f6bc30c39 100644
--- a/rocksdb/_rocksdb.pyx
+++ b/rocksdb/_rocksdb.pyx
@@ -15,13 +15,13 @@ cimport options
cimport merge_operator
cimport filter_policy
cimport comparator
-cimport slice_
cimport cache
cimport logger
cimport snapshot
cimport db
cimport iterator
+from slice_ cimport Slice
from status cimport Status
import sys
@@ -33,7 +33,7 @@ import traceback
import errors
cdef extern from "cpp/utils.hpp" namespace "py_rocks":
- cdef const slice_.Slice* vector_data(vector[slice_.Slice]&)
+ cdef const Slice* vector_data(vector[Slice]&)
## Here comes the stuff to wrap the status to exception
cdef check_status(const Status& st):
@@ -71,10 +71,10 @@ cdef string bytes_to_string(path) except *:
cdef string_to_bytes(string ob):
return PyBytes_FromStringAndSize(ob.c_str(), ob.size())
-cdef slice_.Slice bytes_to_slice(ob) except *:
- return slice_.Slice(PyBytes_AsString(ob), PyBytes_Size(ob))
+cdef Slice bytes_to_slice(ob) except *:
+ return Slice(PyBytes_AsString(ob), PyBytes_Size(ob))
-cdef slice_to_bytes(slice_.Slice sl):
+cdef slice_to_bytes(Slice sl):
return PyBytes_FromStringAndSize(sl.data(), sl.size())
## only for filsystem paths
@@ -149,8 +149,8 @@ cdef class PyBytewiseComparator(PyComparator):
cdef int compare_callback(
void* ctx,
- const slice_.Slice& a,
- const slice_.Slice& b) with gil:
+ const Slice& a,
+ const Slice& b) with gil:
return (<object>ctx).compare(slice_to_bytes(a), slice_to_bytes(b))
@@ -197,7 +197,7 @@ cdef class PyGenericFilterPolicy(PyFilterPolicy):
cdef void create_filter_callback(
void* ctx,
- const slice_.Slice* keys,
+ const Slice* keys,
int n,
string* dst) with gil:
@@ -207,8 +207,8 @@ cdef void create_filter_callback(
cdef cpp_bool key_may_match_callback(
void* ctx,
- const slice_.Slice& key,
- const slice_.Slice& filt) with gil:
+ const Slice& key,
+ const Slice& filt) with gil:
return (<object>ctx).key_may_match(
slice_to_bytes(key),
@@ -229,7 +229,7 @@ cdef class PyBloomFilterPolicy(PyFilterPolicy):
def create_filter(self, keys):
cdef string dst
- cdef vector[slice_.Slice] c_keys
+ cdef vector[Slice] c_keys
for key in keys:
c_keys.push_back(bytes_to_slice(key))
@@ -294,9 +294,9 @@ cdef class PyMergeOperator(object):
cdef cpp_bool merge_callback(
void* ctx,
- const slice_.Slice& key,
- const slice_.Slice* existing_value,
- const slice_.Slice& value,
+ const Slice& key,
+ const Slice* existing_value,
+ const Slice& value,
string* new_value,
logger.Logger* log) with gil:
@@ -326,8 +326,8 @@ cdef cpp_bool merge_callback(
cdef cpp_bool full_merge_callback(
void* ctx,
- const slice_.Slice& key,
- const slice_.Slice* existing_value,
+ const Slice& key,
+ const Slice* existing_value,
const deque[string]& op_list,
string* new_value,
logger.Logger* log) with gil:
@@ -358,9 +358,9 @@ cdef cpp_bool full_merge_callback(
cdef cpp_bool partial_merge_callback(
void* ctx,
- const slice_.Slice& key,
- const slice_.Slice& left_op,
- const slice_.Slice& right_op,
+ const Slice& key,
+ const Slice& left_op,
+ const Slice& right_op,
string* new_value,
logger.Logger* log) with gil:
@@ -966,65 +966,85 @@ cdef class DB(object):
cdef db.DB* db
def __cinit__(self, db_name, Options opts, read_only=False):
+ cdef Status st
+ cdef string db_path = path_to_string(db_name)
+
if read_only:
- check_status(
- db.DB_OpenForReadOnly(
+ with nogil:
+ st = db.DB_OpenForReadOnly(
deref(opts.opts),
- path_to_string(db_name),
+ db_path,
cython.address(self.db),
- False))
+ False)
else:
- check_status(
- db.DB_Open(
+ with nogil:
+ st = db.DB_Open(
deref(opts.opts),
- path_to_string(db_name),
- cython.address(self.db)))
+ db_path,
+ cython.address(self.db))
+ check_status(st)
self.opts = opts
def __dealloc__(self):
del self.db
def put(self, key, value, sync=False, disable_wal=False):
+ cdef Status st
cdef options.WriteOptions opts
opts.sync = sync
opts.disableWAL = disable_wal
- check_status(
- self.db.Put(opts, bytes_to_slice(key), bytes_to_slice(value)))
+ cdef Slice c_key = bytes_to_slice(key)
+ cdef Slice c_value = bytes_to_slice(value)
+
+ with nogil:
+ st = self.db.Put(opts, c_key, c_value)
+ check_status(st)
def delete(self, key, sync=False, disable_wal=False):
+ cdef Status st
cdef options.WriteOptions opts
opts.sync = sync
opts.disableWAL = disable_wal
- check_status(
- self.db.Delete(opts, bytes_to_slice(key)))
+ cdef Slice c_key = bytes_to_slice(key)
+ with nogil:
+ st = self.db.Delete(opts, c_key)
+ check_status(st)
def merge(self, key, value, sync=False, disable_wal=False):
+ cdef Status st
cdef options.WriteOptions opts
opts.sync = sync
opts.disableWAL = disable_wal
- check_status(
- self.db.Merge(opts, bytes_to_slice(key), bytes_to_slice(value)))
+ cdef Slice c_key = bytes_to_slice(key)
+ cdef Slice c_value = bytes_to_slice(value)
+ with nogil:
+ st = self.db.Merge(opts, c_key, c_value)
+ check_status(st)
def write(self, WriteBatch batch, sync=False, disable_wal=False):
+ cdef Status st
cdef options.WriteOptions opts
opts.sync = sync
opts.disableWAL = disable_wal
- check_status(
- self.db.Write(opts, batch.batch))
+ with nogil:
+ st = self.db.Write(opts, batch.batch)
+ check_status(st)
def get(self, key, *args, **kwargs):
cdef string res
cdef Status st
+ cdef options.ReadOptions opts
- st = self.db.Get(
- self.build_read_opts(self.__parse_read_opts(*args, **kwargs)),
- bytes_to_slice(key),
- cython.address(res))
+ opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
+ cdef Slice c_key = bytes_to_slice(key)
+
+ with nogil:
+ st = self.db.Get(opts, c_key, cython.address(res))
if st.ok():
return string_to_bytes(res)
@@ -1037,14 +1057,19 @@ cdef class DB(object):
cdef vector[string] values
values.resize(len(keys))
- cdef vector[slice_.Slice] c_keys
+ cdef vector[Slice] c_keys
for key in keys:
c_keys.push_back(bytes_to_slice(key))
- cdef vector[Status] res = self.db.MultiGet(
- self.build_read_opts(self.__parse_read_opts(*args, **kwargs)),
- c_keys,
- cython.address(values))
+ cdef options.ReadOptions opts
+ opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
+
+ cdef vector[Status] res
+ with nogil:
+ res = self.db.MultiGet(
+ opts,
+ c_keys,
+ cython.address(values))
cdef dict ret_dict = {}
for index in range(len(keys)):
@@ -1062,15 +1087,20 @@ cdef class DB(object):
cdef cpp_bool value_found
cdef cpp_bool exists
cdef options.ReadOptions opts
+ cdef Slice c_key
opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
+ c_key = bytes_to_slice(key)
+ exists = False
+
if fetch:
value_found = False
- exists = self.db.KeyMayExist(
- opts,
- bytes_to_slice(key),
- cython.address(value),
- cython.address(value_found))
+ with nogil:
+ exists = self.db.KeyMayExist(
+ opts,
+ c_key,
+ cython.address(value),
+ cython.address(value_found))
if exists:
if value_found:
@@ -1080,10 +1110,11 @@ cdef class DB(object):
else:
return (False, None)
else:
- exists = self.db.KeyMayExist(
- opts,
- bytes_to_slice(key),
- cython.address(value))
+ with nogil:
+ exists = self.db.KeyMayExist(
+ opts,
+ c_key,
+ cython.address(value))
return (exists, None)
@@ -1092,7 +1123,8 @@ cdef class DB(object):
cdef KeysIterator it
opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
it = KeysIterator(self)
- it.ptr = self.db.NewIterator(opts)
+ with nogil:
+ it.ptr = self.db.NewIterator(opts)
return it
def itervalues(self, prefix=None, *args, **kwargs):
@@ -1100,7 +1132,8 @@ cdef class DB(object):
cdef ValuesIterator it
opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
it = ValuesIterator(self)
- it.ptr = self.db.NewIterator(opts)
+ with nogil:
+ it.ptr = self.db.NewIterator(opts)
return it
def iteritems(self, prefix=None, *args, **kwargs):
@@ -1108,7 +1141,8 @@ cdef class DB(object):
cdef ItemsIterator it
opts = self.build_read_opts(self.__parse_read_opts(*args, **kwargs))
it = ItemsIterator(self)
- it.ptr = self.db.NewIterator(opts)
+ with nogil:
+ it.ptr = self.db.NewIterator(opts)
return it
def snapshot(self):
@@ -1116,8 +1150,13 @@ cdef class DB(object):
def get_property(self, prop):
cdef string value
+ cdef Slice c_prop = bytes_to_slice(prop)
+ cdef cpp_bool ret = False
+
+ with nogil:
+ ret = self.db.GetProperty(c_prop, cython.address(value))
- if self.db.GetProperty(bytes_to_slice(prop), cython.address(value)):
+ if ret:
return string_to_bytes(value)
else:
return None
@@ -1125,7 +1164,8 @@ cdef class DB(object):
def get_live_files_metadata(self):
cdef vector[db.LiveFileMetaData] metadata
- self.db.GetLiveFilesMetaData(cython.address(metadata))
+ with nogil:
+ self.db.GetLiveFilesMetaData(cython.address(metadata))
ret = []
for ob in metadata:
@@ -1181,10 +1221,12 @@ cdef class Snapshot(object):
def __cinit__(self, DB db):
self.db = db
- self.ptr = db.db.GetSnapshot()
+ with nogil:
+ self.ptr = db.db.GetSnapshot()
def __dealloc__(self):
- self.db.db.ReleaseSnapshot(self.ptr)
+ with nogil:
+ self.db.db.ReleaseSnapshot(self.ptr)
@cython.internal
@@ -1208,20 +1250,25 @@ cdef class BaseIterator(object):
raise StopIteration()
cdef object ret = self.get_ob()
- self.ptr.Next()
+ with nogil:
+ self.ptr.Next()
return ret
def __reversed__(self):
return ReversedIterator(self)
cpdef seek_to_first(self):
- self.ptr.SeekToFirst()
+ with nogil:
+ self.ptr.SeekToFirst()
cpdef seek_to_last(self):
- self.ptr.SeekToLast()
+ with nogil:
+ self.ptr.SeekToLast()
cpdef seek(self, key):
- self.ptr.Seek(bytes_to_slice(key))
+ cdef Slice c_key = bytes_to_slice(key)
+ with nogil:
+ self.ptr.Seek(c_key)
cdef object get_ob(self):
return None
@@ -1229,17 +1276,28 @@ cdef class BaseIterator(object):
@cython.internal
cdef class KeysIterator(BaseIterator):
cdef object get_ob(self):
- return slice_to_bytes(self.ptr.key())
+ cdef Slice c_key
+ with nogil:
+ c_key = self.ptr.key()
+ return slice_to_bytes(c_key)
@cython.internal
cdef class ValuesIterator(BaseIterator):
cdef object get_ob(self):
- return slice_to_bytes(self.ptr.value())
+ cdef Slice c_value
+ with nogil:
+ c_value = self.ptr.value()
+ return slice_to_bytes(c_value)
@cython.internal
cdef class ItemsIterator(BaseIterator):
cdef object get_ob(self):
- return (slice_to_bytes(self.ptr.key()), slice_to_bytes(self.ptr.value()))
+ cdef Slice c_key
+ cdef Slice c_value
+ with nogil:
+ c_key = self.ptr.key()
+ c_value = self.ptr.value()
+ return (slice_to_bytes(c_key), slice_to_bytes(c_value))
@cython.internal
cdef class ReversedIterator(object):