Changeset: 6e1c774b47e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e1c774b47e2
Modified Files:
gdk/gdk_calc.c
Branch: Jun2020
Log Message:
Fix up some debug messages.
diffs (truncated from 555 to 300 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -325,8 +325,8 @@ BATcalcnot(BAT *b, BAT *s, BAT *r)
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -455,8 +455,8 @@ BATcalcnegate(BAT *b, BAT *s, BAT *r)
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -595,8 +595,8 @@ BATcalcabsolute(BAT *b, BAT *s, BAT *r)
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -734,8 +734,8 @@ BATcalciszero(BAT *b, BAT *s, BAT *r)
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -877,8 +877,8 @@ BATcalcsign(BAT *b, BAT *s, BAT *r)
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1046,8 +1046,8 @@ BATcalcisnil_implementation(BAT *b, BAT
bn->tnonil = nils == 0;
bn->tkey = ncand <= 1;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " notnil=%s -> " ALGOOPTBATFMT " " LLFMT
"usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT ",notnil=%s -> " ALGOOPTBATFMT " " LLFMT
"usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s), ALGOOPTBATPAR(r),
notnil ? "true" : "false", ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1154,9 +1154,9 @@ BATcalcmin(BAT *b1, BAT *b2, BAT *s1, BA
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1243,9 +1243,9 @@ BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1328,8 +1328,8 @@ BATcalcmincst(BAT *b, const ValRecord *v
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1430,8 +1430,8 @@ BATcalcmincst_no_nil(BAT *b, const ValRe
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1519,9 +1519,9 @@ BATcalcmax(BAT *b1, BAT *b2, BAT *s1, BA
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1613,9 +1613,9 @@ BATcalcmax_no_nil(BAT *b1, BAT *b2, BAT
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1698,8 +1698,8 @@ BATcalcmaxcst(BAT *b, const ValRecord *v
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -1800,8 +1800,8 @@ BATcalcmaxcst_no_nil(BAT *b, const ValRe
bn->tseqbase = oid_nil;
}
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -3589,9 +3589,9 @@ BATcalcadd(BAT *b1, BAT *b2, BAT *s1, BA
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -3656,8 +3656,8 @@ BATcalcaddcst(BAT *b, const ValRecord *v
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -3721,8 +3721,8 @@ BATcalccstadd(const ValRecord *v, BAT *b
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -3814,8 +3814,8 @@ BATcalcincrdecr(BAT *b, BAT *s, BAT *r,
b->batDirtydesc = true;
}
- TRC_DEBUG(ALGO, "%s: b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "%s: b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
func, ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -5541,9 +5541,9 @@ BATcalcsub(BAT *b1, BAT *b2, BAT *s1, BA
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -5604,8 +5604,8 @@ BATcalcsubcst(BAT *b, const ValRecord *v
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -5666,8 +5666,8 @@ BATcalccstsub(const ValRecord *v, BAT *b
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -7594,9 +7594,9 @@ BATcalcmuldivmod(BAT *b1, BAT *b2, BAT *
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "%s: b1=" ALGOBATFMT "b2=" ALGOBATFMT
- " s1=" ALGOOPTBATFMT " s2=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "%s: b1=" ALGOBATFMT ",b2=" ALGOBATFMT
+ ",s1=" ALGOOPTBATFMT ",s2=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
func, ALGOBATPAR(b1), ALGOBATPAR(b2),
ALGOOPTBATPAR(s1), ALGOOPTBATPAR(s2),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -7674,8 +7674,8 @@ BATcalcmulcst(BAT *b, const ValRecord *v
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -7745,8 +7745,8 @@ BATcalccstmul(const ValRecord *v, BAT *b
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -9649,8 +9649,8 @@ BATcalcdivcst(BAT *b, const ValRecord *v
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
ALGOBATPAR(b), ALGOOPTBATPAR(s),
ALGOOPTBATPAR(r), ALGOOPTBATPAR(bn), GDKusec() - t0);
@@ -9708,8 +9708,8 @@ BATcalccstdiv(const ValRecord *v, BAT *b
bn->tnil = nils != 0;
bn->tnonil = nils == 0;
- TRC_DEBUG(ALGO, "b=" ALGOBATFMT " s=" ALGOOPTBATFMT
- " r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
+ ",r=" ALGOOPTBATFMT " -> " ALGOOPTBATFMT " " LLFMT "usec\n",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
