Changeset: 696a19ff66a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=696a19ff66a7
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_align.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_setop.mx
MonetDB4/src/modules/contrib/oo7.mx
MonetDB5/src/optimizer/opt_reorder.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 323 to 300 lines):
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mx Wed Jul 28 13:21:44 2010 +0200
@@ -642,10 +642,13 @@
#define FATALcheck(tst, msg) if (tst) GDKfatal(msg);
#define ERRORcheck(tst, msg) if (tst) { GDKerror(msg); return 0; }
#define WARNcheck(tst, msg) if (tst) GDKwarning(msg)
-#define BATcheck(tst, msg) \
- if (tst == NULL) { \
- GDKerror("%s: BAT required.\n",msg); \
- return 0; \
+#define BATcheck(tst, msg) \
+ if (tst == NULL) { \
+ if (strchr(msg, ':')) \
+ GDKerror("%s.\n",msg); \
+ else \
+ GDKerror("%s: BAT required.\n",msg); \
+ return 0; \
}
/* needed for mel */
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_align.mx
--- a/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 13:21:44 2010 +0200
@@ -85,7 +85,7 @@
int
ALIGNcommit(BAT *b)
{
- BATcheck(b, "ALIGNcommit: bat required");
+ BATcheck(b, "ALIGNcommit");
if (!b->halign) {
b->halign = OIDnew(1);
}
@@ -98,7 +98,7 @@
int
ALIGNundo(BAT *b)
{
- BATcheck(b, "ALIGNundo: bat required");
+ BATcheck(b, "ALIGNundo");
return 0;
}
@@ -214,7 +214,7 @@
BAT *bn;
bat hp;
- BATcheck(h, "VIEWhcreate: bat required");
+ BATcheck(h, "VIEWhcreate");
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (bs == NULL)
bs = BATcreatedesc(h->htype, TYPE_void, FALSE);
@@ -264,8 +264,8 @@
BAT *bn;
bat hp = 0, tp = 0, vc = 0;
- BATcheck(h, "VIEWcreate_: bat required");
- BATcheck(t, "VIEWcreate_: bat required");
+ BATcheck(h, "VIEWcreate_");
+ BATcheck(t, "VIEWcreate_");
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (!bs)
bs = BATcreatedesc(h->htype, t->ttype, FALSE);
@@ -449,7 +449,7 @@
oid h, *x;
chr tshift;
- BATcheck(b, "BATmaterialize: bat required");
+ BATcheck(b, "BATmaterialize");
assert(!isVIEW(b));
ht = b->htype;
cnt = BATcapacity(b);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mx Wed Jul 28 13:21:44 2010 +0200
@@ -1149,7 +1149,7 @@
BAT *bm;
BATcheck(b, "BUNins");
- BATcheck(h, "BUNins: head value is nil\n");
+ BATcheck(h, "BUNins: head value is nil");
countonly = (b->htype == TYPE_void && b->ttype == TYPE_void);
bm = BBP_cache(-b->batCacheid);
@@ -1717,7 +1717,7 @@
BUN p;
BATcheck(b, "BUNdel");
- BATcheck(x, "BUNdel: head value is nil\n");
+ BATcheck(x, "BUNdel: head value is nil");
if ((p = BUNlocate(b, x, y)) != BUN_NONE) {
ALIGNdel(b, "BUNdel", force); /* zap alignment info */
@@ -1841,9 +1841,9 @@
{
BUN p;
- BATcheck(b, "BUNreplace\n");
- BATcheck(h, "BUNreplace: head value is nil\n");
- BATcheck(t, "BUNreplace: tail value is nil\n");
+ BATcheck(b, "BUNreplace");
+ BATcheck(h, "BUNreplace: head value is nil");
+ BATcheck(t, "BUNreplace: tail value is nil");
if ((p = BUNfnd(b, h)) == BUN_NONE)
return b;
@@ -1994,8 +1994,8 @@
BUN p, q;
BAT *v = NULL;
- BATcheck(b, "BUNlocate: BAT parameter");
- BATcheck(x, "BUNlocate: value parameter");
+ BATcheck(b, "BUNlocate: BAT parameter required");
+ BATcheck(x, "BUNlocate: value parameter required");
hcmp = BATatoms[b->htype].atomCmp;
tcmp = BATatoms[b->ttype].atomCmp;
p = BUNfirst(b);
@@ -3082,7 +3082,7 @@
bit isKey = FALSE;
BAT *parent;
- BATcheck(b, "BATpropcheck: BAT parameter");
+ BATcheck(b, "BATpropcheck");
if (b->halign == 0) {
b->batDirtydesc = 1;
b->halign = OIDnew(1);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_batop.mx Wed Jul 28 13:21:44 2010 +0200
@@ -1039,8 +1039,8 @@
BAT *bn;
BUN p, q;
- BATcheck(b, "BATselect: \n");
- BATcheck(tl, "BATselect: tl value required\n");
+ BATcheck(b, "BATselect");
+ BATcheck(tl, "BATselect: tl value required");
@-
Examine type, and values for lower- and higher-bound.
@c
@@ -1347,7 +1347,7 @@
BATiter bi = bat_iterator(b);
BUN bun;
- BATcheck(b, "BATsample: source BAT");
+ BATcheck(b, "BATsample: source BAT required");
assert(BATcount(b) <= BUN_MAX);
@@ -1360,7 +1360,7 @@
n = (BUN) MIN(size, BATcount(b));
bn = BATnew(BAThtype(b), BATttype(b), n);
- BATcheck(bn, "BATsample: dest BAT");
+ BATcheck(bn, "BATsample: dest BAT required");
if (n == 0)
return bn;
@@ -1458,7 +1458,7 @@
BAT *
BATfragment(BAT *b, ptr hl, ptr hh, ptr tl, ptr th)
{
- BATcheck(b, "BATfragment:BAT required\n");
+ BATcheck(b, "BATfragment");
if ((hl == NULL) && (hh == NULL)) {
return BATselect(b, tl, th);
}
@@ -1537,10 +1537,10 @@
BUN s;
int t;
- BATcheck(hl, "BATrestrict:hl is null");
- BATcheck(hh, "BATrestrict:hh is null");
- BATcheck(tl, "BATrestrict:tl is null");
- BATcheck(th, "BATrestrict:th is null");
+ BATcheck(hl, "BATrestrict: hl is null");
+ BATcheck(hh, "BATrestrict: hh is null");
+ BATcheck(tl, "BATrestrict: tl is null");
+ BATcheck(th, "BATrestrict: th is null");
bn = BATnew(BAThtype(b), BATttype(b), BATguess(b));
ESTIDEBUG THRprintf(GDKout, "#BATrestrict: estimated resultsize: "
BUNFMT "\n", BATguess(b));
@@ -1922,7 +1922,7 @@
BAT *bn;
int tt = 0;
- BATcheck(b, "bats...@3: BAT");
+ BATcheck(b, "bats...@3");
tt = b->ttype;
if (b->htype == TYPE_void && b->hseqbase == oid_nil) {
/* b's head is void-nil, hence we return a read-only copy/view
of b */
@@ -1975,7 +1975,7 @@
BAT *
b...@6order@3(BAT *b)
{
- BATcheck(b, "bator...@3: BAT");
+ BATcheck(b, "bator...@3");
if (b->htype == TYPE_void && b->hseqbase == oid_nil) {
/* b's head is void-nil, hence we return b as is */
return BATcopy(b, b->htype, b->ttype, FALSE);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_relop.mx
--- a/MonetDB/src/gdk/gdk_relop.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_relop.mx Wed Jul 28 13:21:44 2010 +0200
@@ -883,8 +883,8 @@
BATiter li = bat_iterator(l);
BATiter ri = bat_iterator(r);
- BATcheck(l, "BATfetchjoin: l");
- BATcheck(r, "BATfetchjoin: r");
+ BATcheck(l, "BATfetchjoin: left BAT required");
+ BATcheck(r, "BATfetchjoin: right BAT required");
lcount = BATcount(l);
rcount = BATcount(r);
@@ -2259,8 +2259,8 @@
BUN l_cur, l_end, r_cur;
BAT *bn;
- BATcheck(l, "BATfetchsemijoin: l");
- BATcheck(r, "BATfetchsemijoin: r");
+ BATcheck(l, "BATfetchsemijoin: left BAT required");
+ BATcheck(r, "BATfetchsemijoin: right BAT required");
if (denselookup) {
if (!BAThdense(r)) {
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_setop.mx
--- a/MonetDB/src/gdk/gdk_setop.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_setop.mx Wed Jul 28 13:21:44 2010 +0200
@@ -228,8 +228,8 @@
BATiter bi = bat_iterator(b);
BATiter bni = bat_iterator(bn);
- BATcheck(b, "BATins_kunique: src BAT");
- BATcheck(bn, "BATins_kunique: dst BAT");
+ BATcheck(b, "BATins_kunique: src BAT required");
+ BATcheck(bn, "BATins_kunique: dst BAT required");
unique = (BATcount(bn) == 0);
@:elim_doubles(k)@
if (unique && bn->hkey == FALSE) {
@@ -253,8 +253,8 @@
BATiter bi = bat_iterator(b);
BATiter bni = bat_iterator(bn);
- BATcheck(b, "BATins_sunique: src BAT");
- BATcheck(bn, "BATins_sunique: dst BAT");
+ BATcheck(b, "BATins_sunique: src BAT required");
+ BATcheck(bn, "BATins_sunique: dst BAT required");
unique = (BATcount(bn) == 0);
@@ -313,7 +313,7 @@
{
BAT *bn;
- BATcheck(b, "BATkunique:");
+ BATcheck(b, "BATkunique");
if (b->hkey) {
bn = BATcopy(b, b->htype, b->ttype, FALSE);
@@ -366,7 +366,7 @@
{
BAT *v, *bn;
- BATcheck(b, "BATukunique:");
+ BATcheck(b, "BATukunique");
bn = BATkunique(v = VIEWhead(b));
BBPreclaim(v);
return bn;
@@ -377,7 +377,7 @@
{
BAT *bn;
- BATcheck(b, "BATsunique:");
+ BATcheck(b, "BATsunique");
if (b->hkey || b->tkey || b->batSet) {
bn = BATcopy(b, b->htype, b->ttype, FALSE);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB4/src/modules/contrib/oo7.mx
--- a/MonetDB4/src/modules/contrib/oo7.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB4/src/modules/contrib/oo7.mx Wed Jul 28 13:21:44 2010 +0200
@@ -994,7 +994,7 @@
ERRORcheck(TYPEerror(b->ttype, b->htype), "BATtraverse:type
conflict\n");
delta = BATsunique(b);
- BATcheck(delta, "BATtraverse: failed to create delta\n");
+ BATcheck(delta, "BATtraverse: failed to create delta");
if (b->ttype <= TYPE_sht || b->ttype >= TYPE_flt) {
GDKerror("BATtraverse: type not yet supported\n");
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB5/src/optimizer/opt_reorder.mx
--- a/MonetDB5/src/optimizer/opt_reorder.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_reorder.mx Wed Jul 28 13:21:44 2010 +0200
@@ -103,11 +103,10 @@
}
for ( i=0; i< mb->stop; i++){
- int cnt;
+ size_t cnt;
size_t slots;
p= getInstrPtr(mb,i);
- cnt = p->argc;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
