Changeset: 6feaa919cbd8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6feaa919cbd8 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out gdk/gdk.h gdk/gdk_cross.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h Branch: Oct2014 Log Message:
Cleanup: removed functions that are not used. Not called from C, and not called from MAL. diffs (truncated from 1075 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -2926,6 +2926,10 @@ command batsql.dec_round(v:bat[:oid,:lng address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2954,6 +2958,10 @@ command batsql.round(v:bat[:oid,:lng],d: address lng_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] +address wrd_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] address int_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -37842,6 +37850,10 @@ command calc.second_interval(sc:int,v:ln address lng_dec2second_interval; comment cast lng decimal to a second_interval +command calc.second_interval(sc:int,v:wrd,ek:int,sk:int):lng +address wrd_dec2second_interval; +comment cast wrd decimal to a second_interval + command calc.second_interval(sc:int,v:int,ek:int,sk:int):lng address int_dec2second_interval; comment cast int decimal to a second_interval @@ -41587,6 +41599,10 @@ command sql.dec_round(v:lng,r:lng):lng address lng_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:wrd,r:wrd):wrd +address wrd_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:int,r:int):int address int_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -41799,6 +41815,10 @@ command sql.round(v:lng,d:int,s:int,r:bt address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:wrd,d:int,s:int,r:bte):wrd +address wrd_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -2847,6 +2847,10 @@ command batsql.dec_round(v:bat[:oid,:lng address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2875,6 +2879,10 @@ command batsql.round(v:bat[:oid,:lng],d: address lng_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] +address wrd_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] address int_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -37763,6 +37771,10 @@ command calc.second_interval(sc:int,v:ln address lng_dec2second_interval; comment cast lng decimal to a second_interval +command calc.second_interval(sc:int,v:wrd,ek:int,sk:int):lng +address wrd_dec2second_interval; +comment cast wrd decimal to a second_interval + command calc.second_interval(sc:int,v:int,ek:int,sk:int):lng address int_dec2second_interval; comment cast int decimal to a second_interval @@ -41477,6 +41489,10 @@ command sql.dec_round(v:lng,r:lng):lng address lng_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:wrd,r:wrd):wrd +address wrd_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:int,r:int):int address int_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -41689,6 +41705,10 @@ command sql.round(v:lng,d:int,s:int,r:bt address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:wrd,d:int,s:int,r:bte):wrd +address wrd_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -2847,6 +2847,10 @@ command batsql.dec_round(v:bat[:oid,:lng address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2875,6 +2879,10 @@ command batsql.round(v:bat[:oid,:lng],d: address lng_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] +address wrd_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] address int_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -37763,6 +37771,10 @@ command calc.second_interval(sc:int,v:ln address lng_dec2second_interval; comment cast lng decimal to a second_interval +command calc.second_interval(sc:int,v:wrd,ek:int,sk:int):lng +address wrd_dec2second_interval; +comment cast wrd decimal to a second_interval + command calc.second_interval(sc:int,v:int,ek:int,sk:int):lng address int_dec2second_interval; comment cast int decimal to a second_interval @@ -41453,6 +41465,10 @@ command sql.dec_round(v:lng,r:lng):lng address lng_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:wrd,r:wrd):wrd +address wrd_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:int,r:int):int address int_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -41665,6 +41681,10 @@ command sql.round(v:lng,d:int,s:int,r:bt address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:wrd,d:int,s:int,r:bte):wrd +address wrd_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -2846,6 +2846,10 @@ command batsql.dec_round(v:bat[:oid,:lng address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2874,6 +2878,10 @@ command batsql.round(v:bat[:oid,:lng],d: address lng_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] +address wrd_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] address int_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -37739,6 +37747,10 @@ command calc.second_interval(sc:int,v:ln address lng_dec2second_interval; comment cast lng decimal to a second_interval +command calc.second_interval(sc:int,v:wrd,ek:int,sk:int):lng +address wrd_dec2second_interval; +comment cast wrd decimal to a second_interval + command calc.second_interval(sc:int,v:int,ek:int,sk:int):lng address int_dec2second_interval; comment cast int decimal to a second_interval @@ -41266,6 +41278,10 @@ command sql.dec_round(v:lng,r:lng):lng address lng_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:wrd,r:wrd):wrd +address wrd_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:int,r:int):int address int_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -41478,6 +41494,10 @@ command sql.round(v:lng,d:int,s:int,r:bt address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:wrd,d:int,s:int,r:bte):wrd +address wrd_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) 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 @@ -104,7 +104,6 @@ BAT *BATconstant(int tt, const void *val BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error); BAT *BATcopy(BAT *b, int ht, int tt, int writeable, int role); BUN BATcount_no_nil(BAT *b); -BAT *BATcross(BAT *l, BAT *r); gdk_return BATcross1(BAT **r1p, BAT **r2p, BAT *l, BAT *r); BAT *BATdel(BAT *b, BAT *c, bit force); BAT *BATdelHead(BAT *b, BAT *c, bit force); @@ -627,7 +626,6 @@ str AGGRprod3_sht(bat *retval, const bat str AGGRprod3_wrd(bat *retval, const bat *bid, const bat *gid, const bat *eid); str AGGRquantile(bat *retval, const bat *bid, const bat *quantile, const bit *skip_nils); str AGGRquantile3(bat *retval, const bat *bid, const bat *gid, const bat *eid, const bat *quantile); -str AGGRsize2(bat *retval, const bat *bid, const bat *eid); str AGGRsize2nils(bat *retval, const bat *bid, const bat *eid); str AGGRstdev2_dbl(bat *retval, const bat *bid, const bat *eid); str AGGRstdev3_dbl(bat *retval, const bat *bid, const bat *gid, const bat *eid); @@ -727,20 +725,15 @@ str ALGcopy(bat *result, const bat *bid) str ALGcount_bat(wrd *result, const bat *bid); str ALGcount_nil(wrd *result, const bat *bid, const bit *ignore_nils); str ALGcount_no_nil(wrd *result, const bat *bid); -str ALGcross(bat *result, const bat *lid, const bat *rid); str ALGcrossproduct2(bat *l, bat *r, const bat *lid, const bat *rid); -str ALGexist(bit *ret, const bat *bid, ptr val); -str ALGfetch(ptr ret, const bat *bid, const lng *pos); -str ALGfetchint(ptr ret, const bat *bid, const int *pos); +str ALGexist(bit *ret, const bat *bid, const void *val); str ALGfetchoid(ptr ret, const bat *bid, const oid *pos); str ALGfind(ptr ret, const bat *bid, ptr val); str ALGfirstn(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ALGgroupby(bat *res, const bat *gids, const bat *cnts); -str ALGhmarkp(bat *result, const bat *bid, const int *nr_parts, const int *part_nr); str ALGhsort(bat *result, const bat *bid); str ALGhsort_rev(bat *result, const bat *bid); str ALGhtsort(bat *result, const bat *lid); -str ALGidentity(bat *ret, const bat *bid); str ALGindexjoin(bat *result, const bat *lid, const bat *rid); str ALGjoin(bat *result, const bat *lid, const bat *rid); str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid); @@ -753,7 +746,6 @@ str ALGleftfetchjoin(bat *result, const str ALGleftjoin(bat *result, const bat *lid, const bat *rid); str ALGleftjoinestimate(bat *result, const bat *lid, const bat *rid, const lng *estimate); str ALGlike(bat *ret, const bat *bid, const str *k); -str ALGmarkHead_default(bat *result, const bat *bid); str ALGmark_grp_1(bat *result, const bat *bid, const bat *gid); str ALGmark_grp_2(bat *result, const bat *bid, const bat *gid, const oid *base); str ALGmaxany(ptr result, const bat *bid); @@ -835,14 +827,14 @@ str AUTHrequireAdmin(Client *c); str AUTHresolveUser(str *ret, oid *uid); str AUTHsetPassword(Client *c, str *username, str *passwd); str AUTHunlockVault(str *password); -str BATPCREilike(bat *ret, bat *b, str *pat, str *esc); -str BATPCREilike2(bat *ret, bat *b, str *pat); -str BATPCRElike(bat *ret, bat *b, str *pat, str *esc); -str BATPCRElike2(bat *ret, bat *b, str *pat); -str BATPCREnotilike(bat *ret, bat *b, str *pat, str *esc); -str BATPCREnotilike2(bat *ret, bat *b, str *pat); -str BATPCREnotlike(bat *ret, bat *b, str *pat, str *esc); -str BATPCREnotlike2(bat *ret, bat *b, str *pat); +str BATPCREilike(bat *ret, const bat *b, const str *pat, const str *esc); +str BATPCREilike2(bat *ret, const bat *b, const str *pat); +str BATPCRElike(bat *ret, const bat *b, const str *pat, const str *esc); +str BATPCRElike2(bat *ret, const bat *b, const str *pat); +str BATPCREnotilike(bat *ret, const bat *b, const str *pat, const str *esc); +str BATPCREnotilike2(bat *ret, const bat *b, const str *pat); +str BATPCREnotlike(bat *ret, const bat *b, const str *pat, const str *esc); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
