Changeset: b3852f86c838 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3852f86c838 Modified Files: NT/rules.msc gdk/gdk_select.c monetdb5/extras/jaql/parser/Makefile.ag sql/backends/monet5/sql.mx sql/backends/monet5/sql_result.c sql/storage/bat/bat_storage.c Branch: default Log Message:
Merge with Feb2013 branch. diffs (182 lines): diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -58,6 +58,10 @@ DEBUGLIB= # warnings about casts which results in the code being uncompilable W_CFLAGS = !ENDIF +!IFDEF ENABLE_STRICT +# strict mode: treat warnings as errors +W_CFLAGS = -WX +!ENDIF # This is the location of pthreads for Win32, # see http://sources.redhat.com/pthreads-win32/ @@ -198,10 +202,10 @@ CONFIGURE_PY = "$(TOPDIR)\..\NT\winconfi WINCONFIG_INCS = "-I$(TOPDIR)\..\buildtools\conf" !IFDEF DEBUG -COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG -RTC1 -Zi +COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MDd -nologo -Od -D_DEBUG -RTC1 -Zi !ELSE # add -Zi flag (implies -debug, not -D_DEBUG) to get symbol info in .pdb files -COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox -Zi +COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MD -nologo -Ox -Zi !ENDIF CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES) $(WINCONFIG_INCS) $(ICONV_CFLAGS) diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c --- a/gdk/gdk_select.c +++ b/gdk/gdk_select.c @@ -144,7 +144,7 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, assert(s->tsorted); s = BATmirror(s); /* SORTfnd works on HEAD column */ HASHloop(bi, b->H->hash, i, tl) { - o = (oid) i + off; + o = (oid) (i + off); if (SORTfnd(s, &o) != BUN_NONE) { buninsfix(bn, T, dst, cnt, oid, o, maximum - BATcapacity(bn), @@ -154,7 +154,7 @@ BAT_hashselect(BAT *b, BAT *s, BAT *bn, } } else { HASHloop(bi, b->H->hash, i, tl) { - o = (oid) i + off; + o = (oid) (i + off); buninsfix(bn, T, dst, cnt, oid, o, maximum - BATcapacity(bn), maximum, NULL); @@ -455,7 +455,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c BATgetId(s), anti); while (p < q) { o = *candlist++; - v = BUNtail(bi,o-off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -470,7 +470,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c BATgetId(s), anti); while (p < q) { o = *candlist++; - v = BUNtail(bi,o-off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -491,7 +491,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c BATgetId(s), anti); while (p < q) { o = *candlist++; - v = BUNtail(bi,o-off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -533,8 +533,8 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co "scanselect equi\n", BATgetId(b), BATcount(b), s ? BATgetId(s) : "NULL", anti); while (p < q) { - o = p + off; - v = BUNtail(bi,o-off); + o = (oid)(p + off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -548,8 +548,8 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co "scanselect anti\n", BATgetId(b), BATcount(b), s ? BATgetId(s) : "NULL", anti); while (p < q) { - o = p + off; - v = BUNtail(bi,o-off); + o = (oid)(p + off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -569,8 +569,8 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co "scanselect range\n", BATgetId(b), BATcount(b), s ? BATgetId(s) : "NULL", anti); while (p < q) { - o = p + off; - v = BUNtail(bi,o-off); + o = (oid)(p + off); + v = BUNtail(bi,(BUN)(o-off)); buninsfix(bn, T, dst, cnt, oid, o, (BUN) ((dbl) cnt / (dbl) (p-r) * (dbl) (q-p) * 1.1 + 1024), @@ -693,8 +693,8 @@ BAT_scanselect(BAT *b, BAT *s, BAT *bn, p = (BUN) b->hseqbase; if ((oid) q > b->hseqbase + BATcount(b)) q = (BUN) b->hseqbase + BATcount(b); - p -= off; - q -= off; + p = (BUN)(p - off); + q = (BUN)(q - off); } else { p = BUNfirst(b); q = BUNlast(b); diff --git a/monetdb5/extras/jaql/parser/Makefile.ag b/monetdb5/extras/jaql/parser/Makefile.ag --- a/monetdb5/extras/jaql/parser/Makefile.ag +++ b/monetdb5/extras/jaql/parser/Makefile.ag @@ -27,6 +27,7 @@ AM_LFLAGS = -ojaql.yy.c --header-file=ja # flex' and bison's output aren't up to the strictness of our flags X_CFLAGS = #$(X_CFLAGS:-Werror=) <- recursive +W_CFLAGS = lib_jaqlp = { NOINST diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx --- a/sql/backends/monet5/sql.mx +++ b/sql/backends/monet5/sql.mx @@ -3743,7 +3743,8 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt sql_table *t; sql_column *c; BAT *tids; - size_t nr, sb = 0, inr = 0; + size_t nr, inr = 0; + oid sb = 0; *res = 0; if (msg) @@ -3769,7 +3770,7 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt int nr_parts = *(int *)getArgReference(stk, pci, 5); nr /= nr_parts; - sb = part_nr*nr; + sb = (oid) (part_nr*nr); if (nr_parts == (part_nr+1)){ /* last part gets the inserts */ nr = cnt - (part_nr*nr); /* keep rest */ nr += inr; @@ -3782,7 +3783,7 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt tids = BATnew(TYPE_void, TYPE_void, 0); tids->H->seq = sb; tids->T->seq = sb; - BATsetcount(tids, nr); + BATsetcount(tids, (BUN) nr); tids->H->revsorted = 0; tids->T->revsorted = 0; diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c --- a/sql/backends/monet5/sql_result.c +++ b/sql/backends/monet5/sql_result.c @@ -566,7 +566,7 @@ mvc_import_table(Client cntxt, mvc *m, b node *n; Tablet as; Column *fmt; - size_t cnt = 0; + BUN cnt = 0; BAT **bats = NULL; if (!t) { @@ -694,7 +694,7 @@ mvc_import_table(Client cntxt, mvc *m, b sql_delta *d = c->data; c->base.wtime = t->base.wtime = t->s->base.wtime = m->session->tr->wtime = m->session->tr->wstime; - d->ibase = d->cnt = BATcount(b); + d->ibase = (oid) (d->cnt = BATcount(b)); BBPunfix(b->batCacheid); } } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
