Changeset: 41660f2e8fef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41660f2e8fef
Modified Files:
gdk/gdk_batop.mx
Branch: jacqueline
Log Message:
Merged from default, this makes the fatal propcheck go away!
diffs (39 lines):
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -2650,14 +2650,14 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
}
BATsetcount(gc, BATcount(g));
gc->hdense = BAThdense(g);
- if (BAThdense(gc)) {
+ if (gc->hdense) {
BATseqbase(gc, g->hseqbase);
gc->hsorted = GDK_SORTED;
} else {
gc->hsorted = BAThordered(g);
}
- BATkey(gc, TRUE);
- gc->H->nonil = gc->H->nonil;
+ BATkey(gc, (gc->hdense || g->hkey != FALSE));
+ gc->H->nonil = g->H->nonil;
gc->T->nonil = 1;
} else {
gc = BATcopy(g, g->htype, g->ttype, TRUE);
@@ -2678,7 +2678,7 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
ALIGNsetH(bn, b);
bn->hsorted = (trivprop ? GDK_SORTED : BAThordered(b));
bn->hdense = BAThdense(b) || (trivprop && b->htype == TYPE_oid);
- if (BAThdense(bn)) {
+ if (bn->hdense) {
BATseqbase(bn, b->hseqbase);
}
BATkey(bn, (bn->hdense || b->hkey != FALSE));
@@ -2689,7 +2689,7 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
BATseqbase(BATmirror(bn), *(oid *) BUNtloc(bni, BUNfirst(bn)));
}
BATkey(BATmirror(bn), trivprop);
- bn->H->nonil = bn->H->nonil;
+ bn->H->nonil = b->H->nonil;
bn->T->nonil = 1;
if (gc)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
