Changeset: 004b76851b36 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=004b76851b36 Modified Files: monetdb5/mal/mal_instruction.mx monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/modules/mal/mat.mx monetdb5/optimizer/opt_mergetable.mx sql/backends/monet5/sql_scenario.c sql/common/sql_types.c sql/server/rel_bin.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_mvc.c testing/Mtest.py.in Branch: default Log Message:
Merge with Aug2011 branch. diffs (truncated from 7483 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All new file mode 100644 --- /dev/null +++ b/clients/Tests/All @@ -0,0 +1,1 @@ +exports diff --git a/clients/Tests/exports.py b/clients/Tests/exports.py new file mode 100644 --- /dev/null +++ b/clients/Tests/exports.py @@ -0,0 +1,1 @@ +import MonetDBtesting.listexports diff --git a/clients/Tests/exports.stable.err b/clients/Tests/exports.stable.err new file mode 100644 --- /dev/null +++ b/clients/Tests/exports.stable.err @@ -0,0 +1,12 @@ +stderr of test 'exports` in directory '.` itself: + + +# 15:10:42 > +# 15:10:42 > "/usr/bin/python" "exports.py" "exports" +# 15:10:42 > + + +# 15:11:17 > +# 15:11:17 > "Done." +# 15:11:17 > + diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out new file mode 100644 --- /dev/null +++ b/clients/Tests/exports.stable.out @@ -0,0 +1,6473 @@ +stdout of test 'exports` in directory '.` itself: + + +# 15:10:42 > +# 15:10:42 > "/usr/bin/python" "exports.py" "exports" +# 15:10:42 > + +# gdk +int ALIGNsetH(BAT *b1, BAT *b2); +int ALIGNsynced(BAT *b1, BAT *b2); +int ATOMcmp(int id, ptr v_1, ptr v_2); +ptr ATOMdup(int id, ptr val); +chr ATOMelmshift(int sz); +int ATOMformat(int id, ptr val, char **buf); +int ATOMindex(char *nme); +int ATOMlen(int id, ptr v); +str ATOMname(int id); +ptr ATOMnil(int id); +int ATOMprint(int id, ptr val, stream *fd); +void ATOMproperty(char *nme, char *property, GDKfcn fcn, int val); +BAT *BAT_select_(BAT *b, ptr tl, ptr th, bit li, bit hi, bit tail, bit anti, bit preserve_order); +size_t BATaccess(BAT *b, int what, int advice, int load); +BAT *BATalpha(BAT *b); +BAT *BATantijoin(BAT *l, BAT *r); +BAT *BATantiuselect_(BAT *b, ptr tl, ptr th, bit li, bit hi); +BAT *BATappend(BAT *b, BAT *c, bit force); +atomDesc BATatoms[]; +BAT *BATattach(int tt, const char *heapfile); +BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi); +BAT *BATclear(BAT *b); +BAT *BATcol_name(BAT *b, const char *tnme); +BAT *BATcommit(BAT *b); +BAT *BATconst(BAT *l, int tt, ptr val); +BAT *BATcopy(BAT *b, int ht, int tt, int writeable); +BUN BATcount(BAT *b); +BUN BATcount_no_nil(BAT *b); +BATstore *BATcreatedesc(int ht, int tt, int heapnames); +BAT *BATcross(BAT *l, BAT *r); +BAT *BATdel(BAT *b, BAT *c, bit force); +BAT *BATdelHead(BAT *b, BAT *c, bit force); +int BATdelete(BAT *b); +BAT *BATdelta(BAT *b); +BAT *BATextend(BAT *b, BUN newcap); +BAT *BATfakeCommit(BAT *b); +BAT *BATfetch(BAT *b, BAT *s); +BAT *BATfetchjoin(BAT *b, BAT *s, BUN estimate); +int BATgetaccess(BAT *b); +PROPrec *BATgetprop(BAT *b, int idx); +BAT *BATgroup(BAT *b, int start, int incr, int grpsize); +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); +void BATinit_idents(BAT *bn); +BAT *BATins(BAT *b, BAT *c, bit force); +BAT *BATjoin(BAT *l, BAT *r, BUN estimate); +BAT *BATkdiff(BAT *b, BAT *c); +BAT *BATkey(BAT *b, int onoff); +BAT *BATkintersect(BAT *b, BAT *c); +BAT *BATkunion(BAT *b, BAT *c); +BAT *BATkunique(BAT *b); +BAT *BATleftfetchjoin(BAT *b, BAT *s, BUN estimate); +BAT *BATleftjoin(BAT *l, BAT *r, BUN estimate); +BAT *BATleftmergejoin(BAT *l, BAT *r, BUN estimate); +BAT *BATleftthetajoin(BAT *l, BAT *r, int mode, BUN estimate); +int BATmadvise(BAT *b, int hb, int tb, int hh, int th); +BAT *BATmark(BAT *b, oid base); +BAT *BATmark_grp(BAT *b, BAT *g, oid *base); +BAT *BATmaterialize(BAT *b); +BAT *BATmaterializeh(BAT *b); +size_t BATmemsize(BAT *b, int dirty); +BAT *BATmergejoin(BAT *l, BAT *r, BUN estimate); +int BATmmap(BAT *b, int hb, int tb, int hh, int th, int force); +BAT *BATmode(BAT *b, int onoff); +int BATmultiprintf(stream *f, int argc, BAT *argv[], int printoid, int order, int printorderby); +int BATname(BAT *b, const char *nme); +BAT *BATnew(int hdtype, int tltype, BUN capacity); +BAT *BATnlthetajoin(BAT *l, BAT *r, int mode, BUN estimate); +BAT *BATnumber(BAT *b); +BAT *BATorder(BAT *b); +BAT *BATorder_rev(BAT *b); +int BATordered(BAT *b); +int BATordered_rev(BAT *b); +BAT *BATouterjoin(BAT *l, BAT *r, BUN estimate); +BAT *BATprev(BAT *b); +int BATprint(BAT *b); +int BATprintf(stream *f, BAT *b); +BAT *BATpropcheck(BAT *b, int mode); +BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi); +BAT *BATrangesplit(BAT *b, BUN n, int unary); +str BATrename(BAT *b, const char *nme); +BAT *BATreplace(BAT *b, BAT *n, bit force); +BAT *BATrestrict(BAT *b, ptr hl, ptr hh, ptr tl, ptr th); +BAT *BATrevert(BAT *b); +BAT *BATroles(BAT *b, const char *hnme, const char *tnme); +BAT *BATsample(BAT *b, BUN n); +BAT *BATsave(BAT *b); +BAT *BATsdiff(BAT *b, BAT *c); +BAT *BATselect(BAT *b, ptr tl, ptr th); +BAT *BATselect_(BAT *b, ptr tl, ptr th, bit li, bit hi); +BAT *BATsemijoin(BAT *l, BAT *r); +BAT *BATseqbase(BAT *b, oid o); +BAT *BATset(BAT *b, int onoff); +BAT *BATsetaccess(BAT *b, int mode); +void BATsetcapacity(BAT *b, BUN cnt); +void BATsetcount(BAT *b, BUN cnt); +void BATsetprop(BAT *b, int idx, int type, void *v); +BAT *BATsintersect(BAT *b, BAT *c); +BAT *BATslice(BAT *b, BUN low, BUN high); +BAT *BATsorder(BAT *b); +BAT *BATsorder_rev(BAT *b); +BAT *BATsort(BAT *b); +BAT *BATsort_rev(BAT *b); +BAT *BATssort(BAT *b); +BAT *BATssort_rev(BAT *b); +BAT *BATsunion(BAT *b, BAT *c); +BAT *BATsunique(BAT *b); +BAT *BATthetajoin(BAT *l, BAT *r, int mode, BUN estimate); +int BATtopN(BAT *b, BUN topN); +BAT *BATundo(BAT *b); +BAT *BATuselect(BAT *b, ptr tl, ptr th); +BAT *BATuselect_(BAT *b, ptr tl, ptr th, bit li, bit hi); +BBPrec *BBP; +int BBP_curstamp; +void BBPcacheit(BATstore *bs, int lock); +void BBPclear(bat bid); +void BBPcold(bat b); +int BBPdecref(bat b, int logical); +BAT *BBPdescriptor(bat b); +int BBPdir(int cnt, bat *subcommit); +BATstore *BBPgetdesc(bat i); +void BBPhot(bat b); +bat BBPimportEntry(char *nme); +int BBPin; +int BBPincref(bat b, int logical); +bat BBPindex(const char *nme); +void BBPkeepref(bat i); +bat BBPlimit; +void BBPlock(const char *s); +str BBPlogical(bat b, str buf); +bat BBPmaxsize; +int BBPout; +str BBPphysical(bat b, str buf); +BAT *BBPquickdesc(bat b, int delaccess); +int BBPreclaim(BAT *b); +void BBPreleaselref(bat i); +void BBPreleaseref(bat i); +int BBPrename(bat bid, const char *nme); +int BBPsave(BAT *b); +void BBPshare(bat b); +int BBPsize; +int BBPsync(int cnt, bat *subcommit); +void BBPunlock(const char *s); +BAT *BUNappend(BAT *b, ptr right, bit force); +BAT *BUNdel(BAT *b, ptr left, ptr right, bit force); +BAT *BUNdelHead(BAT *b, ptr left, bit force); +BUN BUNdelete(BAT *b, BUN p, bit force); +BAT *BUNfastins(BAT *b, ptr left, ptr right); +BUN BUNfnd(BAT *b, ptr left); +BAT *BUNinplace(BAT *b, BUN p, ptr left, ptr right, bit force); +BAT *BUNins(BAT *b, ptr left, ptr right, bit force); +BUN BUNlocate(BAT *b, ptr left, ptr right); +BAT *BUNreplace(BAT *b, ptr left, ptr right, bit force); +size_t GDK_mem_bigsize; +size_t GDK_mem_maxsize; +int GDK_mem_pagebits; +size_t GDK_vm_maxsize; +int GDK_vm_trim; +int GDKatomcnt; +int GDKcreatedir(const char *nme); +int GDKdebug; +int GDKembedded; +BAT *GDKenv; +int GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)__attribute__((__format__(__printf__, 1, 2))); +void GDKexit(int status); +int GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)__attribute__((__format__(__printf__, 1, 2))); +void GDKfilepath(str path, const char *nme, const char *mode, const char *ext); +void GDKfree(void *blk); +char *GDKgetenv(const char *name); +int GDKgetenv_istrue(const char *name); +int GDKgetenv_isyes(const char *name); +int GDKinit(opt *set, int setlen); +void GDKlockHome(void); +void *GDKmalloc(size_t size); +size_t GDKmem_cursize(void); +size_t GDKmem_heapinuse(void); +size_t GDKmem_heapsize(void); +size_t GDKmem_inuse(void); +void *GDKmmap(char *path, int mode, off_t off, size_t len); +int GDKmove(const char *dir1, const char *nme1, const char *ext1, const char *dir2, const char *nme2, const char *ext2); +int GDKms(void); +int GDKnr_threads; +void GDKprotect(void); +int GDKprotected; +void GDKqsort(void *h, void *t, void *base, size_t n, int hs, int ts, int tpe); +void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, int ts, int tpe); +void *GDKrealloc(void *pold, size_t size); +int GDKrecovery; +int GDKremovedir(const char *nme); +void GDKsetenv(str name, str value); +ssize_t GDKstrFromStr(unsigned char *src, unsigned char *dst, ssize_t len); +str GDKstrdup(const char *s); +int GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)__attribute__((__format__(__printf__, 1, 2))); +ThreadRec GDKthreads[THREADS]; +int GDKupgradevarheap(COLrec *c, var_t v, int copyall); +lng GDKusec(void); +const char *GDKversion(void); +size_t GDKvm_cursize(void); +size_t GDKvm_heapsize(void); +void GDKvminc(size_t len); +void *GDKzalloc(size_t size); +void HASHdestroy(BAT *b); +BUN HASHlist(Hash *h, BUN i); +BUN HASHprobe(Hash *h, ptr v); +void HASHremove(BAT *b); +void HEAP_free(Heap *heap, var_t block); +void HEAP_initialize(Heap *heap, size_t nbytes, size_t nprivate, int alignment); +var_t HEAP_malloc(Heap *heap, size_t nbytes); +int HEAPalloc(Heap *h, size_t nitems, size_t itemsize); +int HEAPcopy(Heap *dst, Heap *src); +int HEAPextend(Heap *h, size_t size); +int HEAPfree(Heap *h); +size_t HEAPmemsize(Heap *h); +size_t HEAPvmsize(Heap *h); +int MT_check_nr_cores(void); +unsigned long long MT_clock(); +int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum MT_thr_detach d); +void MT_exit_thread(int status)__attribute__((__noreturn__)); +MT_Id MT_getpid(void); +size_t MT_getrss(void); +void MT_global_exit(int status)__attribute__((__noreturn__)); +char *MT_heapbase; +char *MT_heapcur(void); +void MT_init(void); +int MT_join_thread(MT_Id t); +int MT_kill_thread(MT_Id t); +int MT_lockf(char *filename, int mode, off_t off, off_t len); +MT_Id MT_locktrace; +unsigned long long MT_locktrace_cnt[65536]; +void MT_locktrace_end(); +char *MT_locktrace_nme[65536]; +void MT_locktrace_start(); +struct Mallinfo MT_mallinfo(void); +void *MT_mmap(char *path, int mode, off_t off, size_t len); +void MT_mmap_close(MT_mmap_hdl *hdl); +void *MT_mmap_open(MT_mmap_hdl *hdl, char *path, int mode, off_t off, size_t len, size_t nremaps); +void *MT_mmap_remap(MT_mmap_hdl *hdl, off_t off, size_t len); +int MT_msync(void *p, size_t off, size_t len, int mode); +int MT_munmap(void *p, size_t len); +int MT_path_absolute(const char *path); +void MT_sleep_ms(unsigned int ms); +MT_Lock MT_system_lock; +oid OIDbase(oid base); +int OIDfromStr(str src, int *len, oid **dst); +oid OIDnew(oid inc); +int OIDtoStr(str *dst, int *len, oid *src); +void PROPdestroy(PROPrec *p); +BUN SORTfnd(BAT *b, ptr v); +BUN SORTfnd_bte(BAT *b, ptr v); +BUN SORTfnd_chr(BAT *b, ptr v); +BUN SORTfnd_dbl(BAT *b, ptr v); +BUN SORTfnd_flt(BAT *b, ptr v); +BUN SORTfnd_int(BAT *b, ptr v); +BUN SORTfnd_lng(BAT *b, ptr v); +BUN SORTfnd_loc(BAT *b, ptr v); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
