Changeset: 4fb5524fae69 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4fb5524fae69
Modified Files:
gdk/gdk_bat.c
monetdb5/modules/mal/tablet.c
sql/backends/monet5/vaults/lidar/lidar.c
Branch: gdk_tracer
Log Message:
compile fixes (--disable-assert case)
diffs (101 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2084,8 +2084,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_ERROR(BAT_, "Assertion `%s'
failed\n", #test)))
#endif
/* Assert that properties are set correctly.
@@ -2127,7 +2127,6 @@ 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 *);
@@ -2143,7 +2142,9 @@ BATassertProps(BAT *b)
assert(b->hseqbase <= GDK_oid_max); /* non-nil seqbase */
assert(b->hseqbase + BATcount(b) <= GDK_oid_max);
- bbpstatus = BBP_status(b->batCacheid);
+#ifndef NDEBUG
+ unsigned bbpstatus = BBP_status(b->batCacheid);
+#endif
/* only at most one of BBPDELETED, BBPEXISTING, BBPNEW may be set */
assert(((bbpstatus & BBPDELETED) != 0) +
((bbpstatus & BBPEXISTING) != 0) +
@@ -2204,7 +2205,9 @@ 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);
@@ -2231,7 +2234,9 @@ 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/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -973,7 +973,6 @@ SQLload_parse_line(READERtask *task, int
bool error = false;
str errline = 0;
- char *s;
TRC_DEBUG(MAL_TABLET, "SQL break line id %d state %d\n%s", task->id,
idx, line);
assert(idx < task->top[task->cur]);
@@ -986,11 +985,12 @@ SQLload_parse_line(READERtask *task, int
task->fields[i][idx] = line;
/* recognize fields starting with a quote, keep them */
if (*line && *line == task->quote) {
+ char *l = NULL;
quote = true;
- TRC_DEBUG(MAL_TABLET, "Before #1: %s\n", s =
line);
+ TRC_DEBUG(MAL_TABLET, "Before #1: %s\n", l =
line);
task->fields[i][idx] = line + 1;
line = tablet_skip_string(line + 1,
task->quote);
- TRC_DEBUG(MAL_TABLET, "After #1: %s\n", s);
+ TRC_DEBUG(MAL_TABLET, "After #1: %s\n", l);
if (!line) {
errline = SQLload_error(task, idx, i+1);
@@ -1250,7 +1250,7 @@ SQLproducer(void *p)
bool blocked[MAXBUFFERS] = { false };
bool ateof[MAXBUFFERS] = { false };
BUN cnt = 0, bufcnt[MAXBUFFERS] = { 0 };
- char *end, *e, *s, *base;
+ char *end, *e, *s = NULL, *base;
const char *rsep = task->rsep;
size_t rseplen = strlen(rsep), partial = 0;
char quote = task->quote;
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -854,9 +854,7 @@ str LIDARloadTable(Client cntxt, MalBlkP
str msg = MAL_SUCCEED;
oid rid = oid_nil, frid = oid_nil, tid = oid_nil;
int fid, i;
-#ifndef NDEBUG
int time0;
-#endif
int *tpcode = NULL;
long *rep = NULL, *wid = NULL, rows;
LASReaderH reader = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
