Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13957/sql/src/backends/monet5
Modified Files:
Tag: Feb2010
sql.mx
Log Message:
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.389.2.7
retrieving revision 1.389.2.8
diff -u -d -r1.389.2.7 -r1.389.2.8
--- sql.mx 17 Feb 2010 11:22:45 -0000 1.389.2.7
+++ sql.mx 18 Feb 2010 01:04:11 -0000 1.389.2.8
@@ -2305,7 +2305,7 @@
if ( t == NULL)
throw(MAL,"sql.append","Table missing");
if (tpe == TYPE_bat)
- BATaccessBegin((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);
@@ -2315,7 +2315,7 @@
store_funcs.append_idx(m->session->tr, i, ins, tpe);
}
if (tpe == TYPE_bat) {
- BATaccessEnd((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessEnd((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
}
return MAL_SUCCEED;
@@ -2354,7 +2354,7 @@
if ( t == NULL)
throw(MAL,"sql.update","Table missing");
if (tpe == TYPE_bat)
- BATaccessBegin((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);
@@ -2364,7 +2364,7 @@
store_funcs.update_idx(m->session->tr, i, ins, tpe);
}
if (tpe == TYPE_bat) {
- BATaccessEnd((BAT*)ins, USE_ALL, BUF_SEQUENTIAL);
+ BATaccessEnd((BAT*)ins, USE_ALL, MMAP_SEQUENTIAL);
BBPunfix(((BAT*)ins)->batCacheid);
}
return MAL_SUCCEED;
@@ -3337,7 +3337,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATaccessBegin(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;
@@ -3346,7 +3346,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- BATaccessEnd(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3366,7 +3366,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATaccessBegin(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;
@@ -3375,7 +3375,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- BATaccessEnd(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3490,7 +3490,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATaccessBegin(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;
@@ -3499,7 +3499,7 @@
break;
BUNins(dst, BUNhead(bi,p), &r, FALSE);
}
- BATaccessEnd(b, USE_HEAD|USE_TAIL, BUF_SEQUENTIAL);
+ BATaccessEnd(b, USE_HEAD|USE_TAIL, MMAP_SEQUENTIAL);
BBPkeepref( *res = dst->batCacheid);
BBPunfix(b->batCacheid);
return msg;
@@ -3606,7 +3606,7 @@
bi = bat_iterator(b);
dst = BATnew(b->htype, TYPE_str, BATcount(b));
BATseqbase(dst, b->hseqbase);
- BATaccessBegin(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);
@@ -3615,7 +3615,7 @@
BUNins(dst, BUNhead(bi,p), r, FALSE);
GDKfree(r);
}
- BATaccessEnd(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
