Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16:/tmp/cvs-serv20990/compiler/mil
Modified Files:
milprint_summer.c
Log Message:
* Implement private term- and tag dictionaries. Default is still the global
version so nothing changed yet in the format. I'm having terrible trouble
with the Mtest's again. This version could not be tested by our Mtest tests
because the first query executes OK but all queries after that seem to
'forget' the instance variables of module pftijah. I will look if the same
happens on other machine and post a bugreport for it.
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- milprint_summer.c 6 May 2007 17:43:54 -0000 1.375
+++ milprint_summer.c 7 May 2007 07:01:38 -0000 1.376
@@ -8309,8 +8309,8 @@
" var optbat := new(str,str,32);\n");
milprintf(f,
- " var coll := tj_get_ft_index(optbat,true);\n"
- " tijah_lock := tj_get_collection_lock(coll);\n"
+ " var ftindex := tj_get_ft_index(optbat,true);\n"
+ " tijah_lock := tj_get_collection_lock(ftindex);\n"
" lock_set(tijah_lock);\n"
);
if ( ctx_counter ) {
@@ -8325,9 +8325,9 @@
" iter := iter.tmark([EMAIL PROTECTED]);\n"
" item := item.tmark([EMAIL PROTECTED]);\n"
" kind := kind.tmark([EMAIL PROTECTED]);\n"
- " var xdoc_name := bat(\"tj_\" + coll + \"_doc_name\");\n"
- " var xdoc_firstpre := bat(\"tj_\" + coll +
\"_doc_firstpre\");\n"
- " var xpfpre := bat(\"tj_\" + coll + \"_pfpre\");\n"
+ " var xdoc_name := bat(\"tj_\" + ftindex + \"_doc_name\");\n"
+ " var xdoc_firstpre := bat(\"tj_\" + ftindex +
\"_doc_firstpre\");\n"
+ " var xpfpre := bat(\"tj_\" + ftindex + \"_pfpre\");\n"
" var doc_loaded :=
reverse(ws.fetch(OPEN_CONT)).leftfetchjoin(ws.fetch(OPEN_NAME));\n"
" startNodes :=
pf2tijah_node(xdoc_name,xdoc_firstpre,xpfpre,item,kind,doc_loaded);\n"
, ctx_counter, ctx_counter, str_counter, ctx_counter,
ctx_counter, ctx_counter, ctx_counter);
@@ -8347,12 +8347,12 @@
, (ctx_counter?"true":"false"),item_ext, str_counter);
/* translate tijah_pre to pf-pre */
milprintf(f,
- " var docpre := bat(\"tj_\" + GLOBAL_COLLNAME +
\"_doc_firstpre\").[oid]();\n"
- " var pfpre := bat(\"tj_\" + GLOBAL_COLLNAME +
\"_pfpre\");\n"
+ " var docpre := bat(\"tj_\" + ftindex +
\"_doc_firstpre\").[oid]();\n"
+ " var pfpre := bat(\"tj_\" + ftindex + \"_pfpre\");\n"
" item := nexi_score.hmark([EMAIL PROTECTED]);\n"
" var frag := [find_lower](const
docpre.reverse().mark([EMAIL PROTECTED]), item);\n"
" item := item.join(pfpre).sort().tmark();\n"
- " var needed_docs := bat(\"tj_\" + GLOBAL_COLLNAME +
\"_doc_name\").semijoin(frag.tunique());\n"
+ " var needed_docs := bat(\"tj_\" + ftindex +
\"_doc_name\").semijoin(frag.tunique());\n"
" lock_unset(tijah_lock); tijah_lock := lock_nil;\n"
" var loaded_docs := ws.fetch(OPEN_NAME).reverse();\n"
" var docs_to_load :=
kdiff(needed_docs.reverse(),loaded_docs).hmark([EMAIL PROTECTED]);\n"
-------------------------------------------------------------------------
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
