Changeset: 69385a1b691e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69385a1b691e
Modified Files:
monetdb5/extras/rdf/rdfalgebra.c
monetdb5/extras/rdf/rdfschema.c
monetdb5/modules/mal/tokenizer.c
sql/backends/monet5/sql_rdf.c
Branch: rdf
Log Message:
Removing BATmirror (more) in using BUNfnd
diffs (74 lines):
diff --git a/monetdb5/extras/rdf/rdfalgebra.c b/monetdb5/extras/rdf/rdfalgebra.c
--- a/monetdb5/extras/rdf/rdfalgebra.c
+++ b/monetdb5/extras/rdf/rdfalgebra.c
@@ -77,7 +77,6 @@ RDFpartialjoin(bat *retid, bat *lid, bat
}
map = VIEWcreate(BATmirror(left), right);
- //map = BATleftfetchjoin(BATmirror(left), right, BUN_NONE);
BBPreleaseref(left->batCacheid);
BBPreleaseref(right->batCacheid);
@@ -274,7 +273,7 @@ TKNZRrdf2str(bat *res, const bat *bid, c
BBPunfix(*bid);
BBPunfix(*map);
BBPunfix(*res);
- throw(MAL, "rdf.rdf2str", OPERATION_FAILED "
illegal oid");
+ throw(MAL, "rdf.rdf2str", OPERATION_FAILED "
illegal oid (rdfalgebra.c)");
}
s = (str) BUNtail(mi, pos);
} else {
diff --git a/monetdb5/extras/rdf/rdfschema.c b/monetdb5/extras/rdf/rdfschema.c
--- a/monetdb5/extras/rdf/rdfschema.c
+++ b/monetdb5/extras/rdf/rdfschema.c
@@ -9804,8 +9804,6 @@ RDFextractCSwithTypes(int *ret, bat *sba
//Phase 1: Assign an ID for each CS
RDFassignCSId(ret, sbat, pbat, obat, ontbat,freqCSset, freqThreshold,
csBats, *subjCSMap, maxCSoid, &maxNumProp, maxNumPwithDup);
- if (1) throw(RDF, "rdf.AssignCSId", "Stop for profiling");;
-
curT = clock();
printf (" ----- Exploring all CSs took %f seconds.\n", ((float)(curT -
tmpLastT))/CLOCKS_PER_SEC);
diff --git a/monetdb5/modules/mal/tokenizer.c b/monetdb5/modules/mal/tokenizer.c
--- a/monetdb5/modules/mal/tokenizer.c
+++ b/monetdb5/modules/mal/tokenizer.c
@@ -545,7 +545,7 @@ takeOid(oid id, str *val)
}
if (id >= BATcount(tokenBAT[INDEX].val)) {
- throw(MAL, "tokenizer.takeOid", OPERATION_FAILED " illegal
oid");
+ throw(MAL, "tokenizer.takeOid", OPERATION_FAILED " illegal oid
"BUNFMT,id);
}
id = *(oid *) Tloc(tokenBAT[INDEX].val, id);
diff --git a/sql/backends/monet5/sql_rdf.c b/sql/backends/monet5/sql_rdf.c
--- a/sql/backends/monet5/sql_rdf.c
+++ b/sql/backends/monet5/sql_rdf.c
@@ -1193,7 +1193,7 @@ SQLrdfidtostr(Client cntxt, MalBlkPtr mb
throw(MAL, "rdf.RDFreorganize", RUNTIME_OBJECT_MISSING);
}
- pos = BUNfnd(BATmirror(lmapBat),id);
+ pos = BUNfnd(lmapBat,id);
if (pos == BUN_NONE) //this id is not converted to a new id
origId = id;
else
@@ -1285,7 +1285,7 @@ SQLrdfidtostr_bat(Client cntxt, MalBlkPt
}
else if (objType == URI || objType == BLANKNODE){
- pos = BUNfnd(BATmirror(lmapBat),id);
+ pos = BUNfnd(lmapBat,id);
if (pos == BUN_NONE) //this id is not converted to a
new id
origId = id;
else
@@ -1344,7 +1344,7 @@ SQLrdfidtostr(str *ret, oid *id){
throw(MAL, "rdf.RDFreorganize", RUNTIME_OBJECT_MISSING);
}
- pos = BUNfnd(BATmirror(lmapBat),id);
+ pos = BUNfnd(lmapBat,id);
if (pos == BUN_NONE) //this id is not converted to a new id
origId = id;
else
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
