Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21454/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Wednesday Feb 17 2010 - Thursday Feb 18 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/17 - stmane: src/backends/monet5/sql.mx,1.389.2.7
renamed
BATpreload() -> BATaccess()
BATpreload_() -> BATaccessBegin()
_BATpreload() -> BATaccessEnd()
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/18 - stmane: src/backends/monet5/sql.mx,1.389.2.8
BATaccess() & MT_mmap_inform() do not translate the advise macros
BUF_(NORMAL|RANDOM|SEQUENTIAL|WILLNEED|DONTNEED) to
MMAP_(NORMAL|RANDOM|SEQUENTIAL|WILLNEED|DONTNEED)
(as BATmadvise() does) before calling posix_madvise(),
we better use MMAP_(NORMAL|RANDOM|SEQUENTIAL|WILLNEED|DONTNEED) in
BATaccess() & MT_mmap_inform() and in all calls to BATaccess{Begin,End}()
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -d -r1.396 -r1.397
--- sql.mx 17 Feb 2010 09:56:00 -0000 1.396
+++ sql.mx 18 Feb 2010 08:55:38 -0000 1.397
@@ -2311,7 +2311,7 @@
if ( t == NULL)
throw(MAL,"sql.append","Table missing");
if (tpe == TYPE_bat)
- BATpreload_((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessBegin((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.append_col(m->session->tr, c, ins, tpe);
@@ -2321,7 +2321,7 @@
store_funcs.append_idx(m->session->tr, i, ins, tpe);
}
if (tpe == TYPE_bat) {
- _BATpreload((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessEnd((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
}
return MAL_SUCCEED;
@@ -2360,7 +2360,7 @@
if ( t == NULL)
throw(MAL,"sql.update","Table missing");
if (tpe == TYPE_bat)
- BATpreload_((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessBegin((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
c = mvc_bind_column(m, t, cname);
if (c) {
store_funcs.update_col(m->session->tr, c, ins, tpe, 0);
@@ -2370,7 +2370,7 @@
store_funcs.update_idx(m->session->tr, i, ins, tpe);
}
if (tpe == TYPE_bat) {
- _BATpreload((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessEnd((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
}
return MAL_SUCCEED;
@@ -3343,7 +3343,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload_(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessBegin(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3352,7 +3352,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3372,7 +3372,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload_(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessBegin(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@1 r;
@@ -3381,7 +3381,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3496,7 +3496,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload_(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessBegin(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BATloop(b,p,q) {
str v = (str)BUNtail(bi,p);
@3 r;
@@ -3505,7 +3505,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3612,7 +3612,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, TYPE_str, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATpreload_(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessBegin(b, USE_HEAD|USE_TAIL, MMAP_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);
@@ -3621,7 +3621,7 @@
BUNins(dst, BUNhead(bi,p), r, FALSE);
GDKfree(r);
}
- _BATpreload(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
