Changeset: 03497e12e072 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03497e12e072
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/array.mx
Branch: sciql
Log Message:
array.mx clean-up: removed not used ARRAYmultiply_*_*() (C only) functions
dead code remains available in the HG attic
diffs (76 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
@@ -786,13 +786,6 @@ str ALGuselectInclusive(int *result, int
str ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ARRAYfiller_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ARRAYmap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str ARRAYmultiply_dbl_dbl(int *ret, int *bid, int *rid);
-str ARRAYmultiply_flt_flt(int *ret, int *bid, int *rid);
-str ARRAYmultiply_int_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
str ARRAYproduct(int *ret, int *bid, int *rid);
str ARRAYreplace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ARRAYreplaceScalar(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
diff --git a/monetdb5/modules/mal/array.mx b/monetdb5/modules/mal/array.mx
--- a/monetdb5/modules/mal/array.mx
+++ b/monetdb5/modules/mal/array.mx
@@ -285,55 +285,6 @@ ARRAYseries_@1(int *ret, @1 *start, @1 *
@:dim_wrapper_impl(flt,%f)@
@:dim_wrapper_impl(dbl,%f)@
-@= arraymultiply
-array_export str ARRAYmultiply_@1_@2(int *ret, int *bid, int *rid);
-str
-ARRAYmultiply_@1_@2(int *ret, int *bid, int *rid){
- BAT *bn, *b, *r;
- BUN p,q, s,t;
- @2 val;
- oid o= oid_nil;
- BATiter bi, ri;
-
- if( (b= BATdescriptor(*bid)) == NULL ){
- throw(MAL, "array.*", RUNTIME_OBJECT_MISSING);
- }
- if( (r= BATdescriptor(*rid)) == NULL ){
- BBPreleaseref(b->batCacheid);
- throw(MAL, "array.*", RUNTIME_OBJECT_MISSING);
- }
- bn= BATnew(TYPE_void, TYPE_@2, BATcount(b)*BATcount(r));
-
- bi = bat_iterator(b);
- ri = bat_iterator(r);
- BATloop(b,p,q){
- BATloop(r,s,t){
- val = (*(@1*) BUNtail(bi,p)) * (*(@1*)BUNtail(ri,s));
- BUNfastins(bn,&o,&val);
- }
- }
- BATseqbase(bn,0);
- bn->hdense = TRUE;
- BATkey(bn, TRUE);
- bn->hsorted = 1;
- bn->hrevsorted = (BATcount(bn) <= 1);
- bn->T->nonil = b->T->nonil & r->T->nonil;
- if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); \
- *ret= bn->batCacheid;
- BBPkeepref(*ret);
- BBPreleaseref(b->batCacheid);
- BBPreleaseref(r->batCacheid);
- return MAL_SUCCEED;
-}
-@c
-@:arraymultiply(sht,lng)@
-@:arraymultiply(sht,int)@
-@:arraymultiply(int,int)@
-@:arraymultiply(int,lng)@
-@:arraymultiply(lng,lng)@
-@:arraymultiply(flt,flt)@
-@:arraymultiply(dbl,dbl)@
-
str
ARRAYproduct(int *ret, int *bid, int *rid)
{
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
