Changeset: b9e249ae9f0c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9e249ae9f0c Modified Files: clients/Tests/exports.stable.out Branch: xid Log Message:
Merge with default branch. diffs (27 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 @@ -173,6 +173,7 @@ BAT *BATsort_rev(BAT *b); BAT *BATssort(BAT *b); BAT *BATssort_rev(BAT *b); 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); BAT *BATsunion(BAT *b, BAT *c); BAT *BATsunique(BAT *b); BAT *BATthetajoin(BAT *l, BAT *r, int mode, BUN estimate); @@ -719,6 +720,15 @@ str ALGstdev_sht(dbl *res, int *bid); str ALGstdev_wrd(dbl *res, int *bid); 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 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 ALGsum_bte_bte(bte *res, int *bid, bit *empty_is_nil); str ALGsum_bte_dbl(dbl *res, int *bid, bit *empty_is_nil); str ALGsum_bte_int(int *res, int *bid, bit *empty_is_nil); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
