Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18789
Modified Files:
Tag: XQuery_0-16
nexi.c pftijah.mx
Log Message:
* repair startNodes bug. It is again possblie to search from a seq of startNodes
* repair memory management problem, several BAT_WRITE -> BAT_APPEND
Index: nexi.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
retrieving revision 1.47.2.1
retrieving revision 1.47.2.2
diff -u -d -r1.47.2.1 -r1.47.2.2
--- nexi.c 22 Feb 2007 11:19:56 -0000 1.47.2.1
+++ nexi.c 23 Feb 2007 09:10:03 -0000 1.47.2.2
@@ -242,6 +242,10 @@
MILPRINTF(MILOUT, "if ( view_bbp_name().reverse().exist(\"%s\") )
{\n", startNodes_name );
MILPRINTF(MILOUT, " startNodes := bat(\"%s\");\n", startNodes_name);
MILPRINTF(MILOUT, " bat(\"%s\").persists(false);\n", startNodes_name);
+ if ( TDEBUG(98) ) {
+ MILPRINTF(MILOUT," printf(\"# tijah-mil-exec: contents of
startNodes is:\\n\");\n");
+ MILPRINTF(MILOUT," bat(\"%s\").print();\n",startNodes_name);
+ }
MILPRINTF(MILOUT, "}\n" );
}
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.92.2.16
retrieving revision 1.92.2.17
diff -u -d -r1.92.2.16 -r1.92.2.17
--- pftijah.mx 22 Feb 2007 20:24:32 -0000 1.92.2.16
+++ pftijah.mx 23 Feb 2007 09:10:04 -0000 1.92.2.17
@@ -71,12 +71,12 @@
"C interface to pftijah option serialize"
.COMMAND pf2tijah_node(
- BAT[void,str] doc_name,
- BAT[void,int] doc_firstpre,
+ BAT[oid,str] doc_name,
+ BAT[oid,int] doc_firstpre,
BAT[oid,oid] pfpre,
- BAT[void,oid] item,
- BAT[void,int] kind,
- BAT[void,str] doc_loaded)
+ BAT[oid,oid] item,
+ BAT[oid,int] kind,
+ BAT[oid,str] doc_loaded)
: BAT[void,oid] = CMDpf2tijah_node;
"Translate Pathfinder node sequence to tijah node sequence"
@@ -586,8 +586,8 @@
lock_set(coll_lock);
var err := CATCH({
var t_start := usec();
- bat("tj_globalTerms").access(BAT_WRITE);
- bat("tj_globalTags").access(BAT_WRITE);
+ bat("tj_globalTerms").access(BAT_APPEND);
+ bat("tj_globalTags").access(BAT_APPEND);
var collBat := _tj_collection(collName);
_tj_add2collection(collName, collBat, uri_loc, uri_name, store);
_tj_finalize_collection(collName, collBat);
@@ -619,8 +619,8 @@
lock_set(coll_lock);
var err := CATCH({
var t_start := usec();
- bat("tj_globalTerms").access(BAT_WRITE);
- bat("tj_globalTags").access(BAT_WRITE);
+ bat("tj_globalTerms").access(BAT_APPEND);
+ bat("tj_globalTags").access(BAT_APPEND);
var collBat;
collBat := _tj_collection(collName);
[EMAIL PROTECTED]() {
@@ -746,8 +746,11 @@
_tj_set_parameter(collBat, "_last_finalizedPre", lst_fpre);
#
var gterm_sort := bat("tj_globalTerms").reverse().sort().reverse();
- var gtag_sort := bat("tj_globalTags").reverse().sort().reverse();
+ gterm_sort.access(BAT_APPEND);
gterm_sort.mmap(1);
+ var gtag_sort := bat("tj_globalTags").reverse().sort().reverse();
+ gtag_sort.access(BAT_APPEND);
+ gtag_sort.mmap(1);
collBat.replace("_globalTerms", gterm_sort);
collBat.replace("_globalTags", gtag_sort);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
