Changeset: acdbc47d8417 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/acdbc47d8417
Modified Files:
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.c
gdk/gdk_calc_addsub.c
gdk/gdk_calc_convert.c
gdk/gdk_calc_div.c
gdk/gdk_calc_mod.c
gdk/gdk_calc_mul.c
gdk/gdk_cross.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_join.c
gdk/gdk_project.c
gdk/gdk_select.c
gdk/gdk_string.c
gdk/gdk_unique.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
sql/storage/store.c
Branch: default
Log Message:
Simplify: no need to always have a query context instance.
diffs (truncated from 884 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2372,10 +2372,10 @@ gdk_export BAT *BATsample_with_seed(BAT
static inline void
TIMEOUT_ERROR(QryCtx *qc, const char *file, const char *func, int lineno)
{
- if (GDKexiting())
+ if (GDKexiting()) {
GDKtracer_log(file, func, lineno, M_ERROR, GDK, NULL,
"%s\n", EXITING_MSG);
- else {
+ } else if (qc) {
switch (qc->endtime) {
case QRY_TIMEOUT:
GDKtracer_log(file, func, lineno, M_ERROR, GDK, NULL,
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -208,7 +208,6 @@ dofsum(const void *restrict values, oid
volatile flt f;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
/* we only deal with the two floating point types */
assert(tp1 == TYPE_flt || tp1 == TYPE_dbl);
@@ -719,7 +718,6 @@ dosum(const void *restrict values, bool
unsigned int *restrict seen = NULL; /* bitmask for groups that we've
seen */
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
switch (tp2) {
case TYPE_flt:
@@ -1359,7 +1357,6 @@ doprod(const void *restrict values, oid
unsigned int *restrict seen; /* bitmask for groups that we've seen */
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
/* allocate bitmap for seen group ids */
seen = GDKzalloc(((ngrp + 31) / 32) * sizeof(int));
@@ -1818,7 +1815,6 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
BATiter bi = {0};
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -2008,7 +2004,6 @@ BATgroupavg3(BAT **avgp, BAT **remp, BAT
oid o;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci)) !=
NULL) {
GDKerror("%s\n", err);
@@ -2646,7 +2641,6 @@ BATgroupavg3combine(BAT *avg, BAT *rem,
BAT *bn, *rn, *cn;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
if ((err = BATgroupaggrinit(avg, g, e, NULL, &min, &max, &ngrp, &ci))
!= NULL) {
GDKerror("%s\n", err);
@@ -3003,7 +2997,6 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
const void *restrict src;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
canditer_init(&ci, b, s);
@@ -3090,7 +3083,6 @@ BATgroupcount(BAT *b, BAT *g, BAT *e, BA
BATiter bi = {0};
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -3263,7 +3255,6 @@ do_groupmin(oid *restrict oids, BATiter
int (*atomcmp)(const void *, const void *);
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
nils = ngrp;
TIMEOUT_LOOP_IDX(i, ngrp, qry_ctx)
@@ -3386,7 +3377,6 @@ do_groupmax(oid *restrict oids, BATiter
int (*atomcmp)(const void *, const void *);
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
nils = ngrp;
TIMEOUT_LOOP_IDX(i, ngrp, qry_ctx)
@@ -3984,7 +3974,6 @@ doBATgroupquantile(BAT *b, BAT *g, BAT *
size_t counter = 0;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -4366,7 +4355,6 @@ calcvariance(dbl *restrict avgp, const v
dbl delta;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
switch (tp) {
case TYPE_bte:
@@ -4493,7 +4481,6 @@ calccovariance(const void *v1, const voi
dbl mean1 = 0, mean2 = 0, m2 = 0, delta1, delta2;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
switch (tp) {
@@ -4597,7 +4584,6 @@ BATcalccorrelation(BAT *b1, BAT *b2)
lng t0 = 0;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -4714,7 +4700,6 @@ dogroupstdev(BAT **avgb, BAT *b, BAT *g,
BATiter bi = {0};
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -4952,7 +4937,6 @@ dogroupcovariance(BAT *b1, BAT *b2, BAT
BATiter b1i = {0}, b2i = {0};
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -5158,7 +5142,6 @@ BATgroupcorrelation(BAT *b1, BAT *b2, BA
BATiter b1i = {0}, b2i = {0};
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -906,7 +906,6 @@ COLcopy(BAT *b, int tt, bool writable, r
} else if (BATatoms[tt].atomFix || tt != TYPE_void ||
ATOMextern(tt)) {
/* case (4): one-by-one BUN insert (really slow) */
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TIMEOUT_LOOP_IDX_DECL(p, bi.count, qry_ctx) {
const void *t = BUNtail(bi, p);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -703,7 +703,6 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
}
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
BATiter ni = bat_iterator(n);
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -48,7 +48,6 @@ BATcalcnot(BAT *b, BAT *s)
struct canditer ci;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -241,7 +240,6 @@ BATcalcnegate(BAT *b, BAT *s)
struct canditer ci;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -380,7 +378,6 @@ BATcalcabsolute(BAT *b, BAT *s)
struct canditer ci;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -523,7 +520,6 @@ BATcalciszero(BAT *b, BAT *s)
struct canditer ci;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -663,7 +659,6 @@ BATcalcsign(BAT *b, BAT *s)
struct canditer ci;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -816,7 +811,6 @@ BATcalcisnil_implementation(BAT *b, BAT
oid bhseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -984,7 +978,6 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
oid b1hseqbase, b2hseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -1203,7 +1196,6 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
oid b1hseqbase, b2hseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -1416,7 +1408,6 @@ BATcalcmincst(BAT *b, const ValRecord *v
oid bhseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -1577,7 +1568,6 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
oid bhseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -1726,7 +1716,6 @@ BATcalcmax(BAT *b1, BAT *b2, BAT *s1, BA
oid b1hseqbase, b2hseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -1903,7 +1892,6 @@ BATcalcmax_no_nil(BAT *b1, BAT *b2, BAT
oid b1hseqbase, b2hseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -2103,7 +2091,6 @@ BATcalcmaxcst(BAT *b, const ValRecord *v
oid bhseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -2237,7 +2224,6 @@ BATcalcmaxcst_no_nil(BAT *b, const ValRe
oid bhseqbase;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
TRC_DEBUG_IF(ALGO) t0 = GDKusec();
@@ -2396,7 +2382,6 @@ xor_typeswitchloop(const void *lft, bool
BUN nils = 0;
QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- qry_ctx = qry_ctx ? qry_ctx : &(QryCtx) {.endtime = 0};
switch (ATOMbasetype(tp)) {
case TYPE_bte:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
