Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3946/sql/src/backends/monet5
Modified Files:
Tag: Feb2010
sql.mx
Log Message:
use BATpreload_() instead of BATpreload()
to make sure, we only prealod the data
that we do actually access,
i.e., (in case of views)
that part of the BUNheaps that the view can see,
not the complete underlying BUNheaps of the
parent BAT(s).
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.389.2.3
retrieving revision 1.389.2.4
diff -u -d -r1.389.2.3 -r1.389.2.4
--- sql.mx 11 Feb 2010 08:36:53 -0000 1.389.2.3
+++ sql.mx 11 Feb 2010 08:44:44 -0000 1.389.2.4
@@ -2305,7 +2305,7 @@
if ( t == NULL)
throw(MAL,"sql.append","Table missing");
if (tpe == TYPE_bat)
- BATpreload((BAT*)ins, BUF_SEQUENTIAL);
+ BATpreload_((BAT*)ins, BUF_SEQUENTIAL);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.append_col(m->session->tr, c, ins, tpe);
@@ -2352,7 +2352,7 @@
if ( t == NULL)
throw(MAL,"sql.update","Table missing");
if (tpe == TYPE_bat)
- BATpreload((BAT*)ins, BUF_SEQUENTIAL);
+ BATpreload_((BAT*)ins, BUF_SEQUENTIAL);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.update_col(m->session->tr, c, ins, tpe, 0);
@@ -3333,7 +3333,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload(b, BUF_SEQUENTIAL);
+ BATpreload_(b, BUF_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3361,7 +3361,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload(b, BUF_SEQUENTIAL);
+ BATpreload_(b, BUF_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3484,7 +3484,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload(b, BUF_SEQUENTIAL);
+ BATpreload_(b, BUF_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@3 r;
@@ -3599,7 +3599,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, TYPE_str, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload(b, BUF_SEQUENTIAL);
+ BATpreload_(b, BUF_SEQUENTIAL);
BATloop(b,p,q) {
ptr v = (ptr)BUNtail(bi,p);
msg = SQLstr_cast_( &r, m, *eclass, *d1, *s1, *has_tz, v,
b->ttype, *digits);
------------------------------------------------------------------------------
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
