summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sord/sordmm.hpp28
-rw-r--r--src/sord.c93
-rw-r--r--src/sord_test.c40
-rw-r--r--wscript2
4 files changed, 102 insertions, 61 deletions
diff --git a/sord/sordmm.hpp b/sord/sordmm.hpp
index b3265d2..5f71f09 100644
--- a/sord/sordmm.hpp
+++ b/sord/sordmm.hpp
@@ -219,7 +219,8 @@ operator<<(std::ostream& os, const Node& node)
class URI : public Node {
public:
- inline URI(World& world, const std::string& s) : Node(world, Node::URI, s) {}
+ inline URI(World& world, const std::string& s)
+ : Node(world, Node::URI, s) {}
};
class Curie : public Node {
@@ -230,7 +231,8 @@ public:
class Literal : public Node {
public:
- inline Literal(World& world, const std::string& s) : Node(world, Node::LITERAL, s) {}
+ inline Literal(World& world, const std::string& s)
+ : Node(world, Node::LITERAL, s) {}
};
inline
@@ -355,7 +357,11 @@ struct Iter : public Wrapper<SordIter*> {
inline ~Iter() { sord_iter_free(_c_obj); }
inline bool end() const { return sord_iter_end(_c_obj); }
inline bool next() const { return sord_iter_next(_c_obj); }
- inline Iter& operator++() { assert(!end()); next(); return *this; }
+ inline Iter& operator++() {
+ assert(!end());
+ next();
+ return *this;
+ }
inline const Node get_subject() const {
SordQuad quad;
sord_iter_get(_c_obj, quad);
@@ -398,15 +404,15 @@ public:
inline SerdStatus write_to_file(
const std::string& uri,
- SerdSyntax syntax=SERD_TURTLE,
- SerdStyle style=(SerdStyle)(SERD_STYLE_ABBREVIATED
- |SERD_STYLE_CURIED));
+ SerdSyntax syntax = SERD_TURTLE,
+ SerdStyle style = (SerdStyle)(SERD_STYLE_ABBREVIATED
+ |SERD_STYLE_CURIED));
inline std::string write_to_string(
const std::string& base_uri,
- SerdSyntax syntax=SERD_TURTLE,
- SerdStyle style=(SerdStyle)(SERD_STYLE_ABBREVIATED
- |SERD_STYLE_CURIED));
+ SerdSyntax syntax = SERD_TURTLE,
+ SerdStyle style = (SerdStyle)(SERD_STYLE_ABBREVIATED
+ |SERD_STYLE_CURIED));
inline void add_statement(const Node& subject,
const Node& predicate,
@@ -581,7 +587,7 @@ Model::find(const Node& subject,
return Iter(_world, sord_find(_c_obj, quad));
}
-} // namespace Sord
+} // namespace Sord
-#endif // SORD_SORDMM_HPP
+#endif // SORD_SORDMM_HPP
diff --git a/src/sord.c b/src/sord.c
index 0ccb087..0e33dd4 100644
--- a/src/sord.c
+++ b/src/sord.c
@@ -93,8 +93,12 @@ static const char* const order_names[NUM_ORDERS] = {
(array indexed by SordOrder)
*/
static const int orderings[NUM_ORDERS][TUP_LEN] = {
- { 0,1,2,3}, { 0,2,1,3}, { 2,1,0,3}, { 2,0,1,3}, { 1,0,2,3}, { 1,2,0,3},
- {3,0,1,2 }, {3,0,2,1 }, {3,2,1,0 }, {3,2,0,1 }, {3,1,0,2 }, {3,1,2,0 }
+ { 0, 1, 2, 3 }, { 0, 2, 1, 3 }, // SPO, SOP
+ { 2, 1, 0, 3 }, { 2, 0, 1, 3 }, // OPS, OSP
+ { 1, 0, 2, 3 }, { 1, 2, 0, 3 }, // PSO, POS
+ { 3, 0, 1, 2 }, { 3, 0, 2, 1 }, // GSPO, GSOP
+ { 3, 2, 1, 0 }, { 3, 2, 0, 1 }, // GOPS, GOSP
+ { 3, 1, 0, 2 }, { 3, 1, 2, 0 } // GPSO, GPOS
};
/** World */
@@ -120,7 +124,7 @@ struct SordModelImpl {
/** Mode for searching or iteration */
typedef enum {
- ALL, ///< Iterate to end of store, returning all results, no filtering
+ ALL, ///< Iterate over entire store
SINGLE, ///< Iteration over a single element (exact search)
RANGE, ///< Iterate over range with equal prefix
FILTER_RANGE, ///< Iterate over range with equal prefix, filtering
@@ -129,14 +133,14 @@ typedef enum {
/** Iterator over some range of a store */
struct SordIterImpl {
- const SordModel* sord; ///< Store this is an iterator for
+ const SordModel* sord; ///< Model being iterated over
ZixTreeIter* cur; ///< Current DB cursor
- SordQuad pat; ///< Iteration pattern (in ordering order)
+ SordQuad pat; ///< Pattern (in ordering order)
int ordering[TUP_LEN]; ///< Store ordering
SearchMode mode; ///< Iteration mode
- int n_prefix; ///< Length of range prefix (RANGE, FILTER_RANGE)
+ int n_prefix; ///< Prefix for RANGE and FILTER_RANGE
bool end; ///< True iff reached end
- bool skip_graphs; ///< True iff iteration should ignore graphs
+ bool skip_graphs; ///< Iteration should ignore graphs
};
static unsigned
@@ -493,13 +497,13 @@ sord_iter_free(SordIter* iter)
/**
Return true iff @a sord has an index for @a order.
- If @a graph_search is true, @a order will be modified to be the
+ If @a graphs is true, @a order will be modified to be the
corresponding order with a G prepended (so G will be the MSN).
*/
static inline bool
-sord_has_index(SordModel* sord, SordOrder* order, int* n_prefix, bool graph_search)
+sord_has_index(SordModel* sord, SordOrder* order, int* n_prefix, bool graphs)
{
- if (graph_search) {
+ if (graphs) {
*order += GSPO;
*n_prefix += 1;
}
@@ -515,7 +519,10 @@ sord_has_index(SordModel* sord, SordOrder* order, int* n_prefix, bool graph_sear
(for @a mode == RANGE and @a mode == FILTER_RANGE)
*/
static inline SordOrder
-sord_best_index(SordModel* 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);
@@ -526,18 +533,31 @@ sord_best_index(SordModel* sord, const SordQuad pat, SearchMode* mode, int* n_pr
SordOrder good[2] = { (SordOrder)-1, (SordOrder)-1 };
+#define PAT_CASE(sig, m, g0, g1, np) \
+ case sig: \
+ *mode = m; \
+ good[0] = g0; \
+ good[1] = g1; \
+ *n_prefix = np; \
+ break
+
// Good orderings that don't require filtering
*mode = RANGE;
*n_prefix = 0;
switch (sig) {
- case 0x000: *mode = ALL; return graph_search ? DEFAULT_GRAPH_ORDER : DEFAULT_ORDER;
- case 0x001: *mode = RANGE; good[0] = OPS; good[1] = OSP; *n_prefix = 1; break;
- case 0x010: *mode = RANGE; good[0] = POS; good[1] = PSO; *n_prefix = 1; break;
- case 0x011: *mode = RANGE; good[0] = OPS; good[1] = POS; *n_prefix = 2; break;
- case 0x100: *mode = RANGE; good[0] = SPO; good[1] = SOP; *n_prefix = 1; break;
- case 0x101: *mode = RANGE; good[0] = SOP; good[1] = OSP; *n_prefix = 2; break;
- case 0x110: *mode = RANGE; good[0] = SPO; good[1] = PSO; *n_prefix = 2; break;
- case 0x111: *mode = SINGLE; return graph_search ? DEFAULT_GRAPH_ORDER : DEFAULT_ORDER;
+ case 0x000:
+ *mode = ALL;
+ return graph_search ? DEFAULT_GRAPH_ORDER : DEFAULT_ORDER;
+ case 0x111:
+ *mode = SINGLE;
+ return graph_search ? DEFAULT_GRAPH_ORDER : DEFAULT_ORDER;
+
+ PAT_CASE(0x001, RANGE, OPS, OSP, 1);
+ PAT_CASE(0x010, RANGE, POS, PSO, 1);
+ PAT_CASE(0x011, RANGE, OPS, POS, 2);
+ PAT_CASE(0x100, RANGE, SPO, SOP, 1);
+ PAT_CASE(0x101, RANGE, SOP, OSP, 2);
+ PAT_CASE(0x110, RANGE, SPO, PSO, 2);
}
if (*mode == RANGE) {
@@ -551,9 +571,9 @@ sord_best_index(SordModel* sord, const SordQuad pat, SearchMode* mode, int* n_pr
// Not so good orderings that require filtering, but can
// still be constrained to a range
switch (sig) {
- case 0x011: *mode = FILTER_RANGE; good[0] = OSP; good[1] = PSO; *n_prefix = 1; break;
- case 0x101: *mode = FILTER_RANGE; good[0] = SPO; good[1] = OPS; *n_prefix = 1; break;
- case 0x110: *mode = FILTER_RANGE; good[0] = SOP; good[1] = POS; *n_prefix = 1; break;
+ PAT_CASE(0x011, FILTER_RANGE, OSP, PSO, 1);
+ PAT_CASE(0x101, FILTER_RANGE, SPO, OPS, 1);
+ PAT_CASE(0x110, FILTER_RANGE, SOP, POS, 1);
default: break;
}
@@ -765,11 +785,12 @@ sord_find(SordModel* sord, const SordQuad pat)
return sord_begin(sord);
SearchMode mode;
- int prefix_len;
- const SordOrder index_order = sord_best_index(sord, pat, &mode, &prefix_len);
+ int n_prefix;
+ const SordOrder index_order = sord_best_index(sord, pat, &mode, &n_prefix);
- SORD_FIND_LOG("Find " TUP_FMT " index=%s mode=%d prefix_len=%d ordering=%d%d%d%d\n",
- TUP_FMT_ARGS(pat), order_names[index_order], mode, prefix_len,
+ SORD_FIND_LOG("Find " TUP_FMT " index=%s mode=%d"
+ " n_prefix=%d ordering=%d%d%d%d\n",
+ TUP_FMT_ARGS(pat), order_names[index_order], mode, n_prefix,
ordering[0], ordering[1], ordering[2], ordering[3]);
if (pat[0] && pat[1] && pat[2] && pat[3])
@@ -788,7 +809,7 @@ sord_find(SordModel* sord, const SordQuad pat)
return NULL;
}
- return sord_iter_new(sord, cur, pat, index_order, mode, prefix_len);
+ return sord_iter_new(sord, cur, pat, index_order, mode, n_prefix);
}
bool
@@ -973,13 +994,17 @@ sord_new_blank(SordWorld* world, const uint8_t* str)
}
static SordNode*
-sord_new_literal_counted(SordWorld* world, SordNode* datatype,
- const uint8_t* str, size_t n_bytes, size_t n_chars,
- SerdNodeFlags flags,
- const char* lang)
+sord_new_literal_counted(SordWorld* world,
+ SordNode* datatype,
+ const uint8_t* str,
+ size_t n_bytes,
+ size_t n_chars,
+ SerdNodeFlags flags,
+ const char* lang)
{
lang = sord_intern_lang(world, lang);
- SordNode* node = sord_lookup_literal(world, datatype, str, n_bytes, n_chars, lang);
+ SordNode* node = sord_lookup_literal(
+ world, datatype, str, n_bytes, n_chars, lang);
if (node) {
++node->refs;
return node;
@@ -1023,7 +1048,8 @@ sord_node_from_serd_node(SordWorld* world,
case SERD_NOTHING:
return NULL;
case SERD_LITERAL:
- datatype_node = sord_node_from_serd_node(world, env, datatype, NULL, NULL),
+ datatype_node = sord_node_from_serd_node(
+ world, env, datatype, NULL, NULL),
ret = sord_new_literal_counted(
world,
datatype_node,
@@ -1135,7 +1161,6 @@ sord_add(SordModel* sord, const SordQuad tup)
sord_add_quad_ref(sord, tup[i], i);
++sord->n_quads;
- //assert(sord->n_quads == (size_t)zix_tree_get_length(sord->indices[SPO]));
return true;
}
diff --git a/src/sord_test.c b/src/sord_test.c
index 76a0fb2..93fa735 100644
--- a/src/sord_test.c
+++ b/src/sord_test.c
@@ -55,7 +55,11 @@ test_fail(const char* fmt, ...)
}
int
-generate(SordWorld* world, SordModel* sord, size_t n_quads, size_t n_objects_per, SordNode* graph)
+generate(SordWorld* world,
+ SordModel* sord,
+ size_t n_quads,
+ size_t n_objects_per,
+ SordNode* graph)
{
fprintf(stderr, "Generating %zu (S P *) quads with %zu objects each\n",
n_quads, n_objects_per);
@@ -194,11 +198,12 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g,
sord_iter_free(iter);
- SordNode* plain_hello = sord_new_literal(world, 0, USTR("hello"), NULL);
- SordNode* type4_hello = sord_new_literal(world, uri(world, 4), USTR("hello"), NULL);
- SordNode* type5_hello = sord_new_literal(world, uri(world, 5), USTR("hello"), NULL);
- SordNode* gb_hello = sord_new_literal(world, NULL, USTR("hello"), "en-gb");
- SordNode* us_hello = sord_new_literal(world, NULL, USTR("hello"), "en-us");
+ const uint8_t* s = USTR("hello");
+ SordNode* plain_hello = sord_new_literal(world, 0, s, NULL);
+ SordNode* type4_hello = sord_new_literal(world, uri(world, 4), s, NULL);
+ SordNode* type5_hello = sord_new_literal(world, uri(world, 5), s, NULL);
+ SordNode* gb_hello = sord_new_literal(world, NULL, s, "en-gb");
+ SordNode* us_hello = sord_new_literal(world, NULL, s, "en-us");
#define NUM_PATTERNS 17
@@ -245,8 +250,9 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g,
++num_results;
if (!sord_quad_match(pat, id)) {
sord_iter_free(iter);
- return test_fail("Fail: Query result " TUP_FMT " does not match pattern\n",
- TUP_FMT_ARGS(id));
+ return test_fail(
+ "Fail: Query result " TUP_FMT " does not match pattern\n",
+ TUP_FMT_ARGS(id));
}
}
sord_iter_free(iter);
@@ -270,8 +276,9 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g,
++num_results;
if (!sord_quad_match(pat, id)) {
sord_iter_free(iter);
- return test_fail("Fail: Query result " TUP_FMT " does not match pattern\n",
- TUP_FMT_ARGS(id));
+ return test_fail(
+ "Fail: Query result " TUP_FMT " does not match pattern\n",
+ TUP_FMT_ARGS(id));
}
}
fprintf(stderr, "OK\n");
@@ -300,15 +307,17 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g,
if (!sord_quad_match(subpat, subid)) {
sord_iter_free(iter);
sord_iter_free(subiter);
- return test_fail("Fail: Nested query result does not match pattern\n");
+ return test_fail(
+ "Fail: Nested query result does not match pattern\n");
}
++num_sub_results;
}
sord_iter_free(subiter);
if (num_sub_results != n_objects_per) {
- return test_fail("Fail: Nested query " TUP_FMT " failed"
- "(got %d results, expected %d)\n",
- TUP_FMT_ARGS(subpat), num_sub_results, n_objects_per);
+ return test_fail(
+ "Fail: Nested query " TUP_FMT " failed"
+ " (%d results, expected %d)\n",
+ TUP_FMT_ARGS(subpat), num_sub_results, n_objects_per);
}
last_subject = id[0];
}
@@ -378,7 +387,8 @@ main(int argc, char** argv)
if (uri_id2 != uri_id || !sord_node_equals(uri_id2, uri_id)) {
fprintf(stderr, "Fail: URI interning failed (duplicates)\n");
goto fail;
- } else if (blank_id2 != blank_id || !sord_node_equals(blank_id2, blank_id)) {
+ } else if (blank_id2 != blank_id
+ || !sord_node_equals(blank_id2, blank_id)) {
fprintf(stderr, "Fail: Blank node interning failed (duplicates)\n");
goto fail;
} else if (lit_id2 != lit_id || !sord_node_equals(lit_id2, lit_id)) {
diff --git a/wscript b/wscript
index 37b407b..5c8fb8d 100644
--- a/wscript
+++ b/wscript
@@ -197,7 +197,7 @@ def build(bld):
bld.add_post_fun(fix_docs)
def lint(ctx):
- subprocess.call('cpplint.py --filter=+whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/include src/* serd/*', shell=True)
+ subprocess.call('cpplint.py --filter=+whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-build/header_guard,-readability/casting,-readability/todo,-build/include src/*.* sord/* src/zix/*.*', shell=True)
def build_dir(ctx, subdir):
if autowaf.is_child():
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 05:01:29 +0000