Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21418/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Saturday Feb 06 2010 - Sunday Feb 07 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/06 - mlkersten: src/backends/monet5/sql.mx,1.389.2.2
More preloading advice.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -d -r1.390 -r1.391
--- sql.mx 26 Jan 2010 13:25:21 -0000 1.390
+++ sql.mx 7 Feb 2010 17:22:00 -0000 1.391
@@ -2304,6 +2304,8 @@
t = mvc_bind_table(m, s, tname);
if ( t == NULL)
throw(MAL,"sql.append","Table missing");
+ if (tpe == TYPE_bat)
+ BATpreload((BAT*)ins);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.append_col(m->session->tr, c, ins, tpe);
@@ -2349,6 +2351,8 @@
t = mvc_bind_table(m, s, tname);
if ( t == NULL)
throw(MAL,"sql.update","Table missing");
+ if (tpe == TYPE_bat)
+ BATpreload((BAT*)ins);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.update_col(m->session->tr, c, ins, tpe, 0);
@@ -3329,6 +3333,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
+ BATpreload(b);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3356,6 +3361,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
+ BATpreload(b);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3478,6 +3484,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
+ BATpreload(b);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@3 r;
@@ -3592,6 +3599,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, TYPE_str, BATcount(b));
BATseqbase(dst, b->hseqbase);
+ BATpreload(b);
BATloop(b,p,q) {
ptr v = (ptr)BUNtail(bi,p);
msg = SQLstr_cast_( &r, m, *eclass, *d1, *s1, *has_tz, v,
b->ttype, *digits);
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
