Changeset: c02bf2fbfc70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c02bf2fbfc70
Removed Files:
sql/test/rdf/Tests/q8_v_small.reqtests
sql/test/rdf/Tests/q8_v_small.sql
sql/test/rdf/Tests/q8_v_small.stable.err
sql/test/rdf/Tests/q8_v_small.stable.out
Modified Files:
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
configure.ag
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_system.c
gdk/gdk_tracer.c
gdk/gdk_tracer.h
gdk/gdk_utils.c
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sqlcatalog.mal
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.mal
sql/include/sql_relation.h
sql/rel.txt
sql/scripts/22_clients.sql
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_semantic.c
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout
sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.sql
sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.stable.err
sql/test/BugTracker-2015/Tests/window_function_crash.Bug-3861.stable.out
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/json/Tests/jsonvalidity.Bug-3753.sql
sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
sql/test/merge-partitions/Tests/mergepart20.sql
sql/test/merge-partitions/Tests/mergepart20.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/rdf/Tests/All
sql/test/rdf/Tests/q8_v.stable.err
sql/test/rdf/Tests/q8_v.stable.out
sql/test/rdf/Tests/q8_v.timeout
sql/test/subquery/Tests/correlated.stable.err
sql/test/subquery/Tests/subquery.sql
sql/test/subquery/Tests/subquery.stable.err
sql/test/subquery/Tests/subquery.stable.out
sql/test/subquery/Tests/subquery3.sql
sql/test/subquery/Tests/subquery3.stable.err
sql/test/subquery/Tests/subquery3.stable.out
sql/test/subquery/Tests/subquery4.sql
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
testing/Mfilter.py
Branch: hot-snapshot
Log Message:
Merge branch 'default' into 'hot-snapshot'
diffs (truncated from 6214 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -426,6 +426,13 @@
/* Define to 1 if you have the `strcpy_s' function. */
#define HAVE_STRCPY_S 1
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+#define HAVE_DECL_STRERROR_R 1
+#ifndef strerror_r
+#define strerror_r(e, b, s) strerror_s(b, s, e)
+#endif
+
/* Define to 1 if you have the <strings.h> header file. */
/* #undef HAVE_STRINGS_H */
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -11572,6 +11572,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "alter_add_value_partition", "pattern
sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str,
ptnme:str, nills:int, update:int):void ",
"SQLalter_add_value_partition;", "Catalog operation
alter_add_value_partition" ]
[ "sqlcatalog", "alter_add_value_partition", "pattern
sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str,
ptnme:str, nills:int, update:int, arg:any...):void ",
"SQLalter_add_value_partition;", "Catalog operation
alter_add_value_partition" ]
[ "sqlcatalog", "alter_del_table", "pattern
sqlcatalog.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str,
action:int):void ", "SQLalter_del_table;", "Catalog operation
alter_del_table" ]
+[ "sqlcatalog", "alter_seq", "pattern
sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:bat[:lng]):void ",
"SQLalter_seq;", "Catalog operation alter_seq" ]
[ "sqlcatalog", "alter_seq", "pattern
sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:lng):void ",
"SQLalter_seq;", "Catalog operation alter_seq" ]
[ "sqlcatalog", "alter_set_table", "pattern
sqlcatalog.alter_set_table(sname:str, tnme:str, access:int):void ",
"SQLalter_set_table;", "Catalog operation alter_set_table" ]
[ "sqlcatalog", "alter_table", "pattern
sqlcatalog.alter_table(sname:str, tname:str, tbl:ptr, action:int):void ",
"SQLalter_table;", "Catalog operation alter_table" ]
@@ -11789,6 +11790,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "alter_add_value_partition", "pattern
wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int):void ", "WLCgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlc", "alter_add_value_partition", "pattern
wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int, arg:str...):void ", "WLCgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlc", "alter_del_table", "pattern wlc.alter_del_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;",
"Catalog operation alter_del_table" ]
+[ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str,
seq:ptr, val:bat[:lng]):void ", "WLCgeneric;", "Catalog operation alter_seq"
]
[ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str,
val:lng):void ", "WLCgeneric;", "Catalog operation alter_seq" ]
[ "wlc", "alter_set_table", "pattern wlc.alter_set_table(sname:str,
tnme:str, access:int):void ", "WLCgeneric;", "Catalog operation
alter_set_table" ]
[ "wlc", "alter_table", "pattern wlc.alter_table(sname:str, tname:str,
action:int):void ", "WLCgeneric;", "Catalog operation alter_table" ]
@@ -11858,6 +11860,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "alter_add_value_partition", "pattern
wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int):void ", "WLRgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlr", "alter_add_value_partition", "pattern
wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int, arg:str...):void ", "WLRgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlr", "alter_del_table", "pattern wlr.alter_del_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;",
"Catalog operation alter_del_table" ]
+[ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str,
seq:ptr, val:bat[:lng]):void ", "WLRgeneric;", "Catalog operation alter_seq"
]
[ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str,
val:lng):void ", "WLRgeneric;", "Catalog operation alter_seq" ]
[ "wlr", "alter_set_table", "pattern wlr.alter_set_table(sname:str,
tnme:str, access:int):void ", "WLRgeneric;", "Catalog operation
alter_set_table" ]
[ "wlr", "alter_table", "pattern wlr.alter_table(sname:str, tname:str,
action:int):void ", "WLRgeneric;", "Catalog operation alter_table" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -16016,6 +16016,7 @@ stdout of test 'MAL-signatures` in direc
[ "sqlcatalog", "alter_add_value_partition", "pattern
sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str,
ptnme:str, nills:int, update:int):void ",
"SQLalter_add_value_partition;", "Catalog operation
alter_add_value_partition" ]
[ "sqlcatalog", "alter_add_value_partition", "pattern
sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str,
ptnme:str, nills:int, update:int, arg:any...):void ",
"SQLalter_add_value_partition;", "Catalog operation
alter_add_value_partition" ]
[ "sqlcatalog", "alter_del_table", "pattern
sqlcatalog.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str,
action:int):void ", "SQLalter_del_table;", "Catalog operation
alter_del_table" ]
+[ "sqlcatalog", "alter_seq", "pattern
sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:bat[:lng]):void ",
"SQLalter_seq;", "Catalog operation alter_seq" ]
[ "sqlcatalog", "alter_seq", "pattern
sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:lng):void ",
"SQLalter_seq;", "Catalog operation alter_seq" ]
[ "sqlcatalog", "alter_set_table", "pattern
sqlcatalog.alter_set_table(sname:str, tnme:str, access:int):void ",
"SQLalter_set_table;", "Catalog operation alter_set_table" ]
[ "sqlcatalog", "alter_table", "pattern
sqlcatalog.alter_table(sname:str, tname:str, tbl:ptr, action:int):void ",
"SQLalter_table;", "Catalog operation alter_table" ]
@@ -16234,6 +16235,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "alter_add_value_partition", "pattern
wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int):void ", "WLCgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlc", "alter_add_value_partition", "pattern
wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int, arg:str...):void ", "WLCgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlc", "alter_del_table", "pattern wlc.alter_del_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;",
"Catalog operation alter_del_table" ]
+[ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str,
seq:ptr, val:bat[:lng]):void ", "WLCgeneric;", "Catalog operation alter_seq"
]
[ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str,
val:lng):void ", "WLCgeneric;", "Catalog operation alter_seq" ]
[ "wlc", "alter_set_table", "pattern wlc.alter_set_table(sname:str,
tnme:str, access:int):void ", "WLCgeneric;", "Catalog operation
alter_set_table" ]
[ "wlc", "alter_table", "pattern wlc.alter_table(sname:str, tname:str,
action:int):void ", "WLCgeneric;", "Catalog operation alter_table" ]
@@ -16303,6 +16305,7 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "alter_add_value_partition", "pattern
wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int):void ", "WLRgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlr", "alter_add_value_partition", "pattern
wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
nills:int, update:int, arg:str...):void ", "WLRgeneric;", "Catalog operation
alter_add_value_partition" ]
[ "wlr", "alter_del_table", "pattern wlr.alter_del_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;",
"Catalog operation alter_del_table" ]
+[ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str,
seq:ptr, val:bat[:lng]):void ", "WLRgeneric;", "Catalog operation alter_seq"
]
[ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str,
val:lng):void ", "WLRgeneric;", "Catalog operation alter_seq" ]
[ "wlr", "alter_set_table", "pattern wlr.alter_set_table(sname:str,
tnme:str, access:int):void ", "WLRgeneric;", "Catalog operation
alter_set_table" ]
[ "wlr", "alter_table", "pattern wlr.alter_table(sname:str, tname:str,
action:int):void ", "WLRgeneric;", "Catalog operation alter_table" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -516,6 +516,7 @@ ssize_t shtToStr(str *dst, size_t *len,
const sht sht_nil;
ssize_t strFromStr(const char *restrict src, size_t *restrict len, str
*restrict dst, bool external);
const char str_nil[2];
+int strerror_r(int errnum, char *buf, size_t buflen);
gdk_return void_inplace(BAT *b, oid id, const void *val, bool force)
__attribute__((__warn_unused_result__));
int win_mkdir(const char *, const int mode);
int win_rename(const char *, const char *);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2193,6 +2193,7 @@ AS_VAR_IF([ac_cv_func_fdatasync], [yes],
[AC_DEFINE([HAVE_FDATASYNC], 1, [If the system has a working
fdatasync])])
AC_FUNC_FSEEKO
+AC_FUNC_STRERROR_R
# NOTE: these functions are in alphabetical order to ease maintenance
save_LIBS="$LIBS"
LIBS="$LIBS $MATH_LIBS"
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -520,7 +520,11 @@ typedef struct {
size_t free; /* index where free area starts. */
size_t size; /* size of the heap (bytes) */
char *base; /* base pointer in memory. */
+#if SIZEOF_VOID_P == 4
char filename[32]; /* file containing image of the heap */
+#else
+ char filename[40]; /* file containing image of the heap */
+#endif
bte farmid; /* id of farm where heap is located */
bool copied:1, /* a copy of an existing map. */
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2093,8 +2093,8 @@ BATmode(BAT *b, bool transient)
#ifdef NDEBUG
/* assertions are disabled, turn failing tests into a message */
-//#undef assert
-//#define assert(test) ((void) ((test) || TRC_ERROR(BAT_, "Assertion `%s'
failed\n", #test)))
+#undef assert
+#define assert(test) ((void) ((test) || TRC_CRITICAL_ENDIF(BAT_, "Assertion
`%s' failed\n", #test)))
#endif
/* Assert that properties are set correctly.
@@ -2136,6 +2136,7 @@ BATmode(BAT *b, bool transient)
void
BATassertProps(BAT *b)
{
+ unsigned bbpstatus;
BATiter bi = bat_iterator(b);
BUN p, q;
int (*cmpf)(const void *, const void *);
@@ -2151,9 +2152,7 @@ BATassertProps(BAT *b)
assert(b->hseqbase <= GDK_oid_max); /* non-nil seqbase */
assert(b->hseqbase + BATcount(b) <= GDK_oid_max);
-#ifndef NDEBUG
- unsigned bbpstatus = BBP_status(b->batCacheid);
-#endif
+ bbpstatus = BBP_status(b->batCacheid);
/* only at most one of BBPDELETED, BBPEXISTING, BBPNEW may be set */
assert(((bbpstatus & BBPDELETED) != 0) +
((bbpstatus & BBPEXISTING) != 0) +
@@ -2214,9 +2213,7 @@ BATassertProps(BAT *b)
assert(b->tvheap->free <= b->tvheap->size);
assert(b->tvheap->free % SIZEOF_OID == 0);
if (b->tvheap->free > 0) {
-#ifndef NDEBUG
const oid *oids = (const oid *)
b->tvheap->base;
-#endif
q = b->tvheap->free / SIZEOF_OID;
assert(oids != NULL);
assert(b->tseqbase + BATcount(b) + q <=
GDK_oid_max);
@@ -2243,9 +2240,7 @@ BATassertProps(BAT *b)
assert(b->tkey);
assert(b->tnonil);
if ((q = b->batCount) != 0) {
-#ifndef NDEBUG
const oid *o = (const oid *) Tloc(b, 0);
-#endif
assert(*o == b->tseqbase);
for (p = 1; p < q; p++)
assert(o[p - 1] + 1 == o[p]);
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -401,6 +401,7 @@ fixfltheap(BAT *b)
nme = BBP_physical(b->batCacheid);
srcdir = GDKfilepath(NOFARM, BATDIR, nme, NULL);
if (srcdir == NULL) {
+ TRC_CRITICAL(GDK, "GDKfilepath failed\n");
return GDK_FAIL;
}
/* coverity[null_returns] */
@@ -415,7 +416,7 @@ fixfltheap(BAT *b)
/* make backup of heap */
if (GDKmove(b->theap.farmid, srcdir, bnme, "tail", BAKDIR, bnme,
"tail") != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixfltheap: cannot make backup of %s.tail\n", nme);
+ TRC_CRITICAL(GDK, "cannot make backup of %s.tail\n", nme);
return GDK_FAIL;
}
/* load old heap */
@@ -426,8 +427,8 @@ fixfltheap(BAT *b)
h1.dirty = false;
if (HEAPload(&h1, filename, "tail", false) != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixfltheap: loading old tail heap "
- "for BAT %d failed\n", b->batCacheid);
+ TRC_CRITICAL(GDK, "loading old tail heap "
+ "for BAT %d failed\n", b->batCacheid);
return GDK_FAIL;
}
@@ -437,8 +438,8 @@ fixfltheap(BAT *b)
if (HEAPalloc(&h2, b->batCapacity, b->twidth) != GDK_SUCCEED) {
GDKfree(srcdir);
HEAPfree(&h1, false);
- GDKerror("fixfltheap: allocating new tail heap "
- "for BAT %d failed\n", b->batCacheid);
+ TRC_CRITICAL(GDK, "allocating new tail heap "
+ "for BAT %d failed\n", b->batCacheid);
return GDK_FAIL;
}
h2.dirty = true;
@@ -508,7 +509,7 @@ fixfltheap(BAT *b)
HEAPfree(&h2, true);
if (GDKmove(b->theap.farmid, BAKDIR, bnme, "tail", srcdir,
bnme, "tail") != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixfltheap: cannot restore backup of
%s.tail\n", nme);
+ TRC_CRITICAL(GDK, "cannot restore backup of %s.tail\n",
nme);
return GDK_FAIL;
}
} else {
@@ -517,7 +518,7 @@ fixfltheap(BAT *b)
if (HEAPsave(&h2, nme, "tail", true) != GDK_SUCCEED) {
HEAPfree(&h2, false);
GDKfree(srcdir);
- GDKerror("fixfltheap: saving heap failed\n");
+ TRC_CRITICAL(GDK, "saving heap failed\n");
return GDK_FAIL;
}
HEAPfree(&h2, false);
@@ -555,14 +556,14 @@ fixfloatbats(void)
BBPfarms[0].dirname,
(int) (len - 12), BBP_logical(bid));
if (written == -1 || written >= FILENAME_MAX) {
- GDKerror("fixfloatbats: cannot create file %s
has a very large pathname\n",
+ TRC_CRITICAL(GDK, "cannot create file %s has a
very large pathname\n",
filename);
return GDK_FAIL;
}
fp = fopen(filename, "w");
if (fp == NULL) {
- GDKsyserror("fixfloatbats: cannot create file
%s\n",
- filename);
+ TRC_CRITICAL(GDK, "cannot create file %s: %s\n",
+ filename, GDKstrerror(errno,
(char[128]){0}, 128));
return GDK_FAIL;
}
fclose(fp);
@@ -690,6 +691,7 @@ fixdateheap(BAT *b, const char *anme)
nme = BBP_physical(b->batCacheid);
srcdir = GDKfilepath(NOFARM, BATDIR, nme, NULL);
if (srcdir == NULL) {
+ TRC_CRITICAL(GDK, "GDKfilepath failed\n");
return GDK_FAIL;
}
/* coverity[null_returns] */
@@ -704,7 +706,7 @@ fixdateheap(BAT *b, const char *anme)
/* make backup of heap */
if (GDKmove(b->theap.farmid, srcdir, bnme, "tail", BAKDIR, bnme,
"tail") != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixdateheap: cannot make backup of %s.tail\n", nme);
+ TRC_CRITICAL(GDK, "cannot make backup of %s.tail\n", nme);
return GDK_FAIL;
}
/* load old heap */
@@ -715,8 +717,8 @@ fixdateheap(BAT *b, const char *anme)
h1.dirty = false;
if (HEAPload(&h1, filename, "tail", false) != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixdateheap: loading old tail heap "
- "for BAT %d failed\n", b->batCacheid);
+ TRC_CRITICAL(GDK, "loading old tail heap "
+ "for BAT %d failed\n", b->batCacheid);
return GDK_FAIL;
}
@@ -726,8 +728,8 @@ fixdateheap(BAT *b, const char *anme)
if (HEAPalloc(&h2, b->batCapacity, strcmp(anme, "date") == 0 ? 4 : 8)
!= GDK_SUCCEED) {
GDKfree(srcdir);
HEAPfree(&h1, false);
- GDKerror("fixdateheap: allocating new tail heap "
- "for BAT %d failed\n", b->batCacheid);
+ TRC_CRITICAL(GDK, "allocating new tail heap "
+ "for BAT %d failed\n", b->batCacheid);
return GDK_FAIL;
}
h2.dirty = true;
@@ -795,7 +797,7 @@ fixdateheap(BAT *b, const char *anme)
HEAPfree(&h2, true);
if (GDKmove(b->theap.farmid, BAKDIR, bnme, "tail", srcdir,
bnme, "tail") != GDK_SUCCEED) {
GDKfree(srcdir);
- GDKerror("fixdateheap: cannot restore backup of
%s.tail\n", nme);
+ TRC_CRITICAL(GDK, "cannot restore backup of %s.tail\n",
nme);
return GDK_FAIL;
}
} else {
@@ -804,7 +806,7 @@ fixdateheap(BAT *b, const char *anme)
if (HEAPsave(&h2, nme, "tail", true) != GDK_SUCCEED) {
HEAPfree(&h2, false);
GDKfree(srcdir);
- GDKerror("fixdateheap: saving heap failed\n");
+ TRC_CRITICAL(GDK, "saving heap failed\n");
return GDK_FAIL;
}
if (strcmp(anme, "daytime") == 0) {
@@ -846,14 +848,14 @@ fixdatebats(void)
BBPfarms[0].dirname,
(int) (len - 12), BBP_logical(bid));
if (written == -1 || written >= FILENAME_MAX) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
