Changeset: 0b5b6fe859d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b5b6fe859d9
Modified Files:
gdk/gdk_group.c
gdk/gdk_hash.c
Branch: Jul2017
Log Message:
Some improvements for ALGODEBUG printing.
diffs (129 lines):
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -552,13 +552,13 @@ BATgroup_internal(BAT **groups, BAT **ex
}
if (b->tkey || cnt <= 1 || (g && (g->tkey || BATtdense(g)))) {
/* grouping is trivial: 1 element per group */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT "[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
"trivial case: 1 element per group\n",
- BATgetId(b), BATcount(b),
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -593,13 +593,13 @@ BATgroup_internal(BAT **groups, BAT **ex
/* all values are equal */
if (g == NULL || (BATordered(g) && BATordered_rev(g))) {
/* there's only a single group: 0 */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT
"[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "trivial case: single output group\n",
- BATgetId(b), BATcount(b),
+ "trivial case: single output group\n",
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -635,13 +635,13 @@ BATgroup_internal(BAT **groups, BAT **ex
* e/h available in order to copy them,
* otherwise we will need to calculate them
* which we will do using the "normal" case */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT
"[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
- "trivial case: copy input groups\n",
- BATgetId(b), BATcount(b),
+ "trivial case: copy input groups\n",
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -731,13 +731,13 @@ BATgroup_internal(BAT **groups, BAT **ex
((BATordered(b) || BATordered_rev(b)) &&
(g == NULL || BATordered(g) || BATordered_rev(g)))) {
/* we only need to compare each entry with the previous */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT "[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
"compare consecutive values\n",
- BATgetId(b), BATcount(b),
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -788,13 +788,13 @@ BATgroup_internal(BAT **groups, BAT **ex
* last time we saw that group, so if the last time we
* saw the old group of the current value is within
* this range, we can reuse the new group */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT "[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
"subscan old groups\n",
- BATgetId(b), BATcount(b),
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -943,13 +943,13 @@ BATgroup_internal(BAT **groups, BAT **ex
/* we already have a hash table on b, or b is
* persistent and we could create a hash table, or b
* is a view on a bat that already has a hash table */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT "[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
"use existing hash table\n",
- BATgetId(b), BATcount(b),
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
@@ -1018,13 +1018,13 @@ BATgroup_internal(BAT **groups, BAT **ex
* build an incomplete hash table on the fly--also see
* BATassertProps for similar code; we also exploit if
* g is clustered */
- ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT ","
+ ALGODEBUG fprintf(stderr, "#BATgroup(b=%s#" BUNFMT "[%s],"
"s=%s#" BUNFMT ","
"g=%s#" BUNFMT ","
"e=%s#" BUNFMT ","
"h=%s#" BUNFMT ",subsorted=%d): "
"create partial hash table%s\n",
- BATgetId(b), BATcount(b),
+ BATgetId(b), BATcount(b), ATOMname(b->ttype),
s ? BATgetId(s) : "NULL", s ? BATcount(s) : 0,
g ? BATgetId(g) : "NULL", g ? BATcount(g) : 0,
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -130,7 +130,7 @@ HASHnew(Heap *hp, int tpe, BUN size, BUN
((size_t *) hp->base)[2] = mask;
((size_t *) hp->base)[3] = width;
((size_t *) hp->base)[4] = count;
- ALGODEBUG fprintf(stderr, "#HASHnew: create hash(size " BUNFMT ", mask
" BUNFMT ",width %d, nil " BUNFMT ", total " BUNFMT " bytes);\n", size, mask,
width, h->nil, (size + mask) * width);
+ ALGODEBUG fprintf(stderr, "#HASHnew: create hash(size " BUNFMT ", mask
" BUNFMT ", width %d, nil " BUNFMT ", total " BUNFMT " bytes);\n", size, mask,
width, h->nil, (size + mask) * width);
return h;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
