Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2950
Modified Files:
Tag: XQuery_0-18
pftijah.mx
Log Message:
* undo debugging code Itanium ssort() (compiler) bug.
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.134.2.10
retrieving revision 1.134.2.11
diff -u -d -r1.134.2.10 -r1.134.2.11
--- pftijah.mx 12 Jun 2007 12:14:18 -0000 1.134.2.10
+++ pftijah.mx 12 Jun 2007 12:52:28 -0000 1.134.2.11
@@ -93,7 +93,7 @@
: BAT[void,oid] = CMDpf2tijah_node;
"Translate Pathfinder node sequence to tijah node sequence"
-.COMMAND offsetindex( BAT[void,oid] offset_tid, int res_size,BAT[oid,oid]
moat, BAT[str,str] moat_info)
+.COMMAND offsetindex( BAT[void,oid] offset_tid, int res_size)
: BAT[void,oid] = CMDoffsetindex;
"PARAMETERS:
@@ -3197,11 +3197,8 @@
else # create new index
{
var tmp := tids.kdiff(bat("tj_" + ftiName + "_pfpre"));
- # BUG:1732596: possible cause(1) here:
- # tmp is a BAT[oid,oid]
- var sortinput := tmp.reverse();
- tmp := sortinput.ssort();
- var termindex := tmp.hmark([EMAIL
PROTECTED]).offsetindex(bat(_tj_TermBat(ftiName)).count() +
1,sortinput,sortinput.info());
+ tmp := tmp.reverse().ssort();
+ 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");
@@ -3217,11 +3214,8 @@
collBat.find("submitBats").append("tj_" + ftiName + "_Terms");
tmp := tids.semijoin(bat("tj_" + ftiName + "_pfpre"));
- # BUG:1732596: possible cause(2) here:
- # tmp is a BAT[oid,oid]
- sortinput := tmp.reverse();
- tmp := sortinput.ssort();
- var tagindex := tmp.hmark([EMAIL
PROTECTED]).offsetindex(bat(_tj_TagBat(ftiName)).count() +
1,sortinput,sortinput.info());
+ tmp := tmp.reverse().ssort();
+ 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");
@@ -3754,7 +3748,7 @@
return GDK_SUCCEED;
}
-int CMDoffsetindex ( BAT** result, BAT* tid, int* res_size , BAT* moat, BAT*
moat_info)
+int CMDoffsetindex ( BAT** result, BAT* tid, int* res_size)
{
char *name = "TJoffsetindex";
BAT *res = NULL;
@@ -3768,14 +3762,6 @@
if (!(BATtordered(tid) & 1))
{
/* BUG#1732596 this test currently fails on Itanium */
- /* temporary print a little bit extra output for debugging */
- stream_printf(GDKerr,"!ERROR:%s:
batordered()=%d\n",name,(int)BATtordered(tid));
- BATprintf(GDKerr,tid);
- stream_printf(GDKerr,"!ERROR:%s: MOAT =\n",name);
- BATprintf(GDKerr,moat);
- stream_printf(GDKerr,"!ERROR:%s: MOAT.info() =\n",name);
- BATprintf(GDKerr,moat_info);
- /* end of extra output */
GDKerror("%s: index-bat must be ordered on tail.\n", name);
return GDK_FAIL;
}
-------------------------------------------------------------------------
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
