Changeset: 1f6f64da249f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f6f64da249f
Modified Files:
monetdb5/extras/rdf/rdfalgebra.mal
monetdb5/extras/rdf/rdfschema.mal
sql/backends/monet5/sql_rdf.mal
Branch: rdf
Log Message:
Fix the issue with BAT headtype in .mal files
diffs (80 lines):
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
@@ -17,15 +17,15 @@
module rdf;
-command leftfetchjoin_sorted ( left:bat[:any_1,:oid], right:bat[:oid,:any_3] )
:bat[:any_1,:any_3]
+command leftfetchjoin_sorted ( left:bat[:oid], right:bat[:oid] ) :bat[:oid]
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"
-command rdf2str(i:bat[:oid,:oid],map:bat[:oid,:str]):bat[:oid,:str]
+command rdf2str(i:bat[:oid],map:bat[:str]):bat[:str]
address TKNZRrdf2str
comment "converts id's into strings using the dictionary, but if (id >=
RDF_MIN_LITERAL) look it up in a literal map bat";
-command partialjoin(lmap:bat[:oid, :any_1], rmap:bat[:oid, :any_2],
input:bat[:oid,:any_1]):bat[:any_1,:any_2]
+command partialjoin(lmap:bat[:oid], rmap:bat[:oid], input:bat[:oid]):bat[:oid]
address RDFpartialjoin
comment "Join the input bat and the map bat (lmap, rmap). However, do not use
nil for non-matching value but use the original value from input bat"
diff --git a/monetdb5/extras/rdf/rdfschema.mal
b/monetdb5/extras/rdf/rdfschema.mal
--- a/monetdb5/extras/rdf/rdfschema.mal
+++ b/monetdb5/extras/rdf/rdfschema.mal
@@ -22,20 +22,20 @@ command rdfschemaexplore(tbname:str, cln
address RDFSchemaExplore
comment "Explore the schema information from input table e.g., SPO in RDF";
-command rdfextractCS( sbat:bat[:any_1,:oid], pbat:bat[:any_2,:oid],
freqThreshold:int ) :void
+command rdfextractCS( sbat:bat[:oid], pbat:bat[:oid], freqThreshold:int ) :void
address RDFextractCS
comment "Extract Characteristic sets from SPO table. While extracting CSs, get
the frequent CSs";
-command rdfextractPfromPSO(pbat:bat[:any_1,:oid], sbat:bat[:any_2,:oid]):void
+command rdfextractPfromPSO(pbat:bat[:oid], sbat:bat[:oid]):void
address RDFextractPfromPSO
comment "Extract Properties and their supports from PSO table";
-command rdfextractCSwithTypes( sbat:bat[:any_1,:oid], pbat:bat[:any_2,:oid],
obat:bat[:any_3,:oid], mbat:bat[:any_4,:str], ontbat:bat[:any_5,:str],
freqThreshold:int, freqCSset:void) :void
+command rdfextractCSwithTypes( sbat:bat[:oid], pbat:bat[:oid], obat:bat[:oid],
mbat:bat[:str], ontbat:bat[:str], freqThreshold:int, freqCSset:void) :void
address RDFextractCSwithTypes
comment "Extract Characteristic sets from SPO table. While extracting CSs,
detect the object type";
#TODO: The list of parameters for this function is not correct any more sice
it has been changed for the fucntion in sql.mx
-command rdfreorganize( sbat:bat[:any_1,:oid], pbat:bat[:any_2,:oid],
obat:bat[:any_3,:oid], mbat:bat[:any_4,:str], ontbat:bat[:any_5,:str],
freqThreshold:int, mode:int) :void
+command rdfreorganize( sbat:bat[:oid], pbat:bat[:oid], obat:bat[:oid],
mbat:bat[:str], ontbat:bat[:str], freqThreshold:int, mode:int) :void
address RDFreorganize
comment "Re-organize RDF triple store using the characteristic sets";
@@ -43,7 +43,7 @@ command rdfloadontology(location:str, sc
address RDFOntologyParser
comment "Load ontologies into RDF store";
-command rdfloadsqlontologies( auri:bat[:any_1,:str], aattr:bat[:any_2,:str],
muri:bat[:any_3,:str], msuper:bat[:any_4,:str], mlabel:bat[:any_5,:str]) :void
+command rdfloadsqlontologies( auri:bat[:str], aattr:bat[:str], muri:bat[:str],
msuper:bat[:str], mlabel:bat[:str]) :void
address RDFloadsqlontologies
comment "Load ontologies from SQL into string arrays";
diff --git a/sql/backends/monet5/sql_rdf.mal b/sql/backends/monet5/sql_rdf.mal
--- a/sql/backends/monet5/sql_rdf.mal
+++ b/sql/backends/monet5/sql_rdf.mal
@@ -42,7 +42,7 @@ pattern rdfidtostr(id:oid):str
address SQLrdfidtostr
comment "Convert from oid to string";
-pattern batsql.rdfidtostr(v:bat[:oid]):bat[ :str]
+pattern batsql.rdfidtostr(v:bat[:oid]):bat[:str]
address SQLrdfidtostr_bat
comment "Convert from oid to string";
@@ -63,7 +63,6 @@ address SQLrdftimetoid
comment "Convert from date time to encoded id";
#x:oid contains list of property, their lower bound, their upper bound (if
these bounds exist)
-pattern rdfscan{unsafe}(nprop:int, nrqrop:int, x:oid...)(:bat[:any]...)
+unsafe pattern rdfscan(nprop:int, nrqrop:int, x:oid...)(:bat[:any]...)
address SQLrdfScan
comment "RDFscan operator which return results from exceptional values";
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
