Changeset: ddfaec9c6eb1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddfaec9c6eb1
Modified Files:
MonetDB/src/common/dummy_gdk_utils.mx
MonetDB/src/common/monet_utils.mx
sql/src/backends/monet5/sql.mx
Branch: default
Log Message:
Merge changes
diffs (truncated from 3875 to 300 lines):
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/common/Makefile.ag
--- a/MonetDB/src/common/Makefile.ag Fri Jan 14 08:48:09 2011 +0100
+++ b/MonetDB/src/common/Makefile.ag Fri Jan 14 08:49:40 2011 +0100
@@ -23,14 +23,13 @@
lib_mutils = {
NAME = mutils
- SOURCES = monet_utils.mx monet_options.mx monet_getopt.h
+ SOURCES = monet_options.mx monet_getopt.h
}
headers_common = {
DIR = includedir/MonetDB/common
HEADERS = h
- SOURCES = monet_utils.mx monet_options.mx monet_getopt.h \
- dummy_gdk_utils.mx
+ SOURCES = monet_options.mx monet_getopt.h
}
headers_pc = {
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/common/dummy_gdk_utils.mx
--- a/MonetDB/src/common/dummy_gdk_utils.mx Fri Jan 14 08:48:09 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f dummy_gdk_utils
-@h
-#ifndef _GDK_UTILS_H
-#define _GDK_UTILS_H
-
-#ifdef NATIVE_WIN32
-#define dummy_export extern __declspec(dllimport)
-#else
-#define dummy_export extern
-#endif
-
-dummy_export void *GDKmalloc(size_t size);
-dummy_export void *GDKrealloc(void *pold, size_t size);
-dummy_export void GDKfree(void *blk);
-dummy_export char *GDKstrdup(char *s);
-
-#endif /*_GDK_UTILS_H*/
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/common/monet_getopt.h
--- a/MonetDB/src/common/monet_getopt.h Fri Jan 14 08:48:09 2011 +0100
+++ b/MonetDB/src/common/monet_getopt.h Fri Jan 14 08:49:40 2011 +0100
@@ -53,8 +53,6 @@
# include <ctype.h>
#endif
-#include "monet_utils.h"
-
#ifdef __cplusplus
extern "C" {
#endif
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/common/monet_options.mx
--- a/MonetDB/src/common/monet_options.mx Fri Jan 14 08:48:09 2011 +0100
+++ b/MonetDB/src/common/monet_options.mx Fri Jan 14 08:49:40 2011 +0100
@@ -99,7 +99,6 @@
@c
#include "monetdb_config.h"
#include "monet_options.h"
-#include "monet_utils.h"
#ifndef HAVE_GETOPT_LONG
# include "monet_getopt.h"
#else
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/common/monet_utils.mx
--- a/MonetDB/src/common/monet_utils.mx Fri Jan 14 08:48:09 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f monet_utils
-@a N.J. Nes
-@* utils
-@T
-The monet utils contains all general functionality needed by both clients and
-server.
-
-@h
-#ifndef _MU_H_
-#define _MU_H_
-
-#ifdef WIN32
-#ifndef LIBMUTILS
-#define mutils_export extern __declspec(dllimport)
-#else
-#define mutils_export extern __declspec(dllexport)
-#endif
-#else
-#define mutils_export extern
-#endif
-
-#define SLASH_2_DIR_SEP(s) {char *t; for(t=strchr(s, '/' ); t;
t=strchr(t+1, '/' )) *t=DIR_SEP;}
-#define DIR_SEP_2_SLASH(s) {char *t; for(t=strchr(s, DIR_SEP); t;
t=strchr(t+1, DIR_SEP)) *t='/' ;}
-
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <stdio.h> /* NULL, printf etc. */
-#include <stdlib.h>
-#include <errno.h>
-#include <stdarg.h> /* va_alist.. */
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-void *alloca(size_t);
-#endif
-
-#include <assert.h>
-
-/* Backward compatibility: configure figures out whether it needs to
- define "inline" as something else for the architecture it is testing.
- All uses in the source use "INLINE", so until all occurances of
- "INLINE" have been replaced by "inline", we just define the latter as
- the former. */
-#define INLINE inline
-
-#define REGISTER register
-
-#ifdef HAVE_LONG_LONG
-typedef long long lng;
-
-#define SIZEOF_LNG SIZEOF_LONG_LONG
-#else
-#ifdef HAVE___INT64
-typedef __int64 lng;
-
-#define SIZEOF_LNG SIZEOF___INT64
-#endif
-#endif
-
-#ifndef HAVE_SSIZE_T
-#if SIZEOF_SIZE_T == SIZEOF_INT
-typedef int ssize_t;
-#else
-typedef lng ssize_t;
-#endif
-#define HAVE_SSIZE_T 1
-#endif
-
-#ifndef HAVE_PTRDIFF_T
-#if SIZEOF_SIZE_T == SIZEOF_INT
-typedef int ptrdiff_t;
-#else
-typedef lng ptrdiff_t;
-#endif
-#define HAVE_PTRDIFF_T 1
-#endif
-
-/* define printf formats for printing size_t and ssize_t variables */
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 &&
!defined(__svr4__) && !defined(WIN32) && !defined(__sgi)) || __GNUC__ > 3
-#define SZFMT "%zu"
-#define SSZFMT "%zd"
-#elif defined(__MINGW32__)
-#define SZFMT "%u"
-#define SSZFMT "%ld"
-#elif SIZEOF_SIZE_T == SIZEOF_INT
-#define SZFMT "%u"
-#define SSZFMT "%d"
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-#define SZFMT "%lu"
-#define SSZFMT "%ld"
-#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG || SIZEOF_SIZE_T == SIZEOF___INT64
-#define SZFMT ULLFMT
-#define SSZFMT LLFMT
-#else
-#error no definition for SZFMT/SSZFMT
-#endif
-
-/* prompts for MAPI protocol */
-#define PROMPTBEG '\001' /* start prompt bracket */
-#define PROMPT1 "\001\001\n" /* prompt: ready for new query
*/
-#define PROMPT2 "\001\002\n" /* prompt: more data needed */
-
-#define short_int_SWAP(s) ((short)(((0x00ff&(s))<<8) | ((0xff00&(s))>>8)))
-
-#define normal_int_SWAP(i) (((0x000000ff&(i))<<24) | ((0x0000ff00&(i))<<8) | \
- ((0x00ff0000&(i))>>8) | ((0xff000000&(i))>>24))
-
-#define long_long_SWAP(l) \
- ((((lng)normal_int_SWAP(l))<<32) |\
- (0xffffffff&normal_int_SWAP(l>>32)))
-
-#endif /* _MU_H_ */
diff -r 2452225b96cd -r ddfaec9c6eb1 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mx Fri Jan 14 08:48:09 2011 +0100
+++ b/MonetDB/src/gdk/gdk.mx Fri Jan 14 08:49:40 2011 +0100
@@ -317,8 +317,6 @@
#ifndef _GDK_H_
#define _GDK_H_
-#include <monet_utils.h>
-
/* standard includes upon which all configure tests depend */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
@@ -1080,13 +1078,13 @@
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, str nme, str ext, int trunc);
-gdk_export int HEAPsave(Heap *h, str nme, str ext);
+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, str o, str ext);
+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);
@@ -1468,7 +1466,7 @@
#define bunfastins(b, h, t) \
do { \
- REGISTER BUN _p = BUNlast(b); \
+ register BUN _p = BUNlast(b); \
if (_p == BUN_MAX || BATcount(b) == BUN_MAX) { \
GDKerror("bunfastins: bat too large\n"); \
goto bunins_failed; \
@@ -1605,7 +1603,7 @@
#define BUNhead(bi,p) ((bi).b->hvarsized?BUNhvar(bi,p):BUNhloc(bi,p))
#define BUNtail(bi,p) ((bi).b->tvarsized?BUNtvar(bi,p):BUNtloc(bi,p))
-static INLINE BATiter
+static inline BATiter
bat_iterator(BAT *b)
{
BATiter bi;
@@ -1619,7 +1617,7 @@
#ifdef NDEBUG
#define BUNlast(b) ((b)->batFirst + (b)->batCount)
#else
-static INLINE BUN
+static inline BUN
BUNlast(BAT *b)
{
BUN last;
@@ -1708,7 +1706,7 @@
@{
@h
*/
-gdk_export str BATrename(BAT *b, str nme);
+gdk_export str BATrename(BAT *b, const char *nme);
#ifndef BATcount
gdk_export BUN BATcount(BAT *b);
#endif
@@ -1721,9 +1719,9 @@
gdk_export BAT *BATkey(BAT *b, int onoff);
gdk_export BAT *BATset(BAT *b, int onoff);
gdk_export BAT *BATmode(BAT *b, int onoff);
-gdk_export BAT *BATroles(BAT *b, str hnme, str tnme);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
