Changeset: 65967c1ba698 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/65967c1ba698
Modified Files:
gdk/gdk_aggr.c
Branch: qcancel
Log Message:
group count
diffs (26 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3055,6 +3055,8 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
do { \
const TYPE *restrict vals = (const TYPE *) Tloc(b, 0); \
while (ncand > 0) { \
+ GDK_CHECK_TIMEOUT(timeoffset, counter,\
+ TIMEOUT_HANDLER(NULL));\
ncand--; \
i = canditer_next(&ci) - b->hseqbase; \
if (gids == NULL || \
@@ -3089,6 +3091,13 @@ BATgroupcount(BAT *b, BAT *g, BAT *e, BA
const char *err;
lng t0 = 0;
+ size_t counter = 0;
+ lng timeoffset = 0;
+ QryCtx *qry_ctx = MT_thread_get_qry_ctx();
+ if (qry_ctx != NULL) {
+ timeoffset = (qry_ctx->starttime && qry_ctx->querytimeout) ?
(qry_ctx->starttime + qry_ctx->querytimeout) : 0;
+ }
+
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
assert(tp == TYPE_lng);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
