Changeset: b70d8a1cd423 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b70d8a1cd423 Modified Files: clients/Tests/exports.stable.out Branch: gdk-calc Log Message:
Approved after recent changes. diffs (171 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -31,6 +31,7 @@ BAT *BATcalcadd(BAT *b1, BAT *b2, int tp BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int accum, int abort_on_error); BAT *BATcalcand(BAT *b1, BAT *b2, int accum); BAT *BATcalcandcst(BAT *b, const ValRecord *v, int accum); +int BATcalcavg(BAT *b, dbl *avg, BUN *vals); BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi); BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi); BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi); @@ -1102,7 +1103,7 @@ str BOXrelease(Client cntxt, MalBlkPtr m str BOXreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str BOXtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str BOXtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CALCbat2batid(int *ret, int *bid); +str CALCbat2batid(int *ret, bat *bid); str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1213,87 +1214,87 @@ str CMDBATsetGarbage(Client cntxt, MalBl str CMDBBPproject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDBBPprojectNil(int *ret, int *bid); str CMDactivateProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatABS(int *ret, int *bid); -str CMDbatABSaccum(int *ret, int *bid, int *accum); -str CMDbatADD(int *ret, int *bid1, int *bid2); +str CMDbatABS(bat *ret, bat *bid); +str CMDbatABSaccum(bat *ret, bat *bid, int *accum); +str CMDbatADD(bat *ret, bat *bid1, bat *bid2); str CMDbatADDcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatADDcstenlarge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatADDcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatADDenlarge(int *ret, int *bid1, int *bid2); -str CMDbatADDsignal(int *ret, int *bid1, int *bid2); -str CMDbatADDsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatAND(int *ret, int *bid1, int *bid2); -str CMDbatANDaccum(int *ret, int *bid1, int *bid2, int *accum); +str CMDbatADDenlarge(bat *ret, bat *bid1, bat *bid2); +str CMDbatADDsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatADDsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatAND(bat *ret, bat *bid1, bat *bid2); +str CMDbatANDaccum(bat *ret, bat *bid1, bat *bid2, int *accum); str CMDbatANDcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatBETWEEN(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatCMP(int *ret, int *bid1, int *bid2); +str CMDbatCMP(bat *ret, bat *bid1, bat *bid2); str CMDbatCMPcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatDECR(int *ret, int *bid); -str CMDbatDECRaccum(int *ret, int *bid, int *accum); -str CMDbatDIV(int *ret, int *bid1, int *bid2); +str CMDbatDECR(bat *ret, bat *bid); +str CMDbatDECRaccum(bat *ret, bat *bid, int *accum); +str CMDbatDIV(bat *ret, bat *bid1, bat *bid2); str CMDbatDIVcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatDIVcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatDIVdbl(int *ret, int *bid1, int *bid2); -str CMDbatDIVdblsignal(int *ret, int *bid1, int *bid2); -str CMDbatDIVflt(int *ret, int *bid1, int *bid2); -str CMDbatDIVfltsignal(int *ret, int *bid1, int *bid2); -str CMDbatDIVsignal(int *ret, int *bid1, int *bid2); -str CMDbatDIVsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatEQ(int *ret, int *bid1, int *bid2); +str CMDbatDIVdbl(bat *ret, bat *bid1, bat *bid2); +str CMDbatDIVdblsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatDIVflt(bat *ret, bat *bid1, bat *bid2); +str CMDbatDIVfltsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatDIVsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatDIVsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatEQ(bat *ret, bat *bid1, bat *bid2); str CMDbatEQcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatGE(int *ret, int *bid1, int *bid2); +str CMDbatGE(bat *ret, bat *bid1, bat *bid2); str CMDbatGEcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatGT(int *ret, int *bid1, int *bid2); +str CMDbatGT(bat *ret, bat *bid1, bat *bid2); str CMDbatGTcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatINCR(int *ret, int *bid); -str CMDbatINCRaccum(int *ret, int *bid, int *accum); -str CMDbatISNIL(int *ret, int *bid); -str CMDbatISZERO(int *ret, int *bid); -str CMDbatLE(int *ret, int *bid1, int *bid2); +str CMDbatINCR(bat *ret, bat *bid); +str CMDbatINCRaccum(bat *ret, bat *bid, int *accum); +str CMDbatISNIL(bat *ret, bat *bid); +str CMDbatISZERO(bat *ret, bat *bid); +str CMDbatLE(bat *ret, bat *bid1, bat *bid2); str CMDbatLEcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatLSH(int *ret, int *bid1, int *bid2); +str CMDbatLSH(bat *ret, bat *bid1, bat *bid2); str CMDbatLSHcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatLSHcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatLSHsignal(int *ret, int *bid1, int *bid2); -str CMDbatLSHsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatLT(int *ret, int *bid1, int *bid2); +str CMDbatLSHsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatLSHsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatLT(bat *ret, bat *bid1, bat *bid2); str CMDbatLTcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatMOD(int *ret, int *bid1, int *bid2); +str CMDbatMOD(bat *ret, bat *bid1, bat *bid2); str CMDbatMODcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatMODcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatMODsignal(int *ret, int *bid1, int *bid2); -str CMDbatMODsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatMUL(int *ret, int *bid1, int *bid2); +str CMDbatMODsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatMODsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatMUL(bat *ret, bat *bid1, bat *bid2); str CMDbatMULcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatMULcstenlarge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatMULcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatMULenlarge(int *ret, int *bid1, int *bid2); -str CMDbatMULsignal(int *ret, int *bid1, int *bid2); -str CMDbatMULsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatNE(int *ret, int *bid1, int *bid2); -str CMDbatNEG(int *ret, int *bid); -str CMDbatNEGaccum(int *ret, int *bid, int *accum); +str CMDbatMULenlarge(bat *ret, bat *bid1, bat *bid2); +str CMDbatMULsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatMULsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatNE(bat *ret, bat *bid1, bat *bid2); +str CMDbatNEG(bat *ret, bat *bid); +str CMDbatNEGaccum(bat *ret, bat *bid, int *accum); str CMDbatNEcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatNOT(int *ret, int *bid); -str CMDbatNOTaccum(int *ret, int *bid, int *accum); -str CMDbatOR(int *ret, int *bid1, int *bid2); -str CMDbatORaccum(int *ret, int *bid1, int *bid2, int *accum); +str CMDbatNOT(bat *ret, bat *bid); +str CMDbatNOTaccum(bat *ret, bat *bid, int *accum); +str CMDbatOR(bat *ret, bat *bid1, bat *bid2); +str CMDbatORaccum(bat *ret, bat *bid1, bat *bid2, int *accum); str CMDbatORcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatRSH(int *ret, int *bid1, int *bid2); +str CMDbatRSH(bat *ret, bat *bid1, bat *bid2); str CMDbatRSHcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatRSHcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatRSHsignal(int *ret, int *bid1, int *bid2); -str CMDbatRSHsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatSIGN(int *ret, int *bid); -str CMDbatSUB(int *ret, int *bid1, int *bid2); +str CMDbatRSHsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatRSHsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatSIGN(bat *ret, bat *bid); +str CMDbatSUB(bat *ret, bat *bid1, bat *bid2); str CMDbatSUBcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatSUBcstenlarge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatSUBcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbatSUBenlarge(int *ret, int *bid1, int *bid2); -str CMDbatSUBsignal(int *ret, int *bid1, int *bid2); -str CMDbatSUBsignalaccum(int *ret, int *bid1, int *bid2, int *accum); -str CMDbatXOR(int *ret, int *bid1, int *bid2); -str CMDbatXORaccum(int *ret, int *bid1, int *bid2, int *accum); +str CMDbatSUBenlarge(bat *ret, bat *bid1, bat *bid2); +str CMDbatSUBsignal(bat *ret, bat *bid1, bat *bid2); +str CMDbatSUBsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum); +str CMDbatXOR(bat *ret, bat *bid1, bat *bid2); +str CMDbatXORaccum(bat *ret, bat *bid1, bat *bid2, int *accum); str CMDbatXORcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatpartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1342,6 +1343,8 @@ str CMDbbpreleaseBAT(Client cntxt, MalBl str CMDbbptake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbptoStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbptruncate(int *ret, int *bid, str *fnme); +str CMDcalcavg(dbl *avg, bat *bid); +str CMDcalcavg2(dbl *avg, lng *vals, bat *bid); str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcleanup(int *ret); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
