MonetDB: Mar2018 - Some minor fixes.

[Sjoerd Mullender]

Changeset: eb4297d45a56 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb4297d45a56
Modified Files:
        gdk/gdk_cross.c
        gdk/gdk_group.c
        monetdb5/mal/mal_interpreter.c
Branch: Mar2018
Log Message:

Some minor fixes.


diffs (68 lines):

diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c
--- a/gdk/gdk_cross.c
+++ b/gdk/gdk_cross.c
@@ -36,8 +36,13 @@ BATsubcross(BAT **r1p, BAT **r2p, BAT *l
                cnt2 = rcandend - rcand;
 
        bn1 = COLnew(0, TYPE_oid, cnt1 * cnt2, TRANSIENT);
-       if (bn1 == NULL)
+       bn2 = COLnew(0, TYPE_oid, cnt1 * cnt2, TRANSIENT);
+       if (bn1 == NULL || bn2 == NULL) {
+               BBPreclaim(bn1);
+               BBPreclaim(bn2);
                return GDK_FAIL;
+       }
+
        BATsetcount(bn1, cnt1 * cnt2);
        bn1->tsorted = 1;
        bn1->trevsorted = cnt1 <= 1;
@@ -60,13 +65,8 @@ BATsubcross(BAT **r1p, BAT **r2p, BAT *l
                        BATtseqbase(bn1, seq);
        }
 
-       bn2 = COLnew(0, TYPE_oid, cnt1 * cnt2, TRANSIENT);
-       if (bn2 == NULL) {
-               BBPreclaim(bn1);
-               return GDK_FAIL;
-       }
        BATsetcount(bn2, cnt1 * cnt2);
-       bn2->tsorted = cnt1 <= 1;
+       bn2->tsorted = cnt1 <= 1 || cnt2 <= 1;
        bn2->trevsorted = cnt2 <= 1;
        bn2->tkey = cnt1 <= 1;
        bn2->tnil = 0;
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -633,7 +633,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                                en->tnonil = 1;
                                en->tdense = 0;
                        } else {
-                               en = BATdense(0, b->hseqbase, cnt);
+                               en = BATdense(0, b->hseqbase + start, cnt);
                                if (en == NULL)
                                        goto error;
                        }
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -655,8 +655,7 @@ str runMALsequence(Client cntxt, MalBlkP
                                                BAT *_b = BATdescriptor(bid);
                                                t = getBatType(t);
                                                assert(stk->stk[a].vtype == 
TYPE_bat);
-                                               assert(bid == 0 ||
-                                                          is_bat_nil(bid) ||
+                                               assert(is_bat_nil(bid) ||
                                                           t == TYPE_any ||
                                                           ATOMtype(_b->ttype) 
== ATOMtype(t));
                                                if(_b) BBPunfix(bid);
@@ -680,8 +679,7 @@ str runMALsequence(Client cntxt, MalBlkP
                                        bat bid = stk->stk[a].val.bval;
                                        t = getBatType(t);
                                        assert(stk->stk[a].vtype == TYPE_bat);
-                                       assert(bid == 0 ||
-                                                  is_bat_nil(bid) ||
+                                       assert(is_bat_nil(bid) ||
                                                   t == TYPE_any ||
                                                   
ATOMtype(BBP_desc(bid)->ttype) == ATOMtype(t));
                                } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list