Changeset: e7355b9d36ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7355b9d36ca
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_calc.c
monetdb5/mal/Tests/tst1505.mal
monetdb5/mal/Tests/tst1505.stable.out
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
Branch: default
Log Message:
Removed batcalc accumulator implementation.
diffs (truncated from 9494 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,32 +68,32 @@ 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);
@@ -1169,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);
@@ -1193,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);
@@ -1201,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);
@@ -1210,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);
@@ -1246,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);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3155,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);
-gdk_export BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int accum,
int abort_on_error);
-gdk_export BAT *BATcalcmod(BAT *b1, BAT *b2, int tp, int accum, int
abort_on_error);
-gdk_export BAT *BATcalcmodcst(BAT *b, const ValRecord *v, int tp, int accum,
int abort_on_error);
-gdk_export BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int accum,
int abort_on_error);
-gdk_export BAT *BATcalcxor(BAT *b1, BAT *b2, int accum);
-gdk_export BAT *BATcalcxorcst(BAT *b, const ValRecord *v, int accum);
-gdk_export BAT *BATcalccstxor(const ValRecord *v, BAT *b, int accum);
-gdk_export BAT *BATcalcor(BAT *b1, BAT *b2, int accum);
-gdk_export BAT *BATcalcorcst(BAT *b, const ValRecord *v, int accum);
-gdk_export BAT *BATcalccstor(const ValRecord *v, BAT *b, int accum);
-gdk_export BAT *BATcalcand(BAT *b1, BAT *b2, int accum);
-gdk_export BAT *BATcalcandcst(BAT *b, const ValRecord *v, int accum);
-gdk_export BAT *BATcalccstand(const ValRecord *v, BAT *b, int accum);
-gdk_export BAT *BATcalclsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
-gdk_export BAT *BATcalclshcst(BAT *b, const ValRecord *v, int accum, int
abort_on_error);
+gdk_export BAT *BATcalcnot(BAT *b);
+gdk_export BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int abort_on_error);
+gdk_export BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int
abort_on_error);
+gdk_export BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int
abort_on_error);
+gdk_export BAT *BATcalcsub(BAT *b1, BAT *b2, int tp, int abort_on_error);
+gdk_export BAT *BATcalcsubcst(BAT *b, const ValRecord *v, int tp, int
abort_on_error);
+gdk_export BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int
abort_on_error);
+gdk_export BAT *BATcalcmul(BAT *b1, BAT *b2, int tp, int abort_on_error);
+gdk_export BAT *BATcalcmulcst(BAT *b, const ValRecord *v, int tp, int
abort_on_error);
+gdk_export BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int
abort_on_error);
+gdk_export BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int abort_on_error);
+gdk_export BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int
abort_on_error);
+gdk_export BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int
abort_on_error);
+gdk_export BAT *BATcalcmod(BAT *b1, BAT *b2, int tp, int abort_on_error);
+gdk_export BAT *BATcalcmodcst(BAT *b, const ValRecord *v, int tp, int
abort_on_error);
+gdk_export BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int
abort_on_error);
+gdk_export BAT *BATcalcxor(BAT *b1, BAT *b2);
+gdk_export BAT *BATcalcxorcst(BAT *b, const ValRecord *v);
+gdk_export BAT *BATcalccstxor(const ValRecord *v, BAT *b);
+gdk_export BAT *BATcalcor(BAT *b1, BAT *b2);
+gdk_export BAT *BATcalcorcst(BAT *b, const ValRecord *v);
+gdk_export BAT *BATcalccstor(const ValRecord *v, BAT *b);
+gdk_export BAT *BATcalcand(BAT *b1, BAT *b2);
+gdk_export BAT *BATcalcandcst(BAT *b, const ValRecord *v);
+gdk_export BAT *BATcalccstand(const ValRecord *v, BAT *b);
+gdk_export BAT *BATcalclsh(BAT *b1, BAT *b2, int abort_on_error);
+gdk_export BAT *BATcalclshcst(BAT *b, const ValRecord *v, int abort_on_error);
gdk_export BAT *BATcalccstlsh(const ValRecord *v, BAT *b, int abort_on_error);
-gdk_export BAT *BATcalcrsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
-gdk_export BAT *BATcalcrshcst(BAT *b, const ValRecord *v, int accum, int
abort_on_error);
+gdk_export BAT *BATcalcrsh(BAT *b1, BAT *b2, int abort_on_error);
+gdk_export BAT *BATcalcrshcst(BAT *b, const ValRecord *v, int abort_on_error);
gdk_export BAT *BATcalccstrsh(const ValRecord *v, BAT *b, int abort_on_error);
gdk_export BAT *BATcalclt(BAT *b1, BAT *b2);
gdk_export BAT *BATcalcltcst(BAT *b, const ValRecord *v);
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -133,7 +133,7 @@ checkbats(BAT *b1, BAT *b2, const char *
#define NOTBIT(x) (!(x))
BAT *
-BATcalcnot(BAT *b, int accum)
+BATcalcnot(BAT *b)
{
BAT *bn;
BUN nils = 0;
@@ -143,20 +143,9 @@ BATcalcnot(BAT *b, int accum)
if (checkbats(b, NULL, "BATcalcnot") == GDK_FAIL)
return NULL;
- if (accum) {
- assert(BBP_refs(b->batCacheid) == 1);
- if (BBP_lrefs(b->batCacheid) > 1) {
- GDKerror("logical reference too high to be used as
accumulator\n");
- return NULL;
- }
- assert(!isVIEW(b));
- bn = b;
- BBPfix(b->batCacheid);
- } else {
- bn = BATnew(TYPE_void, b->T->type, b->U->count);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
