Changeset: c5799fb66f6f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5799fb66f6f
Modified Files:
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_batop.c
gdk/gdk_cbp.c
gdk/gdk_cbp.h
gdk/gdk_col.c
gdk/gdk_col.h
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_qsort.c
gdk/gdk_rangejoin.mx
gdk/gdk_relop.mx
gdk/gdk_search.c
gdk/gdk_search.h
gdk/gdk_setop.c
gdk/gdk_ssort.c
gdk/gdk_storage.c
gdk/gdk_storage.h
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tm.c
gdk/gdk_tm.h
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/gdk_value.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/logger.h
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet_sql.c
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1725 to 300 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -21,7 +21,7 @@
# gdk_relop.mx
-EXTRA_DIST = gdk.h gdk_cbp.h gdk_col.h gdk_delta.h gdk_logger.h gdk_posix.h
gdk_qsort_impl.h gdk_ssort_impl.h gdk_storage.h gdk_system.h gdk_tm.h
gdk_utils.h gdk_setop.h
+EXTRA_DIST = gdk.h gdk_cbp.h gdk_col.h gdk_delta.h gdk_logger.h gdk_posix.h
gdk_private.h gdk_qsort_impl.h gdk_ssort_impl.h gdk_storage.h gdk_system.h
gdk_tm.h gdk_utils.h gdk_setop.h
lib_gdk = {
VERSION = $(GDK_VERSION)
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -735,7 +735,6 @@
#define VALnil(v,t) VALset(v,t,ATOMextern(t)?ATOMnil(t):ATOMnilptr(t))
/* interface definitions */
-gdk_export ValPtr VALnew(void);
gdk_export ptr VALconvert(int typ, ValPtr t);
gdk_export int VALformat(char **buf, ValPtr res);
gdk_export int VALprint(stream *fd, ValPtr res);
@@ -934,16 +933,9 @@
gdk_export int HEAPalloc(Heap *h, size_t nitems, size_t itemsize);
gdk_export int HEAPfree(Heap *h);
gdk_export int HEAPextend(Heap *h, size_t size);
-gdk_export int HEAPload(Heap *h, const char *nme, const char *ext, int trunc);
-gdk_export int HEAPsave(Heap *h, const char *nme, const char *ext);
-gdk_export int HEAPshare(Heap *dst, Heap *src, int copy_on_write);
gdk_export int HEAPcopy(Heap *dst, Heap *src);
-gdk_export int HEAPwarm(Heap *h);
-gdk_export size_t HEAPsubcopy(Heap *dst, Heap *src, size_t size, size_t
offset);
-gdk_export int HEAPdelete(Heap *h, const char *o, const char *ext);
gdk_export size_t HEAPvmsize(Heap *h);
gdk_export size_t HEAPmemsize(Heap *h);
-gdk_export void HEAPcacheInit(void);
/*
* Internal HEAP Chunk Management
@@ -988,26 +980,15 @@
*/
} HeapRepair;
-gdk_export void HEAP_initialize(Heap *heap, /* nbytes -- Initial size of
the heap. */
- size_t nbytes, /* alignment -- for objects on
the heap. */
- size_t nprivate, /* nprivate -- Size of
private space */
- int alignment /* alignment restriction for
allocated chunks */
- );
-
-gdk_export void HEAP_initialize_compact(Heap *heap, /* nbytes -- Initial
size of the heap. */
- size_t nbytes, /* alignment -- for
objects on the heap. */
- size_t nprivate, /* nprivate --
Size of private space */
- int alignment, /* alignment
restriction for allocated chunks */
- int (*sizefcn) (ptr) /*
COLatoms[].atomLen function */
- );
+gdk_export void HEAP_initialize(
+ Heap *heap, /* nbytes -- Initial size of the heap. */
+ size_t nbytes, /* alignment -- for objects on the heap. */
+ size_t nprivate, /* nprivate -- Size of private space */
+ int alignment /* alignment restriction for allocated chunks */
+ );
gdk_export var_t HEAP_malloc(Heap *heap, size_t nbytes);
gdk_export void HEAP_free(Heap *heap, var_t block);
-gdk_export var_t HEAP_private(Heap *h);
-gdk_export void HEAP_checkformat(Heap *h);
-gdk_export int HEAP_check(Heap *h, HeapRepair *hr);
-gdk_export void HEAP_init(Heap *heap, int tpe);
-gdk_export int HEAP_mmappable(Heap *heap);
#define HEAP_index(HEAP,INDEX,TYPE) ((TYPE *)((char *) (HEAP)->base +
(INDEX)))
@@ -1036,16 +1017,12 @@
#define COLDELETE (-9999)
gdk_export COL *COLnew(int tp, oid capacity);
-gdk_export COL *COLclone(COL *b, oid capacity);
gdk_export COL *COLextend(COL *b, oid newcap);
gdk_export COL *COLnewdensecol(oid size);
/* internal */
gdk_export COL *COLcreatedesc(int tp, int heapnames);
-gdk_export int COLfree(COL *b);
-gdk_export void COLdestroy(COL *bs);
gdk_export chr ATOMelmshift(int sz);
-gdk_export void COLsetdims(COL *b);
/*
*
@@ -1569,8 +1546,6 @@
gdk_export oid COLcount_no_nil(COL *b);
gdk_export void COLsetcapacity(COL *b, oid cnt);
gdk_export void COLsetcount(COL *b, oid cnt);
-gdk_export oid COLbuncount(COL *b);
-gdk_export oid COLguess(COL *b);
gdk_export oid COLgrows(COL *b);
gdk_export COL *COLkey(COL *b, int onoff);
gdk_export COL *COLmode(COL *b, int onoff);
@@ -1580,7 +1555,6 @@
gdk_export COL *COLsetaccess(COL *b, int mode);
gdk_export void COLsetreadonly(COL *b);
gdk_export int COLgetaccess(COL *b);
-gdk_export int COLcheckmodes(COL *b, int persistent);
#define COLdirty(b) ((b)->copiedtodisk == 0 || (b)->dirty || \
@@ -1709,8 +1683,6 @@
#define USE_HASH 4 /* hash index */
#define USE_ALL (USE_HEAP|USE_HASH)
-gdk_export COL *COLload(const char *nme);
-gdk_export COL *COLload_intern(bat bid, int lock);
#define COLaccessBegin(b,what,advice) COLaccess(b,what,advice,1)
#define COLaccessEnd(b,what,advice) COLaccess(b,what,advice,-1)
gdk_export size_t COLaccess(COL *b, int what, int advice, int load);
@@ -1718,18 +1690,12 @@
gdk_export int COLmmap(COL *c, int b, int h, int force);
gdk_export int COLmadvise(COL *c, int b, int h);
gdk_export int COLdelete(COL *b);
-gdk_export size_t COLvmsize(COL *b, int dirty);
gdk_export size_t COLmemsize(COL *b, int dirty);
-gdk_export int GDKfdlocate(const char *nme, const char *mode, const char *ext);
-gdk_export FILE *GDKfilelocate(const char *nme, const char *mode, const char
*ext);
gdk_export void GDKfilepath(str path, const char *nme, const char *mode, const
char *ext);
gdk_export int GDKcreatedir(const char *nme);
gdk_export int GDKremovedir(const char *nme);
-gdk_export char *GDKload(const char *nme, const char *ext, size_t size, size_t
chunk, int mode);
-gdk_export int GDKsave(const char *nme, const char *ext, void *buf, size_t
size, int mode);
-gdk_export int GDKunlink(const char *dir, const char *nme, const char
*extension);
gdk_export int GDKmove(const char *dir1, const char *nme1, const char *ext1,
const char *dir2, const char *nme2, const char *ext2);
/*
*
@@ -1814,9 +1780,6 @@
gdk_export void GDKqsort(void *h, void *t, void *base, size_t n, int s, int
tpe);
gdk_export void GDKqsort_rev(void *h, void *t, void *base, size_t n, int s,
int tpe);
-gdk_export int GDKssort(void *h, void *t, void *base, size_t n, int s, int
tpe);
-gdk_export int GDKssort_rev(void *h, void *t, void *base, size_t n, int s, int
tpe);
-
#define COLisordered(b) (((b)->type == TYPE_void) || (b)->sorted)
#define COLdense(b) (COLvoid(b) && (b)->seqbase != oid_nil)
#define COLvoid(b) (((b)->dense&(b)->sorted&1) || (b)->type==TYPE_void)
@@ -1992,7 +1955,6 @@
gdk_export void CBPhot(bat b);
gdk_export void CBPcold(bat b);
-gdk_export void CBPtrim(size_t memdelta, size_t vmdelta);
gdk_export void CBPunlock(const char *s);
gdk_export str CBPlogical(bat b, str buf);
@@ -2199,13 +2161,9 @@
gdk_export atomDesc COLatoms[];
gdk_export int GDKatomcnt;
-gdk_export void ATOMdelete(int id);
gdk_export void ATOMproperty(char *nme, char *property, GDKfcn fcn, int val);
gdk_export int ATOMindex(char *nme);
-gdk_export int ATOMisdescendant(int id, int parentid);
-gdk_export int ATOMdump(void);
-gdk_export int ATOMheap(int id, Heap *hp, size_t cap);
gdk_export str ATOMname(int id);
gdk_export int ATOMlen(int id, ptr v);
gdk_export ptr ATOMnil(int id);
@@ -2238,14 +2196,8 @@
* unused OIDs, and returns the starting value of this range.
* The highest OIDBITS designate site. [ DEPRECATED]
*/
-gdk_export int OIDinit(void);
-gdk_export oid OIDrand(void);
gdk_export oid OIDbase(oid base);
-gdk_export oid OIDseed(oid seed);
gdk_export oid OIDnew(oid inc);
-gdk_export oid OIDread(str buf);
-gdk_export int OIDwrite(stream *fp);
-gdk_export int OIDdirty(void);
/*
*
@@ -2284,8 +2236,6 @@
/* low level functions */
gdk_export oid SORTfnd(COL *b, ptr v);
-gdk_export oid SORTfndfirst(COL *b, ptr v);
-gdk_export oid SORTfndlast(COL *b, ptr v);
#define COLprepareHash(X) (((X)->hash == NULL) && !COLhash(X, 0))
/*
@@ -2342,7 +2292,6 @@
/* we prefer to use vm_alloc routines on size > GDKmmap */
gdk_export void GDKvminc(size_t len);
gdk_export void *GDKmmap(char *path, int mode, off_t off, size_t len);
-gdk_export int GDKmunmap(void *addr, size_t len);
gdk_export ptr GDK_mem_start; /* sbrk(0) at start of the program */
gdk_export size_t GDK_mem_bigsize; /* size after which we use anonymous VM
rather than malloc */
@@ -2360,15 +2309,11 @@
gdk_export void *GDKmalloc(size_t size);
gdk_export void *GDKzalloc(size_t size);
-gdk_export void *GDKmallocmax(size_t size, size_t *maxsize, int emergency);
gdk_export void *GDKrealloc(void *pold, size_t size);
-gdk_export void *GDKreallocmax(void *pold, size_t size, size_t *maxsize, int
emergency);
gdk_export void GDKfree(void *blk);
gdk_export str GDKstrdup(const char *s);
gdk_export void *GDKvmalloc(size_t size, size_t *maxsize, int emergency);
-gdk_export void *GDKvmrealloc(void *pold, size_t oldsize, size_t newsize,
size_t oldmax, size_t *maxsize, int emergency);
-gdk_export void GDKvmfree(void *blk, size_t size, size_t maxsize);
/*
*
@@ -2427,19 +2372,10 @@
#define GDKFATAL "!FATAL: "
/* Data Distilleries uses ICU for internationalization of some MonetDB error
messages */
-#ifdef MONET_ICU_I18N
-gdk_export void GDKvsnprintf(char *buf, int maxlen, const char *format,
va_list ap);
-#else
-#define GDKvsnprintf(buf, maxlen, format, ap) vsnprintf(buf, maxlen, format,
ap)
-#endif
-gdk_export void GDKaddbuf(const char *msg);
-gdk_export int GDKwarning(const char *format, ...);
gdk_export int GDKerror(const char *format, ...);
gdk_export int GDKsyserror(const char *format, ...);
gdk_export int GDKfatal(const char *format, ...);
-gdk_export int GDKerrorCount(void);
-gdk_export void GDKclrerr(void);
#include "gdk_delta.h"
#include "gdk_search.h"
@@ -2619,9 +2555,6 @@
gdk_export Thread THRget(int tid);
gdk_export Thread THRnew(MT_Id pid, str name);
gdk_export void THRdel(Thread t);
-gdk_export int THRinit(void);
-gdk_export int THRexit(const char *nme);
-gdk_export int THRcnt(void);
gdk_export void THRsetdata(int, ptr);
gdk_export void *THRgetdata(int);
gdk_export int THRhighwater(void);
@@ -2886,15 +2819,10 @@
gdk_export COL *VIEWcreate(COL *b);
gdk_export COL *VIEWcreate_(COL *b, int stable);
-gdk_export COL *VIEWreset(COL *b);
gdk_export COL *COLmaterialize(COL *b);
-gdk_export void VIEWdestroy(COL *b);
gdk_export void VIEWbounds(COL *b, COL *view, oid l, oid h);
-gdk_export void VIEWunlink(COL *b);
/* low level functions */
-gdk_export int ALIGNundo(COL *b);
-gdk_export int ALIGNcommit(COL *b);
gdk_export int ALIGNset(COL *b1, COL *b2);
#define ALIGNdel(x,y,f) {if (!(f))
VIEWchk(x,y,COL_READ|COL_APPEND);(x)->align=0; }
@@ -3205,15 +3133,6 @@
gdk_export void PROPdestroy(PROPrec *p);
gdk_export PROPrec *COLgetprop(COL *b, int idx);
gdk_export void COLsetprop(COL *b, int idx, int type, void *v);
-gdk_export bit COLgetprop_bit(COL *b, int idx);
-gdk_export int COLgetprop_int(COL *b, int idx);
-gdk_export wrd COLgetprop_wrd(COL *b, int idx);
-gdk_export const char *COLgetprop_str(COL *b, int idx);
-gdk_export void COLsetprop_bit(COL *b, int idx, bit val);
-gdk_export void COLsetprop_int(COL *b, int idx, int val);
-gdk_export void COLsetprop_wrd(COL *b, int idx, wrd val);
-gdk_export void COLsetprop_str(COL *b, int idx, str val);
-gdk_export void COLpropagate(COL *dst, COL *src, int idx);
gdk_export COL *COLsample(COL *b, oid n);
gdk_export COL *COLhistogram(COL *b, COL **unique);
gdk_export int COLtopN(COL *b, oid topN); /* used in
monet5/src/modules/kernel/algebra.mx */
@@ -3338,7 +3257,6 @@
gdk_export COL *COLsemijoin(COL *l, COL *r);
gdk_export COL *COLmergejoin(COL *l, COL *r, oid estimate);
gdk_export COL *COLleftmergejoin(COL *l, COL *r, oid estimate);
-gdk_export COL *COLleftmergejoin_limit(COL *l, COL *r, oid estimate, oid
*limit);
gdk_export COL *COLjoin(COL *l, COL *r, oid estimate);
gdk_export COL *COLantijoin(COL *l, COL *r);
gdk_export COL *COLleftjoin(COL *l, COL *r, oid estimate);
@@ -3363,8 +3281,6 @@
typedef void (*ColFcn) (ptr, ptr);
typedef void (*RowFcn) (ptr, ptr *);
-gdk_export int COLmultijoin(int argc, COL *argv[], RowFcn tuple_fcn, ptr
tuple_data, ColFcn value_fcn[], ptr value_data[]);
-
/* #ifdef __cplusplus */
/* } */
/* #endif */
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -87,6 +87,7 @@
#include "monetdb_config.h"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
