Changeset: d140280d019f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d140280d019f Modified Files: clients/Tests/exports.stable.out Branch: default Log Message:
Approve changes in sub-join interfaces. diffs (41 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 @@ -194,10 +194,11 @@ BAT *BATsort(BAT *b); BAT *BATsort_rev(BAT *b); BAT *BATssort(BAT *b); BAT *BATssort_rev(BAT *b); -gdk_return BATsubhashjoin(BAT **r1, BAT **r2, BAT *l, BAT *r, BAT *sl, BAT *sr); -gdk_return BATsubmergejoin(BAT **r1, BAT **r2, BAT *l, BAT *r, BAT *sl, BAT *sr); +gdk_return BATsubleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, BUN estimate); +gdk_return BATsubouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, BUN estimate); BAT *BATsubselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi, int anti); gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o, BAT *g, int reverse, int stable); +gdk_return BATsubthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, const char *op, BUN estimate); gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, int skip_nils, int abort_on_error, int nil_if_empty); BAT *BATsunion(BAT *b, BAT *c); BAT *BATsunique(BAT *b); @@ -823,10 +824,10 @@ 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 ALGsubhashjoin(bat *r1, bat *r2, bat *l, bat *r); -str ALGsubhashjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr); -str ALGsubmergejoin(bat *r1, bat *r2, bat *l, bat *r); -str ALGsubmergejoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr); +str ALGsubleftjoin(bat *r1, bat *r2, bat *l, bat *r); +str ALGsubleftjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr); +str ALGsubouterjoin(bat *r1, bat *r2, bat *l, bat *r); +str ALGsubouterjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr); str ALGsubsample(int *result, int *bid, int *param); 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); @@ -840,6 +841,8 @@ str ALGsubsort23(bat *result, bat *norde 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, str *op); +str ALGsubthetajoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, str *op); str ALGsunion(int *result, int *lid, int *rid); str ALGsunique(int *result, int *bid); str ALGtdiff(int *result, int *lid, int *rid); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
