MonetDB: mosaic - Clean up code a bit.

[Aris Koning]

Changeset: 6e0356cd52de for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e0356cd52de
Modified Files:
        gdk/gdk_mosaic.c
        monetdb5/modules/mosaic/mosaic.c
Branch: mosaic
Log Message:

Clean up code a bit.


diffs (38 lines):

diff --git a/gdk/gdk_mosaic.c b/gdk/gdk_mosaic.c
--- a/gdk/gdk_mosaic.c
+++ b/gdk/gdk_mosaic.c
@@ -114,13 +114,13 @@ MOSdestroy(BAT *bn)
        // TODO: Check if this is correct.
        if( bn && bn->tmosaic && !VIEWtparent(bn) && !VIEWmosaictparent(bn)){
                h= bn->tmosaic;
-               bn->tmosaic = NULL;
                if( HEAPdelete(h, BBP_physical(bn->batCacheid), "mosaic"))
                        IODEBUG fprintf(stderr,"#MOSdestroy (%s) failed", 
BATgetId(bn));
                bn->tmosaic = NULL;
                GDKfree(h);
        }
 }
+
 /* return TRUE if we have a mosaic on the tail, even if we need to read
  * one from disk */
 int
diff --git a/monetdb5/modules/mosaic/mosaic.c b/monetdb5/modules/mosaic/mosaic.c
--- a/monetdb5/modules/mosaic/mosaic.c
+++ b/monetdb5/modules/mosaic/mosaic.c
@@ -1145,7 +1145,7 @@ str MOSprojection(Client cntxt, MalBlkPt
                        stopblk  =  startblk + task->hdr->top/nrofparts;
                else
                        stopblk  =  task->hdr->top;
-       } else{
+       } else {
                startblk =0;
                stopblk = task->hdr->top;
        }
@@ -1535,7 +1535,6 @@ MOSanalyseReport(Client cntxt, BAT *b, B
                MOSdecompressInternal(cntxt, &bid, &bid);
                pat[i].clk2 = GDKms()- pat[i].clk2;
 
-
                // get rid of mosaic heap
                MOSdestroy(BBPdescriptor(bid));
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list