Changeset: 77aa7d3606e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77aa7d3606e9
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/array.c
monetdb5/modules/kernel/array.h
Branch: int128
Log Message:
array.[hc]: removed unused ARRAYmultiply_*_*() functions
The ARRAYmultiply_*_*() functions multiply to BATs
by creating the carthesian product and calculating
the product of each BUN pair combination.
This appears to be some odd functionality with unknown use/application.
diffs (79 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
@@ -869,11 +869,6 @@ str ARRAYgridShift_int(int *ret, int *gr
str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int
*offset);
str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng
*offset);
-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 ARRAYproject(int *ret, int *bid, int *cst);
str AUTHaddUser(oid *ret, Client *c, str *user, str *pass);
diff --git a/monetdb5/modules/kernel/array.c b/monetdb5/modules/kernel/array.c
--- a/monetdb5/modules/kernel/array.c
+++ b/monetdb5/modules/kernel/array.c
@@ -321,46 +321,6 @@ ARRAYgridBATshift_lng(lng *ret, lng *bid
return MAL_SUCCEED;
}
-#define arraymultiply(X1,X2)\
-str \
-ARRAYmultiply_##X1##_##X2(int *ret, int *bid, int *rid){\
- BAT *bn, *b, *r;\
- BUN p,q, s,t;\
- X2 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_##X2, BATcount(b)*BATcount(r));\
- BATseqbase(bn,0);\
- bi = bat_iterator(b);\
- ri = bat_iterator(r);\
- BATloop(b,p,q){\
- BATloop(r,s,t){\
- val = (*(X1*) BUNtail(bi,p)) * (*(X1*)BUNtail(ri,s));\
- BUNfastins(bn,&o,&val);\
- }\
- }\
- 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;\
-}
-
-arraymultiply(sht,lng)
-arraymultiply(sht,int)
-arraymultiply(int,int)
-arraymultiply(int,lng)
-arraymultiply(lng,lng)
-
str
ARRAYproduct(int *ret, int *bid, int *rid)
{
diff --git a/monetdb5/modules/kernel/array.h b/monetdb5/modules/kernel/array.h
--- a/monetdb5/modules/kernel/array.h
+++ b/monetdb5/modules/kernel/array.h
@@ -46,10 +46,4 @@ array_export str ARRAYgrid_lng(lng *ret,
array_export str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
array_export str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng
*groupsize, lng *clustersize, lng *offset);
array_export str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng
*groupsize, lng *clustersize, lng *offset, lng *shift);
-
-array_export str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
-array_export str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid);
-array_export str ARRAYmultiply_int_int(int *ret, int *bid, int *rid);
-array_export str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid);
-array_export str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid);
#endif
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
