Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31388/modules/pftijah
Modified Files:
Tag: M5XQ
pftijah.mx
Log Message:
propagated changes of Friday Aug 28 2009 - Friday Sep 04 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/28 - stmane: modules/pftijah/pftijah.mx,1.233
propagated changes of Friday Aug 21 2009 - Friday Aug 28 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/21 - hrode: modules/pftijah/pftijah.mx,1.232.2.1
bugfix in containmentjoin algorithm: when the first operand comes as a
void-void BAT (something that can apparently happen now),
the Tloc failed, so i replaced it by BUNtail.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.226.2.5
retrieving revision 1.226.2.6
diff -u -d -r1.226.2.5 -r1.226.2.6
--- pftijah.mx 1 Jul 2009 08:01:25 -0000 1.226.2.5
+++ pftijah.mx 4 Sep 2009 11:56:50 -0000 1.226.2.6
@@ -6029,7 +6029,7 @@
/* -------------------------------- main
---------------------------------------- */
/* skip descendant candidates before the next ancestor candidate */
- while(D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
*(oid*)Tloc(Astart,A_cur))
+ while(D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
*(oid*)BUNtail(Ai,A_cur))
D_cur++;
while(D_cur < D_last && A_cur < A_last) {
@@ -6047,7 +6047,7 @@
A_cur++;
/* write to result */
- while (D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
(*(oid*)Tloc(Astart, A_cur) + size[*(oid*)BUNhead(Ai, A_cur)])) {
+ while (D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
(*(oid*)BUNtail(Ai, A_cur) + size[*(oid*)BUNhead(Ai, A_cur)])) {
*hdst++ = *(oid*)BUNhead(Ai, A_cur);
*tdst++ = *(oid*)BUNhead(Di, D_cur);
D_cur++;
@@ -6133,7 +6133,7 @@
/* -------------------------------- main
---------------------------------------- */
/* skip descendant candidates before the next ancestor candidate */
- while(D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
*(oid*)Tloc(Astart,A_cur))
+ while(D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
*(oid*)BUNtail(Ai,A_cur))
D_cur++;
while(D_cur < D_last && A_cur < A_last) {
@@ -6151,7 +6151,7 @@
A_cur++;
/* write to result */
- while (D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
(*(oid*)Tloc(Astart, A_cur) + size[*(oid*)BUNhead(Ai, A_cur)])) {
+ while (D_cur < D_last && *(oid*)Tloc(Dstart, D_cur) <=
(*(oid*)BUNtail(Ai, A_cur) + size[*(oid*)BUNhead(Ai, A_cur)])) {
*hdst++ = *(oid*)BUNhead(Ai, A_cur);
*tdst++ = *(oid*)BUNhead(Di, D_cur);
D_cur++;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
