Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32666/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Friday Feb 12 2010 - Wednesday Feb 17 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/12 - stmane: src/backends/monet5/sql.mx,1.389.2.6
added some more _BATpreload()
to "close" after BATpreload_()
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -d -r1.395 -r1.396
--- sql.mx 12 Feb 2010 09:36:17 -0000 1.395
+++ sql.mx 17 Feb 2010 09:56:00 -0000 1.396
@@ -2320,8 +2320,10 @@
if (i)
store_funcs.append_idx(m->session->tr, i, ins, tpe);
}
- if (tpe == TYPE_bat)
+ if (tpe == TYPE_bat) {
+ _BATpreload((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
+ }
return MAL_SUCCEED;
}
@@ -2367,8 +2369,10 @@
if (i)
store_funcs.update_idx(m->session->tr, i, ins, tpe);
}
- if (tpe == TYPE_bat)
+ if (tpe == TYPE_bat) {
+ _BATpreload((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
+ }
return MAL_SUCCEED;
}
@@ -3348,6 +3352,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
+ _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3376,6 +3381,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
+ _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3499,6 +3505,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
+ _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3614,6 +3621,7 @@
BUNins(dst, BUNhead(bi,p), r, FALSE);
GDKfree(r);
}
+ _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
