Changeset: 18b34fd06ce0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18b34fd06ce0
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cand.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
Layout.
diffs (truncated from 2073 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -944,13 +944,14 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
bn = NULL;
}
- TRC_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 : "",
- ci.seq, ncand, GDKusec() - t0);
+ TRC_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 : "",
+ ci.seq, ncand, GDKusec() - t0);
return bn;
}
@@ -1067,11 +1068,11 @@ BATsum(void *res, int tp, BAT *b, BAT *s
res, true, b->ttype, tp, &min, min, max,
skip_nils, abort_on_error, nil_if_empty, "BATsum", &algo);
TRC_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);
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)\n",
+ __func__,
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ algo ? algo : "",
+ ci.seq, ncand, GDKusec() - t0);
return nils < BUN_NONE ? GDK_SUCCEED : GDK_FAIL;
}
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -137,7 +137,8 @@ VIEWcreate(oid seq, BAT *b)
GDKfree(bn);
return NULL;
}
- TRC_DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOBATPAR(bn));
+ TRC_DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
+ ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
}
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -847,7 +847,7 @@ COLcopy(BAT *b, int tt, bool writable, r
if (!writable)
bn->batRestricted = BAT_READ;
TRC_DEBUG(ALGO, "COLcopy(" ALGOBATFMT ")=" ALGOBATFMT "\n",
- ALGOBATPAR(b), ALGOBATPAR(bn));
+ ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
bunins_failed:
BBPreclaim(bn);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -521,7 +521,7 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
if (BATttype(b) != BATttype(n) &&
ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
TRC_DEBUG(CHECK_, "Interpreting %s as %s.\n",
-
ATOMname(BATttype(n)), ATOMname(BATttype(b)));
+ ATOMname(BATttype(n)), ATOMname(BATttype(b)));
}
cnt = canditer_init(&ci, n, s);
@@ -1297,8 +1297,8 @@ BATslice(BAT *b, BUN l, BUN h)
BATkey(bn, BATtkey(b));
}
TRC_DEBUG(ALGO, "BATslice(" ALGOBATFMT "," BUNFMT "," BUNFMT ")"
- "=" ALGOBATFMT "\n",
- ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
+ "=" ALGOBATFMT "\n",
+ ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
return bn;
}
@@ -1741,15 +1741,15 @@ BATsort(BAT **sorted, BAT **order, BAT *
*groups = gn;
}
TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
- ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
- ",reverse=%d,nilslast=%d,stable=%d) = ("
- ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- trivial (" LLFMT
- " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOOPTBATPAR(g), reverse, nilslast,
stable,
- ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
- ALGOOPTBATPAR(on), GDKusec() - t0);
+ ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
+ ",reverse=%d,nilslast=%d,stable=%d) = ("
+ ALGOOPTBATFMT "," ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- trivial (" LLFMT
+ " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOOPTBATPAR(g), reverse, nilslast, stable,
+ ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
+ ALGOOPTBATPAR(on), GDKusec() - t0);
return GDK_SUCCEED;
}
if (VIEWtparent(b)) {
@@ -1828,15 +1828,15 @@ BATsort(BAT **sorted, BAT **order, BAT *
on = NULL;
}
TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
- ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
- ",reverse=%d,nilslast=%d,stable=%d) = ("
- ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- orderidx (" LLFMT
- " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOOPTBATPAR(g), reverse, nilslast,
stable,
- ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
- ALGOOPTBATPAR(on), GDKusec() - t0);
+ ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
+ ",reverse=%d,nilslast=%d,stable=%d) = ("
+ ALGOOPTBATFMT "," ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- orderidx (" LLFMT
+ " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOOPTBATPAR(g), reverse, nilslast, stable,
+ ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
+ ALGOOPTBATPAR(on), GDKusec() - t0);
return GDK_SUCCEED;
}
if (o) {
@@ -1930,16 +1930,16 @@ BATsort(BAT **sorted, BAT **order, BAT *
*groups = gn;
}
TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT
- ",o=" ALGOOPTBATFMT ",g="
ALGOBATFMT
-
",reverse=%d,nilslast=%d,stable=%d"
- ") = (" ALGOOPTBATFMT ","
- ALGOOPTBATFMT "," ALGOOPTBATFMT
- ") -- key group (" LLFMT "
usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOBATPAR(g), reverse,
nilslast,
- stable, ALGOOPTBATPAR(bn),
- ALGOOPTBATPAR(gn),
ALGOOPTBATPAR(on),
- GDKusec() - t0);
+ ",o=" ALGOOPTBATFMT ",g=" ALGOBATFMT
+ ",reverse=%d,nilslast=%d,stable=%d"
+ ") = (" ALGOOPTBATFMT ","
+ ALGOOPTBATFMT "," ALGOOPTBATFMT
+ ") -- key group (" LLFMT " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOBATPAR(g), reverse, nilslast,
+ stable, ALGOOPTBATPAR(bn),
+ ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
+ GDKusec() - t0);
return GDK_SUCCEED;
}
assert(g->ttype == TYPE_oid);
@@ -2052,13 +2052,13 @@ BATsort(BAT **sorted, BAT **order, BAT *
}
TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o=" ALGOOPTBATFMT
- ",g=" ALGOOPTBATFMT ",reverse=%d,nilslast=%d,"
- "stable=%d) = (" ALGOOPTBATFMT ","
ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- %ssort (" LLFMT " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
ALGOOPTBATPAR(g),
- reverse, nilslast, stable, ALGOOPTBATPAR(bn),
- ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
- g ? "grouped " : "", GDKusec() - t0);
+ ",g=" ALGOOPTBATFMT ",reverse=%d,nilslast=%d,"
+ "stable=%d) = (" ALGOOPTBATFMT "," ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- %ssort (" LLFMT " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o), ALGOOPTBATPAR(g),
+ reverse, nilslast, stable, ALGOOPTBATPAR(bn),
+ ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
+ g ? "grouped " : "", GDKusec() - t0);
return GDK_SUCCEED;
error:
@@ -2137,9 +2137,9 @@ BATconstant(oid hseq, int tailtype, cons
bn->tkey = BATcount(bn) <= 1;
}
TRC_DEBUG(ALGO, "%s()=" ALGOOPTBATFMT
- " (" LLFMT "usec)\n",
- __func__,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ " (" LLFMT "usec)\n",
+ __func__,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -375,9 +375,9 @@ recover_dir(int farmid, bool direxists)
if (direxists) {
/* just try; don't care about these non-vital files */
if (GDKunlink(farmid, BATDIR, "BBP", "bak") != GDK_SUCCEED)
- TRC_WARNING(GDK, "unlink of BBP.bak failed");
+ TRC_WARNING(GDK, "unlink of BBP.bak failed\n");
if (GDKmove(farmid, BATDIR, "BBP", "dir", BATDIR, "BBP", "bak")
!= GDK_SUCCEED)
- TRC_WARNING(GDK, "rename of BBP.dir to BBP.bak failed");
+ TRC_WARNING(GDK, "rename of BBP.dir to BBP.bak
failed\n");
}
return GDKmove(farmid, BAKDIR, "BBP", "dir", BATDIR, "BBP", "dir");
}
@@ -1723,7 +1723,7 @@ new_bbpentry(FILE *fp, bat i, const char
return GDK_FAIL;
}
TRC_DEBUG(IO_, "%s%zd %u %s %s %d " BUNFMT " "
- BUNFMT " " OIDFMT " %s", prefix,
+ BUNFMT " " OIDFMT " %s\n", prefix,
/* BAT info */
(ssize_t) i,
BBP_status(i) & BBPPERSISTENT,
@@ -3705,7 +3705,7 @@ BBPrecover_subdir(void)
if (ret == GDK_SUCCEED) {
ret = GDKremovedir(0, SUBDIR);
if (backup_dir == 2) {
- TRC_DEBUG(IO_, "%s%cBBP.dir had disappeared!", SUBDIR,
DIR_SEP);
+ TRC_DEBUG(IO_, "%s%cBBP.dir had disappeared!\n",
SUBDIR, DIR_SEP);
backup_dir = 0;
}
}
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -895,8 +895,8 @@ BATnegcands(BAT *dense_cands, BAT *odels
dense_cands->tvheap = dels;
BATsetcount(dense_cands, dense_cands->batCount - (hi - lo));
TRC_DEBUG(ALGO, "BATnegcands(cands=" ALGOBATFMT ","
- "dels=" ALGOBATFMT ")\n",
- ALGOBATPAR(dense_cands),
- ALGOBATPAR(odels));
+ "dels=" ALGOBATFMT ")\n",
+ ALGOBATPAR(dense_cands),
+ ALGOBATPAR(odels));
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -36,10 +36,7 @@ BATcommit(BAT *b)
if (b == NULL)
return;
TRC_DEBUG(DELTA, "BATcommit1 %s free %zu ins " BUNFMT " base %p\n",
- BATgetId(b),
- b->theap.free,
- b->batInserted,
- b->theap.base);
+ BATgetId(b), b->theap.free, b->batInserted, b->theap.base);
if (!BATdirty(b)) {
b->batDirtyflushed = false;
}
@@ -48,10 +45,7 @@ BATcommit(BAT *b)
}
b->batInserted = BUNlast(b);
TRC_DEBUG(DELTA, "BATcommit2 %s free %zu ins " BUNFMT " base %p\n",
- BATgetId(b),
- b->theap.free,
- b->batInserted,
- b->theap.base);
+ BATgetId(b), b->theap.free, b->batInserted, b->theap.base);
}
/*
diff --git a/gdk/gdk_delta.h b/gdk/gdk_delta.h
--- a/gdk/gdk_delta.h
+++ b/gdk/gdk_delta.h
@@ -25,11 +25,11 @@ DELTAinit(BAT *b)
b->batInserted = 0;
b->tshift = ATOMelmshift(Tsize(b));
TRC_DEBUG(DELTA,
- "%s free %zu ins " BUNFMT " base %p\n",
- BBP_logical(b->batCacheid),
- b->theap.free,
- b->batInserted,
- b->theap.base);
+ "%s free %zu ins " BUNFMT " base %p\n",
+ BBP_logical(b->batCacheid),
+ b->theap.free,
+ b->batInserted,
+ b->theap.base);
}
/*
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -612,17 +612,17 @@ BATgroup_internal(BAT **groups, BAT **ex
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
