MonetDB: default - This code is taken from the remote module, up...

[Pedro Ferreira]

Changeset: 8f1ec9724dda for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8f1ec9724dda
Modified Files:
        sql/backends/monet5/sql_result.c
Branch: default
Log Message:

This code is taken from the remote module, update it


diffs (34 lines):

diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -819,7 +819,7 @@ mvc_export_warning(stream *s, str w)
 static int
 mvc_export_binary_bat(stream *s, BAT* bn)
 {
-       bool sendtheap = bn->ttype != TYPE_void && bn->tvarsized;
+       bool sendtheap = bn->ttype != TYPE_void, sendtvheap = sendtheap && 
bn->tvarsized;
 
        if (mnstr_printf(s, /*JSON*/"{"
                "\"version\":1,"
@@ -842,17 +842,17 @@ mvc_export_binary_bat(stream *s, BAT* bn
                bn->tnonil,
                BATtdense(bn),
                bn->batCount,
-               (size_t)bn->batCount << bn->tshift,
-               sendtheap && bn->batCount > 0 ? bn->tvheap->free : 0) < 0)
+               sendtheap ? (size_t)bn->batCount << bn->tshift : 0,
+               sendtvheap && bn->batCount > 0 ? bn->tvheap->free : 0) < 0)
                return -4;
 
-       if (bn->batCount > 0) {
+       if (sendtheap && bn->batCount > 0) {
                BATiter bni = bat_iterator(bn);
                if (mnstr_write(s, /* tail */ bni.base, bni.count * bni.width, 
1) < 1) {
                        bat_iterator_end(&bni);
                        return -4;
                }
-               if (sendtheap && mnstr_write(s, /* theap */ bni.vh->base, 
bni.vh->free, 1) < 1) {
+               if (sendtvheap && mnstr_write(s, /* tvheap */ bni.vh->base, 
bni.vh->free, 1) < 1) {
                        bat_iterator_end(&bni);
                        return -4;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list