Changeset: ede862bdc2bd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ede862bdc2bd Modified Files: clients/Tests/exports.stable.out monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batcolor.h monetdb5/modules/mal/cluster.c monetdb5/modules/mal/cluster.h monetdb5/modules/mal/tokenizer.c Branch: Oct2014 Log Message:
Use correct type (bat) and use const. diffs (truncated from 3139 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 @@ -717,113 +717,113 @@ str ALARMsleep(int *res, int *secs); str ALARMtime(int *res); str ALARMtimers(int *res); str ALARMusec(lng *ret); -str ALGantijoin(int *result, int *lid, int *rid); -str ALGantijoin2(int *l, int *r, int *lid, int *rid); -str ALGavg(dbl *res, int *bid); -str ALGbandjoin(int *result, int *lid, int *rid, const void *minus, const void *plus, bit *li, bit *hi); -str ALGbandjoin2(int *l, int *r, int *lid, int *rid, const void *minus, const void *plus, bit *li, bit *hi); -str ALGbandjoin_default(int *result, int *lid, int *rid, const void *minus, const void *plus); -str ALGcard(lng *result, int *bid); -str ALGcopy(int *result, int *bid); -str ALGcount_bat(wrd *result, int *bid); -str ALGcount_nil(wrd *result, int *bid, bit *ignore_nils); -str ALGcount_no_nil(wrd *result, int *bid); -str ALGcross(int *result, int *lid, int *rid); -str ALGcrossproduct2(int *l, int *r, int *lid, int *rid); -str ALGexist(bit *ret, int *bid, ptr val); -str ALGfetch(ptr ret, int *bid, lng *pos); -str ALGfetchint(int *ret, int *bid, int *pos); -str ALGfetchoid(int *ret, int *bid, oid *pos); -str ALGfind(ptr ret, int *bid, ptr val); +str ALGantijoin(bat *result, const bat *lid, const bat *rid); +str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid); +str ALGavg(dbl *res, const bat *bid); +str ALGbandjoin(bat *result, const bat *lid, const bat *rid, const void *minus, const void *plus, const bit *li, const bit *hi); +str ALGbandjoin2(bat *l, bat *r, const bat *lid, const bat *rid, const void *minus, const void *plus, const bit *li, const bit *hi); +str ALGbandjoin_default(bat *result, const bat *lid, const bat *rid, const void *minus, const void *plus); +str ALGcard(lng *result, const bat *bid); +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 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(int *res, int *gids, int *cnts); -str ALGhmarkp(int *result, int *bid, int *nr_parts, int *part_nr); -str ALGhsort(int *result, int *bid); -str ALGhsort_rev(int *result, int *bid); -str ALGhtsort(int *result, int *lid); -str ALGidentity(int *ret, int *bid); -str ALGindexjoin(int *result, int *lid, int *rid); -str ALGjoin(int *result, int *lid, int *rid); -str ALGjoin2(int *l, int *r, int *lid, int *rid); +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); str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); BAT *ALGjoinPathBody(Client cntxt, int top, BAT **joins, int flag); -str ALGjoinestimate(int *result, int *lid, int *rid, lng *estimate); -str ALGkdiff(int *result, int *lid, int *rid); -str ALGkunion(int *result, int *lid, int *rid); -str ALGleftfetchjoin(int *result, int *lid, int *rid); -str ALGleftjoin(int *result, int *lid, int *rid); -str ALGleftjoinestimate(int *result, int *lid, int *rid, lng *estimate); -str ALGlike(int *ret, int *bid, str *k); -str ALGmarkHead(int *result, int *bid, oid *base); -str ALGmarkHead_default(int *result, int *bid); -str ALGmark_grp_1(int *result, int *bid, int *gid); -str ALGmark_grp_2(int *result, int *bid, int *gid, oid *base); -str ALGmaxany(ptr result, int *bid); -str ALGminany(ptr result, int *bid); -str ALGouterjoin(int *result, int *lid, int *rid); -str ALGouterjoinestimate(int *result, int *lid, int *rid, lng *estimate); -str ALGprojectNIL(int *ret, int *bid); +str ALGjoinestimate(bat *result, const bat *lid, const bat *rid, const lng *estimate); +str ALGkdiff(bat *result, const bat *lid, const bat *rid); +str ALGkunion(bat *result, const bat *lid, const bat *rid); +str ALGleftfetchjoin(bat *result, const bat *lid, const bat *rid); +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(bat *result, const bat *bid, const oid *base); +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); +str ALGminany(ptr result, const bat *bid); +str ALGouterjoin(bat *result, const bat *lid, const bat *rid); +str ALGouterjoinestimate(bat *result, const bat *lid, const bat *rid, const lng *estimate); +str ALGprojectNIL(bat *ret, const bat *bid); str ALGprojecthead(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str ALGrangejoin(int *result, int *lid, int *rlid, int *rhid, bit *li, bit *hi); -str ALGrangejoin2(int *l, int *r, int *lid, int *rlid, int *rhid, bit *li, bit *hi); -str ALGreuse(int *ret, int *bid); -str ALGrevert(int *result, int *bid); -str ALGsample(int *result, int *bid, int *param); -str ALGselect(int *result, int *bid, ptr low, ptr high); -str ALGselect1(int *result, int *bid, ptr value); -str ALGselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); -str ALGselectNotNil(int *result, int *bid); -str ALGsemijoin(int *result, int *lid, int *rid); -str ALGslice(int *ret, bat *bid, lng *start, lng *end); -str ALGslice_int(int *ret, bat *bid, int *start, int *end); -str ALGslice_oid(int *ret, bat *bid, oid *start, oid *end); -str ALGslice_wrd(int *ret, bat *bid, wrd *start, wrd *end); -str ALGssort(int *result, int *bid); -str ALGssort_rev(int *result, int *bid); -str ALGstdev(dbl *res, int *bid); -str ALGstdevp(dbl *res, int *bid); -str ALGsubbandjoin(bat *r1, bat *r2, bat *lid, bat *rid, bat *slid, bat *srid, const void *low, const void *high, const bit *li, const bit *hi, const lng *estimate); -str ALGsubjoin(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, const bit *nil_matches, const lng *estimate); -str ALGsubleftjoin(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, const bit *nil_matches, const lng *estimate); -str ALGsubouterjoin(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, const bit *nil_matches, const lng *estimate); -str ALGsubrangejoin(bat *r1, bat *r2, bat *lid, bat *rlid, bat *rhid, bat *slid, bat *srid, const bit *li, const bit *hi, const lng *estimate); -str ALGsubselect1(bat *result, bat *bid, const void *low, const void *high, const bit *li, const bit *hi, const bit *anti); -str ALGsubselect2(bat *result, bat *bid, bat *sid, const void *low, const void *high, const bit *li, const bit *hi, const bit *anti); -str ALGsubslice_wrd(int *ret, bat *bid, wrd *start, wrd *end); -str ALGsubsort11(bat *result, bat *bid, bit *reverse, bit *stable); -str ALGsubsort12(bat *result, bat *norder, bat *bid, bit *reverse, bit *stable); -str ALGsubsort13(bat *result, bat *norder, bat *ngroup, bat *bid, bit *reverse, bit *stable); -str ALGsubsort21(bat *result, bat *bid, bat *order, bit *reverse, bit *stable); -str ALGsubsort22(bat *result, bat *norder, bat *bid, bat *order, bit *reverse, bit *stable); -str ALGsubsort23(bat *result, bat *norder, bat *ngroup, bat *bid, bat *order, bit *reverse, bit *stable); -str ALGsubsort31(bat *result, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); -str ALGsubsort32(bat *result, bat *norder, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); -str ALGsubsort33(bat *result, bat *norder, bat *ngroup, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); -str ALGsubthetajoin(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, int *op, const bit *nil_matches, const lng *estimate); -str ALGsubunique1(bat *result, bat *bid); -str ALGsubunique2(bat *result, bat *bid, bat *sid); -str ALGtdiff(int *result, int *lid, int *rid); -str ALGtdifference(int *result, int *lid, int *rid); -str ALGthetajoin(int *result, int *lid, int *rid, int *opc); -str ALGthetajoin2(int *l, int *r, int *lid, int *rid, int *opc); -str ALGthetajoinEstimate(int *result, int *lid, int *rid, int *opc, lng *estimate); -str ALGthetasubselect1(bat *result, bat *bid, const void *val, const char **op); -str ALGthetasubselect2(bat *result, bat *bid, bat *sid, const void *val, const char **op); -str ALGthsort(int *result, int *lid); -str ALGtinter(int *result, int *lid, int *rid); -str ALGtintersect(int *result, int *lid, int *rid); -str ALGtmark(int *result, int *bid, oid *base); -str ALGtmark_default(int *result, int *bid); -str ALGtmarkp(int *result, int *bid, int *nr_parts, int *part_nr); -str ALGtsort(int *result, int *bid); -str ALGtsort_rev(int *result, int *bid); -str ALGtunion(int *result, int *lid, int *rid); -str ALGuselect(int *result, int *bid, ptr low, ptr high); -str ALGuselect1(int *result, int *bid, ptr value); -str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit *rin); -str ALGvariance(dbl *res, int *bid); -str ALGvariancep(dbl *res, int *bid); +str ALGrangejoin(bat *result, const bat *lid, const bat *rlid, const bat *rhid, const bit *li, const bit *hi); +str ALGrangejoin2(bat *l, bat *r, const bat *lid, const bat *rlid, const bat *rhid, const bit *li, const bit *hi); +str ALGreuse(bat *ret, const bat *bid); +str ALGrevert(bat *result, const bat *bid); +str ALGsample(bat *result, const bat *bid, const int *param); +str ALGselect(bat *result, const bat *bid, ptr low, ptr high); +str ALGselect1(bat *result, const bat *bid, ptr value); +str ALGselectInclusive(bat *result, const bat *bid, ptr low, ptr high, const bit *lin, const bit *rin); +str ALGselectNotNil(bat *result, const bat *bid); +str ALGsemijoin(bat *result, const bat *lid, const bat *rid); +str ALGslice(bat *ret, const bat *bid, const lng *start, const lng *end); +str ALGslice_int(bat *ret, const bat *bid, const int *start, const int *end); +str ALGslice_oid(bat *ret, const bat *bid, const oid *start, const oid *end); +str ALGslice_wrd(bat *ret, const bat *bid, const wrd *start, const wrd *end); +str ALGssort(bat *result, const bat *bid); +str ALGssort_rev(bat *result, const bat *bid); +str ALGstdev(dbl *res, const bat *bid); +str ALGstdevp(dbl *res, const bat *bid); +str ALGsubbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const void *low, const void *high, const bit *li, const bit *hi, const lng *estimate); +str ALGsubjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); +str ALGsubleftjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); +str ALGsubouterjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); +str ALGsubrangejoin(bat *r1, bat *r2, const bat *lid, const bat *rlid, const bat *rhid, const bat *slid, const bat *srid, const bit *li, const bit *hi, const lng *estimate); +str ALGsubselect1(bat *result, const bat *bid, const void *low, const void *high, const bit *li, const bit *hi, const bit *anti); +str ALGsubselect2(bat *result, const bat *bid, const bat *sid, const void *low, const void *high, const bit *li, const bit *hi, const bit *anti); +str ALGsubslice_wrd(bat *ret, const bat *bid, const wrd *start, const wrd *end); +str ALGsubsort11(bat *result, const bat *bid, const bit *reverse, const bit *stable); +str ALGsubsort12(bat *result, bat *norder, const bat *bid, const bit *reverse, const bit *stable); +str ALGsubsort13(bat *result, bat *norder, bat *ngroup, const bat *bid, const bit *reverse, const bit *stable); +str ALGsubsort21(bat *result, const bat *bid, const bat *order, const bit *reverse, const bit *stable); +str ALGsubsort22(bat *result, bat *norder, const bat *bid, const bat *order, const bit *reverse, const bit *stable); +str ALGsubsort23(bat *result, bat *norder, bat *ngroup, const bat *bid, const bat *order, const bit *reverse, const bit *stable); +str ALGsubsort31(bat *result, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); +str ALGsubsort32(bat *result, bat *norder, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); +str ALGsubsort33(bat *result, bat *norder, bat *ngroup, const bat *bid, const bat *order, const bat *group, const bit *reverse, const bit *stable); +str ALGsubthetajoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const int *op, const bit *nil_matches, const lng *estimate); +str ALGsubunique1(bat *result, const bat *bid); +str ALGsubunique2(bat *result, const bat *bid, const bat *sid); +str ALGtdiff(bat *result, const bat *lid, const bat *rid); +str ALGtdifference(bat *result, const bat *lid, const bat *rid); +str ALGthetajoin(bat *result, const bat *lid, const bat *rid, const int *opc); +str ALGthetajoin2(bat *l, bat *r, const bat *lid, const bat *rid, const int *opc); +str ALGthetajoinEstimate(bat *result, const bat *lid, const bat *rid, const int *opc, const lng *estimate); +str ALGthetasubselect1(bat *result, const bat *bid, const void *val, const char **op); +str ALGthetasubselect2(bat *result, const bat *bid, const bat *sid, const void *val, const char **op); +str ALGthsort(bat *result, const bat *lid); +str ALGtinter(bat *result, const bat *lid, const bat *rid); +str ALGtintersect(bat *result, const bat *lid, const bat *rid); +str ALGtmark(bat *result, const bat *bid, const oid *base); +str ALGtmark_default(bat *result, const bat *bid); +str ALGtmarkp(bat *result, const bat *bid, const int *nr_parts, const int *part_nr); +str ALGtsort(bat *result, const bat *bid); +str ALGtsort_rev(bat *result, const bat *bid); +str ALGtunion(bat *result, const bat *lid, const bat *rid); +str ALGuselect(bat *result, const bat *bid, ptr low, ptr high); +str ALGuselect1(bat *result, const bat *bid, ptr value); +str ALGuselectInclusive(bat *result, const bat *bid, ptr low, ptr high, const bit *lin, const bit *rin); +str ALGvariance(dbl *res, const bat *bid); +str ALGvariancep(dbl *res, const bat *bid); str AUTHaddUser(oid *ret, Client *c, str *user, str *pass); str AUTHchangePassword(Client *c, str *oldpass, str *passwd); str AUTHchangeUsername(Client *c, str *olduser, str *newuser); @@ -865,104 +865,104 @@ str BATXMLstr2xml(bat *ret, const bat *b str BATXMLxml2str(bat *ret, const bat *bid); str BATXMLxmltext(bat *ret, const bat *bid); str BATXMLxquery(bat *ret, const bat *bid, const char *const *expr); -str BKCaccbuild(int *ret, int *bid, str *acc, ptr *param); -str BKCaccbuild_std(int *ret, int *bid, int *acc); -str BKCappend_force_wrap(int *r, int *bid, int *uid, bit *force); -str BKCappend_reverse_val_wrap(int *r, int *bid, ptr u); -str BKCappend_val_force_wrap(int *r, int *bid, ptr u, bit *force); -str BKCappend_val_wrap(int *r, int *bid, ptr u); -str BKCappend_wrap(int *r, int *bid, int *uid); -str BKCattach(int *ret, int *tt, str *heapfile); -char *BKCbat_append_val_wrap(int *r, int *bid, ptr u); -char *BKCbat_append_void_bat_wrap(int *r, int *bid, int *uid); -str BKCbat_inplace(int *r, int *bid, int *rid); -str BKCbat_inplace_force(int *r, int *bid, int *rid, bit *force); -str BKCbatdisksize(lng *tot, int *bid); -str BKCbatsize(lng *tot, int *bid); -str BKCbatvmsize(lng *tot, int *bid); -str BKCbun_inplace(int *r, int *bid, oid *id, ptr t); -str BKCbun_inplace_force(int *r, int *bid, oid *id, ptr t, bit *force); -str BKCcold(int *res, str *input); -str BKCcoldBAT(int *res, int *bid); -char *BKCdelete(int *r, int *bid, const void *h); -str BKCdelete_all(int *r, int *bid); -char *BKCdelete_bat(int *r, int *bid, int *bnid); -str BKCdelete_bat(int *r, int *bid, int *sid); -str BKCdelete_bat_bun(int *r, int *bid, int *sid); -char *BKCdelete_bun(int *r, int *bid, ptr h, ptr t); -str BKCdensebat(int *ret, wrd *size); -char *BKCdestroy(signed char *r, int *bid); -char *BKCdestroyImmediate(signed char *r, int *bid); -str BKCdestroy_bat(bit *r, str *input); -str BKCgetAccess(str *res, int *bid); -char *BKCgetAlpha(int *r, int *bid); -str BKCgetBBPname(str *ret, int *bid); -str BKCgetCapacity(lng *res, int *bid); -str BKCgetColumnType(str *res, int *bid); -char *BKCgetDelta(int *r, int *bid); -str BKCgetHeadType(str *res, int *bid); -str BKCgetKey(bit *ret, int *bid); -str BKCgetRole(str *res, int *bid); -str BKCgetSequenceBase(oid *r, int *bid); -str BKCgetSpaceUsed(lng *tot, int *bid); -str BKCgetStorageSize(lng *tot, int *bid); +str BKCaccbuild(bat *ret, const bat *bid, const char *const *acc, const ptr *param); +str BKCaccbuild_std(bat *ret, const bat *bid, const int *acc); +str BKCappend_force_wrap(bat *r, const bat *bid, const bat *uid, const bit *force); +str BKCappend_reverse_val_wrap(bat *r, const bat *bid, const void *u); +str BKCappend_val_force_wrap(bat *r, const bat *bid, const void *u, const bit *force); +str BKCappend_val_wrap(bat *r, const bat *bid, const void *u); +str BKCappend_wrap(bat *r, const bat *bid, const bat *uid); +str BKCattach(bat *ret, const int *tt, const char *const *heapfile); +char *BKCbat_append_val_wrap(bat *r, const bat *bid, const void *u); +char *BKCbat_append_void_bat_wrap(bat *r, const bat *bid, const bat *uid); +str BKCbat_inplace(bat *r, const bat *bid, const bat *rid); +str BKCbat_inplace_force(bat *r, const bat *bid, const bat *rid, const bit *force); +str BKCbatdisksize(lng *tot, const bat *bid); +str BKCbatsize(lng *tot, const bat *bid); +str BKCbatvmsize(lng *tot, const bat *bid); +str BKCbun_inplace(bat *r, const bat *bid, const oid *id, const void *t); +str BKCbun_inplace_force(bat *r, const bat *bid, const oid *id, const void *t, const bit *force); +str BKCcold(bat *res, const char *const *input); +str BKCcoldBAT(bat *res, const bat *bid); +char *BKCdelete(bat *r, const bat *bid, const void *h); +str BKCdelete_all(bat *r, const bat *bid); +char *BKCdelete_bat(bat *r, const bat *bid, const bat *bnid); +str BKCdelete_bat(bat *r, const bat *bid, const bat *sid); +str BKCdelete_bat_bun(bat *r, const bat *bid, const bat *sid); +char *BKCdelete_bun(bat *r, const bat *bid, const void *h, const void *t); +str BKCdensebat(bat *ret, const wrd *size); +char *BKCdestroy(signed char *r, bat *bid); +char *BKCdestroyImmediate(signed char *r, const bat *bid); +str BKCdestroy_bat(bit *r, const char *const *input); +str BKCgetAccess(str *res, const bat *bid); +char *BKCgetAlpha(bat *r, const bat *bid); +str BKCgetBBPname(str *ret, const bat *bid); +str BKCgetCapacity(lng *res, const bat *bid); +str BKCgetColumnType(str *res, const bat *bid); +char *BKCgetDelta(bat *r, const bat *bid); +str BKCgetHeadType(str *res, const bat *bid); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
