Update of /cvsroot/monetdb/MonetDB/src/gdk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30721/src/gdk
Modified Files:
gdk_align.mx gdk_bbp.mx
Log Message:
propagated changes of Saturday Mar 01 2008 - Thursday Mar 06 2008
from the MonetDB_1-22 branch to the development trunk
Index: gdk_bbp.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_bbp.mx,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- gdk_bbp.mx 8 Feb 2008 22:35:06 -0000 1.210
+++ gdk_bbp.mx 6 Mar 2008 14:16:43 -0000 1.211
@@ -2438,7 +2438,7 @@
}
if ((hp == 0 && tp == 0) && (b->htype | b->ttype)) {
/* additional restrictions do not hold for views and void,void
bats */
- /* bat should be of the right size, types and BUN layoutt */
+ /* bat should be of the right size, types and BUN layout */
if (b->U->capacity < batcache_minsize ||
b->U->capacity >= (batcache_minsize<<1) ||
BATCACHE_NOTYPE(b->htype) ||
Index: gdk_align.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_align.mx,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- gdk_align.mx 18 Feb 2008 10:47:42 -0000 1.92
+++ gdk_align.mx 6 Mar 2008 14:16:42 -0000 1.93
@@ -250,7 +250,7 @@
VIEWcreate_(BAT *h, BAT *t, int slice_view)
{
BAT *bn, *recycled = NULL;
- bat hp = 0, tp = 0;
+ bat hp = 0, tp = 0, vc = 0;
BATcheck(h, "VIEWcreate_: bat required");
BATcheck(t, "VIEWcreate_: bat required");
@@ -274,6 +274,7 @@
*bn->U = *h->U;
*bn->H = *h->H;
if (h->H == t->T) {
+ vc = 1;
tp = hp;
bn->T = bn->H;
} else {
@@ -324,6 +325,11 @@
bn->T->hash = t->T->hash;
if (recycled == NULL)
BBPcacheit(bn); /* enter in BBP and create mirror */
+ /* View of VIEW combine, ie we need to fix the head of the mirror */
+ if (vc) {
+ BAT *bm = BATmirror(bn);
+ bm->H = bn->H;
+ }
return bn;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
