Changeset: caddad521db5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=caddad521db5
Added Files:
        gdk/gdk_group.c
Modified Files:
        clients/Tests/exports.stable.out
        clients/mapiclient/Tests/stethoscope--help.stable.err
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_calc.c
        gdk/gdk_private.h
        monetdb5/mal/Tests/tst1505.mal
        monetdb5/mal/Tests/tst1505.stable.out
        monetdb5/modules/kernel/aggr_be_count.mx
        monetdb5/modules/kernel/aggr_bge_count.mx
        monetdb5/modules/kernel/group.mx
        monetdb5/modules/mal/Tests/remote03.stable.out
        monetdb5/modules/mal/batcalc.c
        monetdb5/modules/mal/batcalc.mal
        monetdb5/modules/mal/batcalc.mal.sh
        monetdb5/modules/mal/pcre.c
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/drop3.stable.out
        sql/test/leaks/Tests/select1.stable.out
        sql/test/leaks/Tests/select2.stable.out
        sql/test/leaks/Tests/temp1.stable.out
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/leaks/Tests/temp3.stable.out
Branch: default
Log Message:

Merged


diffs (truncated from 12281 to 300 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
@@ -26,11 +26,11 @@ void BATassertProps(BAT *b);
 atomDesc BATatoms[];
 BAT *BATattach(int tt, const char *heapfile);
 BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi);
-BAT *BATcalcabsolute(BAT *b, int accum);
-BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-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);
+BAT *BATcalcabsolute(BAT *b);
+BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
+BAT *BATcalcand(BAT *b1, BAT *b2);
+BAT *BATcalcandcst(BAT *b, const ValRecord *v);
 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);
@@ -38,26 +38,26 @@ BAT *BATcalcbetweencstbat(BAT *b, const 
 BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi);
 BAT *BATcalccmp(BAT *b1, BAT *b2);
 BAT *BATcalccmpcst(BAT *b, const ValRecord *v);
-BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int accum, int 
abort_on_error);
-BAT *BATcalccstand(const ValRecord *v, BAT *b, int accum);
+BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int abort_on_error);
+BAT *BATcalccstand(const ValRecord *v, BAT *b);
 BAT *BATcalccstcmp(const ValRecord *v, BAT *b);
-BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int accum, int 
abort_on_error);
+BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int abort_on_error);
 BAT *BATcalccsteq(const ValRecord *v, BAT *b);
 BAT *BATcalccstge(const ValRecord *v, BAT *b);
 BAT *BATcalccstgt(const ValRecord *v, BAT *b);
 BAT *BATcalccstle(const ValRecord *v, BAT *b);
 BAT *BATcalccstlsh(const ValRecord *v, BAT *b, int abort_on_error);
 BAT *BATcalccstlt(const ValRecord *v, BAT *b);
-BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int accum, int 
abort_on_error);
-BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int accum, int 
abort_on_error);
+BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int abort_on_error);
+BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int abort_on_error);
 BAT *BATcalccstne(const ValRecord *v, BAT *b);
-BAT *BATcalccstor(const ValRecord *v, BAT *b, int accum);
+BAT *BATcalccstor(const ValRecord *v, BAT *b);
 BAT *BATcalccstrsh(const ValRecord *v, BAT *b, int abort_on_error);
-BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int accum, int 
abort_on_error);
-BAT *BATcalccstxor(const ValRecord *v, BAT *b, int accum);
-BAT *BATcalcdecr(BAT *b, int accum, int abort_on_error);
-BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int accum, int 
abort_on_error);
+BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int abort_on_error);
+BAT *BATcalccstxor(const ValRecord *v, BAT *b);
+BAT *BATcalcdecr(BAT *b, int abort_on_error);
+BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
 BAT *BATcalceq(BAT *b1, BAT *b2);
 BAT *BATcalceqcst(BAT *b, const ValRecord *v);
 BAT *BATcalcge(BAT *b1, BAT *b2);
