MonetDB: histograms - Use right type to print histogram

[Pedro Ferreira]

Changeset: 0220c3612bba for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0220c3612bba
Modified Files:
        gdk/gdk_histogram.c
Branch: histograms
Log Message:

Use right type to print histogram


diffs (30 lines):

diff --git a/gdk/gdk_histogram.c b/gdk/gdk_histogram.c
--- a/gdk/gdk_histogram.c
+++ b/gdk/gdk_histogram.c
@@ -431,7 +431,7 @@ HISTOGRAMcreate(BAT *b)
 
 #define histogram_print_loop(TPE) \
        do { \
-               ssize_t (*atomtostr)(str *, size_t *, const void *, bool) = 
BATatoms[TYPE_##TPE].atomToStr; \
+               ssize_t (*atomtostr)(str *, size_t *, const void *, bool) = 
BATatoms[ptype].atomToStr; \
                const HistogramBucket_##TPE *restrict hist = 
(HistogramBucket_##TPE *) b->thistogram->histogram; \
                for (int i = 0 ; i < nbuckets ; i++) { \
                        const HistogramBucket_##TPE *restrict hb = &(hist[i]); \
@@ -465,7 +465,7 @@ HISTOGRAMprint(BAT *b)
 {
        size_t len = 0, rlen = 2048, minlen = 256, maxlen = 256;
        str res = NULL, minbuf = NULL, maxbuf = NULL;
-       int tpe = ATOMbasetype(b->ttype), nbuckets;
+       int tpe = ATOMbasetype(b->ttype), nbuckets, ptype = b->ttype;
 
        if (VIEWtparent(b)) /* don't look on views */
                b = BBP_cache(VIEWtparent(b));
@@ -488,6 +488,8 @@ HISTOGRAMprint(BAT *b)
        len = sprintf(res, "Total entries: %d, buckets: %d\n", 
b->thistogram->size, b->thistogram->nbuckets);
        len += sprintf(res + len, "nulls -> %d\n", b->thistogram->nulls);
 
+       if (tpe == TYPE_str) /* strings use integer size buckets */
+               ptype = TYPE_int;
        nbuckets = b->thistogram->nbuckets;
        switch (tpe) {
        case TYPE_bte:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org