MonetDB: Jun2016 - A bat is not an int, and don't use abs() on b...

[Sjoerd Mullender]

Changeset: 5dfacae4b195 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5dfacae4b195
Modified Files:
        monetdb5/mal/mal_debugger.c
Branch: Jun2016
Log Message:

A bat is not an int, and don't use abs() on bat_nil.


diffs (24 lines):

diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -1247,11 +1247,16 @@ printStackElm(stream *f, MalBlkPtr mb, V
        printStackHdr(f, mb, v, index);
 
        if (v && v->vtype == TYPE_bat) {
-               int i = v->val.ival;
-               BAT *b = BBPquickdesc(abs(i), TRUE);
+               bat i = v->val.bval;
+               BAT *b;
 
-               if (i < 0)
-                       b = BATmirror(b);
+               if (i == bat_nil) {
+                       b = NULL;
+               } else {
+                       b = BBPquickdesc(abs(i), TRUE);
+                       if (i < 0)
+                               b = BATmirror(b);
+               }
                if (b) {
                        nme = getTypeName(newColumnType(b->ttype));
                        mnstr_printf(f, " :%s rows="BUNFMT, nme, BATcount(b));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list