[WIP] Add Keyset callbacks; work through compile errors.

lakesuperior/model/graph/callbacks.pyx

@@ -3,8 +3,9 @@ import logging
 from libc.stdint cimport uint32_t, uint64_t
 from libc.string cimport memcmp
 
-from lakesuperior.cy_include cimport collections as cc
-from lakesuperior.cy_include cimport spookyhash as sph
+cimport lakesuperior.cy_include.collections as cc
+cimport lakesuperior.cy_include.spookyhash as sph
+
 from lakesuperior.model.base cimport Buffer, buffer_dump
 from lakesuperior.model.graph cimport graph
 from lakesuperior.model.graph.triple cimport BufferTriple

lakesuperior/model/graph/graph.pyx

@@ -12,9 +12,10 @@ from libc.stdlib cimport free
 
 from cymem.cymem cimport Pool
 
-from lakesuperior.cy_include cimport collections as cc
+cimport lakesuperior.cy_include.collections as cc
+cimport lakesuperior.model.graph.callbacks as cb
+
 from lakesuperior.model.base cimport Buffer, buffer_dump
-from lakesuperior.model.graph cimport callbacks as cb
 from lakesuperior.model.graph cimport term
 from lakesuperior.model.graph.triple cimport BufferTriple
 from lakesuperior.model.structures.hash cimport term_hash_seed32

lakesuperior/model/structures/callbacks.pxd

@@ -0,0 +1,21 @@
+from lakesuperior.model.base cimport KeyIdx, TripleKey
+
+cdef:
+    bint lookup_sk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )
+    bint lookup_pk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )
+    bint lookup_ok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )
+    bint lookup_skpk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )
+    bint lookup_skok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )
+    bint lookup_pkok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    )

lakesuperior/model/structures/callbacks.pyx

@@ -0,0 +1,33 @@
+from lakesuperior.model.base cimport KeyIdx, TripleKey
+
+cdef bint lookup_sk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[0] == k1
+
+cdef bint lookup_pk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[1] == k1
+
+cdef bint lookup_ok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[2] == k1
+
+cdef bint lookup_skpk_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[0] == k1 and spok[1] == k2
+
+cdef bint lookup_skok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[0] == k1 and spok[2] == k2
+
+cdef bint lookup_pkok_cmp_fn(
+        const TripleKey* spok, const KeyIdx* k1, const KeyIdx* k2
+    ):
+    return spok[1] == k1 and spok[2] == k2
+
+

lakesuperior/model/structures/keyset.pxd

@@ -5,12 +5,8 @@ from lakesuperior.model.base cimport (
 cdef class Keyset:
     cdef:
         readonly size_t ct, size
-        readonly cc.Array* data
-        readonly cc.ArrayConf conf
-
-        unsigned char *get_item(self, i)
-        bint iter_next(self, unsigned char** val)
-        bint contains(self, const void *val)
+        cc.Array* data
+        cc.ArrayConf conf
 
         Keyset lookup(
             self, const KeyIdx* sk, const KeyIdx* pk, const KeyIdx* ok

lakesuperior/model/structures/keyset.pyx

@@ -1,9 +1,11 @@
 from libc.string cimport memcmp
-from libc.mem cimport free
+from libc.stdlib cimport free
+
+cimport lakesuperior.cy_include.collections as cc
+cimport lakesuperior.model.structures.callbacks as cb
 
-from lakesuperior.cy_include cimport collections as cc
 from lakesuperior.model.base cimport (
-    KeyIdx, Key, DoubleKey, TripleKey, Buffer
+    TRP_KLEN, KeyIdx, Key, DoubleKey, TripleKey, Buffer
 )
 
 cdef class Keyset:
@@ -22,7 +24,7 @@ cdef class Keyset:
         self.conf.capacity = ct
         self.conf.exp_factor = .5
 
-        cc.array_init_conf(&self.conf, &self.data)
+        cc.array_new_conf(&self.conf, &self.data)
         if not self.data:
             raise MemoryError()
 
@@ -60,7 +62,8 @@ cdef class Keyset:
             cc.ArrayIter it
             TripleKey spok
             Keyset ret
-            KeyIdx k1 = NULL, k2 = NULL
+            KeyIdx* k1 = NULL
+            KeyIdx* k2 = NULL
 
         cc.array_iter_init(&it, self.data)
 
@@ -68,29 +71,29 @@ cdef class Keyset:
             pass # TODO
 
         elif sk:
-            k1 = sk[0]
+            k1 = sk
             if pk: # s p ?
-                k2 = pk[0]
+                k2 = pk
                 cmp_fn = cb.lookup_skpk_cmp_fn
 
             elif ok: # s ? o
-                k2 = ok[0]
+                k2 = ok
                 cmp_fn = cb.lookup_skok_cmp_fn
 
             else: # s ? ?
                 cmp_fn = cb.lookup_sk_cmp_fn
 
         elif pk:
-            k1 = pk[0]
+            k1 = pk
             if ok: # ? p o
-                k2 = ok[0]
+                k2 = ok
                 cmp_fn = cb.lookup_pkok_cmp_fn
 
             else: # ? p ?
                 cmp_fn = cb.lookup_pk_cmp_fn
 
         elif ok: # ? ? o
-            k1 = ok[0]
+            k1 = ok
             cmp_fn = cb.lookup_ok_cmp_fn
 
         else: # ? ? ?

lakesuperior/store/ldp_rs/lmdb_triplestore.pxd

@@ -13,19 +13,19 @@ cdef enum:
     IDX_OP_ADD = 1
     IDX_OP_REMOVE = -1
 
-    INT_KEY_MASK = (
+cdef:
+    unsigned char lookup_rank[3]
+    unsigned char lookup_ordering[3][3]
+    unsigned char lookup_ordering_2bound[3][3]
+    unsigned int MDB_INT_KEY_MASK = (
         lmdb.MDB_DUPSORT | lmdb.MDB_DUPFIXED | lmdb.MDB_INTEGERKEY
         | lmdb.MDB_REVERSEKEY # TODO Check endianness.
     )
-    INT_DUP_MASK = (
+    unsigned int INT_DUP_MASK = (
         lmdb.MDB_DUPSORT | lmdb.MDB_DUPFIXED | lmdb.MDB_INTEGERDUP
         | lmdb.MDB_REVERSEDUP # TODO Check endianness.
     )
 
-cdef:
-    unsigned char lookup_rank[3]
-    unsigned char lookup_ordering[3][3]
-    unsigned char lookup_ordering_2bound[3][3]
 
 
 cdef class LmdbTriplestore(BaseLmdbStore):

lakesuperior/store/ldp_rs/lmdb_triplestore.pyx

@@ -557,7 +557,7 @@ cdef class LmdbTriplestore(BaseLmdbStore):
                         self.lookup_indices[i + 3],
                         <DoubleKey>dbl_key_v.mv_data,
                         <Key>key_v.mv_data[0]
-                    )
+                    ))
 
                     try:
                         _check(lmdb.mdb_cursor_put(
@@ -1473,9 +1473,10 @@ cdef class LmdbTriplestore(BaseLmdbStore):
 
 
     cdef KeyIdx _append(
-            self, Buffer *value,
-            unsigned char *dblabel=b'', lmdb.MDB_txn *txn=NULL,
-            unsigned int flags=0)
+        self, Buffer *value,
+        unsigned char *dblabel=b'', lmdb.MDB_txn *txn=NULL,
+        unsigned int flags=0
+    ):
         """
         Append one or more keys and values to the end of a database.