IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ReaderOptions support to segment (de)serialization.

Browse Source
This commit is contained in:
Constantine Vetoshev
2016-06-24 13:25:27 -07:00
parent 42ed1e819f
commit 70e4e2d930
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
capnp/lib/capnp.pyx
View File

@@ -2995,8 +2995,8 @@ class _StructModule(object):
else: else:
message = _FlatArrayMessageReader(buf, traversal_limit_in_words, nesting_limit) message = _FlatArrayMessageReader(buf, traversal_limit_in_words, nesting_limit)
return message.get_root(self.schema) return message.get_root(self.schema)
def from_segments(self, segments): def from_segments(self, segments, traversal_limit_in_words = None, nesting_limit = None):
message = _SegmentArrayMessageReader(segments) message = _SegmentArrayMessageReader(segments, traversal_limit_in_words, nesting_limit)
return message.get_root(self.schema) return message.get_root(self.schema)
def from_bytes_packed(self, buf, traversal_limit_in_words = None, nesting_limit = None): def from_bytes_packed(self, buf, traversal_limit_in_words = None, nesting_limit = None):
"""Returns a Reader for the packed object in buf. """Returns a Reader for the packed object in buf.
@@ -3764,8 +3764,13 @@ cdef class _SegmentArrayMessageReader(_MessageReader):
cdef object _objects_to_pin cdef object _objects_to_pin
def __init__(self, segments): def __init__(self, segments, traversal_limit_in_words = None, nesting_limit = None):
# takes a Python array of bytes and constructs a ConstWordArrayArrayPtr cdef schema_cpp.ReaderOptions opts
if traversal_limit_in_words is not None:
opts.traversalLimitInWords = traversal_limit_in_words
if nesting_limit is not None:
opts.nestingLimit = nesting_limit
# take a Python array of bytes and constructs a ConstWordArrayArrayPtr
num_segments = len(segments) num_segments = len(segments)
cdef char* ptr cdef char* ptr
cdef schema_cpp.ConstWordArrayPtr seg_ptr cdef schema_cpp.ConstWordArrayPtr seg_ptr
@@ -3783,7 +3788,8 @@ cdef class _SegmentArrayMessageReader(_MessageReader):
seg_ptr = schema_cpp.ConstWordArrayPtr(<schema_cpp.word*>ptr, len(segment)//8) seg_ptr = schema_cpp.ConstWordArrayPtr(<schema_cpp.word*>ptr, len(segment)//8)
seg_ptrs[i] = seg_ptr seg_ptrs[i] = seg_ptr
self.thisptr = new schema_cpp.SegmentArrayMessageReader( self.thisptr = new schema_cpp.SegmentArrayMessageReader(
schema_cpp.ConstWordArrayArrayPtr(seg_ptrs, num_segments)) schema_cpp.ConstWordArrayArrayPtr(seg_ptrs, num_segments),
opts)
def __dealloc__(self): def __dealloc__(self):
del self.thisptr del self.thisptr