Changeset: 68446e50f728 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68446e50f728 Added Files: sql/test/pg_regress/Tests/oid.stable.err.32bit 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/Tests/exports.stable.out 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/ChangeLog-Archive gdk/ChangeLog.Jul2015 gdk/gdk_atoms.c gdk/libbat.rc libversions monetdb5/ChangeLog monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/profiler.mal monetdb5/modules/mal/remote.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/server/Makefile.ag sql/server/rel_optimizer.c sql/storage/store.c sql/test/BugTracker-2012/Tests/All sql/test/json/Tests/All sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/oid.stable.err sql/test/remote/Tests/ssbm.SQL.py testing/Mtest.py.in tools/embedded/Tests/All vertoo.data Branch: leftmart Log Message:
merge with default diffs (truncated from 1087 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -620,3 +620,5 @@ feec2e4020548d3137a0e946b7a4e29db5b9e14a ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_17 ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release +51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_19 +51322027cb7e7c27f03fc7c3cab4db4fd4cd4446 Jul2015_SP4_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -104,7 +104,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP4/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist BuildRequires: systemd @@ -986,6 +986,20 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Apr 05 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- Rebuilt. +- BZ#3905: MonetDB doesn't handle ANY/SOME/ALL operator correctly +- BZ#3929: R aggregate not recognized when using 3 or more parameters +- BZ#3965: Not possible to quote/escape single quote character in the + name of the file to load. +- BZ#3968: Missing double use of column names + +* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- gdk: Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + * Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324 - Rebuilt. - BZ#2972: SQL URL functionality contains errors diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1601,6 +1601,7 @@ str PCREreplace_wrap(str *res, const str str PCREsql2pcre(str *ret, const str *pat, const str *esc); str PROFexitClient(Client c); str PROFinitClient(Client c); +str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void QLOGcalls(BAT **r); void QLOGcatalog(BAT **r); @@ -1609,7 +1610,6 @@ str QLOGdisable(void *ret); str QLOGempty(void *ret); str QLOGenable(void *ret); str QLOGenableThreshold(void *ret, int *threshold); -str QLOGinsert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int QLOGisset(void); str QLOGissetFcn(int *ret); str QOTclrdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -2165,7 +2165,6 @@ int initTrace(void); int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc); str inplaceRef; void insertInstruction(MalBlkPtr mb, InstrPtr p, int pc); -str insertRef; void insertSymbol(Module scope, Symbol prg); str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden); str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base, size_t len); diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +monetdb (11.21.19) unstable; urgency=low + + * Rebuilt. + * BZ#3905: MonetDB doesn't handle ANY/SOME/ALL operator correctly + * BZ#3929: R aggregate not recognized when using 3 or more parameters + * BZ#3965: Not possible to quote/escape single quote character in the + name of the file to load. + * BZ#3968: Missing double use of column names + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 05 Apr 2016 11:29:47 +0200 + +monetdb (11.21.19) unstable; urgency=low + + * gdk: Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 4 Apr 2016 11:29:47 +0200 + monetdb (11.21.17) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,12 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.19-20160405 +- Fixed a bug that caused various instances where old data returned or + where crashes occurred. The problem was that internally data wasn't + always marked dirty when it was being changed, causiing later processing + to not deal with the changed data correctly. + * Wed Feb 4 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807 - BUNtvar and BUNhvar macros no longer work for TYPE_void columns. diff --git a/gdk/ChangeLog.Jul2015 b/gdk/ChangeLog.Jul2015 --- a/gdk/ChangeLog.Jul2015 +++ b/gdk/ChangeLog.Jul2015 @@ -1,9 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Mon Apr 4 2016 Sjoerd Mullender <sjo...@acm.org> -- Fixed a bug that caused various instances where old data returned or - where crashes occurred. The problem was that internally data wasn't - always marked dirty when it was being changed, causiing later processing - to not deal with the changed data correctly. - diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c --- a/gdk/gdk_atoms.c +++ b/gdk/gdk_atoms.c @@ -854,8 +854,11 @@ dblFromStr(const char *src, int *len, db * ERANGE. We accept underflow, but not overflow. */ char *pe; errno = 0; - d = strtod(src, &pe); - p = pe; + d = strtod(p, &pe); + if (p == pe) + p = src; /* nothing converted */ + else + p = pe; n = (int) (p - src); if (n == 0 || (errno == ERANGE && (d < -1 || d > 1)) #ifdef isfinite @@ -917,8 +920,11 @@ fltFromStr(const char *src, int *len, fl * ERANGE. We accept underflow, but not overflow. */ char *pe; errno = 0; - f = strtof(src, &pe); - p = pe; + f = strtof(p, &pe); + if (p == pe) + p = src; /* nothing converted */ + else + p = pe; n = (int) (p - src); if (n == 0 || (errno == ERANGE && (f < -1 || f > 1)) #else /* no strtof, try sscanf */ 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:8:0 +GDK_VERSION=12:9:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=7:6:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=20:3:1 +MONETDB5_VERSION=20:4:1 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=7:0:0 diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog --- a/monetdb5/ChangeLog +++ b/monetdb5/ChangeLog @@ -1,3 +1,8 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Apr 6 2016 Martin Kersten <m...@cwi.nl> +- Keep a collection of full traces Each time the SQL user applies + the TRACE option, the full json trace is retained within the + <dbpath>/<dbname>/sql_traces + 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 @@ -527,9 +527,28 @@ startProfiler(void) } /* SQL queries can be traced without obstructing the stream */ +/* A hard limit is currently imposed */ +#define MAXTRACEFILES 50 +static int offlinestore = 0; +static int tracecounter = 0; str -startTrace(void) +startTrace(str path) { + char buf[PATHLENGTH]; + + if( path && eventstream == NULL){ + // create a file to keep the events, unless we + // already have a profiler stream + MT_lock_set(&mal_profileLock ); + if(eventstream == NULL && offlinestore ==0){ + snprintf(buf,PATHLENGTH,"%s%c%s",GDKgetenv("gdk_dbname"), DIR_SEP, path); + (void) mkdir(buf,0755); + snprintf(buf,PATHLENGTH,"%s%c%s%ctrace_%d",GDKgetenv("gdk_dbname"), DIR_SEP, path,DIR_SEP,tracecounter++ % MAXTRACEFILES); + eventstream = open_wastream(buf); + offlinestore++; + } + MT_lock_unset(&mal_profileLock ); + } malProfileMode = 1; sqlProfiling = TRUE; clearTrace(); @@ -537,8 +556,16 @@ startTrace(void) } str -stopTrace(void) +stopTrace(str path) { + MT_lock_set(&mal_profileLock ); + if( path && offlinestore){ + (void) close_stream(eventstream); + eventstream = 0; + offlinestore =0; + } + MT_lock_unset(&mal_profileLock ); + malProfileMode = eventstream != NULL; sqlProfiling = FALSE; return MAL_SUCCEED; diff --git a/monetdb5/mal/mal_profiler.h b/monetdb5/mal/mal_profiler.h --- a/monetdb5/mal/mal_profiler.h +++ b/monetdb5/mal/mal_profiler.h @@ -31,8 +31,8 @@ mal_export void profilerEvent(MalBlkPtr mal_export str startProfiler(void); mal_export str stopProfiler(void); -mal_export str startTrace(void); -mal_export str stopTrace(void); +mal_export str startTrace(str path); +mal_export str stopTrace(str path); mal_export void setHeartbeat(int delay); mal_export str setprofilerpoolsize(int size); mal_export void initHeartbeat(void); diff --git a/monetdb5/modules/mal/profiler.c b/monetdb5/modules/mal/profiler.c --- a/monetdb5/modules/mal/profiler.c +++ b/monetdb5/modules/mal/profiler.c @@ -74,18 +74,35 @@ CMDstopProfiler(Client cntxt, MalBlkPtr return stopProfiler(); } +// called by the SQL front end. str CMDstartTrace(void *res) { (void) res; - return startTrace(); + return startTrace(0); +} + +// if you haven't started the stethoscope +// then the output is saved in a file +str +CMDstartTracePath(void *res, str *path) +{ + (void) res; + return startTrace(*path); } str CMDstopTrace(void *res) { (void) res; - return stopTrace(); + return stopTrace(0); +} + +str +CMDstopTracePath(void *res, str *path) +{ + (void) res; + return stopTrace(*path); } str diff --git a/monetdb5/modules/mal/profiler.h b/monetdb5/modules/mal/profiler.h --- a/monetdb5/modules/mal/profiler.h +++ b/monetdb5/modules/mal/profiler.h @@ -41,7 +41,9 @@ profiler_export str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); profiler_export str CMDstopProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); profiler_export str CMDstartTrace(void *res); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
