Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added serializing into bytes object #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added serializing into bytes object #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libdatrie
Open in desktop
Submodule libdatrie updated 37 files
+507 −0 ChangeLog
+27 −0 INSTALL
+0 −2 Makefile.am
+40 −0 NEWS
+2 −2 README
+20 −19 configure.ac
+5 −0 datrie/alpha-map-private.h
+59 −24 datrie/alpha-map.c
+2 −3 datrie/alpha-map.h
+25 −3 datrie/darray.c
+5 −1 datrie/darray.h
+47 −12 datrie/fileutils.c
+2 −0 datrie/fileutils.h
+2 −0 datrie/libdatrie.def
+4 −0 datrie/libdatrie.map
+61 −6 datrie/tail.c
+6 −2 datrie/tail.h
+41 −1 datrie/trie-string.c
+16 −0 datrie/trie-string.h
+57 −10 datrie/trie.c
+6 −2 datrie/trie.h
+7 −5 datrie/typedefs.h
+478 −226 doc/Doxyfile.in
+24 −0 tests/Makefile.am
+95 −0 tests/test_byte_alpha.c
+186 −0 tests/test_byte_list.c
+10 −9 tests/test_file.c
+7 −6 tests/test_iterator.c
+5 −4 tests/test_nonalpha.c
+3 −2 tests/test_null_trie.c
+132 −0 tests/test_serialization.c
+13 −12 tests/test_store-retrieve.c
+1 −1 tests/test_term_state.c
+5 −2 tests/test_walk.c
+3 −3 tests/utils.c
+2 −2 tests/utils.h
+45 −20 tools/trietool.c
4 changes: 4 additions & 0 deletions src/cdatrie.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ cdef extern from "../libdatrie/datrie/trie.h":

int trie_fwrite (Trie *trie, stdio.FILE *file)

size_t trie_get_serialized_size (Trie *trie);

void trie_serialize (Trie *trie, unsigned char *ptr);

bint trie_is_dirty (Trie *trie)


Expand Down
11 changes: 11 additions & 0 deletions src/datrie.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Cython wrapper for libdatrie.
from cpython.version cimport PY_MAJOR_VERSION
from cython.operator import dereference as deref
from libc.stdlib cimport malloc, free
from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free
from libc cimport stdio
from libc cimport string
cimport stdio_ext
Expand Down Expand Up @@ -129,6 +130,16 @@ cdef class BaseTrie:

stdio.fflush(f_ptr)

def __bytes__(self):
cdef Py_ssize_t size = cdatrie.trie_get_serialized_size(self._c_trie)
cdef unsigned char* data = <unsigned char*> PyMem_Malloc(size)
try:
cdatrie.trie_serialize (self._c_trie, data)
return <bytes> data[:size]
finally:
PyMem_Free(data)
return res

@classmethod
def load(cls, path):
"""
Expand Down