Changeset: efbfa3a4de2f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/efbfa3a4de2f
Modified Files:
MonetDB.spec
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_tm.c
gdk/gdk_tracer.c
sql/ChangeLog.Jan2022
tools/mserver/mserver5.c
Branch: Jan2022
Log Message:
Merge with Jul2021 branch.
diffs (151 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -417,9 +417,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\n");
+ GDKwarning("unlink of BBP.bak failed\n");
if (GDKmove(farmid, BATDIR, "BBP", "dir", BATDIR, "BBP", "bak",
false) != GDK_SUCCEED)
- TRC_WARNING(GDK, "rename of BBP.dir to BBP.bak
failed\n");
+ GDKwarning("rename of BBP.dir to BBP.bak failed\n");
}
return GDKmove(farmid, BAKDIR, "BBP", "dir", BATDIR, "BBP", "dir",
true);
}
@@ -1413,7 +1413,7 @@ movestrbats(void)
GDKerror("both %s and %s exist
with %s unexpectedly newer: manual intervention required\n", oldpath, newpath,
oldpath);
ret = -1;
} else {
- TRC_WARNING(GDK, "both %s and
%s exist, removing %s\n", oldpath, newpath, oldpath);
+ GDKwarning("both %s and %s
exist, removing %s\n", oldpath, newpath, oldpath);
ret = MT_remove(oldpath);
}
} else {
@@ -3385,8 +3385,8 @@ BBPquickdesc(bat bid)
const char *aname = ATOMunknown_name(b->ttype);
int tt = ATOMindex(aname);
if (tt < 0) {
- TRC_WARNING(GDK, "atom '%s' unknown in bat '%s'.\n",
- aname, BBP_physical(bid));
+ GDKwarning("atom '%s' unknown in bat '%s'.\n",
+ aname, BBP_physical(bid));
} else {
b->ttype = tt;
}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -762,8 +762,7 @@ la_bat_destroy(logger *lg, logaction *la
if (bid < 0)
return GDK_FAIL;
if (!bid) {
- GDKerror("la_bat_destroy failed to find bid for object %d
(issue ignored)\n", la->cid);
- GDKclrerr();
+ GDKwarning("failed to find bid for object %d\n", la->cid);
return GDK_SUCCEED;
}
if (logger_del_bat(lg, bid) != GDK_SUCCEED)
@@ -1519,7 +1518,7 @@ cleanup_and_swap(logger *lg, int *r, con
if ((lb = BATdescriptor(bids[pos])) == NULL ||
BATmode(lb, true/*transient*/) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "Failed to set bat(%d)
transient\n", bids[pos]);
+ GDKwarning("Failed to set bat(%d) transient\n",
bids[pos]);
}
logbat_destroy(lb);
}
@@ -1804,8 +1803,8 @@ logger_cleanup(logger *lg, lng id)
return GDK_FAIL;
}
if (GDKunlink(0, lg->dir, LOGFILE, log_id) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "#logger_cleanup: failed to remove old WAL
%s.%s\n", LOGFILE, log_id);
- GDKclrerr();
+ GDKwarning("failed to remove old WAL %s.%s\n", LOGFILE, log_id);
+ GDKclrerr(); /* clear error from unlink */
}
return GDK_SUCCEED;
}
@@ -2915,7 +2914,7 @@ bm_commit(logger *lg)
assert(bid);
if ((lb = BATdescriptor(bid)) == NULL ||
BATmode(lb, false) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "Failed to set bat (%d%s)
persistent\n", bid, !lb?" gone":"");
+ GDKwarning("Failed to set bat (%d%s) persistent\n",
bid, !lb?" gone":"");
logbat_destroy(lb);
logger_unlock(lg);
return GDK_FAIL;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -391,7 +391,7 @@ MT_mremap(const char *path, int mode, vo
return old_address;
}
if (path && truncate(path, *new_size) < 0)
- TRC_WARNING(GDK, "MT_mremap(%s): truncate failed: %s\n",
+ GDKwarning("truncate of %s failed: %s\n",
path, GDKstrerror(errno, (char[64]){0},
64));
#endif /* !__COVERITY__ */
return old_address;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -173,6 +173,9 @@ gdk_return GDKtracer_init(const char *db
__attribute__((__visibility__("hidden")));
gdk_return GDKunlink(int farmid, const char *dir, const char *nme, const char
*extension)
__attribute__((__visibility__("hidden")));
+#define GDKwarning(format, ...) \
+ GDKtracer_log(__FILE__, __func__, __LINE__, M_WARNING, \
+ GDK, NULL, format, ##__VA_ARGS__)
void HASHappend(BAT *b, BUN i, const void *v)
__attribute__((__visibility__("hidden")));
void HASHappend_locked(BAT *b, BUN i, const void *v)
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -76,7 +76,7 @@ epilogue(int cnt, bat *subcommit, bool l
if (b) {
/* check mmap modes */
if (BATcheckmodes(b, true) != GDK_SUCCEED)
- TRC_WARNING(GDK, "BATcheckmodes
failed\n");
+ GDKwarning("BATcheckmodes failed\n");
}
}
b = BBP_desc(bid);
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -536,7 +536,8 @@ GDKtracer_log(const char *file, const ch
return;
if (level <= M_WARNING) {
- fprintf(stderr, "#%s%s%s: %s: %s%s%s%s\n",
+ fprintf(level <= M_ERROR ? stderr : stdout,
+ "#%s%s%s: %s: %s%s%s%s\n",
add_ts ? ts : "",
add_ts ? ": " : "",
MT_thread_getname(), func, level == M_WARNING ?
GDKWARNING : GDKERROR,
diff --git a/sql/ChangeLog.Jan2022 b/sql/ChangeLog.Jan2022
--- a/sql/ChangeLog.Jan2022
+++ b/sql/ChangeLog.Jan2022
@@ -7,7 +7,7 @@
* Fri Mar 24 2023 Sjoerd Mullender <[email protected]>
- Increased the size of a variable counting the number of changes made
- to the database (e.g. in case more than a 2 billion rows are added to
+ to the database (e.g. in case more than 2 billion rows are added to
a table).
- Improved cleanup after failures such as failed memory allocations.
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -280,6 +280,8 @@ wmain(int argc, wchar_t **argv)
main(int argc, char **av)
#endif
{
+ /* make sure stdout is line buffered, even when not to a terminal */
+ setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
#ifdef _MSC_VER
char **av = malloc((argc + 1) * sizeof(char *));
if (av == NULL) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
