Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16:/tmp/cvs-serv4936/runtime
Modified Files:
pathfinder.mx
Log Message:
- make index pruning less enthusiastic (securites/Symbol/text() now gets indexd)
- pf_commit_docmgt supplants pf_commit_shred so the 'no-commit'experiment
can also be done for del-doc(), not only for shred-doc()
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- pathfinder.mx 18 Apr 2007 09:49:56 -0000 1.339
+++ pathfinder.mx 18 Apr 2007 13:27:11 -0000 1.340
@@ -1942,7 +1942,7 @@
vxt := vxt.tmark([EMAIL PROTECTED]);
# eliminate too frequent values from the index
- var lim := 16*log2(lng(count(vxt)));
+ var lim := 8192;
var sel := histogram(vxt);
sel := [<](sel, lim);
sel := vxt.leftjoin(sel).tmark([EMAIL PROTECTED]).access(BAT_WRITE); #
true for infrequent values
@@ -3357,8 +3357,7 @@
if (cleanup) return _collection_cleanup(); # garbage collect empty
collections
return new(str,str);
}
-
-var pf_commit_shred := true;
+var pf_commit_docmgmt := true;
PROC shred_doc_base(BAT[void,str] commitBAT,
BAT[void,str] idx_locations,
@@ -3423,7 +3422,7 @@
}
# checkpoint the new bats
- if (pf_commit_shred)
+ if (pf_commit_docmgt)
if (pf_checkpoint(commitBAT)) {
# remove the in-memory undo log; and trim collection
lock_set(pf_short);
@@ -3446,6 +3445,7 @@
if (not(isnil(err))) ERROR(err);
}
+
@- deleting documents
To make document deletes atomic, we first just set the document names to nil
in the
@@ -3509,11 +3509,13 @@
var commitBAT := del_doc(cachedOnly, names, pf_short_req);
# now here is our commit: checkpoint 2 bat descs and BBP.dir
- var ok := false;
- lock_set(pf_wal);
- CATCH(ok := subcommit(commitBAT));
- lock_unset(pf_wal);
- if (not(ok)) ERROR("XQDY0062: checkpoint failed, query aborted.\n");
+ if (pf_commit_docmgt) {
+ var ok := false;
+ lock_set(pf_wal);
+ CATCH(ok := subcommit(commitBAT));
+ lock_unset(pf_wal);
+ if (not(ok)) ERROR("XQDY0062: checkpoint failed, query aborted.\n");
+ }
if (pf_short_req) {
# try to remove empty collections (non-critical)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
