Changeset: f983003b5c5e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f983003b5c5e Added Files: tools/embedded/inline.py Removed Files: tools/embedded/encode.R Modified Files: .hgtags 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/mapiclient/eventparser.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/mal/mal_import.c monetdb5/mal/mal_profiler.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out sql/benchmarks/ATIS/Tests/load.stable.out sql/benchmarks/arno/Tests/insert_ATOM.stable.out sql/benchmarks/arno/Tests/insert_BOND.stable.out sql/benchmarks/arno_flt/Tests/init.stable.out sql/benchmarks/moa/Tests/load.stable.out sql/benchmarks/wisconsin/Tests/load.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/Tests/decimal2.stable.out testing/Mtest.py.in tools/embedded/build-rpkg.sh tools/embedded/demo.c tools/mserver/mserver5.1.in tools/mserver/mserver5.c vertoo.data Branch: embedded Log Message:
merge with default diffs (truncated from 1146 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -613,3 +613,5 @@ d1dd6e5b7a5acfe14a33070e08c776341996deb2 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_11 d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_SP1_release 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release +25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_13 +25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -970,6 +970,45 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Jan 05 2016 Sjoerd Mullender <[email protected]> - 11.21.13-20160105 +- Rebuilt. +- BZ#2014: 'null' from copy into gets wrong +- BZ#3817: opt_pushselect stuck with multi-table UDF +- BZ#3835: windows does not release ram after operations +- BZ#3836: rand() only gets evaluated once when used as an expression +- BZ#3838: Update column with or without parenthesis produce different + results +- BZ#3840: savepoints may crash the database +- BZ#3841: mclient fails with response "Challenge string is not valid" +- BZ#3842: SQL execution fails to finish and reports bogus error messages +- BZ#3845: Too many VALUES in INSERT freeze mserver5 +- BZ#3847: Wrong SQL results for a certain combination of GROUP BY / + ORDER BY / LIMIT +- BZ#3848: mserver segfault during bulk loading/updating +- BZ#3849: HUGEINT incorrect value +- BZ#3850: DEL character not escaped +- BZ#3851: expression that should evaluate to FALSE evaluates to TRUE + in SELECT query +- BZ#3852: CASE statement produces GDK error on multithreaded database: + BATproject does not match always +- BZ#3854: Complex expression with comparison evaluates incorrectly in + WHERE clause +- BZ#3855: Foreign key referencing table in a different schema - + not allowed. +- BZ#3857: Large LIMIT in SELECT may abort the query +- BZ#3861: Using window functions cause a crash +- BZ#3864: Error in bulk import for chinese character +- BZ#3871: NOT x LIKE triggers "too many nested operators" +- BZ#3872: mserver crashes under specific combination of JOIN and WHERE + conditions +- BZ#3873: mserver5: gdk_bat.c:1015: setcolprops: Assertion `x != + ((void *)0) || col->type == 0' failed. +- BZ#3879: Database crashes when querying with several UNION ALLs. +- BZ#3887: Querying "sys"."tracelog" causes assertion violation and + crash of mserver5 process +- BZ#3889: read only does not protect empty tables +- BZ#3895: read only does not protect this table + * Fri Oct 30 2015 Sjoerd Mullender <[email protected]> - 11.21.11-20151030 - Rebuilt. - BZ#3828: Schema corruption after several ALTER TABLE statements and diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c --- a/clients/mapiclient/eventparser.c +++ b/clients/mapiclient/eventparser.c @@ -20,6 +20,7 @@ char *malvalues[MAXMALARGS]; int malsize; int debug=0; char *currentquery=0; +int eventcounter = 0; #ifndef HAVE_STRPTIME extern char *strptime(const char *, const char *, struct tm *); @@ -182,6 +183,7 @@ keyvalueparser(char *txt, EventRecord *e resetEventRecord(ev); memset(malvariables, 0, sizeof(malvariables)); memset(malvalues, 0, sizeof(malvalues)); + ev->eventnr= eventcounter++; return 0; } if( *c == '}'){ @@ -202,7 +204,6 @@ keyvalueparser(char *txt, EventRecord *e *c = 0; } else val =c; - if( strstr(key,"event")) { ev->eventnr= atol(val); return 0;} if( strstr(key,"clk")){ ev->clk = atol(val); return 0; diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c --- a/clients/mapiclient/stethoscope.c +++ b/clients/mapiclient/stethoscope.c @@ -70,7 +70,7 @@ static stream *conn = NULL; static char hostname[128]; static char *filename = NULL; -static int beat = 50; +static int beat = 0; static int json = 0; static Mapi dbh; static MapiHdl hdl = NULL; diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +monetdb (11.21.13) unstable; urgency=low + + * Rebuilt. + * BZ#2014: 'null' from copy into gets wrong + * BZ#3817: opt_pushselect stuck with multi-table UDF + * BZ#3835: windows does not release ram after operations + * BZ#3836: rand() only gets evaluated once when used as an expression + * BZ#3838: Update column with or without parenthesis produce different + results + * BZ#3840: savepoints may crash the database + * BZ#3841: mclient fails with response "Challenge string is not valid" + * BZ#3842: SQL execution fails to finish and reports bogus error messages + * BZ#3845: Too many VALUES in INSERT freeze mserver5 + * BZ#3847: Wrong SQL results for a certain combination of GROUP BY / + ORDER BY / LIMIT + * BZ#3848: mserver segfault during bulk loading/updating + * BZ#3849: HUGEINT incorrect value + * BZ#3850: DEL character not escaped + * BZ#3851: expression that should evaluate to FALSE evaluates to TRUE + in SELECT query + * BZ#3852: CASE statement produces GDK error on multithreaded database: + BATproject does not match always + * BZ#3854: Complex expression with comparison evaluates incorrectly in + WHERE clause + * BZ#3855: Foreign key referencing table in a different schema - + not allowed. + * BZ#3857: Large LIMIT in SELECT may abort the query + * BZ#3861: Using window functions cause a crash + * BZ#3864: Error in bulk import for chinese character + * BZ#3871: NOT x LIKE triggers "too many nested operators" + * BZ#3872: mserver crashes under specific combination of JOIN and WHERE + conditions + * BZ#3873: mserver5: gdk_bat.c:1015: setcolprops: Assertion `x != + ((void *)0) || col->type == 0' failed. + * BZ#3879: Database crashes when querying with several UNION ALLs. + * BZ#3887: Querying "sys"."tracelog" causes assertion violation and + crash of mserver5 process + * BZ#3889: read only does not protect empty tables + * BZ#3895: read only does not protect this table + + -- Sjoerd Mullender <[email protected]> Tue, 05 Jan 2016 11:05:59 +0100 + monetdb (11.21.11) unstable; urgency=low * Rebuilt. 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.18.jar jdbcclient.jar + FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.19.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=18 +JDBC_MINOR=19 # 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.18</version> + <version>2.19</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,8 +1,8 @@ RELEASE NOTES -MonetDB JDBC driver version 2.18 (Liberica/MCL-1.13) +MonetDB JDBC driver version 2.19 (Liberica/MCL-1.13) Fabian Groffen <[email protected]> -Release date: 2015-10-20 +Release date: 2016-01-05 This JDBC driver is designed for use with MonetDB, a main-memory 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=12:5:0 +GDK_VERSION=12:6:0 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=7:5:0 +MAPI_VERSION=7:6:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=20:0:1 +MONETDB5_VERSION=20:1:1 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=7:0:0 diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c --- a/monetdb5/mal/mal_import.c +++ b/monetdb5/mal/mal_import.c @@ -154,6 +154,10 @@ malLoadScript(Client c, str name, bstrea c->blkmode = oldblkmode; \ c->srcFile = oldsrcFile; + +#ifdef HAVE_EMBEDDED +#include "mal_init_inline.h" +#endif /* * The include operation parses the file indentified and * leaves the MAL code behind in the 'main' function. @@ -181,9 +185,25 @@ malInclude(Client c, str name, int listi c->prompt = GDKstrdup(""); /* do not produce visible prompts */ c->promptlength = 0; c->listing = listing; - c->fdin = NULL; +#ifdef HAVE_EMBEDDED + { + size_t mal_init_len = strlen(mal_init_inline); + buffer* mal_init_buf = buffer_create(mal_init_len); + stream* mal_init_stream = buffer_rastream(mal_init_buf, name); + buffer_init(mal_init_buf, mal_init_inline, mal_init_len); + c->srcFile = name; + c->yycur = 0; + c->bak = NULL; + c->fdin = bstream_create(mal_init_stream, mal_init_len); + bstream_next(c->fdin); + parseMAL(c, c->curprg, 1); + free(mal_init_buf); + free(mal_init_stream); + c->fdin = NULL; + } +#else if ((filename = malResolveFile(name)) != NULL) { name = filename; do { @@ -206,7 +226,7 @@ malInclude(Client c, str name, int listi GDKfree(name); c->fdin = NULL; } - +#endif restoreClient; return s; } diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c --- a/monetdb5/mal/mal_profiler.c +++ b/monetdb5/mal/mal_profiler.c @@ -63,30 +63,16 @@ static struct{ // The heart beat events should be sent to all outstanding channels. static void logjsonInternal(char *logbuffer) { - char buf[BUFSIZ], *s; - size_t len, lenhdr; + size_t len; - s = strchr(logbuffer,(int) ':'); - if( s == NULL){ - return; - } len = strlen(logbuffer); MT_lock_set(&mal_profileLock); - snprintf(buf,BUFSIZ,"%d",eventcounter); - strncpy(s+1, buf,strlen(buf)); - if (eventstream) { // upon request the log record is sent over the profile stream - if( eventcounter == 0){ - snprintf(buf,BUFSIZ,"%s\n",monet_characteristics); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
