Changeset: aaeae2a6e3ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaeae2a6e3ce
Modified Files:
gdk/gdk_bat.c
monetdb5/mal/mal.c
Branch: Jun2020
Log Message:
Changes some errors into warning/critical.
diffs (43 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2363,13 +2363,16 @@ BATassertProps(BAT *b)
BUN mask;
if ((hs = GDKzalloc(sizeof(Hash))) == NULL) {
- TRC_ERROR(BAT_, "Cannot allocate hash table\n");
+ TRC_WARNING(BAT_, "Cannot allocate hash
table\n");
goto abort_check;
}
if (snprintf(hs->heaplink.filename,
sizeof(hs->heaplink.filename), "%s.thshprpl%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs->heaplink.filename) ||
snprintf(hs->heapbckt.filename,
sizeof(hs->heapbckt.filename), "%s.thshprpb%x", nme, (unsigned) THRgettid()) >=
(int) sizeof(hs->heapbckt.filename)) {
+ /* cannot happen, see comment in gdk.h
+ * about sizes near definition of
+ * BBPINIT */
GDKfree(hs);
- TRC_ERROR(BAT_, "Heap filename is too large\n");
+ TRC_CRITICAL(BAT_, "Heap filename is too
large\n");
goto abort_check;
}
if (ATOMsize(b->ttype) == 1)
@@ -2385,7 +2388,7 @@ BATassertProps(BAT *b)
HASHnew(hs, b->ttype, BUNlast(b),
mask, BUN_NONE, false) != GDK_SUCCEED) {
GDKfree(hs);
- TRC_ERROR(BAT_, "Cannot allocate hash table\n");
+ TRC_WARNING(BAT_, "Cannot allocate hash
table\n");
goto abort_check;
}
BATloop(b, p, q) {
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -70,7 +70,7 @@ int mal_init(void){
#ifndef NDEBUG
mdbExit();
#endif
- TRC_ERROR(MAL_SERVER, "%s\n", err);
+ TRC_CRITICAL(MAL_SERVER, "%s\n", err);
freeException(err);
return -1;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
