Changeset: a164dbc84c89 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a164dbc84c89
Modified Files:
gdk/gdk_storage.mx
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/batxml.mx
monetdb5/modules/atoms/colxml.mx
monetdb5/modules/kernel/colcalc.mx
monetdb5/modules/kernel/colcast.mx
monetdb5/modules/kernel/colcolor.mx
monetdb5/modules/kernel/colifthen.mx
monetdb5/modules/kernel/colmmath.mx
monetdb5/modules/kernel/colmtime.mx
monetdb5/modules/kernel/colstr.mx
monetdb5/modules/mal/bbp.mx
monetdb5/optimizer/opt_dictionary.mx
Branch: headless
Log Message:
Merge the changes
diffs (truncated from 2780 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -129,7 +129,7 @@
!IFNDEF LIBICONV
LIBICONV = C:\iconv-1.9.2.win$(bits)
!ENDIF
-ICONV_LIBS = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
+LTLIBICONV = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
@@ -210,7 +210,7 @@
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
NO_INLINE_CFLAGS = -Od -Ob0gysi-
!ENDIF
-CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS)
+CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
# No general LDFLAGS needed
INSTALL = copy
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -52,7 +52,7 @@
sed '1,/^AC_CONFIG_FILES/d' configure.ag
) > configure.ac &&
$libtoolize -c -f &&
-aclocal -I . -I buildtools/conf ${_m4_extra_dirs} &&
+aclocal ${_m4_extra_dirs} &&
autoheader &&
automake --add-missing --copy --foreign &&
autoconf
diff --git a/clients/odbc/driver/Makefile.ag b/clients/odbc/driver/Makefile.ag
--- a/clients/odbc/driver/Makefile.ag
+++ b/clients/odbc/driver/Makefile.ag
@@ -117,6 +117,6 @@
SQLTransact.c \
driver.rc \
ODBC.syms
- LIBS = ../../mapilib/libmapi $(ICONV_LIBS) $(ODBC_LIBS) $(SOCKET_LIBS)
+ LIBS = ../../mapilib/libmapi $(LTLIBICONV) $(ODBC_LIBS) $(SOCKET_LIBS)
}
diff --git a/clients/perl/Cimpl/Makefile.ag b/clients/perl/Cimpl/Makefile.ag
--- a/clients/perl/Cimpl/Makefile.ag
+++ b/clients/perl/Cimpl/Makefile.ag
@@ -15,25 +15,26 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SWIGFLAGS = -I../../mapilib $(PERL_INCS)
+SWIGFLAGS = -I$(srcdir)/../../mapilib $(PERL_INCS)
INCLUDES = ../../mapilib ../../../common/options $(PERL_INCS)
-# Both GNU's gcc and Intel's icc do not like to compile swig-generated code
-# with our strict X_CFLAGS.
-# Instead of diabling the strict X_CFLAGS completely,
-# we use GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively,
-# to disable only the problematic warnings/errors as locally as possbile.
-# See configure.ag for details.
+# Both GNU's gcc and Intel's icc do not like to compile
+# swig-generated code with our strict X_CFLAGS.
+# Instead of disabling the strict X_CFLAGS completely, we use
+# GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively, to disable only
+# the problematic warnings/errors as locally as possible. See
+# configure.ag for details.
#CFLAGS = $(GCC_SWIG_CFLAGS) $(ICC_SWIG_CFLAGS) -D_GNU_SOURCE
#
-# However, at least with gcc 4.2.2 and swig 1.3.31 on Gentoo 1.12.9, we still
get
+# However, at least with gcc 4.2.2 and swig 1.3.31 on Gentoo 1.12.9,
+# we still get
# MapiLib.pm.c: In function 'boot_MapiLib':
# MapiLib.pm.c:6157: warning: passing argument 2 of '_swig_create_magic'
discards qualifiers from pointer target type
# Hence, we have to disable (override) our X_CFLAGS completely:
X_CFLAGS = -D_GNU_SOURCE
-# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings as
errors)
-# for swig-generated code on Windows
+# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings
+# as errors) for swig-generated code on Windows
W_CFLAGS =
lib_MapiLib = {
diff --git a/common/stream/Makefile.ag b/common/stream/Makefile.ag
--- a/common/stream/Makefile.ag
+++ b/common/stream/Makefile.ag
@@ -24,8 +24,7 @@
INCLUDES = $(zlib_CFLAGS) \
$(BZ_CFLAGS) \
$(openssl_CFLAGS) \
- $(curl_CFLAGS) \
- $(ICONV_CFLAGS)
+ $(curl_CFLAGS)
lib_stream = {
SOURCES = stream.c stream.h
@@ -35,7 +34,7 @@
$(BZ_LIBS) \
$(openssl_LIBS) \
$(curl_LIBS) \
- $(ICONV_LIBS)
+ $(LTLIBICONV)
}
headers_common = {
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1614,20 +1614,20 @@
#define BUF_WILLNEED 3 /* Will need these pages */
#define BUF_DONTNEED 4 /* Don't need these pages */
-/* Heaps that are use and hence should to be loaded by BATaccess */
+/* Heaps that are use and hence should to be loaded by COLaccess */
#define USE_HEAP 1 /* BUNs & string heap */
#define USE_HASH 4 /* hash index */
#define USE_ALL (USE_HEAP|USE_HASH)
-gdk_export COL *BATload(const char *nme);
-gdk_export COL *BATload_intern(bat bid, int lock);
-#define BATaccessBegin(b,what,advice) BATaccess(b,what,advice,1)
-#define BATaccessEnd(b,what,advice) BATaccess(b,what,advice,-1)
-gdk_export size_t BATaccess(COL *b, int what, int advice, int load);
-gdk_export COL *BATsave(COL *b);
+gdk_export COL *COLload(const char *nme);
+gdk_export COL *COLload_intern(bat bid, int lock);
+#define BATaccessBegin(b,what,advice) COLaccess(b,what,advice,1)
+#define BATaccessEnd(b,what,advice) COLaccess(b,what,advice,-1)
+gdk_export size_t COLaccess(COL *b, int what, int advice, int load);
+gdk_export COL *COLsave(COL *b);
gdk_export int BATmmap(COL *b, int b, int h, int force);
gdk_export int BATmadvise(COL *b, int b, int h);
-gdk_export int BATdelete(COL *b);
+gdk_export int COLdelete(COL *b);
gdk_export size_t BATvmsize(COL *b, int dirty);
gdk_export size_t BATmemsize(COL *b, int dirty);
@@ -1665,9 +1665,9 @@
* over them, and prints the multi-column result on the file.
*
*/
-gdk_export int BATprint(COL *b);
-gdk_export int BATprintf(stream *f, COL *b);
-gdk_export int BATmultiprintf(stream *f, int argc, COL *argv[], int printoid,
int order, int printorderby);
+gdk_export int COLprint(COL *b);
+gdk_export int COLprintf(stream *f, COL *b);
+gdk_export int COLmultiprintf(stream *f, int argc, COL *argv[], int printoid,
int order, int printorderby);
/*
*
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2089,7 +2089,7 @@
ret = BBPbackup(b, FALSE);
if (ret == 0) {
BBPout++;
- ret = (BATsave(b) == NULL);
+ ret = (COLsave(b) == NULL);
}
/* clearing bits can be done without the lock */
BBP_status_off(bid, BBPSAVING, "BBPsave");
@@ -2882,7 +2882,7 @@
/* only cache simple non-saved non-renamed transient bats */
if (batcache_maxbuckets == 0 || b->batCopiedtodisk || b->heap.storage
!= STORE_MEM || b->lview || BBPtmpcheck(s) == 0 || (b->type == TYPE_str &&
b->width > 1) || b->type > TYPE_str || VIEWvparent(b)) {
BATDEBUG THRprintf(GDKout, "#BBPaddtobin %d " BUNFMT " %d
N1\n", b->type, b->capacity, bin);
- BATdelete(b); /* handles persistent case also (file deletes)
*/
+ COLdelete(b); /* handles persistent case also (file deletes)
*/
return 1;
}
if (hp == 0 && b->type) {
@@ -2890,7 +2890,7 @@
/* bat should be of the right size, types and BUN layout */
if (b->capacity > (BUN) BATTINY * batcache_maxbuckets ||
(b->capacity & ((BUN) BATTINY - 1)) != 0 || BATCACHE_NOTYPE(b->type)) {
BATDEBUG THRprintf(GDKout, "#BBPaddtobin %d " BUNFMT "
%d N2\n", b->type, b->capacity, bin);
- BATdelete(b); /* handles persistent case also (file
deletes) */
+ COLdelete(b); /* handles persistent case also (file
deletes) */
return 1;
}
}
@@ -3339,7 +3339,7 @@
BAT *b = dirty_bat(&i, subcommit != NULL);
if (i <= 0)
break;
- if (b != NULL && BATsave(b) == NULL)
+ if (b != NULL && COLsave(b) == NULL)
break; /* write error */
}
}
diff --git a/gdk/gdk_storage.mx b/gdk/gdk_storage.c
rename from gdk/gdk_storage.mx
rename to gdk/gdk_storage.c
--- a/gdk/gdk_storage.mx
+++ b/gdk/gdk_storage.c
@@ -1,50 +1,42 @@
-@/
-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
+/*
+ * 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.
+ */
-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.
+/*
+ * @f gdk_storage
+ * @a M. L. Kersten, P. Boncz, N. Nes
+ *
+ * @* Database Storage Management
+ * Contains routines for writing and reading GDK data to and from disk.
+ * This section contains the primitives to manage the disk-based images
+ * of the BATs. It relies on the existence of a UNIX file system, including
+ * memory mapped files. Solaris and IRIX have different implementations of
+ * madvise().
+ *
+ * The current version assumes that all BATs are stored on a single disk
+ * partition. This simplistic assumption should be replaced in the near
+ * future by a multi-volume version. The intension is to use several
+ * BAT home locations.
+ * The files should be owned by the database server. Otherwise, IO operations
are
+ * likely to fail. This is accomplished by setting the GID and UID upon
+ * system start.
+ */
-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 gdk_storage
-@a M. L. Kersten, P. Boncz, N. Nes
-
-@* Database Storage Management
-Contains routines for writing and reading GDK data to and from disk.
-This section contains the primitives to manage the disk-based images
-of the BATs. It relies on the existence of a UNIX file system, including
-memory mapped files. Solaris and IRIX have different implementations of
-madvise().
-
-The current version assumes that all BATs are stored on a single disk
-partition. This simplistic assumption should be replaced in the near
-future by a multi-volume version. The intension is to use several
-BAT home locations.
-The files should be owned by the database server. Otherwise, IO operations are
-likely to fail. This is accomplished by setting the GID and UID upon
-system start.
-@{
-@h
-#ifndef _GDK_STORAGE_H_
-#define _GDK_STORAGE_H_
-#include "gdk.h"
-
-extern void DESCclean(BAT *);
-extern int DESCsetmodes(BAT *b);
-
-#endif /* _GDK_STORAGE_H_ */
-@c
#include "monetdb_config.h"
#include "gdk.h"
#include <stdlib.h>
@@ -54,8 +46,6 @@
#include <fcntl.h>
#endif
-@
-@c
void
GDKfilepath(str path, const char *dir, const char *name, const char *ext)
{
@@ -191,9 +181,9 @@
}
-@-
-Unlink the file.
-@c
+/*
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
