[Monetdb-sql-checkins] sql/src/backends/monet5 sql.mx, Feb2010, 1.389.2.5, 1.389.2.6

[Stefan Manegold]

Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8993/sql/src/backends/monet5

Modified Files:
      Tag: Feb2010
        sql.mx 
Log Message:

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.389.2.5
retrieving revision 1.389.2.6
diff -u -d -r1.389.2.5 -r1.389.2.6
--- sql.mx      11 Feb 2010 19:54:08 -0000      1.389.2.5
+++ sql.mx      12 Feb 2010 17:43:40 -0000      1.389.2.6
@@ -2314,8 +2314,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;
 }
 
@@ -2361,8 +2363,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;
 }
 
@@ -3342,6 +3346,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;
@@ -3370,6 +3375,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;
@@ -3493,6 +3499,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;
@@ -3608,6 +3615,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
Monetdb-sql-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins