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

Better error messages

Browse source
This commit is contained in:
hofmockel 2014-01-26 10:50:44 +01:00
parent 44cd1978af
commit 8ef2a13476
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rocksdb/_rocksdb.pyx
View file

@ -120,8 +120,7 @@ cdef class PyGenericComparator(PyComparator):
def __cinit__(self, object ob): def __cinit__(self, object ob):
self.comparator_ptr = NULL self.comparator_ptr = NULL
if not isinstance(ob, IComparator): if not isinstance(ob, IComparator):
# TODO: raise wrong subclass error raise TypeError("%s is not of type %s" % (ob, IComparator))
raise TypeError("Cannot set comparator: %s" % ob)
self.ob = ob self.ob = ob
self.comparator_ptr = new comparator.ComparatorWrapper( self.comparator_ptr = new comparator.ComparatorWrapper(
@ -202,7 +201,7 @@ cdef class PyGenericFilterPolicy(PyFilterPolicy):
def __cinit__(self, object ob): def __cinit__(self, object ob):
self.policy = NULL self.policy = NULL
if not isinstance(ob, IFilterPolicy): if not isinstance(ob, IFilterPolicy):
raise TypeError("Cannot set filter policy: %s" % ob) raise TypeError("%s is not of type %s" % (ob, IFilterPolicy))
self.ob = ob self.ob = ob
self.policy = new filter_policy.FilterPolicyWrapper( self.policy = new filter_policy.FilterPolicyWrapper(
@ -330,7 +329,9 @@ cdef class PyMergeOperator(object):
full_merge_callback, full_merge_callback,
partial_merge_callback)) partial_merge_callback))
else: else:
raise TypeError("Cannot set MergeOperator: %s" % ob) msg = "%s is not of this types %s"
msg %= (ob, (IAssociativeMergeOperator, IMergeOperator))
raise TypeError(msg)
cdef object get_ob(self): cdef object get_ob(self):
return self.ob return self.ob
@ -1109,7 +1110,6 @@ cdef class DB(object):
self.db = NULL self.db = NULL
self.opts = None self.opts = None
if opts.in_use: if opts.in_use:
raise Exception("Options object is already used by another DB") raise Exception("Options object is already used by another DB")
@ -1127,7 +1127,6 @@ cdef class DB(object):
deref(opts.opts), deref(opts.opts),
db_path, db_path,
cython.address(self.db)) cython.address(self.db))
check_status(st) check_status(st)
# Inject the loggers into the python callbacks # Inject the loggers into the python callbacks