Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18647

Modified Files:
        sql.mx 
Log Message:
support of RDF/MLA storage in the sql frontend 


Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -d -r1.398 -r1.399
--- sql.mx      19 Feb 2010 15:35:28 -0000      1.398
+++ sql.mx      22 Feb 2010 14:07:29 -0000      1.399
@@ -5052,7 +5052,11 @@
        sql_schema *sch;
        sql_table *g_tbl;
        sql_column *gname, *gid;
+#if STORE == TRIPLE_STORE
        sql_table *spo_tbl, *sop_tbl, *pso_tbl, *pos_tbl, *osp_tbl, *ops_tbl;
+#elif STORE == MLA_STORE
+       sql_table *spo_tbl;
+#endif /* STORE */
        sql_table *map_tbl;
        sql_subtype tpe;
        str *location = (str *) getArgReference(stk,pci,1);
@@ -5094,12 +5098,16 @@
                sql_find_subtype(&tpe, "oid", 31, 0);
                /* sql_find_subtype(&tpe, "int", 32, 0); */
        }
+#if STORE == TRIPLE_STORE
        @:crt_tbl(id,spo,subject,property,object)@
        @:crt_tbl(id,sop,subject,object,property)@
        @:crt_tbl(id,pso,property,subject,object)@
        @:crt_tbl(id,pos,property,object,subject)@
        @:crt_tbl(id,osp,object,subject,property)@
        @:crt_tbl(id,ops,object,property,subject)@
+#elif STORE == MLA_STORE
+       @:crt_tbl(id,spo,subject,property,object)@
+#endif /* STORE */
 
        sprintf(buff, "map%d", id);
        map_tbl = mvc_create_table(m, sch, buff, 0, SQL_PERSIST, 0, 2);
@@ -5127,19 +5135,28 @@
                        TYPE_bat);
        BBPunfix(s->batCacheid);
 
+#if STORE == TRIPLE_STORE
        @:crt_col(spo_tbl,S_sort,P_PO,O_PO)@
        @:crt_col(sop_tbl,S_sort,P_OP,O_OP)@
        @:crt_col(pso_tbl,S_SO,P_sort,O_SO)@
        @:crt_col(pos_tbl,S_OS,P_sort,O_OS)@
        @:crt_col(osp_tbl,S_SP,P_SP,O_sort)@
        @:crt_col(ops_tbl,S_PS,P_PS,O_sort)@
+#elif STORE == MLA_STORE
+       @:crt_col(spo_tbl,S_sort,P_sort,O_sort)@
+#endif /* STORE */
+
+
+
 
        /* unfix graph */
        BBPunfix(graph->batCacheid);
 
        return MAL_SUCCEED;
+
+
 #else
        (void) cntxt; (void) mb; (void) stk; (void) pci;
        throw(SQL, "sql.rdfShred", "RDF support is missing from Monet5");
-#endif
+#endif /* RDF */
 }


------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to