Changeset: 7564037fab25 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7564037fab25
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_select.c
Branch: gdk_tracer
Log Message:
Minor fixes in replacements
diffs (293 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -896,7 +896,9 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
const char *algo = NULL;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in ALGODEBUG
+ t0 = GDKusec();
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATgroupsum: %s\n", err);
@@ -947,9 +949,9 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
bn = NULL;
}
- DEBUG(ALGO,
"(b="ALGOBATFMT",g="ALGOOPTBATFMT",e="ALGOOPTBATFMT",s="ALGOOPTBATFMT")="ALGOOPTBATFMT":
%s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)"
- "\n",
+ DEBUG(ALGO,
"%s(b="ALGOBATFMT",g="ALGOOPTBATFMT",e="ALGOOPTBATFMT",s="ALGOOPTBATFMT")="ALGOOPTBATFMT":
%s; "
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(g),
ALGOOPTBATPAR(e),
ALGOOPTBATPAR(s), ALGOOPTBATPAR(bn),
algo ? algo : "",
@@ -969,7 +971,9 @@ BATsum(void *res, int tp, BAT *b, BAT *s
const char *algo = NULL;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in ALGODEBUG
+ t0 = GDKusec();
if ((err = BATgroupaggrinit(b, NULL, NULL, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATsum: %s\n", err);
@@ -1071,9 +1075,9 @@ BATsum(void *res, int tp, BAT *b, BAT *s
nils = dosum(Tloc(b, 0), b->tnonil, b->hseqbase, &ci, ncand,
res, true, b->ttype, tp, &min, min, max,
skip_nils, abort_on_error, nil_if_empty, "BATsum", &algo);
- DEBUG(ALGO, "(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)"
- "\n",
+ DEBUG(ALGO, "%s(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s),
algo ? algo : "",
ci.seq, ncand, GDKusec() - t0);
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -45,8 +45,9 @@ virtualize(BAT *bn)
* (const oid *) Tloc(bn, 0) + BATcount(bn) - 1 ==
* (const oid *) Tloc(bn, BUNlast(bn) - 1))) {
/* column is dense, replace by virtual oid */
- DEBUG(ALGO, "(bn=" ALGOBATFMT ",seq="OIDFMT")\n",
- ALGOBATPAR(bn),
+ DEBUG(ALGO, "%s(bn=" ALGOBATFMT ",seq="OIDFMT")\n",
+ __func__,
+ ALGOBATPAR(bn),
BATcount(bn) > 0 ? * (const oid *)
Tloc(bn, 0) : 0);
if (BATcount(bn) == 0)
bn->tseqbase = 0;
@@ -99,9 +100,10 @@ hashselect(BAT *b, struct canditer *rest
if (phash) {
BAT *b2 = BBPdescriptor(VIEWtparent(b));
*algo = "hashselect on parent";
- DEBUG(ALGO, "(" ALGOBATFMT "): "
+ DEBUG(ALGO, "%s(" ALGOBATFMT "): "
"using parent(" ALGOBATFMT ") "
"for hash\n",
+ __func__,
ALGOBATPAR(b),
ALGOBATPAR(b2));
d = (BUN) ((b->theap.base - b2->theap.base) >> b->tshift);
@@ -1023,10 +1025,11 @@ BATselect(BAT *b, BAT *s, const void *tl
if (canditer_init(&ci, b, s) == 0) {
/* trivially empty result */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
" (" LLFMT " usec): "
"trivially empty\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
@@ -1043,10 +1046,11 @@ BATselect(BAT *b, BAT *s, const void *tl
* want an interval that's open on at least one
* side */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT
",li=%d,hi=%d,anti=%d)=" ALGOOPTBATFMT
" (" LLFMT " usec): "
"empty interval\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s),
li, hi, anti, ALGOOPTBATPAR(bn),
GDKusec() - t0);
return bn;
@@ -1081,9 +1085,10 @@ BATselect(BAT *b, BAT *s, const void *tl
hval = ti;
lnil = ATOMcmp(t, tl, nil) == 0;
anti = false;
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d):
"
"anti: switch ranges...\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s),
anti);
} else if (!lval && !hval) {
@@ -1091,10 +1096,11 @@ BATselect(BAT *b, BAT *s, const void *tl
* values are in range; we must return all
* other non-nil values, i.e. nothing */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
" (" LLFMT " usec): "
"anti: nil-nil range, nonil\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s),
anti, ALGOOPTBATPAR(bn), GDKusec() -
t0);
return bn;
@@ -1106,9 +1112,10 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=0): "
"anti-nil...\n",
+ __func__,
ALGOBATPAR(b),
ALGOOPTBATPAR(s));
} else if (equi) {
equi = false;
@@ -1119,10 +1126,11 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- DEBUG(ALGO, "(b="
+ DEBUG(ALGO, "%s(b="
ALGOBATFMT ",s="
ALGOOPTBATFMT
",anti=0): "
"anti-nothing...\n",
+ __func__,
ALGOBATPAR(b),
ALGOOPTBATPAR(s));
}
@@ -1133,9 +1141,10 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=0): "
"anti-nil...\n",
+ __func__,
ALGOBATPAR(b),
ALGOOPTBATPAR(s));
}
}
@@ -1146,10 +1155,11 @@ BATselect(BAT *b, BAT *s, const void *tl
if (hval && ((equi && !(li && hi)) || ATOMcmp(t, tl, th) > 0)) {
/* empty range */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
" (" LLFMT " usec): "
"empty range\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
@@ -1157,10 +1167,11 @@ BATselect(BAT *b, BAT *s, const void *tl
if (equi && lnil && b->tnonil) {
/* return all nils, but there aren't any */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
" (" LLFMT " usec): "
"equi-nil, nonil\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
@@ -1170,10 +1181,11 @@ BATselect(BAT *b, BAT *s, const void *tl
/* return all non-nils from a BAT that doesn't have
* any: i.e. return everything */
bn = canditer_slice(&ci, 0, ci.ncand);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
" (" LLFMT " usec): "
"everything, nonil\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
@@ -1196,11 +1208,11 @@ BATselect(BAT *b, BAT *s, const void *tl
* left over for
* anti */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b=" ALGOBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT
",s="
ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
" ("
LLFMT " usec): "
"nothing, out of range\n",
-
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti, ALGOOPTBATPAR(bn), GDKusec() - t0);
+
__func__, ALGOBATPAR(b), ALGOOPTBATPAR(s), anti, ALGOOPTBATPAR(bn), GDKusec() -
t0);
return bn;
}
}
@@ -1216,11 +1228,12 @@ BATselect(BAT *b, BAT *s, const void *tl
/* smallest value in BAT larger than
* what we're looking for */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b="
+ DEBUG(ALGO, "%s(b="
ALGOBATFMT ",s="
ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
" (" LLFMT " usec): "
"nothing, out of
range\n",
+ __func__,
ALGOBATPAR(b),
ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn),
GDKusec() - t0);
@@ -1233,11 +1246,12 @@ BATselect(BAT *b, BAT *s, const void *tl
/* largest value in BAT smaller than
* what we're looking for */
bn = BATdense(0, 0, 0);
- DEBUG(ALGO, "(b="
+ DEBUG(ALGO, "%s(b="
ALGOBATFMT ",s="
ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
" (" LLFMT " usec): "
"nothing, out of
range\n",
+ __func__,
ALGOBATPAR(b),
ALGOOPTBATPAR(s), anti,
ALGOOPTBATPAR(bn),
GDKusec() - t0);
@@ -1466,8 +1480,9 @@ BATselect(BAT *b, BAT *s, const void *tl
}
bn = virtualize(bn);
- DEBUG(ALGO, "(b=" ALGOBATFMT ",anti=%s)="
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT ",anti=%s)="
ALGOOPTBATFMT " %s (" LLFMT " usec)\n",
+ __func__,
ALGOBATPAR(b), anti ? "true" : "false",
ALGOOPTBATPAR(bn), algo,
GDKusec() - t0);
@@ -1609,8 +1624,9 @@ BATselect(BAT *b, BAT *s, const void *tl
}
bn = virtualize(bn);
- DEBUG(ALGO, "(b=" ALGOBATFMT ",s=" ALGOOPTBATFMT",anti=%s)="
ALGOOPTBATFMT
+ DEBUG(ALGO, "%s(b=" ALGOBATFMT ",s=" ALGOOPTBATFMT",anti=%s)="
ALGOOPTBATFMT
" %s (" LLFMT " usec)\n",
+ __func__,
ALGOBATPAR(b), ALGOOPTBATPAR(s),
anti ? "true" : "false",
ALGOOPTBATPAR(bn), algo,
@@ -1746,10 +1762,11 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
assert(rl->ttype != TYPE_void || !is_oid_nil(rl->tseqbase));
assert(rh->ttype != TYPE_void || !is_oid_nil(rh->tseqbase));
- DEBUG(ALGO, "(l=" ALGOBATFMT ","
+ DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
"rl=" ALGOBATFMT ",rh=" ALGOBATFMT ","
"sl=" ALGOOPTBATFMT ",sr=" ALGOOPTBATFMT ","
"anti=%s,symmetric=%s)\n",
+ __func__,
ALGOBATPAR(l),
ALGOBATPAR(rl),
ALGOBATPAR(rh),
@@ -2314,8 +2331,9 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
if (BATtdense(r2))
r2->tseqbase = cnt > 0 ? dst2[0] : 0;
}
- DEBUG(ALGO, "(l=%s,rl=%s,rh=%s)="
+ DEBUG(ALGO, "%s(l=%s,rl=%s,rh=%s)="
"(" ALGOBATFMT "," ALGOOPTBATFMT ")\n",
+ __func__,
BATgetId(l), BATgetId(rl), BATgetId(rh),
ALGOBATPAR(r1), ALGOOPTBATPAR(r2));
return GDK_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