@@ -68,35 +68,36 @@ BAT *BATcalcifthencstelse(BAT *b, const 
 BAT *BATcalcifthencstelsecst(BAT *b, const ValRecord *c1, const ValRecord *c2);
 BAT *BATcalcifthenelse(BAT *b, BAT *b1, BAT *b2);
 BAT *BATcalcifthenelsecst(BAT *b, BAT *b1, const ValRecord *c2);
-BAT *BATcalcincr(BAT *b, int accum, int abort_on_error);
+BAT *BATcalcincr(BAT *b, int abort_on_error);
 BAT *BATcalcisnil(BAT *b);
 BAT *BATcalciszero(BAT *b);
 BAT *BATcalcle(BAT *b1, BAT *b2);
 BAT *BATcalclecst(BAT *b, const ValRecord *v);
-BAT *BATcalclsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
-BAT *BATcalclshcst(BAT *b, const ValRecord *v, int accum, int abort_on_error);
+BAT *BATcalclsh(BAT *b1, BAT *b2, int abort_on_error);
+BAT *BATcalclshcst(BAT *b, const ValRecord *v, int abort_on_error);
 BAT *BATcalclt(BAT *b1, BAT *b2);
 BAT *BATcalcltcst(BAT *b, const ValRecord *v);
-BAT *BATcalcmod(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-BAT *BATcalcmodcst(BAT *b, const ValRecord *v, int tp, int accum, int 
abort_on_error);
-BAT *BATcalcmul(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-BAT *BATcalcmulcst(BAT *b, const ValRecord *v, int tp, int accum, int 
abort_on_error);
+BAT *BATcalcmod(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcmodcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
+BAT *BATcalcmul(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcmulcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
 BAT *BATcalcne(BAT *b1, BAT *b2);
 BAT *BATcalcnecst(BAT *b, const ValRecord *v);
-BAT *BATcalcnegate(BAT *b, int accum);
-BAT *BATcalcnot(BAT *b, int accum);
-BAT *BATcalcor(BAT *b1, BAT *b2, int accum);
-BAT *BATcalcorcst(BAT *b, const ValRecord *v, int accum);
-BAT *BATcalcrsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
-BAT *BATcalcrshcst(BAT *b, const ValRecord *v, int accum, int abort_on_error);
+BAT *BATcalcnegate(BAT *b);
+BAT *BATcalcnot(BAT *b);
+BAT *BATcalcor(BAT *b1, BAT *b2);
+BAT *BATcalcorcst(BAT *b, const ValRecord *v);
+BAT *BATcalcrsh(BAT *b1, BAT *b2, int abort_on_error);
+BAT *BATcalcrshcst(BAT *b, const ValRecord *v, int abort_on_error);
 BAT *BATcalcsign(BAT *b);
-BAT *BATcalcsub(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-BAT *BATcalcsubcst(BAT *b, const ValRecord *v, int tp, int accum, int 
abort_on_error);
-BAT *BATcalcxor(BAT *b1, BAT *b2, int accum);
-BAT *BATcalcxorcst(BAT *b, const ValRecord *v, int accum);
+BAT *BATcalcsub(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcsubcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
+BAT *BATcalcxor(BAT *b1, BAT *b2);
+BAT *BATcalcxorcst(BAT *b, const ValRecord *v);
 BAT *BATclear(BAT *b, int force);
 BAT *BATcommit(BAT *b);
 BAT *BATconst(BAT *l, int tt, const void *val);
+BAT *BATconstant(int tt, const void *val, BUN cnt);
 BAT *BATconvert(BAT *b, int tp, int abort_on_error);
 BAT *BATcopy(BAT *b, int ht, int tt, int writeable);
 BUN BATcount(BAT *b);
@@ -114,7 +115,7 @@ BAT *BATfetch(BAT *b, BAT *s);
 BAT *BATfetchjoin(BAT *b, BAT *s, BUN estimate);
 int BATgetaccess(BAT *b);
 PROPrec *BATgetprop(BAT *b, int idx);
-BAT *BATgroup(BAT *b, int start, int incr, int grpsize);
+gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *g, 
BAT *e, BAT *h);
 BUN BATgrows(BAT *b);
 BAT *BAThash(BAT *b, BUN masksize);
 BAT *BAThashjoin(BAT *l, BAT *r, BUN estimate);
@@ -1168,22 +1169,18 @@ str CMDBATnewDerived(Client cntxt, MalBl
 str CMDBATnewint(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
 str CMDactivateProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 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(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(bat *ret, bat *bid1, bat *bid2);
 str CMDbatCMPcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 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);
@@ -1192,7 +1189,6 @@ str CMDbatDIVdblsignal(bat *ret, bat *bi
 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(bat *ret, bat *bid1, bat *bid2);
@@ -1200,7 +1196,6 @@ str CMDbatGEcst(Client cntxt, MalBlkPtr 
 str CMDbatGT(bat *ret, bat *bid1, bat *bid2);
 str CMDbatGTcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 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);
@@ -1209,35 +1204,28 @@ str CMDbatLSH(bat *ret, bat *bid1, bat *
 str CMDbatLSHcst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDbatLSHcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 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(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(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(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(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(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(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);
@@ -1245,9 +1233,7 @@ str CMDbatSUBcstenlarge(Client cntxt, Ma
 str CMDbatSUBcstsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 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 CMDbatpartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CMDbatpartition2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1462,12 +1448,9 @@ str GRPavg_sht(int *ret, int *bid, int *
 str GRPavg_wrd(int *ret, int *bid, int *eid);
 str GRPderive(int *hid, int *mid, int *ct_histoid, int *ct_mapid, int *bid);
 str GRPgroup(int *rethisto, int *retbid, int *bid);
-str GRPgroup0(int *ret, int *bid, int *start, int *incr, int *grpsize);
-str GRPgroup_custom(int *rethisto, int *retbid, int *bid, int *N, int *rng);
 str GRPmax(int *retval, int *bid, int *eid);
 str GRPmin(int *retval, int *bid, int *eid);
 str GRPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-str GRPprelude(void);
 str GRPprod_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils);
 str GRPprod_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils);
 str GRPprod_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
@@ -1498,6 +1481,8 @@ str GRPslidingsum_lng(int *retval, int *
 str GRPslidingsum_oid(int *retval, int *bid, int *size, int *shift);
 str GRPslidingsum_sht(int *retval, int *bid, int *size, int *shift);
 str GRPslidingsum_wrd(int *retval, int *bid, int *size, int *shift);
+str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, bat *bid);
+str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid);
 str GRPsum_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils);
 str GRPsum_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils);
 str GRPsum_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
diff --git a/clients/mapiclient/Tests/stethoscope--help.stable.err 
b/clients/mapiclient/Tests/stethoscope--help.stable.err
--- a/clients/mapiclient/Tests/stethoscope--help.stable.err
+++ b/clients/mapiclient/Tests/stethoscope--help.stable.err
@@ -27,7 +27,7 @@ The trace options (default 'ISTest'):
   T = wall clock time
   t = ticks in microseconds
   c = cpu statistics (utime,ctime,stime,cstime)
-  m = memory resources as provided by OS
+  m = rss memory as provided by OS (in MB)
   r = block reads
   w = block writes
   b = bytes read/written
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -35,7 +35,7 @@ lib_gdk = {
                gdk_posix.c gdk_logger.c gdk_sample.c \
                gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
                gdk_system.h gdk_tm.h gdk_storage.h \
-               gdk_calc.c \
+               gdk_calc.c gdk_group.c \
                bat.feps bat1.feps bat2.feps \
                libbat.rc
        LIBS = ../common/options/libmoptions \
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1536,7 +1536,8 @@ gdk_export BAT *BATclear(BAT *b, int for
 gdk_export BAT *BATcopy(BAT *b, int ht, int tt, int writeable);
 gdk_export BAT *BATmark(BAT *b, oid base);
 gdk_export BAT *BATmark_grp(BAT *b, BAT *g, oid *base);
-gdk_export BAT *BATgroup(BAT *b, int start, int incr, int grpsize);
+
+gdk_export gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT 
*b, BAT *g, BAT *e, BAT *h);
 
 /*
  * @- BAT Input/Output
@@ -3129,6 +3130,7 @@ gdk_export BAT *BATselect(BAT *b, const 
 gdk_export BAT *BATuselect(BAT *b, const void *tl, const void *th);
 gdk_export BAT *BATrestrict(BAT *b, const void *hl, const void *hh, const void 
*tl, const void *th);
 
+gdk_export BAT *BATconstant(int tt, const void *val, BUN cnt);
 gdk_export BAT *BATconst(BAT *l, int tt, const void *val);
 gdk_export BAT *BATthetajoin(BAT *l, BAT *r, int mode, BUN estimate);
 gdk_export BAT *BATsemijoin(BAT *l, BAT *r);
@@ -3153,43 +3155,43 @@ gdk_export BAT *BATkunion(BAT *b, BAT *c
 gdk_export BAT *BATsdiff(BAT *b, BAT *c);
 gdk_export BAT *BATkdiff(BAT *b, BAT *c);
 
-gdk_export BAT *BATcalcnegate(BAT *b, int accum);
-gdk_export BAT *BATcalcabsolute(BAT *b, int accum);
-gdk_export BAT *BATcalcincr(BAT *b, int accum, int abort_on_error);
-gdk_export BAT *BATcalcdecr(BAT *b, int accum, int abort_on_error);
+gdk_export BAT *BATcalcnegate(BAT *b);
+gdk_export BAT *BATcalcabsolute(BAT *b);
+gdk_export BAT *BATcalcincr(BAT *b, int abort_on_error);
+gdk_export BAT *BATcalcdecr(BAT *b, int abort_on_error);
 gdk_export BAT *BATcalciszero(BAT *b);
 gdk_export BAT *BATcalcsign(BAT *b);
 gdk_export BAT *BATcalcisnil(BAT *b);
-gdk_export BAT *BATcalcnot(BAT *b, int accum);
-gdk_export BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int accum, int 
abort_on_error);
-gdk_export BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalcsub(BAT *b1, BAT *b2, int tp, int accum, int 
abort_on_error);
-gdk_export BAT *BATcalcsubcst(BAT *b, const ValRecord *v, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalcmul(BAT *b1, BAT *b2, int tp, int accum, int 
abort_on_error);
-gdk_export BAT *BATcalcmulcst(BAT *b, const ValRecord *v, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int accum, 
int abort_on_error);
-gdk_export BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int accum, int 
abort_on_error);
-gdk_export BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int accum, 
int abort_on_error);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to