Changeset: e2d0850cf358 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2d0850cf358 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message:
Approved after recent changes. diffs (truncated from 324 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 @@ -114,7 +114,6 @@ BAT *BATgroup(BAT *b, int start, int inc BUN BATgrows(BAT *b); BAT *BAThash(BAT *b, BUN masksize); BAT *BAThashjoin(BAT *l, BAT *r, BUN estimate); -BAT *BAThashsplit(BAT *b, BUN n, int unary); BAT *BAThistogram(BAT *b); BAT *BATins(BAT *b, BAT *c, bit force); BAT *BATjoin(BAT *l, BAT *r, BUN estimate); @@ -147,7 +146,6 @@ BAT *BATprev(BAT *b); int BATprint(BAT *b); int BATprintf(stream *f, BAT *b); BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi); -BAT *BATrangesplit(BAT *b, BUN n, int unary); BAT *BATreplace(BAT *b, BAT *n, bit force); BAT *BATrestrict(BAT *b, const void *hl, const void *hh, const void *tl, const void *th); BAT *BATrevert(BAT *b); @@ -237,7 +235,7 @@ BAT *GDKkey; void *GDKmalloc(size_t size); size_t GDKmem_cursize(void); size_t GDKmem_inuse(void); -void *GDKmmap(char *path, int mode, off_t off, size_t len); +void *GDKmmap(const char *path, int mode, off_t off, size_t len); int GDKms(void); int GDKnr_threads; void GDKprotect(void); @@ -287,7 +285,7 @@ void MT_locktrace_end(void); char *MT_locktrace_nme[65536]; void MT_locktrace_start(void); struct Mallinfo MT_mallinfo(void); -void *MT_mmap(char *path, int mode, off_t off, size_t len); +void *MT_mmap(const char *path, int mode, off_t off, size_t len); int MT_munmap(void *p, size_t len); int MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); @@ -738,19 +736,22 @@ str ALGsum_wrd_lng(lng *res, int *bid, b str ALGsum_wrd_wrd(wrd *res, int *bid, bit *empty_is_nil); str ALGsunion(int *result, int *lid, int *rid); str ALGsunique(int *result, int *bid); +str ALGtdiff(int *result, int *lid, int *rid); str ALGthetajoin(int *result, int *lid, int *rid, int *opc); str ALGthetajoinEstimate(int *result, int *lid, int *rid, int *opc, lng *estimate); str ALGthetaselect(int *result, int *bid, ptr low, str *op); str ALGthetauselect(int *result, int *bid, ptr value, str *op); str ALGthsort(int *result, int *lid); +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 ALGtopN(int *res, int *bid, lng *top); str ALGtsort(int *result, int *bid); str ALGtsort_rev(int *result, int *bid); +str ALGtunion(int *result, int *lid, int *rid); str ALGtunique(int *result, int *bid); -str ALGuhashsplit(int *result, int *bid, int *nfrag); +str ALGtunique(int *result, int *bid); 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); @@ -920,7 +921,6 @@ ptr BATmin(BAT *b, ptr aggr); char BBPTraceCall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc); str BKCaccbuild(int *ret, int *bid, str *acc, ptr *param); str BKCaccbuild_std(int *ret, int *bid, int *acc); -str BKCaccess(int *res, int *bid, int *m); 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); @@ -967,7 +967,7 @@ str BKChasWriteMode(bit *res, int *bid); str BKCheat(int *res, str *input); str BKChot(int *res, str *input); str BKChotBAT(int *res, int *bid); -str BKCinfo(int *retval, int *bid); +str BKCinfo(int *ret1, int *ret2, int *bid); str BKCinsert_bat(int *r, int *bid, int *sid); str BKCinsert_bat_force(int *r, int *bid, int *sid, bit *force); char *BKCinsert_bun(int *r, int *bid, ptr h, ptr t); @@ -1242,7 +1242,6 @@ str CMDbbpDiskReads(lng *ret); str CMDbbpDiskSpace(lng *ret); str CMDbbpDiskWrites(lng *ret); str CMDbbpGetObjects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbbpHeadType(int *ret); str CMDbbpHeat(int *ret); str CMDbbpKind(int *ret); str CMDbbpLRefCount(int *ret); @@ -1254,7 +1253,7 @@ str CMDbbpRefCount(int *ret); str CMDbbpReleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbpStatus(int *ret); str CMDbbpSubCommit(int *ret, int *bid); -str CMDbbpTailType(int *ret); +str CMDbbpType(int *ret); str CMDbbpbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbbpbind2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CMDbbpbindDefinition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1323,108 +1322,41 @@ str CMDgetPageSize(int *ret); str CMDgetSystemTime(lng *ret); str CMDgetTrace(int *res, str *ev); str CMDgetUserTime(lng *ret); -str CMDifThenCst_bit(int *ret, int *bid, bit *tid); -str CMDifThenCst_bte(int *ret, int *bid, bte *tid); -str CMDifThenCst_dbl(int *ret, int *bid, dbl *tid); -str CMDifThenCst_flt(int *ret, int *bid, flt *tid); -str CMDifThenCst_int(int *ret, int *bid, int *tid); -str CMDifThenCst_lng(int *ret, int *bid, lng *tid); -str CMDifThenCst_oid(int *ret, int *bid, oid *tid); -str CMDifThenCst_sht(int *ret, int *bid, sht *tid); -str CMDifThenCst_str(int *ret, int *bid, str *tid); -str CMDifThenElseCst1_bit(int *ret, int *bid, bit *val, int *eid); -str CMDifThenElseCst1_bte(int *ret, int *bid, bte *val, int *eid); -str CMDifThenElseCst1_dbl(int *ret, int *bid, dbl *val, int *eid); -str CMDifThenElseCst1_flt(int *ret, int *bid, flt *val, int *eid); -str CMDifThenElseCst1_int(int *ret, int *bid, int *val, int *eid); -str CMDifThenElseCst1_lng(int *ret, int *bid, lng *val, int *eid); -str CMDifThenElseCst1_oid(int *ret, int *bid, oid *val, int *eid); -str CMDifThenElseCst1_sht(int *ret, int *bid, sht *val, int *eid); -str CMDifThenElseCst1_str(int *ret, int *bid, str *val, int *eid); -str CMDifThenElseCst2_bit(int *ret, int *bid, int *tid, bit *val); -str CMDifThenElseCst2_bte(int *ret, int *bid, int *tid, bte *val); -str CMDifThenElseCst2_dbl(int *ret, int *bid, int *tid, dbl *val); -str CMDifThenElseCst2_flt(int *ret, int *bid, int *tid, flt *val); -str CMDifThenElseCst2_int(int *ret, int *bid, int *tid, int *val); -str CMDifThenElseCst2_lng(int *ret, int *bid, int *tid, lng *val); -str CMDifThenElseCst2_oid(int *ret, int *bid, int *tid, oid *val); -str CMDifThenElseCst2_sht(int *ret, int *bid, int *tid, sht *val); -str CMDifThenElseCst2_str(int *ret, int *bid, int *tid, str *val); -str CMDifThenElseCst_bit(int *ret, int *bid, bit *tid, bit *eid); -str CMDifThenElseCst_bte(int *ret, int *bid, bte *tid, bte *eid); -str CMDifThenElseCst_dbl(int *ret, int *bid, dbl *tid, dbl *eid); -str CMDifThenElseCst_flt(int *ret, int *bid, flt *tid, flt *eid); -str CMDifThenElseCst_int(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElseCst_lng(int *ret, int *bid, lng *tid, lng *eid); -str CMDifThenElseCst_oid(int *ret, int *bid, oid *tid, oid *eid); -str CMDifThenElseCst_sht(int *ret, int *bid, sht *tid, sht *eid); -str CMDifThenElseCst_str(int *ret, int *bid, str *tid, str *eid); -str CMDifThenElse_bit(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_bte(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_dbl(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_flt(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_int(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_lng(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_oid(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_sht(int *ret, int *bid, int *tid, int *eid); -str CMDifThenElse_str(int *ret, int *bid, int *tid, int *eid); -str CMDifThen_bit(int *ret, int *bid, int *tid); -str CMDifThen_bte(int *ret, int *bid, int *tid); -str CMDifThen_dbl(int *ret, int *bid, int *tid); -str CMDifThen_flt(int *ret, int *bid, int *tid); -str CMDifThen_int(int *ret, int *bid, int *tid); -str CMDifThen_lng(int *ret, int *bid, int *tid); -str CMDifThen_oid(int *ret, int *bid, int *tid); -str CMDifThen_sht(int *ret, int *bid, int *tid); -str CMDifThen_str(int *ret, int *bid, int *tid); +str CMDifThen(int *ret, int *bid, int *tid); +str CMDifThenCst(int *ret, int *bid, ptr *tid); +str CMDifThenCst_bit(int *ret, int *bid, ptr *tid); +str CMDifThenCst_bte(int *ret, int *bid, ptr *tid); +str CMDifThenCst_dbl(int *ret, int *bid, ptr *tid); +str CMDifThenCst_flt(int *ret, int *bid, ptr *tid); +str CMDifThenCst_int(int *ret, int *bid, ptr *tid); +str CMDifThenCst_lng(int *ret, int *bid, ptr *tid); +str CMDifThenCst_oid(int *ret, int *bid, ptr *tid); +str CMDifThenCst_sht(int *ret, int *bid, ptr *tid); +str CMDifThenCst_str(int *ret, int *bid, ptr *tid); +str CMDifThenElse(int *ret, int *bid, int *tid, int *eid); +str CMDifThenElseCst(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst1(int *ret, int *bid, ptr *val, int *eid); +str CMDifThenElseCst2(int *ret, int *bid, int *tid, ptr *val); +str CMDifThenElseCst_bit(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_bte(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_dbl(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_flt(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_int(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_lng(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_sht(int *ret, int *bid, ptr *tid, ptr *eid); +str CMDifThenElseCst_str(int *ret, int *bid, ptr *tid, ptr *eid); str CMDincludeFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDmodules(int *bid); str CMDnoopProfiler(int *res); str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDqgramnormalize(str *res, str *input); -str CMDqgramselfjoin(BAT **res, BAT *qgram, BAT *id, BAT *pos, BAT *len, flt *c, int *k); +str CMDqgramselfjoin(BAT **res, BAT **res2, BAT *qgram, BAT *id, BAT *pos, BAT *len, flt *c, int *k); str CMDraise(str *ret, str *msg); str CMDregisterFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDscience_bat_cst_atan2_dbl(int *ret, int *bid, dbl *d); str CMDscience_bat_cst_atan2_flt(int *ret, int *bid, flt *d); str CMDscience_bat_cst_pow_dbl(int *ret, int *bid, dbl *d); str CMDscience_bat_cst_pow_flt(int *ret, int *bid, flt *d); -str CMDscience_bat_dbl_acos(int *ret, int *bid); -str CMDscience_bat_dbl_asin(int *ret, int *bid); -str CMDscience_bat_dbl_atan(int *ret, int *bid); -str CMDscience_bat_dbl_ceil(int *ret, int *bid); -str CMDscience_bat_dbl_cos(int *ret, int *bid); -str CMDscience_bat_dbl_cosh(int *ret, int *bid); -str CMDscience_bat_dbl_degrees(int *ret, int *bid); -str CMDscience_bat_dbl_exp(int *ret, int *bid); -str CMDscience_bat_dbl_fabs(int *ret, int *bid); -str CMDscience_bat_dbl_floor(int *ret, int *bid); -str CMDscience_bat_dbl_log(int *ret, int *bid); -str CMDscience_bat_dbl_log10(int *ret, int *bid); -str CMDscience_bat_dbl_radians(int *ret, int *bid); -str CMDscience_bat_dbl_sin(int *ret, int *bid); -str CMDscience_bat_dbl_sinh(int *ret, int *bid); -str CMDscience_bat_dbl_sqrt(int *ret, int *bid); -str CMDscience_bat_dbl_tan(int *ret, int *bid); -str CMDscience_bat_dbl_tanh(int *ret, int *bid); -str CMDscience_bat_flt_acos(int *ret, int *bid); -str CMDscience_bat_flt_asin(int *ret, int *bid); -str CMDscience_bat_flt_atan(int *ret, int *bid); -str CMDscience_bat_flt_ceil(int *ret, int *bid); -str CMDscience_bat_flt_cos(int *ret, int *bid); -str CMDscience_bat_flt_cosh(int *ret, int *bid); -str CMDscience_bat_flt_degrees(int *ret, int *bid); -str CMDscience_bat_flt_exp(int *ret, int *bid); -str CMDscience_bat_flt_fabs(int *ret, int *bid); -str CMDscience_bat_flt_floor(int *ret, int *bid); -str CMDscience_bat_flt_log(int *ret, int *bid); -str CMDscience_bat_flt_log10(int *ret, int *bid); -str CMDscience_bat_flt_radians(int *ret, int *bid); -str CMDscience_bat_flt_sin(int *ret, int *bid); -str CMDscience_bat_flt_sinh(int *ret, int *bid); -str CMDscience_bat_flt_sqrt(int *ret, int *bid); -str CMDscience_bat_flt_tan(int *ret, int *bid); -str CMDscience_bat_flt_tanh(int *ret, int *bid); str CMDsetAllProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); @@ -1748,56 +1680,13 @@ str MANUALcreateSection(Client cntxt, Ma str MANUALcreateSummary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANUALhelp(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANUALsearch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MATHbinary_ATAN2dbl(dbl *res, dbl *a, dbl *b); -str MATHbinary_ATAN2flt(flt *res, flt *a, flt *b); -str MATHbinary_POWdbl(dbl *res, dbl *a, dbl *b); -str MATHbinary_POWflt(flt *res, flt *a, flt *b); -str MATHbinary_ROUNDdbl(dbl *res, dbl *a, int *b); -str MATHbinary_ROUNDflt(flt *res, flt *a, int *b); str MATHpi(dbl *pi); str MATHrandint(int *res); str MATHsqlrandint(int *res, int *seed); str MATHsrandint(int *seed); -str MATHunary_ACOSdbl(dbl *res, dbl *a); -str MATHunary_ACOSflt(flt *res, flt *a); -str MATHunary_ASINdbl(dbl *res, dbl *a); -str MATHunary_ASINflt(flt *res, flt *a); -str MATHunary_ATANdbl(dbl *res, dbl *a); -str MATHunary_ATANflt(flt *res, flt *a); -str MATHunary_CEILdbl(dbl *res, dbl *a); -str MATHunary_CEILflt(flt *res, flt *a); -str MATHunary_COSHdbl(dbl *res, dbl *a); -str MATHunary_COSHflt(flt *res, flt *a); -str MATHunary_COSdbl(dbl *res, dbl *a); -str MATHunary_COSflt(flt *res, flt *a); -str MATHunary_COTdbl(dbl *res, dbl *a); -str MATHunary_COTflt(flt *res, flt *a); -str MATHunary_DEGREESdbl(dbl *res, dbl *a); -str MATHunary_DEGREESflt(flt *res, flt *a); -str MATHunary_EXPdbl(dbl *res, dbl *a); -str MATHunary_EXPflt(flt *res, flt *a); -str MATHunary_FABSdbl(dbl *res, dbl *a); str MATHunary_FINITE(bit *res, dbl *a); -str MATHunary_FLOORdbl(dbl *res, dbl *a); -str MATHunary_FLOORflt(flt *res, flt *a); str MATHunary_ISINF(int *res, dbl *a); str MATHunary_ISNAN(bit *res, dbl *a); -str MATHunary_LOG10dbl(dbl *res, dbl *a); -str MATHunary_LOG10flt(flt *res, flt *a); -str MATHunary_LOGdbl(dbl *res, dbl *a); -str MATHunary_LOGflt(flt *res, flt *a); -str MATHunary_RADIANSdbl(dbl *res, dbl *a); -str MATHunary_RADIANSflt(flt *res, flt *a); -str MATHunary_SINHdbl(dbl *res, dbl *a); -str MATHunary_SINHflt(flt *res, flt *a); -str MATHunary_SINdbl(dbl *res, dbl *a); -str MATHunary_SINflt(flt *res, flt *a); -str MATHunary_SQRTdbl(dbl *res, dbl *a); -str MATHunary_SQRTflt(flt *res, flt *a); -str MATHunary_TANHdbl(dbl *res, dbl *a); -str MATHunary_TANHflt(flt *res, flt *a); -str MATHunary_TANdbl(dbl *res, dbl *a); -str MATHunary_TANflt(flt *res, flt *a); str MATdummy(int *ret, str *grp); str MAThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MATinfo(int *ret, str *grp, str *elm); @@ -2582,6 +2471,7 @@ str STRbatRstrSearchcst(int *ret, int *l str STRbatRtrim(int *ret, int *l); str STRbatStrip(int *ret, int *l); str STRbatSubstitutecst(int *ret, int *l, str *arg2, str *arg3, bit *rep); +str STRbatSubstitutecst(int *ret, int *l, str *arg2, str *arg3, bit *rep); str STRbatSuffix(int *ret, int *l, int *r); str STRbatSuffixcst(int *ret, int *l, str *cst); str STRbatTail(int *ret, int *l, int *r); @@ -2590,12 +2480,22 @@ str STRbatUpper(int *ret, int *l); str STRbatWChrAt(int *ret, int *l, int *r); str STRbatWChrAtcst(int *ret, int *l, int *cst); str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc); +str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc); +str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc); str STRbatlike_uselect2(int *ret, int *bid, str *pat); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
