Changeset: 5671aaac7b29 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5671aaac7b29 Added Files: ChangeLog-Archive Modified Files: .hgtags ChangeLog.Jun2016 MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk.h gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/cudf/Makefile.ag sql/backends/monet5/UDF/pyapi/connection.c sql/backends/monet5/UDF/pyapi/connection.h sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/pyapi.h sql/backends/monet5/vaults/bam/Makefile.ag sql/backends/monet5/vaults/fits/Makefile.ag sql/backends/monet5/vaults/lidar/Makefile.ag sql/backends/monet5/vaults/netcdf/Makefile.ag sql/backends/monet5/vaults/shp/Makefile.ag sql/server/sql_parser.y vertoo.data Branch: python3udf Log Message:
Merge with default. diffs (truncated from 412 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -627,3 +627,5 @@ 192e3168234a5f9f8a4d1c4ce17805f608f001c3 b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_3 192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release +4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_5 +4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive new file mode 100644 --- /dev/null +++ b/ChangeLog-Archive @@ -0,0 +1,6 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Fri Jul 1 2016 Sjoerd Mullender <[email protected]> - 11.23.5-20160704 +- Lots of memory leaks have been plugged across the whole system. + diff --git a/ChangeLog.Jun2016 b/ChangeLog.Jun2016 --- a/ChangeLog.Jun2016 +++ b/ChangeLog.Jun2016 @@ -1,6 +1,3 @@ # ChangeLog file for candidate # This file is updated with Maddlog -* Fri Jul 1 2016 Sjoerd Mullender <[email protected]> -- Lots of memory leaks have been plugged across the whole system. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -119,7 +119,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jun2016/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jun2016-SP1/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -962,6 +962,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon Jul 04 2016 Sjoerd Mullender <[email protected]> - 11.23.5-20160704 +- Rebuilt. +- BZ#4031: mclient doesn't accept - argument to refer to stdin + +* Fri Jul 1 2016 Sjoerd Mullender <[email protected]> - 11.23.5-20160704 +- MonetDB: Lots of memory leaks have been plugged across the whole system. + * Fri Jun 10 2016 Sjoerd Mullender <[email protected]> - 11.23.3-20160610 - Rebuilt. - BZ#4015: Daemon crashes on database release command diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.23.5) unstable; urgency=low + + * Rebuilt. + * BZ#4031: mclient doesn't accept - argument to refer to stdin + + -- Sjoerd Mullender <[email protected]> Mon, 04 Jul 2016 12:57:25 +0200 + +monetdb (11.23.5) unstable; urgency=low + + * MonetDB: Lots of memory leaks have been plugged across the whole system. + + -- Sjoerd Mullender <[email protected]> Fri, 1 Jul 2016 12:57:25 +0200 + monetdb (11.23.3) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1309,7 +1309,7 @@ gdk_export BUN BUNfnd(BAT *b, const void #define tailsize(b,p) ((b)->ttype?((size_t)(p))<<(b)->tshift:0) -#define Tloc(b,p) ((b)->theap.base+((p)<<(b)->tshift)) +#define Tloc(b,p) ((b)->theap.base+(((size_t)(p))<<(b)->tshift)) #if SIZEOF_VAR_T < SIZEOF_VOID_P /* NEW 11/4/2009: when compiled with 32-bits oids/var_t on 64-bits diff --git a/java/Makefile.ag b/java/Makefile.ag --- a/java/Makefile.ag +++ b/java/Makefile.ag @@ -16,7 +16,7 @@ JAVA_HOME = @JAVA_HOME@ ant_distjdbc = { COND = HAVE_JAVAJDBC DIR = datadir/monetdb/lib - FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.21.jar jdbcclient.jar + FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.22.jar jdbcclient.jar } ant_distmerocontrol = { diff --git a/java/build.properties b/java/build.properties --- a/java/build.properties +++ b/java/build.properties @@ -19,7 +19,7 @@ MCL_MINOR=13 # major release number JDBC_MAJOR=2 # minor release number -JDBC_MINOR=21 +JDBC_MINOR=22 # an additional identifying string JDBC_VER_SUFFIX=Liberica # the default port to connect on, if no port given when using SQL diff --git a/java/pom.xml b/java/pom.xml --- a/java/pom.xml +++ b/java/pom.xml @@ -6,7 +6,7 @@ <groupId>monetdb</groupId> <artifactId>monetdb-jdbc</artifactId> - <version>2.21</version> + <version>2.22</version> <name>${project.groupId}:${project.artifactId}</name> <description>MonetDB JDBC driver</description> <url>https://www.monetdb.org</url> diff --git a/java/release.txt b/java/release.txt --- a/java/release.txt +++ b/java/release.txt @@ -1,6 +1,6 @@ RELEASE NOTES -MonetDB JDBC driver version 2.21 (Liberica/MCL-1.13) -Release date: 2016-06-10 +MonetDB JDBC driver version 2.22 (Liberica/MCL-1.13) +Release date: 2016-07-04 This JDBC driver is designed for use with MonetDB, a main-memory database. For more information see https://www.monetdb.org/. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=13:1:0 +GDK_VERSION=13:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=8:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=21:1:0 +MONETDB5_VERSION=21:2:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=8:0:0 +STREAM_VERSION=8:1:0 diff --git a/sql/backends/monet5/UDF/cudf/Makefile.ag b/sql/backends/monet5/UDF/cudf/Makefile.ag --- a/sql/backends/monet5/UDF/cudf/Makefile.ag +++ b/sql/backends/monet5/UDF/cudf/Makefile.ag @@ -4,7 +4,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. -INCLUDES = ../../ \ +INCLUDES = ../.. \ ../../../../include \ ../../../../common \ ../../../../storage \ diff --git a/sql/backends/monet5/UDF/pyapi/connection.c b/sql/backends/monet5/UDF/pyapi/connection.c --- a/sql/backends/monet5/UDF/pyapi/connection.c +++ b/sql/backends/monet5/UDF/pyapi/connection.c @@ -9,8 +9,8 @@ #define PyString_FromString PyUnicode_FromString #endif -CREATE_SQL_FUNCTION_PTR(void,SQLdestroyResult,(res_table*)); -CREATE_SQL_FUNCTION_PTR(str,SQLstatementIntern,(Client, str *, str, int, bit, res_table **)); +CREATE_SQL_FUNCTION_PTR(void,SQLdestroyResult); +CREATE_SQL_FUNCTION_PTR(str,SQLstatementIntern); static PyObject * _connection_execute(Py_ConnectionObject *self, PyObject *args) @@ -260,10 +260,8 @@ str _connection_init(void) { str msg = MAL_SUCCEED; _connection_import_array(); - - LOAD_SQL_FUNCTION_PTR(SQLdestroyResult, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(SQLstatementIntern, "lib_sql.dll"); - + LOAD_SQL_FUNCTION_PTR(SQLdestroyResult); + LOAD_SQL_FUNCTION_PTR(SQLstatementIntern); if (msg != MAL_SUCCEED) { return msg; } diff --git a/sql/backends/monet5/UDF/pyapi/connection.h b/sql/backends/monet5/UDF/pyapi/connection.h --- a/sql/backends/monet5/UDF/pyapi/connection.h +++ b/sql/backends/monet5/UDF/pyapi/connection.h @@ -24,7 +24,7 @@ typedef struct { int query_sem; } Py_ConnectionObject; -PyAPI_DATA(PyTypeObject) Py_ConnectionType; +extern PyTypeObject Py_ConnectionType; #define Py_Connection_Check(op) (Py_TYPE(op) == &Py_ConnectionType) #define Py_Connection_CheckExact(op) (Py_TYPE(op) == &Py_ConnectionType) diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c b/sql/backends/monet5/UDF/pyapi/pyapi.c --- a/sql/backends/monet5/UDF/pyapi/pyapi.c +++ b/sql/backends/monet5/UDF/pyapi/pyapi.c @@ -100,16 +100,16 @@ static char* FunctionBasePath(void) { return basepath; } -CREATE_SQL_FUNCTION_PTR(str,batbte_dec2_dbl,(bat*, int*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,batsht_dec2_dbl,(bat*, int*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,batint_dec2_dbl,(bat*, int*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,batlng_dec2_dbl,(bat*, int*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,bathge_dec2_dbl,(bat*, int*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,batstr_2time_timestamp,(bat*, bat*, int*)); -CREATE_SQL_FUNCTION_PTR(str,batstr_2time_daytime,(bat*, bat*, int*)); -CREATE_SQL_FUNCTION_PTR(str,batstr_2_date,(bat*, bat*)); -CREATE_SQL_FUNCTION_PTR(str,batdbl_num2dec_lng,(bat*, bat*, int*,int*)); -CREATE_SQL_FUNCTION_PTR(str,SQLbatstr_cast,(Client, MalBlkPtr, MalStkPtr, InstrPtr)); +CREATE_SQL_FUNCTION_PTR(str,batbte_dec2_dbl); +CREATE_SQL_FUNCTION_PTR(str,batsht_dec2_dbl); +CREATE_SQL_FUNCTION_PTR(str,batint_dec2_dbl); +CREATE_SQL_FUNCTION_PTR(str,batlng_dec2_dbl); +CREATE_SQL_FUNCTION_PTR(str,bathge_dec2_dbl); +CREATE_SQL_FUNCTION_PTR(str,batstr_2time_timestamp); +CREATE_SQL_FUNCTION_PTR(str,batstr_2time_daytime); +CREATE_SQL_FUNCTION_PTR(str,batstr_2_date); +CREATE_SQL_FUNCTION_PTR(str,batdbl_num2dec_lng); +CREATE_SQL_FUNCTION_PTR(str,SQLbatstr_cast); static MT_Lock pyapiLock; static MT_Lock queryLock; @@ -1589,19 +1589,16 @@ PYFUNCNAME(PyAPIprelude)(void *ret) { return createException(MAL, "pyapi.eval", "Failed to load function \"loads\" from Marshal module."); } PyEval_SaveThread(); - LOAD_SQL_FUNCTION_PTR(batbte_dec2_dbl, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batsht_dec2_dbl, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batint_dec2_dbl, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batlng_dec2_dbl, "lib_sql.dll"); -#ifdef HAVE_HGE - LOAD_SQL_FUNCTION_PTR(bathge_dec2_dbl, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(bathge_dec2_dbl, "lib_sql.dll"); -#endif - LOAD_SQL_FUNCTION_PTR(batstr_2time_timestamp, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batstr_2time_daytime, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batstr_2_date, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(batdbl_num2dec_lng, "lib_sql.dll"); - LOAD_SQL_FUNCTION_PTR(SQLbatstr_cast, "lib_sql.dll"); + LOAD_SQL_FUNCTION_PTR(batbte_dec2_dbl); + LOAD_SQL_FUNCTION_PTR(batsht_dec2_dbl); + LOAD_SQL_FUNCTION_PTR(batint_dec2_dbl); + LOAD_SQL_FUNCTION_PTR(batlng_dec2_dbl); + LOAD_SQL_FUNCTION_PTR(bathge_dec2_dbl); + LOAD_SQL_FUNCTION_PTR(batstr_2time_timestamp); + LOAD_SQL_FUNCTION_PTR(batstr_2time_daytime); + LOAD_SQL_FUNCTION_PTR(batstr_2_date); + LOAD_SQL_FUNCTION_PTR(batdbl_num2dec_lng); + LOAD_SQL_FUNCTION_PTR(SQLbatstr_cast); if (msg != MAL_SUCCEED) { MT_lock_unset(&pyapiLock); return msg; @@ -2880,14 +2877,4 @@ bool Python_ReleaseGIL(bool state) return 0; } -void* lookup_function(char *func, char* library) { - void *dl, *fun; - dl = mdlopen(library, RTLD_NOW | RTLD_GLOBAL); - if (dl == NULL) { - return NULL; - } - fun = dlsym(dl, func); - dlclose(dl); - return fun; -} diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.h b/sql/backends/monet5/UDF/pyapi/pyapi.h --- a/sql/backends/monet5/UDF/pyapi/pyapi.h +++ b/sql/backends/monet5/UDF/pyapi/pyapi.h @@ -108,16 +108,23 @@ pyapi_export str PYFUNCNAME(PyAPIevalAgg pyapi_export str PYFUNCNAME(PyAPIprelude)(void *ret); -pyapi_export void* lookup_function(char *func, char* library); +#ifdef WIN32 +#define CREATE_SQL_FUNCTION_PTR(retval, fcnname) \ + typedef retval (*fcnname##_ptr_tpe)(); \ + fcnname##_ptr_tpe fcnname##_ptr = NULL; -#define CREATE_SQL_FUNCTION_PTR(retval, fcnname, params) \ - typedef retval (*fcnname##_ptr_tpe)params; \ - fcnname##_ptr_tpe fcnname##_ptr = NULL; +#define LOAD_SQL_FUNCTION_PTR(fcnname) \ + fcnname##_ptr = (fcnname##_ptr_tpe) getAddress(NULL, "lib_sql.dll", NULL, #fcnname, 0); \ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
