Changeset: f5ea265a4d17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5ea265a4d17
Modified Files:
MonetDB5/src/modules/kernel/aggr.mx
Branch: Jun2010
Log Message:
removed unused macro parameter
diffs (137 lines):
diff -r e4b8e3ac1cd8 -r f5ea265a4d17 MonetDB5/src/modules/kernel/aggr.mx
--- a/MonetDB5/src/modules/kernel/aggr.mx Wed Jun 30 12:43:25 2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr.mx Wed Jun 30 12:43:25 2010 +0200
@@ -278,8 +278,8 @@
@-
@= AX3sum
-aggr_export str ax3aggrx3_s...@1_@3(int *retid, int *bid, int *eid);
-str ax3aggrx3_s...@1_@3(int *retid, int *bid, int *eid){
+aggr_export str ax3aggrx3_s...@1_@2(int *retid, int *bid, int *eid);
+str ax3aggrx3_s...@1_@2(int *retid, int *bid, int *eid){
BAT *b, *e;
BAT *bn;
@@ -290,7 +290,7 @@
BBPreleaseref(b->batCacheid);
throw(MAL, "aggr.sum", RUNTIME_OBJECT_MISSING);
}
- if( cmdaggrx3_s...@1_@3(&bn,b,e) == GDK_SUCCEED){
+ if( cmdaggrx3_s...@1_@2(&bn,b,e) == GDK_SUCCEED){
if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
*retid = bn->batCacheid;
BBPkeepref(*retid);
@@ -305,8 +305,8 @@
@-
@= AX3prod
-aggr_export str ax3aggrx3_pr...@1_@3(int *retid, int *bid, int *eid);
-str ax3aggrx3_pr...@1_@3(int *retid, int *bid, int *eid){
+aggr_export str ax3aggrx3_pr...@1_@2(int *retid, int *bid, int *eid);
+str ax3aggrx3_pr...@1_@2(int *retid, int *bid, int *eid){
BAT *b, *e, *bn;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -316,7 +316,7 @@
BBPreleaseref(b->batCacheid);
throw(MAL, "aggr.prod", RUNTIME_OBJECT_MISSING);
}
- if( cmdaggrx3_pr...@1_@3(&bn,b,e) == GDK_SUCCEED){
+ if( cmdaggrx3_pr...@1_@2(&bn,b,e) == GDK_SUCCEED){
if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
*retid = bn->batCacheid;
BBPkeepref(*retid);
@@ -330,30 +330,30 @@
}
@-
@= AX3sumprod
- @:AX3sum(@1,@2,@3)@
+ @:AX3sum(@1,@2)@
/* product here */
- @:AX3prod(@1,@2,@3)@
+ @:AX3prod(@1,@2)@
@c
-@:AX3sumprod(bte,tloc,bte)@
-@:AX3sumprod(bte,tloc,sht)@
-@:AX3sumprod(bte,tloc,int)@
-@:AX3sumprod(bte,tloc,wrd)@
-@:AX3sumprod(bte,tloc,lng)@
-@:AX3sumprod(sht,tloc,sht)@
-@:AX3sumprod(sht,tloc,int)@
-@:AX3sumprod(sht,tloc,wrd)@
-@:AX3sumprod(sht,tloc,lng)@
-@:AX3sumprod(int,tloc,int)@
-@:AX3sumprod(int,tloc,wrd)@
-@:AX3sumprod(int,tloc,lng)@
-@:AX3sumprod(wrd,tloc,wrd)@
-@:AX3sumprod(wrd,tloc,lng)@
-@:AX3sumprod(lng,tloc,wrd)@
-@:AX3sumprod(lng,tloc,lng)@
-@:AX3sumprod(flt,tloc,flt)@
-@:AX3sumprod(flt,tloc,dbl)@
-@:AX3sumprod(dbl,tloc,dbl)@
+@:AX3sumprod(bte,bte)@
+@:AX3sumprod(bte,sht)@
+@:AX3sumprod(bte,int)@
+@:AX3sumprod(bte,wrd)@
+@:AX3sumprod(bte,lng)@
+@:AX3sumprod(sht,sht)@
+@:AX3sumprod(sht,int)@
+@:AX3sumprod(sht,wrd)@
+@:AX3sumprod(sht,lng)@
+@:AX3sumprod(int,int)@
+@:AX3sumprod(int,wrd)@
+@:AX3sumprod(int,lng)@
+@:AX3sumprod(wrd,wrd)@
+@:AX3sumprod(wrd,lng)@
+@:AX3sumprod(lng,wrd)@
+@:AX3sumprod(lng,lng)@
+@:AX3sumprod(flt,flt)@
+@:AX3sumprod(flt,dbl)@
+@:AX3sumprod(dbl,dbl)@
@-
@= AX3arithavg
@@ -381,13 +381,13 @@
throw(MAL, "aggrx3_a...@1",GDK_EXCEPTION);
}
@c
-@:AX3arithavg(bte,loc)@
-@:AX3arithavg(sht,loc)@
-@:AX3arithavg(int,loc)@
-@:AX3arithavg(wrd,loc)@
-@:AX3arithavg(lng,loc)@
-@:AX3arithavg(flt,loc)@
-@:AX3arithavg(dbl,loc)@
+@:AX3arithavg(bte)@
+@:AX3arithavg(sht)@
+@:AX3arithavg(int)@
+@:AX3arithavg(wrd)@
+@:AX3arithavg(lng)@
+@:AX3arithavg(flt)@
+@:AX3arithavg(dbl)@
@- "Extremes" (Min & Max)
@@ -601,13 +601,13 @@
throw(MAL, "aggrX3_avg3",GDK_EXCEPTION);
}
@c
-@:AX3arithavg3(bte,loc)@
-@:AX3arithavg3(sht,loc)@
-@:AX3arithavg3(int,loc)@
-@:AX3arithavg3(wrd,loc)@
-@:AX3arithavg3(lng,loc)@
-@:AX3arithavg3(flt,loc)@
-@:AX3arithavg3(dbl,loc)@
+@:AX3arithavg3(bte)@
+@:AX3arithavg3(sht)@
+@:AX3arithavg3(int)@
+@:AX3arithavg3(wrd)@
+@:AX3arithavg3(lng)@
+@:AX3arithavg3(flt)@
+@:AX3arithavg3(dbl)@
@- "Extremes" (Min & Max)
@c
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
