Changeset: e182a13222f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e182a13222f1
Modified Files:
monetdb5/extras/rdf/30_rdf.mal
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf.h
monetdb5/extras/rdf/rdfalgebra.mal
sql/backends/monet5/Makefile.ag
sql/scripts/30_rdf.sql
Branch: rdf
Log Message:
Add missing semicolon in .mal files, modify the Makefile for new added files.
diffs (106 lines):
diff --git a/monetdb5/extras/rdf/30_rdf.mal b/monetdb5/extras/rdf/30_rdf.mal
--- a/monetdb5/extras/rdf/30_rdf.mal
+++ b/monetdb5/extras/rdf/30_rdf.mal
@@ -16,5 +16,10 @@
# All Rights Reserved.
# This loads the MonetDB/RDF module
+library rdf;
+
include tokenizer;
include rdfalgebra;
+
+# For rdf schema exploration and summarization
+include rdfschema;
diff --git a/monetdb5/extras/rdf/Makefile.ag b/monetdb5/extras/rdf/Makefile.ag
--- a/monetdb5/extras/rdf/Makefile.ag
+++ b/monetdb5/extras/rdf/Makefile.ag
@@ -25,12 +25,15 @@ INCLUDES = ../../modules/atoms ../../mod
MTSAFE
-lib_rdf = {
+SUBDIRS = hashmap
+
+lib__rdf = {
MODULE
DIR = libdir/monetdb5
- SOURCES = rdf.h rdf_shredder.mx rdfalgebra.c
-
- LIBS = ../../tools/libmonetdb5 \
+ SOURCES = rdf.h rdf_shredder.mx rdfalgebra.c rdfschema.c
+ #SEP = _
+ LIBS = ./hashmap/librdfhash
+ ../../tools/libmonetdb5 \
../../../gdk/libbat \
$(MALLOC_LIBS) $(raptor_LIBS)
}
@@ -38,7 +41,7 @@ lib_rdf = {
headers_rdf_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = rdfalgebra.mal
+ SOURCES = rdfalgebra.mal rdfschema.mal
}
headers_autoload = {
@@ -47,5 +50,5 @@ headers_autoload = {
SOURCES = 30_rdf.mal
}
-#EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 30_rdf.mal rdfalgebra.mal
+EXTRA_DIST_DIR = hashmap
+EXTRA_DIST = 30_rdf.mal rdfalgebra.mal rdfschema.mal
diff --git a/monetdb5/extras/rdf/rdf.h b/monetdb5/extras/rdf/rdf.h
--- a/monetdb5/extras/rdf/rdf.h
+++ b/monetdb5/extras/rdf/rdf.h
@@ -47,9 +47,17 @@ RDFParser(BAT **graph, str *location, st
rdf_export str
RDFleftfetchjoin_sortedestimate(int *result, int *lid, int *rid, lng
*estimate);
+
rdf_export str
RDFleftfetchjoin_sorted(int *result, int* lid, int *rid);
+rdf_export str
+RDFSchemaExplore(int *ret, str *tbname, str *clname);
+
+
+rdf_export str
+RDFextractCS(int *ret, bat *sbatid, bat *pbatid);
+
#define TRIPLE_STORE 1
#define MLA_STORE 2
diff --git a/monetdb5/extras/rdf/rdfalgebra.mal
b/monetdb5/extras/rdf/rdfalgebra.mal
--- a/monetdb5/extras/rdf/rdfalgebra.mal
+++ b/monetdb5/extras/rdf/rdfalgebra.mal
@@ -19,4 +19,4 @@ module rdf;
command leftfetchjoin_sorted ( left:bat[:any_1,:oid], right:bat[:oid,:any_3] )
:bat[:any_1,:any_3]
address RDFleftfetchjoin_sorted
-comment "like algebra_leftfetchjoin(), but asserts that the resulting tail
column is sorted -- ONLY USE IF YOU ARE SURE OF THIS!!! also requires sorted
tail left input"
+comment "like algebra_leftfetchjoin(), but asserts that the resulting tail
column is sorted -- ONLY USE IF YOU ARE SURE OF THIS!!! also requires sorted
tail left input";
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -49,7 +49,7 @@ lib__sql = {
../../storage/bat/libbatstore \
../../storage/restrict/librestrictstore \
../../common/libsqlcommon \
- HAVE_RAPTOR?../../../monetdb5/extras/rdf/librdf \
+ HAVE_RAPTOR?../../../monetdb5/extras/rdf/lib_rdf \
../../../monetdb5/tools/libmonetdb5 \
../../../gdk/libbat \
../../../common/stream/libstream \
diff --git a/sql/scripts/30_rdf.sql b/sql/scripts/30_rdf.sql
--- a/sql/scripts/30_rdf.sql
+++ b/sql/scripts/30_rdf.sql
@@ -30,3 +30,6 @@ create table rdf.graph (gname string, gi
-- the backend
create procedure rdf_shred(location string, gname string, sch string)
external name sql.rdfshred;
+
+create procedure rdf_schema_explore(tbname string, clname string)
+ external name rdf.rdfschemaexplore;
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
