Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14072/src/modules/kernel
Modified Files:
aggr.mx algebra.mx array.mx batcalc.mx group.mx status.mx
Log Message:
Squashed compiler warnings.
Index: aggr.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/aggr.mx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- aggr.mx 4 Oct 2007 10:37:15 -0000 1.19
+++ aggr.mx 13 Dec 2007 15:26:50 -0000 1.20
@@ -269,7 +269,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst += *t;
+ *dst += (@9) *t;
}
}
}
@@ -332,7 +332,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst *= *t;
+ *dst *= (@9) *t;
}
}
}
@@ -1152,7 +1152,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst += *t;
+ *dst += (@9) *t;
}
}
}
@@ -1228,7 +1228,7 @@
if (*t == @6_nil) {
*dst = @9_nil;
} else {
- *dst *= *t;
+ *dst *= (@9) *t;
}
}
}
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/algebra.mx,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- algebra.mx 6 Nov 2007 23:22:58 -0000 1.186
+++ algebra.mx 13 Dec 2007 15:26:50 -0000 1.187
@@ -1055,7 +1055,7 @@
result = @2_nil;
break;
} else {
- result += *value;
+ result += (@2) *value;
}
}
*res = result;
@@ -1753,7 +1753,7 @@
return GDK_FAIL;
}
i += BUNfirst(b);
- @:putTail((size_t)i)@
+ @:putTail(((BUN)i))@
@= putTail
if (b->ttype && b->theap) {
ptr _src = BUNtvar(bi,@1);/*b->theap->base + *(var_t*)
BUNtloc(bi,@1);*/
Index: array.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/array.mx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- array.mx 4 Oct 2007 10:37:16 -0000 1.38
+++ array.mx 13 Dec 2007 15:26:50 -0000 1.39
@@ -239,7 +239,7 @@
BAT *bn;
@1 shift = 1;
- if ((bn = BATdescriptor(*bid)) == NULL) {
+ if ((bn = BATdescriptor((bat) *bid)) == NULL) {
throw(MAL, "array.grid", "Cannot access descriptor");
}
@@ -256,7 +256,7 @@
{
BAT *bn;
- if ((bn = BATdescriptor(*bid)) == NULL) {
+ if ((bn = BATdescriptor((bat) *bid)) == NULL) {
throw(MAL, "array.grid", "Cannot access descriptor");
}
if ([EMAIL PROTECTED](&bn, groups, groupsize, clustersize, offset,
shift) == GDK_FAIL)
Index: group.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/group.mx,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- group.mx 11 Dec 2007 17:32:02 -0000 1.100
+++ group.mx 13 Dec 2007 15:26:51 -0000 1.101
@@ -673,7 +673,7 @@
BBPfix(map->batCacheid);
BATloop(histo, p, q) {
/* + 4 for a average chain list of 4 */
- r += ((dbl)cnt/SAMPLE_SIZE)/(*(int*)Tloc(histo,p)+4);
+ r += (hash_t)
(((dbl)cnt/SAMPLE_SIZE)/(*(int*)Tloc(histo,p)+4));
}
BBPunfix(histo->batCacheid);
BBPunfix(map->batCacheid);
@@ -1438,7 +1438,7 @@
@= large_aggr_sum
if (BATprepareHash(bn)) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.sum", "Cannot prepare hash");
}
BATloop(b, p, q) {
oid *h = (oid*) BUNhead(bi,p);
@@ -1484,7 +1484,7 @@
@= large_aggr_prod
if (BATprepareHash(bn)) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.prod", "Cannot prepare hash");
}
BATloop(b, p, q) {
oid *h = (oid*) BUNhead(bi,p);
@@ -1533,7 +1533,7 @@
if (BATprepareHash(bn)) {
GDKfree(cnt);
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "[EMAIL PROTECTED]", "Cannot prepare hash");
}
BATloop(b, p, q) {
oid *h = (oid*) BUNhead(bi,p);
@@ -1635,7 +1635,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &zero) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.sum", "Cannot insert zero");
}
}
max = *(oid*)BUNhead(ei, BUNlast(e)-1);
@@ -1644,7 +1644,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &zero) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.sum", "Cannot insert zero");
}
i = *(oid*)BUNhead(ei, p);
if (i < min)
@@ -1705,7 +1705,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &one) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.prod", "Cannot insert one");
}
}
max = *(oid*)BUNhead(ei, BUNlast(e)-1);
@@ -1714,7 +1714,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &one) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.prod", "Cannot insert one");
}
i = *(oid*)BUNhead(ei, p);
if (i < min)
@@ -1773,10 +1773,10 @@
BUN p, q, r;
if (bn == NULL)
- throw(MAL, "group.avg", "Cannot create descriptor");
+ throw(MAL, "[EMAIL PROTECTED]", "Cannot create descriptor");
if ((b = BATdescriptor(*bid)) == NULL ){
- throw(MAL, "group.avg", "Cannot access descriptor");
+ throw(MAL, "[EMAIL PROTECTED]", "Cannot access descriptor");
}
@:chkHeader(b,[EMAIL PROTECTED])@
if( (e= BATdescriptor(*eid)) == NULL ){
@@ -1797,7 +1797,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &zero) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "[EMAIL PROTECTED]", "Cannot insert
zero");
}
}
max = *(oid*)BUNhead(ei, BUNlast(e)-1);
@@ -1806,7 +1806,7 @@
BATloop(e, p, q) {
if (BUNfastins(bn, BUNhead(ei,p), &zero) == NULL) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "[EMAIL PROTECTED]", "Cannot insert
zero");
}
i = *(oid*)BUNhead(ei, p);
if (i < min)
@@ -2148,7 +2148,7 @@
@= large_aggr_count
if (BATprepareHash(bn)) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.count", "Cannot prepare hash");
}
BATloop(b, p, q) {
oid *h = (oid*) BUNhead(bi,p);
@@ -2315,7 +2315,7 @@
/* scan b, and add increment totals for true values */
if (BATprepareHash(bn)) {
BBPreclaim(bn);
- return GDK_FAIL;
+ throw(MAL, "group.count", "Cannot prepare hash");
}
BATloop(b, p, q) {
if (*(bit *) BUNtloc(bi, p) == TRUE) {
Index: batcalc.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/batcalc.mx,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- batcalc.mx 11 Dec 2007 17:32:02 -0000 1.146
+++ batcalc.mx 13 Dec 2007 15:26:50 -0000 1.147
@@ -849,11 +849,11 @@
*o = @1_nil;
else
#endif
- *o = (@1) (@2 *p);
+ *o = @2 *p;
}
}
@-
-Unary accummulators are only indirectly called. They can not
+Unary accummulators are only called indirectly. They cannot
always be defined without signature clashes, eg. -(batA,batC).
@= unary_impl
batcalc_export str [EMAIL PROTECTED](int *ret,int *did, int *bid);
Index: status.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/status.mx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- status.mx 4 Oct 2007 10:37:30 -0000 1.47
+++ status.mx 13 Dec 2007 15:26:53 -0000 1.48
@@ -496,7 +496,7 @@
str
SYSmem_usage(int *ret, lng *minsize)
{
- lng hbuns = 0, tbuns, hhsh = 0, thsh = 0, hind = 0, tind = 0, head = 0,
tail = 0, tot = 0, n = 0, sz;
+ lng hbuns = 0, tbuns = 0, hhsh = 0, thsh = 0, hind = 0, tind = 0, head
= 0, tail = 0, tot = 0, n = 0, sz;
BAT *bn = BATnew(TYPE_str, TYPE_lng, 2 * BBPsize);
struct mallinfo m;
char buf[1024];
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
