Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20709
Modified Files:
Tag: XQuery_0-18
pftijah.mx
Log Message:
* some small changes to prepare for new Itanium test
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.134.2.5
retrieving revision 1.134.2.6
diff -u -d -r1.134.2.5 -r1.134.2.6
--- pftijah.mx 7 Jun 2007 18:20:19 -0000 1.134.2.5
+++ pftijah.mx 8 Jun 2007 12:47:17 -0000 1.134.2.6
@@ -3130,13 +3130,13 @@
PROC _buildIRindex(str ftiName, BAT[str,bat] collBat) : void :=
{
- var offset := oid(int(_tj_get_parameter(collBat, "_last_finalizedPre"))
+ 1);
+ var offset := oid(lng(_tj_get_parameter(collBat, "_last_finalizedPre"))
+ 1);
var fragments := collBat.find("_fragments");
var frag_offset := int(find_lower(fragments.reverse(), offset));
var frag_last := fragments.count();
var pre_tid := bat("tj_" + ftiName + "_tid" + str(frag_offset));
- var tids := pre_tid.slice(int(offset) - int(pre_tid.seqbase()),
pre_tid.count() - 1);
+ var tids := pre_tid.slice(lng(offset) - lng(pre_tid.seqbase()),
lng(pre_tid.count() - 1));
tids.access(BAT_WRITE);
frag_offset :+= 1;
while (frag_offset <= frag_last)
@@ -3144,6 +3144,7 @@
tids.append(bat("tj_" + ftiName + "_tid" + str(frag_offset)));
frag_offset :+= 1;
}
+ tids.access(BAT_READ);
# incremental index merge
if (view_bbp_name().reverse().exist("tj_" + ftiName + "_TermIndex"))
@@ -3187,7 +3188,7 @@
# BUG:1732596: possible cause(1) here:
# tmp is a BAT[oid,oid]
tmp := tmp.reverse().ssort();
- var termindex := tmp.hmark([EMAIL
PROTECTED]).assert_order().offsetindex(bat(_tj_TermBat(ftiName)).count() + 1);
+ var termindex := tmp.hmark([EMAIL
PROTECTED]).offsetindex(bat(_tj_TermBat(ftiName)).count() + 1);
var terms := tmp.tmark([EMAIL PROTECTED]);
# create _TermIndex and _Terms here
termindex.persists(true).bbpname("tj_" + ftiName +
"_TermIndex");
@@ -3206,7 +3207,7 @@
# BUG:1732596: possible cause(2) here:
# tmp is a BAT[oid,oid]
tmp := tmp.reverse().ssort();
- var tagindex := tmp.hmark([EMAIL
PROTECTED]).assert_order().offsetindex(bat(_tj_TagBat(ftiName)).count() + 1);
+ var tagindex := tmp.hmark([EMAIL
PROTECTED]).offsetindex(bat(_tj_TagBat(ftiName)).count() + 1);
var tags := tmp.tmark([EMAIL PROTECTED]);
# create _Tags and _Tagindex here
tagindex.persists(true).bbpname("tj_" + ftiName + "_TagIndex");
@@ -3406,6 +3407,7 @@
*
*/
static int bat_oid_sort_chck(BAT* b) {
+ /* incomplete, the head should also be key */
if ( !b->hsorted ) {
GDKerror("bat_oid_sort_chck: BAT should be head sorted.\n");
return 0;
-------------------------------------------------------------------------
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
