MonetDB: default - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: d521a7aec9fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d521a7aec9fc
Modified Files:
        gdk/gdk_aggr.c
Branch: default
Log Message:

Merge with Jul2021 branch.


diffs (41 lines):

diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3326,11 +3326,10 @@ BATgroupsize(BAT *b, BAT *g, BAT *e, BAT
                                i = canditer_next(ci) - hseq;           \
                                if (!skip_nils ||                       \
                                    !is_##TYPE##_nil(vals[i])) {        \
-                                       oids[gid++] = i + hseq;         \
+                                       oids[gid] = i + hseq;           \
                                        nils--;                         \
-                               } else {                                \
-                                       gid++;                          \
                                }                                       \
+                               gid++;                                  \
                        }                                               \
                        TIMEOUT_CHECK(timeoffset,                       \
                                      TIMEOUT_HANDLER(BUN_NONE));       \
@@ -3449,9 +3448,10 @@ do_groupmin(oid *restrict oids, BATiter 
                                i = canditer_next(ci) - hseq;
                                if (!skip_nils ||
                                    (*atomcmp)(BUNtail(*bi, i), nil) != 0) {
-                                       oids[gid++] = i + hseq;
+                                       oids[gid] = i + hseq;
                                        nils--;
                                }
+                               gid++;
                        }
                        TIMEOUT_CHECK(timeoffset,
                                      TIMEOUT_HANDLER(BUN_NONE));
@@ -3578,9 +3578,10 @@ do_groupmax(oid *restrict oids, BATiter 
                                i = canditer_next(ci) - hseq;
                                if (!skip_nils ||
                                    (*atomcmp)(BUNtail(*bi, i), nil) != 0) {
-                                       oids[gid++] = i + hseq;
+                                       oids[gid] = i + hseq;
                                        nils--;
                                }
+                               gid++;
                        }
                        TIMEOUT_CHECK(timeoffset,
                                      TIMEOUT_HANDLER(BUN_NONE));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list