MonetDB: arrays - removing old implementation

[Foteini Alvanaki]

Changeset: 684a8ae67c88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=684a8ae67c88
Modified Files:
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_bat.c
        gdk/gdk_calc.c
Branch: arrays
Log Message:

removing old implementation


diffs (84 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -852,8 +852,6 @@ typedef struct {
        char map_hheap;         /* mmap mode for head atom heap */
        char map_theap;         /* mmap mode for tail atom heap */
 
-       int array; /*the BAT represents an array*/
-
        /* delta status administration */
        BUN deleted;            /* start of deleted elements */
        BUN first;              /* to store next deletion */
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2432,22 +2432,6 @@ BATgroupmin(BAT *b, BAT *g, BAT *e, BAT 
                              do_groupmin, "BATgroupmin");
 }
 
-static void* BATdimensionMin(BAT* b, void* aggr) {
-       BATiter bi = bat_iterator(b);
-       void *res =  BUNtail(bi, 0);
-       int len = 0;       
-       if (aggr == NULL) {
-               len = ATOMlen(BATttype(b), res);       
-               aggr = GDKmalloc(len);
-       } else {
-               len = ATOMsize(ATOMtype(BATttype(b)));
-       }
-       if (aggr != NULL)   /* else: malloc error */
-               memcpy(aggr, res, len);
-               
-       return aggr;
-}
-
 void *
 BATmin(BAT *b, void *aggr)
 {
@@ -2462,23 +2446,6 @@ BATgroupmax(BAT *b, BAT *g, BAT *e, BAT 
                              do_groupmax, "BATgroupmax");
 }
 
-static void* BATdimensionMax(BAT* b, void* aggr) {
-       BATiter bi = bat_iterator(b);
-       void *res =  BUNtail(bi, BATcount(b)-2);
-       int len = 0;       
-       if (aggr == NULL) {
-               len = ATOMlen(BATttype(b), res);       
-               aggr = GDKmalloc(len);
-       } else {
-               len = ATOMsize(ATOMtype(BATttype(b)));
-       }
-       if (aggr != NULL)   /* else: malloc error */
-               memcpy(aggr, res, len);
-               
-       return aggr;
-
-}
-
 void *
 BATmax(BAT *b, void *aggr)
 {
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -250,7 +250,6 @@ BATnewstorage(int ht, int tt, BUN cap, i
 
        BATsetdims(bn);
        bn->batCapacity = cap;
-       bn->batArray = 0; /*by default is not an aray*/
 
        /* alloc the main heaps */
        if (ht && HEAPalloc(&bn->H->heap, cap, bn->H->width) != GDK_SUCCEED) {
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13254,7 +13254,6 @@ BATconvert(BAT *b, BAT *s, int tp, int a
 
        BATsetcount(bn, b->batCount);
        BATseqbase(bn, b->H->seq);
-       BATsetArray(bn, b->batArray);
 
        bn->T->nil = nils != 0;
        bn->T->nonil = nils == 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list