Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29202/runtime
Modified Files:
Tag: M5XQ
shredder.mx
Log Message:
propagated changes of Tuesday Apr 21 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/04/21 - boncz: runtime/shredder.mx,1.159
forgot to change some uses of var_t into stridx_t
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U shredder.mx
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.158
retrieving revision 1.158.2.1
diff -u -d -r1.158 -r1.158.2.1
--- shredder.mx 13 Apr 2009 23:40:10 -0000 1.158
+++ shredder.mx 21 Apr 2009 12:58:25 -0000 1.158.2.1
@@ -1586,10 +1586,10 @@
sb->bat->theap->free = sb->heapSize;
if (sb->heapBackup) {
/* restore internal hash table to pre-state */
- memcpy(sb->bat->theap->base, sb->heapBackup,
GDK_STRHASHTABLE*sizeof(var_t));
+ memcpy(sb->bat->theap->base, sb->heapBackup,
GDK_STRHASHTABLE*sizeof(stridx_t));
} else {
/* zap internal hash table. is not critical */
- memset(sb->bat->theap->base, 0,
GDK_STRHASHTABLE*sizeof(var_t));
+ memset(sb->bat->theap->base, 0,
GDK_STRHASHTABLE*sizeof(stridx_t));
}
}
shredBAT_setcount(sb, sb->abortSize);
@@ -1717,7 +1717,7 @@
if (sb->def->tailType == TYPE_str) {
sb->heapSize = sb->bat->theap->free;
if (GDK_ELIMDOUBLES(sb->bat->theap)) {
- sb->heapBackup = GDKmalloc(GDK_STRHASHTABLE*sizeof(var_t));
+ sb->heapBackup =
GDKmalloc(GDK_STRHASHTABLE*sizeof(stridx_t));
if (!sb->heapBackup) {
GDKerror("shredder_create: malloc failure\n");
return shredder_free(shredCtx,0);
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
