still partial implementation for complex queries in libsg, and added sg.h which I had forgotten to include in darcs

2 files changed, 123 insertions, 2 deletions

diff --git a/src/runtime/c/sg/sg.c b/src/runtime/c/sg/sg.c
index 27c1a8293..2aa6ce07a 100644
--- a/src/runtime/c/sg/sg.c
+++ b/src/runtime/c/sg/sg.c
@@ -915,7 +915,7 @@ close:
 }
 
 bool
-sg_query_result_fetch(SgTripleResult* tres, SgId* pKey, SgTriple triple, GuExn* err)
+sg_triple_result_fetch(SgTripleResult* tres, SgId* pKey, SgTriple triple, GuExn* err)
 {
 	while (tres->res == 0) {
 		int rc;
@@ -993,7 +993,7 @@ sg_query_result_fetch(SgTripleResult* tres, SgId* pKey, SgTriple triple, GuExn*
 }
 
 void
-sg_query_result_close(SgTripleResult* tres, GuExn* err)
+sg_triple_result_close(SgTripleResult* tres, GuExn* err)
 {
 	close_triples(tres->db, tres->cursors, &tres->n_cursors);
 
@@ -1005,3 +1005,67 @@ sg_query_result_close(SgTripleResult* tres, GuExn* err)
 
 	free(tres);
 }
+
+struct SgQueryResult {
+	sqlite3 *db;
+	SgQuery* query;
+
+	int n_results;
+	SgTripleResult* results[];
+};
+
+SgQueryResult*
+sg_query(SgSG *sg, SgQuery* query, GuExn* err)
+{
+	sqlite3 *db = (sqlite3 *) sg;
+
+	SgQueryResult* qres = 
+		malloc(sizeof(SgQueryResult)+
+		       sizeof(SgTripleResult*)*query->n_patterns);
+	qres->db = db;
+	qres->query = query;
+	qres->n_results = 0;
+	
+	return qres;
+}
+
+bool
+sg_query_result_fetch(SgQueryResult* qres, SgId* res, GuExn* err)
+{
+	size_t i = 0;
+	while (i < qres->query->n_patterns) {
+		SgTriple triple;
+		triple[0] = qres->query->vars[qres->query->patterns[i][0]];
+		triple[1] = qres->query->vars[qres->query->patterns[i][1]];
+		triple[2] = qres->query->vars[qres->query->patterns[i][2]];
+		qres->results[i] = sg_query_triple((SgSG *) qres->db, triple, err);
+
+		SgId key;
+		for (;;) {
+			bool found = sg_triple_result_fetch(qres->results[i], &key, triple, err);
+			if (gu_exn_is_raised(err)) {
+				return false;
+			}
+
+			if (!found) {
+				sg_triple_result_close(qres->results[i], err);
+				if (gu_exn_is_raised(err)) {
+					return false;
+				}
+				
+				if (i == 0)
+					break;
+				
+				i--;
+			}
+		}
+
+		qres->query->vars[qres->query->patterns[i][0]] = triple[0];
+		qres->query->vars[qres->query->patterns[i][1]] = triple[1];
+		qres->query->vars[qres->query->patterns[i][2]] = triple[2];
+
+		i++;
+	}
+	
+	return false;
+}
diff --git a/src/runtime/c/sg/sg.h b/src/runtime/c/sg/sg.h
new file mode 100644
index 000000000..a859bbec2
--- /dev/null
+++ b/src/runtime/c/sg/sg.h
@@ -0,0 +1,57 @@
+#ifndef SG_SG_H_
+#define SG_SG_H_
+
+typedef long long int SgId;
+
+#include <gu/exn.h>
+#include <pgf/pgf.h>
+
+typedef struct SgSG SgSG;
+
+SgSG*
+sg_open(const char *filename, GuExn* err);
+
+void
+sg_close(SgSG *sg, GuExn* err);
+
+SgId
+sg_insert_expr(SgSG *sg, PgfExpr expr, GuExn* err);
+
+PgfExpr
+sg_select_expr(SgSG *sg, SgId key, GuPool* out_pool, GuExn* err);
+
+
+typedef SgId SgTriple[3];
+
+SgId
+sg_insert_triple(SgSG *sg, SgTriple triple, GuExn* err);
+
+bool
+sg_select_triple(SgSG *sg, SgId key, SgTriple triple, GuExn* err);
+
+typedef struct SgTripleResult SgTripleResult;
+
+SgTripleResult*
+sg_query_triple(SgSG *sg, SgTriple triple, GuExn* err);
+
+bool
+sg_triple_result_fetch(SgTripleResult* tres, SgId* pKey, SgTriple triple, GuExn* err);
+
+void
+sg_triple_result_close(SgTripleResult* tres, GuExn* err);
+
+typedef int SgPattern[3];
+
+typedef struct {
+	SgId* sel;
+	SgId* vars;
+	size_t n_patterns;
+	SgPattern patterns[];
+} SgQuery;
+
+typedef struct SgQueryResult SgQueryResult;
+
+SgQueryResult*
+sg_query(SgSG *sg, SgQuery* query, GuExn* err);
+
+#endif