Changeset: 1e154c7aead3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e154c7aead3
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql.mx
sql/include/sql_catalog.h
sql/server/rel_select.c
sql/server/sql_mvc.c
Branch: sciql
Log Message:
Merge from default branch.
diffs (truncated from 1515 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
@@ -18,7 +18,6 @@ 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);
@@ -28,13 +27,11 @@ 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);
@@ -52,7 +49,6 @@ 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);
@@ -62,13 +58,10 @@ 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);
@@ -76,7 +69,6 @@ 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);
@@ -89,7 +81,6 @@ 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);
@@ -108,8 +99,6 @@ 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);
@@ -123,7 +112,6 @@ 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);
@@ -144,7 +132,6 @@ 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);
@@ -172,23 +159,19 @@ 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)));
+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)));
+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);
@@ -196,19 +179,16 @@ 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)));
+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);
@@ -217,19 +197,16 @@ 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();
+unsigned long long MT_clock(void);
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__));
+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__));
+void MT_global_exit(int status) __attribute__((__noreturn__));
char *MT_heapbase;
char *MT_heapcur(void);
void MT_init(void);
@@ -238,52 +215,19 @@ 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();
+void MT_locktrace_end(void);
char *MT_locktrace_nme[65536];
-void MT_locktrace_start();
+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_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);
-BUN SORTfnd_sht(BAT *b, ptr v);
-BUN SORTfnd_var(BAT *b, ptr v);
-BUN SORTfndfirst_bte(BAT *b, ptr v);
-BUN SORTfndfirst_chr(BAT *b, ptr v);
-BUN SORTfndfirst_dbl(BAT *b, ptr v);
-BUN SORTfndfirst_flt(BAT *b, ptr v);
-BUN SORTfndfirst_int(BAT *b, ptr v);
-BUN SORTfndfirst_lng(BAT *b, ptr v);
-BUN SORTfndfirst_loc(BAT *b, ptr v);
-BUN SORTfndfirst_sht(BAT *b, ptr v);
-BUN SORTfndfirst_var(BAT *b, ptr v);
-BUN SORTfndlast_bte(BAT *b, ptr v);
-BUN SORTfndlast_chr(BAT *b, ptr v);
-BUN SORTfndlast_dbl(BAT *b, ptr v);
-BUN SORTfndlast_flt(BAT *b, ptr v);
-BUN SORTfndlast_int(BAT *b, ptr v);
-BUN SORTfndlast_lng(BAT *b, ptr v);
-BUN SORTfndlast_loc(BAT *b, ptr v);
-BUN SORTfndlast_sht(BAT *b, ptr v);
-BUN SORTfndlast_var(BAT *b, ptr v);
void *THRdata[16];
void THRdel(Thread t);
Thread THRget(int tid);
@@ -291,7 +235,7 @@ void *THRgetdata(int);
int THRgettid(void);
int THRhighwater(void);
Thread THRnew(MT_Id pid, str name);
-int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 2, 3)));
+int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
void THRsetdata(int, ptr);
int TMabort(void);
int TMcommit(void);
@@ -305,14 +249,11 @@ void VALempty(ValPtr v);
int VALformat(char **buf, ValPtr res);
void *VALget(ValPtr v);
ValPtr VALinit(ValPtr d, int tpe, ptr s);
-int VALprint(stream *fd, ValPtr res);
ValPtr VALset(ValPtr v, int t, ptr p);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
BAT *VIEWcombine(BAT *b);
BAT *VIEWcreate(BAT *h, BAT *t);
BAT *VIEWcreate_(BAT *h, BAT *t, int stable);
-BAT *VIEWhead(BAT *b);
-BAT *VIEWhead_(BAT *b, int mode);
size_t _MT_npages;
size_t _MT_pagesize;
int batFromStr(str src, int *len, bat **dst);
@@ -5736,9 +5677,9 @@ str copy_fromRef;
str countRef;
str count_no_nilRef;
int cpyConstant(MalBlkPtr mb, VarPtr vr);
-str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
3, 4)));
+str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
str createRef;
-str createScriptException(MalBlkPtr, int, enum malexception, const char *,
_In_z_ _Printf_format_string_ const char *,
...)__attribute__((__format__(__printf__, 5, 6)));
+str createScriptException(MalBlkPtr, int, enum malexception, const char *,
_In_z_ _Printf_format_string_ const char *, ...)
__attribute__((__format__(__printf__, 5, 6)));
str crossRef;
int cstToken(Client cntxt, ValPtr val);
str datacellRef;
@@ -6304,7 +6245,7 @@ void showAllScenarios(stream *f);
void showAtoms(stream *fd);
void showCurrentScenario(void);
void showErrors(Client cntxt);
-void showException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
3, 4)));
+void showException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
void showFlowGraph(MalBlkPtr mb, MalStkPtr stk, str fname);
void showHelp(Module m, str txt,stream *fs);
void showMalBlkHistory(MalBlkPtr mb);
@@ -6314,7 +6255,7 @@ void showOptimizerHistory(void);
void showOptimizerStep(str fnme,int i, int flg);
void showScenario(stream *f, Scenario s);
void showScenarioByName(stream *f, str s);
-void showScriptException(MalBlkPtr, int, enum malexception, _In_z_
_Printf_format_string_ const char *, ...)__attribute__((__format__(__printf__,
4, 5)));
+void showScriptException(MalBlkPtr, int, enum malexception, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
4, 5)));
str shtFromintImpl(sht *res, int *val);
str shtFromlngImpl(sht *res, lng *val);
str shutdownFactory(Client cntxt, MalBlkPtr mb);
@@ -6463,7 +6404,7 @@ int mnstr_fsync(stream *s);
buffer *mnstr_get_buffer(stream *s);
int mnstr_init(void);
char *mnstr_name(stream *s);
-int mnstr_printf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...)__attribute__((__format__(__printf__, 2, 3)));
+int mnstr_printf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
ssize_t mnstr_read(stream *s, void *buf, size_t elmsize, size_t cnt);
int mnstr_readBte(stream *s, signed char *val);
int mnstr_readBteArray(stream *s, signed char *val, size_t cnt);
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -199,7 +199,7 @@ stream_export buffer *mnstr_get_buffer(s
Block stream is a stream which sends data in blocks of a known
size (BLOCK size or dynamically changed using CHANGE_BLOCK_SIZE msg).
- A block is written once more then BLOCK size data has been written using
+ A block is written once more than BLOCK size data has been written using
the write commands or when the flush command is sent.
All full blocks together with a single not full block form a major
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -731,7 +731,6 @@ typedef struct {
/* interface definitions */
gdk_export ptr VALconvert(int typ, ValPtr t);
gdk_export int VALformat(char **buf, ValPtr res);
-gdk_export int VALprint(stream *fd, ValPtr res);
gdk_export ValPtr VALcopy(ValPtr dst, ValPtr src);
gdk_export ValPtr VALinit(ValPtr d, int tpe, ptr s);
gdk_export void VALempty(ValPtr v);
@@ -985,10 +984,7 @@ typedef int (*GDKfcn) ();
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
