Update of /cvsroot/monetdb/MonetDB/src/gdk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30850/src/gdk
Modified Files:
Tag: MonetDB_1-22
gdk_align.mx
Log Message:
fixed bug in VIEWcreate (view on viewcombine view)
Index: gdk_align.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_align.mx,v
retrieving revision 1.90.2.1
retrieving revision 1.90.2.2
diff -u -d -r1.90.2.1 -r1.90.2.2
--- gdk_align.mx 5 Feb 2008 21:53:29 -0000 1.90.2.1
+++ gdk_align.mx 6 Mar 2008 06:55:05 -0000 1.90.2.2
@@ -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
