Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28750/modules/pftijah
Modified Files:
Tag: M5XQ
pftijah.mx
Log Message:
propagated changes of Thursday May 14 2009 - Saturday May 16 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/14 - cornuz: modules/pftijah/pftijah.mx,1.229
This commit is a temporary fix for the incorrect definition of count() mil proc:
count(BAT b) : int
This should be instead:
count(BAT b) : wrd
!! Note that the problem should be solved properly in algebra.mx, changing the
definition of count() and fixing all related code.
In addition, this commit fixes some more incorrect usage of the int type, for
example all bat offsets should be wrd and not int.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/15 - cornuz: modules/pftijah/pftijah.mx,1.230
- Use BUN instead of int
- Use BUNFMT instead of %d (and instead of OIDFMT)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.226.2.2
retrieving revision 1.226.2.3
diff -u -d -r1.226.2.2 -r1.226.2.3
--- pftijah.mx 13 May 2009 11:14:05 -0000 1.226.2.2
+++ pftijah.mx 16 May 2009 08:24:04 -0000 1.226.2.3
@@ -117,7 +117,7 @@
: BAT[oid,oid] = CMDpf2tijah_node;
"Translate Pathfinder node sequence to tijah node sequence"
-.COMMAND offsetindex( BAT[void,oid] offset_tid, int res_size)
+.COMMAND offsetindex( BAT[void,oid] offset_tid, wrd res_size)
: BAT[void,oid] = CMDoffsetindex;
"PARAMETERS:
@@ -127,7 +127,7 @@
creates an offset index.
"
[...1129 lines suppressed...]
/* ------------------------------- checks
---------------------------------------- */
@@ -6045,7 +6074,7 @@
BATiter Ai, Di;
oid D_cur_pre;
int *size;
- int free;
+ BUN free;
oid *sdst = NULL, *hdst = NULL, *tdst = NULL;
/* ------------------------------- checks
---------------------------------------- */
@@ -6150,7 +6179,7 @@
A_cur, A_last;
oid D_cur_pre;
int *size;
- int free;
+ BUN free;
oid *sdst = NULL, *hdst = NULL, *tdst = NULL;
/* ------------------------------- checks
---------------------------------------- */
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
