Update of /cvsroot/monetdb/pathfinder/runtime
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22448/runtime
Modified Files:
Tag: M5XQ
vx_index.mx
Log Message:
propagated changes of Wednesday Dec 09 2009
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/09 - sjoerd: runtime/vx_index.mx,1.12.12.1
propagated changes of Wednesday Dec 09 2009
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/09 - sjoerd: runtime/vx_index.mx,1.13
propagated changes of Monday Dec 07 2009 - Wednesday Dec 09 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/07 - sjoerd: runtime/vx_index.mx,1.12.8.1
Postpone dereference until after NULL check.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: vx_index.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/vx_index.mx,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- vx_index.mx 13 Apr 2009 23:40:10 -0000 1.12
+++ vx_index.mx 9 Dec 2009 14:26:03 -0000 1.12.2.1
@@ -128,11 +128,16 @@
if (ALIGNsynced(l, r)) {
size_t i = 0, cnt = BATcount(l);
BAT *bn = *res = BATnew(TYPE_void, TYPE_int, cnt);
- int *lval = (int*) Tloc(bn, BUNfirst(l));
- int *rval = (int*) Tloc(bn, BUNfirst(r));
- int *dst = (int*) Tloc(bn, BUNfirst(bn));
+ int *lval;
+ int *rval;
+ int *dst;
+
if (bn == NULL) return GDK_FAIL;
+ lval = (int*) Tloc(bn, BUNfirst(l));
+ rval = (int*) Tloc(bn, BUNfirst(r));
+ dst = (int*) Tloc(bn, BUNfirst(bn));
+
for(i=0; i<cnt; i++)
dst[i] = XQH_C(lval[i], rval[i]);
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
