Changeset: a8251a94bf5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a8251a94bf5b
Modified Files:
debian/libmonetdb-client2.install
debian/libmonetdb-stream2.install
debian/libmonetdb2.install
Branch: jacqueline
Log Message:
Merged from default
diffs (truncated from 470 to 300 lines):
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -57,7 +57,7 @@ typedef struct Ssabuplog {
} sabuplog;
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBSABAOTH)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
#define msab_export extern __declspec(dllimport)
#else
#define msab_export extern __declspec(dllexport)
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 5), autotoo
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
-Package: libmonetdb2
+Package: libmonetdb4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb1, libmonetdb-dev
-Replaces: libmonetdb1, libmonetdb-dev
+Conflicts: libmonetdb1, libmonetdb2, libmonetdb-dev
+Replaces: libmonetdb1, libmonetdb2, libmonetdb-dev
Description: MonetDB core library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -24,7 +24,9 @@ Description: MonetDB core library
single shared library. If you want to use MonetDB, you will certainly
need this package, but you will also need one of the server packages.
-Package: libmonetdb-stream2
+Package: libmonetdb-stream3
+Conflicts: libmonetdb-stream2
+Replaces: libmonetdb-stream2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -38,7 +40,7 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream3
Description: MonetDB stream library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -46,13 +48,13 @@ Description: MonetDB stream library deve
accelerators. It also has an SQL frontend.
.
This package contains the files to develop with the
- libmonetdb-stream1 library.
+ libmonetdb-stream3 library.
-Package: libmonetdb-client2
+Package: libmonetdb-client5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client1
-Replaces: libmonetdb-client1
+Conflicts: libmonetdb-client1, libmonetdb-client2
+Replaces: libmonetdb-client1, libmonetdb-client2
Description: MonetDB client/server interface library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -64,14 +66,14 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client5
Description: MonetDB client/server interface library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files to develop with the libmonetdb-client1
+ This package contains the files to develop with the libmonetdb-client5
library.
Package: monetdb-client
diff --git a/debian/libmonetdb-client2.install
b/debian/libmonetdb-client5.install
rename from debian/libmonetdb-client2.install
rename to debian/libmonetdb-client5.install
diff --git a/debian/libmonetdb-stream2.install
b/debian/libmonetdb-stream3.install
rename from debian/libmonetdb-stream2.install
rename to debian/libmonetdb-stream3.install
diff --git a/debian/libmonetdb2.install b/debian/libmonetdb4.install
rename from debian/libmonetdb2.install
rename to debian/libmonetdb4.install
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -969,7 +969,9 @@ typedef int (*GDKfcn) ();
* These routines should be used to alloc free or extend heaps;
* they isolate you from the different ways heaps can be accessed.
*/
+gdk_export int HEAPfree(Heap *h);
gdk_export int HEAPextend(Heap *h, size_t size);
+gdk_export int HEAPcopy(Heap *dst, Heap *src);
gdk_export size_t HEAPvmsize(Heap *h);
gdk_export size_t HEAPmemsize(Heap *h);
@@ -2242,6 +2244,8 @@ gdk_export BAT *BAThashjoin(BAT *l, BAT
#define GDK_HISTO_MAX_BIT ((int) (sizeof(size_t)<<3))
/* we prefer to use vm_alloc routines on size > GDKmmap */
+gdk_export void *GDKmmap(char *path, int mode, off_t off, size_t len);
+
gdk_export size_t GDK_mem_bigsize; /* size after which we use anonymous VM
rather than malloc */
gdk_export size_t GDK_mem_maxsize; /* max allowed size of committed memory
*/
gdk_export size_t GDK_vm_maxsize; /* max allowed size of reserved vm */
@@ -2747,8 +2751,11 @@ gdk_export BAT *BATpropcheck(BAT *b, int
gdk_export BAT *VIEWcreate(BAT *h, BAT *t);
gdk_export BAT *VIEWcreate_(BAT *h, BAT *t, int stable);
+gdk_export BAT *VIEWhead(BAT *b);
+gdk_export BAT *VIEWhead_(BAT *b, int mode);
gdk_export BAT *VIEWcombine(BAT *b);
gdk_export BAT *BATmaterialize(BAT *b);
+gdk_export BAT *BATmaterializeh(BAT *b);
gdk_export void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
/* low level functions */
@@ -2821,9 +2828,6 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
* @item HASHloop_bit
* @tab
* (BAT *b; Hash *h, size_t idx; bit *value, BUN w)
- * @item HASHloop_chr
- * @tab
- * (BAT *b; Hash *h, size_t idx; char *value, BUN w)
* @item HASHloop_bte
* @tab
* (BAT *b; Hash *h, size_t idx; bte *value, BUN w)
@@ -3075,7 +3079,7 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
#define SORTfndlast_wrd(b,v) SORTfndlast_lng(b,v)
@:sortloop(wrd,lng,wrd,simple,&wrd_nil)@
#endif
-#define SORTloop_bit(b,p,q,tl,th) SORTloop_chr(b,p,q,tl,th)
+#define SORTloop_bit(b,p,q,tl,th) SORTloop_bte(b,p,q,tl,th)
/*
* @+ Common BAT Operations
diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx
--- a/gdk/gdk_atoms.mx
+++ b/gdk/gdk_atoms.mx
@@ -64,7 +64,6 @@ All Rights Reserved.
* @- maximum atomic string lengths
*/
#define bitStrlen 8
-#define chrStrlen 8
#define bteStrlen 8
#define shtStrlen 12
#define intStrlen 24
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -50,7 +50,6 @@ void BATinit_idents(BAT *bn);
BAT *BATleftmergejoin(BAT *l, BAT *r, BUN estimate);
BAT *BATleftthetajoin(BAT *l, BAT *r, int mode, BUN estimate);
BAT *BATload_intern(bat bid, int lock);
-BAT *BATmaterializeh(BAT *b);
BAT *BATmaterializet(BAT *b);
int BATmultijoin(int argc, BAT *argv[], RowFcn tuple_fcn, ptr tuple_data,
ColFcn value_fcn[], ptr value_data[], int orderspec);
BAT *BATnlthetajoin(BAT *l, BAT *r, int mode, BUN estimate);
@@ -78,7 +77,6 @@ void GDKlog(_In_z_ _Printf_format_string
__attribute__((__format__(__printf__, 1, 2)));
void *GDKmallocmax(size_t size, size_t *maxsize, int emergency);
size_t GDKmem_heapinuse(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 GDKmunmap(void *addr, size_t len);
void *GDKreallocmax(void *pold, size_t size, size_t *maxsize, int emergency);
@@ -97,9 +95,7 @@ Hash *HASHnew(Heap *hp, int tpe, BUN siz
int HEAPalloc(Heap *h, size_t nitems, size_t itemsize);
void HEAPcacheInit(void);
int HEAP_check(Heap *h, HeapRepair *hr);
-int HEAPcopy(Heap *dst, Heap *src);
int HEAPdelete(Heap *h, const char *o, const char *ext);
-int HEAPfree(Heap *h);
void HEAP_init(Heap *heap, int tpe);
int HEAPload(Heap *h, const char *nme, const char *ext, int trunc);
int HEAP_mmappable(Heap *heap);
@@ -128,35 +124,8 @@ oid OIDseed(oid seed);
int oidWrite(oid *a, stream *s, size_t cnt);
int OIDwrite(stream *fp);
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(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(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 strCleanHash(Heap *hp, int rebuild);
int strCmpNoNil(const unsigned char *l, const unsigned char *r);
int strElimDoubles(Heap *h);
@@ -165,8 +134,6 @@ var_t strLocate(Heap *h, const char *v);
var_t strPut(Heap *b, var_t *off, const char *src);
int VALprint(stream *fd, ValPtr res);
void VIEWdestroy(BAT *b);
-BAT *VIEWhead(BAT *b);
-BAT *VIEWhead_(BAT *b, int mode);
BAT *VIEWreset(BAT *b);
void VIEWunlink(BAT *b);
diff --git a/gdk/gdk_search.mx b/gdk/gdk_search.mx
--- a/gdk/gdk_search.mx
+++ b/gdk/gdk_search.mx
@@ -90,7 +90,6 @@ gdk_export BUN HASHlist(Hash *h, BUN i);
#define hash_any(H,V) (ATOMhash((H)->type, (V)) & (H)->mask)
#define heap_hash_any(hp,H,V) ((hp) && (hp)->hashash ? ((BUN *) (V))[-1] &
(H)->mask : hash_any(H,V))
#define hash_bte(H,V) ((BUN) (*(unsigned char*) (V)) & (H)->mask)
-#define hash_chr(H,V) hash_bte(H,V)
#define hash_sht(H,V) ((BUN) mix_sht(*((unsigned short*) (V))) &
(H)->mask)
#define hash_int(H,V) ((BUN) mix_int(*((unsigned int*) (V))) &
(H)->mask)
/* XXX return size_t-sized value for 8-byte oid? */
@@ -161,7 +160,7 @@ gdk_export BUN HASHlist(Hash *h, BUN i);
#else /* SIZEOF_VOID_P == SIZEOF_LNG */
#define HASHfnd_ptr(x,y,z) HASHfnd_lng(x,y,z)
#endif
-#define HASHfnd_bit(x,y,z) HASHfnd_chr(x,y,z)
+#define HASHfnd_bit(x,y,z) HASHfnd_bte(x,y,z)
#define HASHfnd_flt(x,y,z) HASHfnd_int(x,y,z)
#define HASHfnd_dbl(x,y,z) HASHfnd_lng(x,y,z)
#define HASHfnd_any(x,y,z) HASHfnd(x,y,z)
@@ -211,7 +210,7 @@ gdk_export BUN HASHlist(Hash *h, BUN i);
#else /* SIZEOF_VOID_P == SIZEOF_LNG */
#define HASHins_ptr(h,i,v) HASHins_lng(h,i,v)
#endif
-#define HASHins_bit(h,i,v) HASHins_chr(h,i,v)
+#define HASHins_bit(h,i,v) HASHins_bte(h,i,v)
#if SIZEOF_OID == SIZEOF_INT /* OIDDEPEND */
#define HASHins_oid(h,i,v) HASHins_int(h,i,v)
#else
@@ -660,17 +659,41 @@ HASHgonebad(BAT *b, ptr v)
* @- Range Binary Search
* Type-specific versions of SORTfndfirst are available using macro
* expansions. It finds the first BUN larger or equal than a certain
- * value and expands to @`SORTfndfirst_chr@5, @`SORTfndfirst_sht@5,
+ * value and expands to @`SORTfndfirst_bte@5, @`SORTfndfirst_sht@5,
* @`SORTfndfirst_int@5, @`SORTfndfirst_flt@5, @`SORTfndfirst_lng@5,
* @`SORTfndfirst_dbl@5, @`SORTfndfirst_loc@5 and @`SORTfndfirst_var@5.
*
* Type-specific versions of SORTfndlast are available using macro
* expansions. It finds the first BUN smaller or equal than a certain
- * value and expands to @`SORTfndlast_chr@5, @`SORTfndlast_sht@5,
+ * value and expands to @`SORTfndlast_bte@5, @`SORTfndlast_sht@5,
* @`SORTfndlast_int@5, @`SORTfndlast_flt@5, @`SORTfndlast_lng@5,
* @`SORTfndlast_dbl@5, @`SORTfndlast_loc@5 and @`SORTfndlast_var@5.
*/
/* type specific binary search implementations */
+gdk_export BUN SORTfnd_bte(BAT *b, ptr v);
+gdk_export BUN SORTfnd_dbl(BAT *b, ptr v);
+gdk_export BUN SORTfnd_flt(BAT *b, ptr v);
+gdk_export BUN SORTfnd_int(BAT *b, ptr v);
+gdk_export BUN SORTfnd_lng(BAT *b, ptr v);
+gdk_export BUN SORTfnd_loc(BAT *b, ptr v);
+gdk_export BUN SORTfnd_sht(BAT *b, ptr v);
+gdk_export BUN SORTfnd_var(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_bte(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_dbl(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_flt(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_int(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_lng(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_loc(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_sht(BAT *b, ptr v);
+gdk_export BUN SORTfndfirst_var(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_bte(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_dbl(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_flt(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_int(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_lng(BAT *b, ptr v);
+gdk_export BUN SORTfndlast_loc(BAT *b, ptr v);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
