diff options
| -rw-r--r-- | sord/sord.h | 47 | ||||
| -rw-r--r-- | src/sord.c | 65 | ||||
| -rw-r--r-- | src/sord_test.c | 10 | ||||
| -rw-r--r-- | src/sordi.c | 4 | ||||
| -rw-r--r-- | src/syntax.c | 6 |
5 files changed, 76 insertions, 56 deletions
diff --git a/sord/sord.h b/sord/sord.h index b7dd49e..6b00268 100644 --- a/sord/sord.h +++ b/sord/sord.h @@ -51,7 +51,7 @@ */ typedef struct _SordWorld* SordWorld; ///< Sord world (library state) -typedef struct _Sord* Sord; ///< Quad store +typedef struct _SordModel* SordModel; ///< Quad store typedef struct _SordIter* SordIter; ///< Store iterator typedef struct _SordNode* SordNode; ///< Node @@ -144,6 +144,16 @@ sord_new_literal_counted(SordWorld world, SordNode datatype, const uint8_t* str, int str_len, const char* lang, uint8_t lang_len); +/** Copy a node. */ +SORD_API +SordNode +sord_node_copy(SordNode node); + +/** Free a node. */ +SORD_API +void +sord_node_free(SordNode node); + /** Return the type of a node (SORD_URI, SORD_BLANK, or SORD_LITERAL). */ SORD_API SordNodeType @@ -177,8 +187,7 @@ bool sord_node_equals(const SordNode a, const SordNode b); /** @} */ -/** @name Store - * For brevity, the Sord store is simply referred to as a "Sord". +/** @name Model * @{ */ @@ -191,17 +200,17 @@ sord_node_equals(const SordNode a, const SordNode b); * @param graphs If true, store (and index) graph contexts. */ SORD_API -Sord +SordModel sord_new(SordWorld world, unsigned indices, bool graphs); /** Close and free @a sord. */ SORD_API void -sord_free(Sord sord); +sord_free(SordModel model); SORD_API SordWorld -sord_get_world(Sord sord); +sord_get_world(SordModel model); /** Return the number of nodes stored in @a sord. * Nodes are included in this count iff they are a part of a quad in @a sord. @@ -213,29 +222,29 @@ sord_num_nodes(SordWorld world); /** Return the number of quads stored in @a sord. */ SORD_API int -sord_num_quads(Sord read); +sord_num_quads(SordModel model); /** Return an iterator to the start of the store. */ SORD_API SordIter -sord_begin(Sord read); +sord_begin(SordModel model); /** Return an iterator that will iterate over each graph URI. */ SORD_API SordIter -sord_graphs_begin(Sord read); +sord_graphs_begin(SordModel model); /** Search for a triple pattern. * @return an iterator to the first match, or NULL if no matches found */ SORD_API SordIter -sord_find(Sord sord, const SordQuad pat); +sord_find(SordModel model, const SordQuad pat); /** Add a quad to the store. */ SORD_API void -sord_add(Sord sord, const SordQuad tup); +sord_add(SordModel model, const SordQuad quad); /** Remove a quad from the store. * This function invalidates all iterators to @a sord (use sord_remove_iter @@ -243,19 +252,19 @@ sord_add(Sord sord, const SordQuad tup); */ SORD_API void -sord_remove(Sord sord, const SordQuad tup); +sord_remove(SordModel model, const SordQuad quad); /** Remove a quad from the store by iterator. * @a iter will be incremented to point at the next value. */ SORD_API void -sord_remove_iter(Sord sord, SordIter iter); +sord_remove_iter(SordModel model, SordIter iter); /** Remove a graph from the store. */ SORD_API void -sord_remove_graph(Sord sord, SordNode graph); +sord_remove_graph(SordModel model, SordNode graph); /** @} */ /** @name Iteration @@ -265,12 +274,12 @@ sord_remove_graph(Sord sord, SordNode graph); /** Set @a id to the quad pointed to by @a iter. */ SORD_API void -sord_iter_get(SordIter iter, SordQuad tup); +sord_iter_get(SordIter iter, SordQuad quad); /** Return the store pointed to by @a iter. */ SORD_API -Sord -sord_iter_get_sord(SordIter iter); +SordModel +sord_iter_get_model(SordIter iter); /** Increment @a iter to point to the next statement. */ SORD_API @@ -308,14 +317,14 @@ sord_quad_match(const SordQuad x, const SordQuad y); SORD_API bool -sord_read_file(Sord sord, +sord_read_file(SordModel model, const uint8_t* uri, const SordNode graph, const uint8_t* blank_prefix); SORD_API bool -sord_read_file_handle(Sord sord, +sord_read_file_handle(SordModel model, FILE* fd, const uint8_t* base_uri, const SordNode graph, @@ -114,7 +114,7 @@ struct _SordWorld { }; /** Store */ -struct _Sord { +struct _SordModel { SordWorld world; /** Index for each possible triple ordering (may or may not exist). @@ -137,7 +137,7 @@ typedef enum { /** Iterator over some range of a store */ struct _SordIter { - Sord sord; ///< Store this is an iterator for + SordModel sord; ///< Store this is an iterator for GSequenceIter* cur; ///< Current DB cursor SordQuad pat; ///< Iteration pattern (in ordering order) int ordering[TUP_LEN]; ///< Store ordering @@ -216,7 +216,7 @@ sord_node_equals(const SordNode a, const SordNode b) * result set. */ static inline int -sord_id_compare(Sord sord, const SordNode a, const SordNode b) +sord_id_compare(SordModel sord, const SordNode a, const SordNode b) { if (a == b || !a || !b) { return (const char*)a - (const char*)b; @@ -254,7 +254,7 @@ sord_quad_match(const SordQuad x, const SordQuad y) static int sord_quad_compare(const void* x_ptr, const void* y_ptr, void* user_data) { - Sord const sord = (Sord)user_data; + SordModel const sord = (SordModel)user_data; SordNode* const x = (SordNode*)x_ptr; SordNode* const y = (SordNode*)y_ptr; @@ -334,7 +334,7 @@ sord_iter_seek_match_range(SordIter iter) } static SordIter -sord_iter_new(Sord sord, GSequenceIter* cur, const SordQuad pat, +sord_iter_new(SordModel sord, GSequenceIter* cur, const SordQuad pat, SordOrder order, SearchMode mode, int n_prefix) { const int* ordering = orderings[order]; @@ -377,8 +377,8 @@ sord_iter_new(Sord sord, GSequenceIter* cur, const SordQuad pat, return iter; } -Sord -sord_iter_get_sord(SordIter iter) +SordModel +sord_iter_get_model(SordIter iter) { return iter->sord; } @@ -469,7 +469,7 @@ sord_iter_free(SordIter iter) * corresponding order with a G prepended (so G will be the MSN). */ static inline bool -sord_has_index(Sord sord, SordOrder* order, int* n_prefix, bool graph_search) +sord_has_index(SordModel sord, SordOrder* order, int* n_prefix, bool graph_search) { if (graph_search) { *order += GSPO; @@ -486,7 +486,7 @@ sord_has_index(Sord sord, SordOrder* order, int* n_prefix, bool graph_search) * (for @a mode == RANGE and @a mode == FILTER_RANGE) */ static inline SordOrder -sord_best_index(Sord sord, const SordQuad pat, SearchMode* mode, int* n_prefix) +sord_best_index(SordModel sord, const SordQuad pat, SearchMode* mode, int* n_prefix) { const bool graph_search = (pat[TUP_G] != 0); @@ -544,10 +544,10 @@ sord_best_index(Sord sord, const SordQuad pat, SearchMode* mode, int* n_prefix) } } -Sord +SordModel sord_new(SordWorld world, unsigned indices, bool graphs) { - Sord sord = (Sord)malloc(sizeof(struct _Sord)); + SordModel sord = (SordModel)malloc(sizeof(struct _SordModel)); sord->world = world; sord->n_quads = 0; @@ -573,7 +573,7 @@ sord_new(SordWorld world, unsigned indices, bool graphs) } static void -sord_add_quad_ref(Sord sord, const SordNode node) +sord_add_quad_ref(SordModel sord, const SordNode node) { if (node) { ++node->refs; @@ -581,7 +581,7 @@ sord_add_quad_ref(Sord sord, const SordNode node) } static void -sord_drop_node(Sord sord, SordNode node) +sord_drop_node(SordModel sord, SordNode node) { SordWorld world = sord_get_world(sord); if (node->type == SORD_LITERAL) { @@ -600,7 +600,7 @@ sord_drop_node(Sord sord, SordNode node) } static void -sord_drop_quad_ref(Sord sord, const SordNode node) +sord_drop_quad_ref(SordModel sord, const SordNode node) { if (node) { if (--node->refs == 0) { @@ -610,7 +610,7 @@ sord_drop_quad_ref(Sord sord, const SordNode node) } void -sord_free(Sord sord) +sord_free(SordModel sord) { if (!sord) return; @@ -634,13 +634,13 @@ sord_free(Sord sord) } SordWorld -sord_get_world(Sord sord) +sord_get_world(SordModel sord) { return sord->world; } int -sord_num_quads(Sord sord) +sord_num_quads(SordModel sord) { return sord->n_quads; } @@ -652,7 +652,7 @@ sord_num_nodes(SordWorld world) } SordIter -sord_begin(Sord sord) +sord_begin(SordModel sord) { if (sord_num_quads(sord) == 0) { return NULL; @@ -664,20 +664,20 @@ sord_begin(Sord sord) } SordIter -sord_graphs_begin(Sord read) +sord_graphs_begin(SordModel model) { return NULL; } static inline GSequenceIter* -index_search(Sord sord, GSequence* db, const SordQuad search_key) +index_search(SordModel sord, GSequence* db, const SordQuad search_key) { return g_sequence_search( db, (void*)search_key, sord_quad_compare, sord); } static inline GSequenceIter* -index_lower_bound(Sord sord, GSequence* db, const SordQuad search_key) +index_lower_bound(SordModel sord, GSequence* db, const SordQuad search_key) { GSequenceIter* i = g_sequence_search( db, (void*)search_key, sord_quad_compare, sord); @@ -722,7 +722,7 @@ index_lower_bound(Sord sord, GSequence* db, const SordQuad search_key) } SordIter -sord_find(Sord sord, const SordQuad pat) +sord_find(SordModel sord, const SordQuad pat) { if (!pat[0] && !pat[1] && !pat[2] && !pat[3]) return sord_begin(sord); @@ -913,8 +913,19 @@ sord_new_literal(SordWorld world, SordNode type, lang, lang ? strlen(lang) : 0); } +void +sord_node_free(SordNode node) +{ +} + +SordNode +sord_node_copy(SordNode node) +{ + return node; +} + static inline bool -sord_add_to_index(Sord sord, const SordQuad tup, SordOrder order) +sord_add_to_index(SordModel sord, const SordQuad tup, SordOrder order) { assert(sord->indices[order]); const int* const ordering = orderings[order]; @@ -936,7 +947,7 @@ sord_add_to_index(Sord sord, const SordQuad tup, SordOrder order) } void -sord_add(Sord sord, const SordQuad tup) +sord_add(SordModel sord, const SordQuad tup) { SORD_WRITE_LOG("Add " TUP_FMT "\n", TUP_FMT_ARGS(tup)); assert(tup[0] && tup[1] && tup[2]); @@ -958,7 +969,7 @@ sord_add(Sord sord, const SordQuad tup) } void -sord_remove(Sord sord, const SordQuad tup) +sord_remove(SordModel sord, const SordQuad tup) { SORD_WRITE_LOG("Remove " TUP_FMT "\n", TUP_FMT_ARGS(tup)); @@ -985,7 +996,7 @@ sord_remove(Sord sord, const SordQuad tup) } void -sord_remove_iter(Sord sord, SordIter iter) +sord_remove_iter(SordModel sord, SordIter iter) { SordQuad tup; sord_iter_get(iter, tup); @@ -1018,7 +1029,7 @@ sord_remove_iter(Sord sord, SordIter iter) } void -sord_remove_graph(Sord sord, SordNode graph) +sord_remove_graph(SordModel sord, SordNode graph) { #if 0 if (!sord->indices[GSPO]) diff --git a/src/sord_test.c b/src/sord_test.c index ae3280b..a6517f5 100644 --- a/src/sord_test.c +++ b/src/sord_test.c @@ -43,7 +43,7 @@ uri(SordWorld world, int num) } void -generate(SordWorld world, Sord sord, size_t n_quads, size_t n_objects_per) +generate(SordWorld world, SordModel sord, size_t n_quads, size_t n_objects_per) { fprintf(stderr, "Generating %zu (S P *) quads with %zu objects each\n", n_quads, n_objects_per); @@ -105,14 +105,14 @@ test_fail() ((t)[2] ? sord_node_get_string((t)[2]) : USTR("*")) int -test_read(SordWorld world, Sord sord, const size_t n_quads, const int n_objects_per) +test_read(SordWorld world, SordModel sord, const size_t n_quads, const int n_objects_per) { int ret = EXIT_SUCCESS; SordQuad id; SordIter iter = sord_begin(sord); - if (sord_iter_get_sord(iter) != sord) { + if (sord_iter_get_model(iter) != sord) { fprintf(stderr, "Fail: Iterator has incorrect sord pointer\n"); return test_fail(); } @@ -232,7 +232,7 @@ test_read(SordWorld world, Sord sord, const size_t n_quads, const int n_objects_ } int -test_write(Sord sord, const size_t n_quads, const int n_objects_per) +test_write(SordModel sord, const size_t n_quads, const int n_objects_per) { int ret = EXIT_SUCCESS; @@ -267,7 +267,7 @@ main(int argc, char** argv) SordWorld world = sord_world_new(); // Create with minimal indexing - Sord sord = sord_new(world, SORD_SPO, false); + SordModel sord = sord_new(world, SORD_SPO, false); generate(world, sord, n_quads, n_objects_per); if (test_read(world, sord, n_quads, n_objects_per)) { diff --git a/src/sordi.c b/src/sordi.c index bf27e48..71ac3d6 100644 --- a/src/sordi.c +++ b/src/sordi.c @@ -28,7 +28,7 @@ typedef struct { SerdEnv env; SerdNode base_uri_node; SerdURI base_uri; - Sord sord; + SordModel sord; } State; int @@ -119,7 +119,7 @@ main(int argc, char** argv) const uint8_t* input = (const uint8_t*)argv[a++]; SordWorld world = sord_world_new(); - Sord sord = sord_new(world, SORD_SPO|SORD_OPS, false); + SordModel sord = sord_new(world, SORD_SPO|SORD_OPS, false); bool success = sord_read_file(sord, input, NULL, NULL); diff --git a/src/syntax.c b/src/syntax.c index 7444fe5..9f90e20 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -33,7 +33,7 @@ typedef struct { SerdNode base_uri_node; SerdURI base_uri; SordWorld world; - Sord sord; + SordModel sord; } ReadState; static uint8_t* @@ -175,7 +175,7 @@ event_statement(void* handle, SORD_API bool -sord_read_file(Sord sord, +sord_read_file(SordModel sord, const uint8_t* input, const SordNode graph, const uint8_t* blank_prefix) @@ -210,7 +210,7 @@ sord_read_file(Sord sord, SORD_API bool -sord_read_file_handle(Sord sord, +sord_read_file_handle(SordModel sord, FILE* fd, const uint8_t* base_uri_str_in, const SordNode graph, |