Changeset: dfac69a1edd7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dfac69a1edd7 Modified Files: geom/monetdb5/50_geom.mal Branch: default Log Message:
Merger diffs (truncated from 825 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -588,7 +588,7 @@ * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - gdk: Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 diff --git a/clients/mapilib/monetdb-mapi.pc.in b/clients/mapilib/monetdb-mapi.pc.in --- a/clients/mapilib/monetdb-mapi.pc.in +++ b/clients/mapilib/monetdb-mapi.pc.in @@ -6,6 +6,7 @@ Name: monetdb-mapi Description: MonetDB MAPI C-client libary Version: @PACKAGE_VERSION@ +Requires: monetdb-stream openssl -Libs: -L${libdir} -lmapi +Libs: -L${libdir} -lmapi @SOCKET_LIBS@ Cflags: -I${includedir}/monetdb diff --git a/common/stream/monetdb-stream.pc.in b/common/stream/monetdb-stream.pc.in --- a/common/stream/monetdb-stream.pc.in +++ b/common/stream/monetdb-stream.pc.in @@ -8,5 +8,5 @@ Version: @PACKAGE_VERSION@ Requires: @PKG_CURL@ @PKG_ZLIB@ -Libs: -L${libdir} -lstream +Libs: -L${libdir} -lstream @SOCKET_LIBS@ Cflags: -I${includedir}/monetdb diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -278,6 +278,35 @@ AC_ENABLE_SHARED AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) +dnl logs usually end up in /var/log +logdir='${localstatedir}/log/monetdb' +AC_ARG_WITH(logdir, + [--with-logdir=DIR Where to put log files (LOCALSTATEDIR/log/monetdb/)], + [case "$withval" in + yes|no|auto) + AC_MSG_WARN([--with-logdir called without argument - will use default]) + ;; + *) + logdir="$withval" + ;; + esac] +) + +dnl pidfiles usually end up in /var/run +rundir='${localstatedir}/run/monetdb' +AC_ARG_WITH(rundir, + [--with-rundir=DIR Where to put pid files (LOCALSTATEDIR/run/monetdb/)], + [case "$withval" in + yes|no|auto) + AC_MSG_WARN([--with-rundir called without argument - will use default]) + ;; + *) + rundir="$withval" + ;; + esac] +) + + dnl checks for programs AC_LANG([C]) @@ -2133,17 +2162,21 @@ PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver], [have_pcre=yes], [have_pcre=no]) if test "x$have_pcre" = xyes; then - AC_PATH_PROG(PCRETEST,pcretest) - if test "x$PCRETEST" = x; then - AC_MSG_ERROR([could not find pcretest]) - else - AC_MSG_CHECKING(whether pcre comes with UTF-8 support) - pcre_utf8="`$PCRETEST -C 2>/dev/null | grep 'UTF-8 support' | sed -e 's|^ *||' -e 's| *$||'`" - if test "x$pcre_utf8" != "xUTF-8 support"; then - AC_MSG_ERROR([PCRE library compiled without UTF-8 support]) - fi - AC_MSG_RESULT([yes]) - fi + AC_MSG_CHECKING(whether pcre comes with UTF-8 support) + save_LIBS="$LIBS" + LIBS="$LIBS $pcre_LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pcre_CFLAGS" + AC_RUN_IFELSE([AC_LANG_PROGRAM( + [[#include <pcre.h>]], + [[int rc; pcre_config(PCRE_CONFIG_UTF8, &rc); exit(!rc);]])], + AC_MSG_RESULT([yes]), + have_pcre=no; AC_MSG_RESULT([no]), + AC_MSG_RESULT([assuming yes])) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi +if test "x$have_pcre" = xyes; then AC_DEFINE(HAVE_LIBPCRE, 1, [Define if you have the pcre library]) fi AM_CONDITIONAL(HAVE_PCRE, test x"$have_pcre" != xno) @@ -2181,7 +2214,7 @@ [AC_DEFINE(HAVE_RAPTOR, 1, [Define if you have raptor installed]) have_raptor="yes"], [if test "x$enable_rdf" = xyes; then AC_MSG_ERROR([raptor library required for RDF support]); fi - have_raptor="no"]) + have_raptor="no"; enable_rdf=no; disable_rdf="(raptor library not found)"]) fi AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno) @@ -2422,7 +2455,8 @@ if test "x$enable_fits" != xno; then PKG_CHECK_MODULES([cfitsio], [cfitsio], [have_cfitsio=yes; AC_DEFINE(HAVE_CFITSIO, 1, [Define if you have the cfitsio library])], - [have_cfitsio=no; if test "x$enable_fits" = xyes; then AC_MSG_ERROR([cfitsio library required for FITS support]); fi]) + [have_cfitsio=no; if test "x$enable_fits" = xyes; then AC_MSG_ERROR([cfitsio library required for FITS support]); fi; + enable_fits=no; disable_fits="(cfitsio library not found)"]) fi AM_CONDITIONAL(HAVE_CFITSIO, test x"$have_cfitsio" != xno) @@ -2929,6 +2963,18 @@ AC_SUBST(Xlocalstatedir) AC_SUBST(Elocalstatedir) AC_SUBST(QXlocalstatedir) +Xlogdir="`$translatepath "$logdir"`" +eval "Elogdir=${Xlogdir}" +# need second eval because localstatedir defaults to being ${prefix}/var +eval "Elogdir=${Elogdir}" +AC_SUBST(logdir) +AC_SUBST(Elogdir) +Xrundir="`$translatepath "$rundir"`" +eval "Erundir=${Xrundir}" +# need second eval because localstatedir defaults to being ${prefix}/var +eval "Erundir=${Erundir}" +AC_SUBST(rundir) +AC_SUBST(Erundir) Qlibdir="$libdir" Xlibdir="`$translatepath "$libdir"`" QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`" @@ -3163,7 +3209,6 @@ echo echo "* Enabled/disabled components:" for comp in \ - common \ gdk \ monetdb5 \ sql \ diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ monetdb (11.3.1-20110414) unstable; urgency=low * gdk: Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. -- Sjoerd Mullender <[email protected]> Thu, 14 Apr 2011 10:11:07 +0200 diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -3,7 +3,7 @@ * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - Fixed bugs in antiselect which gave the incorrect result when upper - and lower bount were equal. This bug could be triggered by the SQL + and lower bound were equal. This bug could be triggered by the SQL query SELECT * FROM t WHERE x NOT BETWEEN y AND y. * Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 diff --git a/geom/ChangeLog.Apr2011 b/geom/ChangeLog.Apr2011 --- a/geom/ChangeLog.Apr2011 +++ b/geom/ChangeLog.Apr2011 @@ -1,3 +1,7 @@ # ChangeLog file for geom # This file is updated with Maddlog +* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> +- Fixed various problems so that now all our tests work correctly on + all our testing platforms. + diff --git a/geom/monetdb5/50_geom.mal b/geom/monetdb5/30_geom.mal rename from geom/monetdb5/50_geom.mal rename to geom/monetdb5/30_geom.mal diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag --- a/geom/monetdb5/Makefile.ag +++ b/geom/monetdb5/Makefile.ag @@ -49,7 +49,7 @@ headers_autoload = { HEADERS = mal DIR = libdir/monetdb5/autoload - SOURCES = 50_geom.mal + SOURCES = 30_geom.mal } -EXTRA_DIST = 50_geom.mal +EXTRA_DIST = 30_geom.mal diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx --- a/geom/monetdb5/geom.mx +++ b/geom/monetdb5/geom.mx @@ -501,10 +501,10 @@ return a; } -geom_export void +geom_export int mbrWRITE(mbr *c, stream *s, size_t cnt); -void +int mbrWRITE(mbr *c, stream *s, size_t cnt) { size_t i; @@ -517,8 +517,9 @@ !mnstr_writeInt(s, (int) c->ymin) || !mnstr_writeInt(s, (int) c->xmax) || !mnstr_writeInt(s, (int) c->ymax)) - break; + return GDK_FAIL; } + return GDK_SUCCEED; } geom_export str @@ -628,8 +629,8 @@ ) { GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed from the src string. */ - unsigned char* wkb = NULL; /* The "well known binary" serialization of the geometry object. */ - size_t wkbLen = 0; /* The length of the wkb string. */ + unsigned char* wkbSer = NULL; /* The "well known binary" serialization of the geometry object. */ + size_t wkbLen = 0; /* The length of the wkbSer string. */ int nil = 0; if (strcmp(src, str_nil) == 0) @@ -645,20 +646,20 @@ } if (!nil) { - wkb = GEOSGeomToWKB_buf(geosGeometry, &wkbLen); + wkbSer = GEOSGeomToWKB_buf(geosGeometry, &wkbLen); GEOSGeom_destroy(geosGeometry); } if (*len < (int)wkb_size(wkbLen)) { if (*atom) GDKfree(*atom); *atom = GDKmalloc(*len = (int)wkb_size(wkbLen)); } - if (!wkb) { + if (!wkbSer) { **atom = *wkbNULL(); } else { assert(wkbLen <= GDK_int_max); (*atom)->len = (int) wkbLen; - memcpy(&(*atom)->data, wkb, wkbLen); - free(wkb); + memcpy(&(*atom)->data, wkbSer, wkbLen); + free(wkbSer); } wkbLen = strlen(src); assert(wkbLen <= GDK_int_max); @@ -837,18 +838,21 @@ return a; } -geom_export void +geom_export int wkbWRITE(wkb *a, stream *s, size_t cnt); -void +int wkbWRITE(wkb *a, stream *s, size_t cnt) { int len = a->len; (void) cnt; assert(cnt == 1); - if (mnstr_writeInt(s, len) && len > 0) /* 64bit: check for overflow */ + if (!mnstr_writeInt(s, len)) /* 64bit: check for overflow */ + return GDK_FAIL; + if (len > 0) /* 64bit: check for overflow */ mnstr_write(s, (char *) a->data, len, 1); + return GDK_SUCCEED; } geom_export void diff --git a/monetdb5/modules/atoms/blob.mx b/monetdb5/modules/atoms/blob.mx --- a/monetdb5/modules/atoms/blob.mx +++ b/monetdb5/modules/atoms/blob.mx @@ -179,7 +179,7 @@ blob_export int BLOBnitems(int *ret, blob *b); blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val); blob_export blob * BLOBread(blob *a, stream *s, size_t cnt); -blob_export void BLOBwrite(blob *a, stream *s, size_t cnt); +blob_export int BLOBwrite(blob *a, stream *s, size_t cnt); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
