Changeset: 107231ebe646 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=107231ebe646
Modified Files:
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_delta.c
gdk/gdk_imprints.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_select_legacy.c
gdk/gdk_storage.c
gdk/gdk_unique.c
Branch: default
Log Message:
Don't mix enums and ints.
diffs (truncated from 1087 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -658,14 +658,14 @@ typedef uint64_t BUN8type;
typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return;
#define ERRORcheck(tst, msg, err) do if (tst) { if (msg) GDKerror(msg);
return (err); } while (0)
-#define BATcheck(tst, msg) \
+#define BATcheck(tst, msg, err) \
do { \
if ((tst) == NULL) { \
if (strchr((msg), ':')) \
GDKerror("%s.\n", (msg)); \
else \
GDKerror("%s: BAT required.\n", (msg)); \
- return 0; \
+ return err; \
} \
} while (0)
@@ -675,17 +675,6 @@ typedef enum { GDK_FAIL, GDK_SUCCEED } g
#define TYPEequal(t1,t2) (ATOMtype(t1)==ATOMtype(t2))
#define TYPEcomp(t1,t2)
(ATOMstorage(ATOMtype(t1))==ATOMstorage(ATOMtype(t2)))
#define TYPEerror(t1,t2) (!TYPEcomp(t1,t2))
-#define TYPEcheck(t1,t2) \
- do { \
- if (TYPEerror(t1, t2)) { \
- GDKerror("TYPEcheck: Incompatible types %s and %s.\n", \
- ATOMname(t2), ATOMname(t1)); \
- return 0; \
- } else if (!TYPEcomp(t1, t2)) { \
- CHECKDEBUG fprintf(stderr,"#Interpreting %s as %s.\n", \
- ATOMname(t2), ATOMname(t1)); \
- } \
- } while (0)
#define BATcompatible(P1,P2,E) \
do { \
ERRORcheck((P1) == NULL, "BATcompatible: BAT required\n", E); \
@@ -694,7 +683,7 @@ typedef enum { GDK_FAIL, GDK_SUCCEED } g
TYPEerror(BATttype(P1),BATttype(P2))) \
{ \
GDKerror("Incompatible operands.\n"); \
- return 0; \
+ return (E); \
} \
if (BAThtype(P1) != BAThtype(P2) && \
ATOMtype((P1)->htype) != ATOMtype((P2)->htype)) { \
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -89,7 +89,7 @@
int
ALIGNcommit(BAT *b)
{
- BATcheck(b, "ALIGNcommit");
+ BATcheck(b, "ALIGNcommit", 0);
if (!b->halign) {
b->halign = OIDnew(1);
}
@@ -102,7 +102,7 @@ ALIGNcommit(BAT *b)
int
ALIGNundo(BAT *b)
{
- BATcheck(b, "ALIGNundo");
+ BATcheck(b, "ALIGNundo", 0);
return 0;
}
@@ -111,8 +111,8 @@ ALIGNsetH(BAT *b1, BAT *b2)
{
ssize_t diff;
- BATcheck(b1, "ALIGNsetH: bat 1 required");
- BATcheck(b2, "ALIGNsetH: bat 2 required");
+ BATcheck(b1, "ALIGNsetH: bat 1 required", 0);
+ BATcheck(b2, "ALIGNsetH: bat 2 required", 0);
diff = (ssize_t) (BUNfirst(b1) - BUNfirst(b2));
if (b2->halign == 0) {
@@ -154,8 +154,8 @@ ALIGNsetH(BAT *b1, BAT *b2)
int
ALIGNsynced(BAT *b1, BAT *b2)
{
- BATcheck(b1, "ALIGNsynced: bat 1 required");
- BATcheck(b2, "ALIGNsynced: bat 2 required");
+ BATcheck(b1, "ALIGNsynced: bat 1 required", 0);
+ BATcheck(b2, "ALIGNsynced: bat 2 required", 0);
/* first try to prove head columns are not in sync */
if (BATcount(b1) != BATcount(b2))
@@ -203,7 +203,7 @@ VIEWhcreate(BAT *h)
BAT *bn;
bat hp;
- BATcheck(h, "VIEWhcreate");
+ BATcheck(h, "VIEWhcreate", NULL);
bs = BATcreatedesc(h->htype, TYPE_void, FALSE, TRANSIENT);
if (bs == NULL)
return NULL;
@@ -255,8 +255,8 @@ VIEWcreate_(BAT *h, BAT *t, int slice_vi
BAT *bn;
bat hp = 0, tp = 0, vc = 0;
- BATcheck(h, "VIEWcreate_");
- BATcheck(t, "VIEWcreate_");
+ BATcheck(h, "VIEWcreate_", NULL);
+ BATcheck(t, "VIEWcreate_", NULL);
if (BATcount(h) != BATcount(t))
slice_view = 1;
@@ -440,7 +440,7 @@ BATmaterializeh(BAT *b)
oid h, *x;
bte tshift;
- BATcheck(b, "BATmaterialize");
+ BATcheck(b, "BATmaterialize", GDK_FAIL);
assert(!isVIEW(b));
ht = b->htype;
cnt = BATcapacity(b);
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -400,7 +400,7 @@ BATguess(BAT *b)
{
BUN newcap;
- BATcheck(b, "BATguess");
+ BATcheck(b, "BATguess", 0);
newcap = b->batCount;
if (newcap < 10 * BATTINY)
return newcap;
@@ -416,7 +416,7 @@ BATgrows(BAT *b)
{
BUN oldcap, newcap;
- BATcheck(b, "BATgrows");
+ BATcheck(b, "BATgrows", 0);
newcap = oldcap = BATcapacity(b);
if (newcap < BATTINY)
@@ -452,7 +452,7 @@ BATextend(BAT *b, BUN newcap)
size_t hheap_size = newcap, theap_size = newcap;
assert(newcap <= BUN_MAX);
- BATcheck(b, "BATextend");
+ BATcheck(b, "BATextend", GDK_FAIL);
/*
* The main issue is to properly predict the new BAT size.
* storage overflow. The assumption taken is that capacity
@@ -504,7 +504,7 @@ BATclear(BAT *b, int force)
int voidbat;
BAT *bm;
- BATcheck(b, "BATclear");
+ BATcheck(b, "BATclear", GDK_FAIL);
voidbat = 0;
bm = BATmirror(b);
@@ -612,7 +612,7 @@ BATclear(BAT *b, int force)
int
BATfree(BAT *b)
{
- BATcheck(b, "BATfree");
+ BATcheck(b, "BATfree", 0);
/* deallocate all memory for a bat */
if (b->batCacheid < 0)
@@ -770,7 +770,7 @@ BATcopy(BAT *b, int ht, int tt, int writ
BUN cnt;
BAT *bn = NULL;
- BATcheck(b, "BATcopy");
+ BATcheck(b, "BATcopy", NULL);
assert(ht != TYPE_bat);
assert(tt != TYPE_bat);
cnt = b->batCount;
@@ -1190,8 +1190,8 @@ BUNins(BAT *b, const void *h, const void
BUN p;
BAT *bm;
- BATcheck(b, "BUNins");
- BATcheck(h, "BUNins: head value is nil");
+ BATcheck(b, "BUNins", GDK_FAIL);
+ BATcheck(h, "BUNins: head value is nil", GDK_FAIL);
countonly = (b->htype == TYPE_void && b->ttype == TYPE_void);
bm = BBP_cache(-b->batCacheid);
@@ -1291,7 +1291,7 @@ BUNappend(BAT *b, const void *t, bit for
int countonly;
size_t hsize = 0, tsize = 0;
- BATcheck(b, "BUNappend");
+ BATcheck(b, "BUNappend", GDK_FAIL);
if (b->htype != TYPE_void && b->htype != TYPE_oid) {
GDKerror("BUNappend: can only append to void and oid bats\n");
@@ -1558,8 +1558,8 @@ BUNdel(BAT *b, const void *x, const void
{
BUN p;
- BATcheck(b, "BUNdel");
- BATcheck(x, "BUNdel: head value is nil");
+ BATcheck(b, "BUNdel", GDK_FAIL);
+ BATcheck(x, "BUNdel: head value is nil", GDK_FAIL);
if ((p = BUNlocate(b, x, y)) != BUN_NONE) {
ALIGNdel(b, "BUNdel", force, GDK_FAIL); /* zap alignment info */
@@ -1579,7 +1579,7 @@ BUNdelHead(BAT *b, const void *x, bit fo
BUN p;
BAT *bm;
- BATcheck(b, "BUNdelHead");
+ BATcheck(b, "BUNdelHead", GDK_FAIL);
bm = BATmirror(b);
if (x == NULL) {
@@ -1695,9 +1695,9 @@ BUNreplace(BAT *b, const void *h, const
{
BUN p;
- BATcheck(b, "BUNreplace");
- BATcheck(h, "BUNreplace: head value is nil");
- BATcheck(t, "BUNreplace: tail value is nil");
+ BATcheck(b, "BUNreplace", GDK_FAIL);
+ BATcheck(h, "BUNreplace: head value is nil", GDK_FAIL);
+ BATcheck(t, "BUNreplace: tail value is nil", GDK_FAIL);
if ((p = BUNfnd(BATmirror(b), h)) == BUN_NONE)
return GDK_SUCCEED;
@@ -1792,7 +1792,7 @@ BUNfnd(BAT *b, const void *v)
BUN r = BUN_NONE;
BATiter bi;
- BATcheck(b, "BUNfnd");
+ BATcheck(b, "BUNfnd", 0);
if (!v)
return r;
if (BATtvoid(b))
@@ -1867,8 +1867,8 @@ BUNlocate(BAT *b, const void *x, const v
BUN p, q;
BAT *v = NULL;
- BATcheck(b, "BUNlocate: BAT parameter required");
- BATcheck(x, "BUNlocate: value parameter required");
+ BATcheck(b, "BUNlocate: BAT parameter required", 0);
+ BATcheck(x, "BUNlocate: value parameter required", 0);
hcmp = ATOMcompare(b->htype);
tcmp = ATOMcompare(b->ttype);
p = BUNfirst(b);
@@ -2145,7 +2145,7 @@ BATsetcount(BAT *b, BUN cnt)
size_t
BATvmsize(BAT *b, int dirty)
{
- BATcheck(b, "BATvmsize");
+ BATcheck(b, "BATvmsize", 0);
if (b->batDirty || (b->batPersistence != TRANSIENT &&
!b->batCopiedtodisk))
dirty = 0;
return (!dirty || b->H->heap.dirty ? HEAPvmsize(&b->H->heap) : 0) +
@@ -2159,7 +2159,7 @@ BATvmsize(BAT *b, int dirty)
size_t
BATmemsize(BAT *b, int dirty)
{
- BATcheck(b, "BATmemsize");
+ BATcheck(b, "BATmemsize", 0);
if (b->batDirty ||
(b->batPersistence != TRANSIENT && !b->batCopiedtodisk))
dirty = 0;
@@ -2185,7 +2185,7 @@ BATkey(BAT *b, int flag)
{
bat parent;
- BATcheck(b, "BATkey");
+ BATcheck(b, "BATkey", GDK_FAIL);
parent = VIEWparentcol(b);
if (b->htype == TYPE_void) {
if (b->hseqbase == oid_nil && flag == BOUND2BTRUE) {
@@ -2264,7 +2264,7 @@ BATseqbase(BAT *b, oid o)
int
BATname(BAT *b, const char *nme)
{
- BATcheck(b, "BATname");
+ BATcheck(b, "BATname", 0);
return BBPrename(b->batCacheid, nme);
}
@@ -2273,7 +2273,7 @@ BATrename(BAT *b, const char *nme)
{
int ret;
- BATcheck(b, "BATrename");
+ BATcheck(b, "BATrename", NULL);
ret = BATname(b, nme);
if (ret == 1) {
GDKerror("BATrename: identifier expected: %s\n", nme);
@@ -2586,7 +2586,7 @@ BATcheckmodes(BAT *b, int existing)
storage_t m0 = STORE_MEM, m1 = STORE_MEM, m2 = STORE_MEM, m3 =
STORE_MEM;
int dirty = 0;
- BATcheck(b, "BATcheckmodes");
+ BATcheck(b, "BATcheckmodes", 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
