Changeset: 8fdb640ccfe0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fdb640ccfe0 Added Files: geom/sql/Tests/ogc_destroy.sql geom/sql/Tests/ogc_geometry.sql geom/sql/Tests/ogc_load.sql geom/sql/Tests/ogc_schema.sql geom/sql/Tests/ogc_schema.stable.err geom/sql/Tests/ogc_schema.stable.out geom/sql/Tests/ogc_test.sql 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 buildtools/ChangeLog-Archive buildtools/ChangeLog.Jan2014 clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/monetdb.R 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/libbat.rc geom/sql/Tests/All libversions monetdb5/mal/mal.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_recycle.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/mal/mal_session.c monetdb5/modules/atoms/Makefile.ag monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/modules/mal/clients.c monetdb5/modules/mal/profiler.c monetdb5/modules/mal/trader.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_scenario.c tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jan2014 vertoo.data Branch: multifarm Log Message:
Merge with default branch. diffs (truncated from 2660 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -557,3 +557,5 @@ fb702cba0210295b29825b095ed87d92b6645434 ce19933aa1cf72076fd33ddd485ea0303f87753f Jan2014_9 fb702cba0210295b29825b095ed87d92b6645434 Jan2014_release 14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release +28bad4f9c07415a7f784ac6af2494b0333c866a6 Jan2014_11 +fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jan2014/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -798,6 +798,20 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Mon Mar 03 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303 +- Rebuilt. +- BZ#3442: COPY INTO ... LOCKED reports incorrect count +- BZ#3443: DROP INDEX crashes server with BATsubselect: invalid argument: + b must have a dense head +- BZ#3444: AND after ON () of LEFT OUTER JOIN with certain expressions + will cause crash + +* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303 +- buildtools: Configure now enables the SQL front end by default. + +* Sun Feb 16 2014 Fabian Groffen <fab...@monetdb.org> - 11.17.11-20140303 +- merovingian: monetdb destroy -f now also works on running databases + * Thu Feb 13 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.9-20140213 - Rebuilt. - BZ#3435: INDEX prevents JOIN from discovering matches diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303 +- Configure now enables the SQL front end by default. + * Tue Dec 10 2013 Sjoerd Mullender <sjo...@acm.org> - 11.17.1-20140114 - Created packages for RPM based systems and Debian/Ubunty containing the MonetDB interface to the GNU Scientific Library (gsl). diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> -- Configure now enables the SQL front end by default. - diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION --- a/clients/R/MonetDB.R/DESCRIPTION +++ b/clients/R/MonetDB.R/DESCRIPTION @@ -1,6 +1,6 @@ Package: MonetDB.R -Version: 0.9 -Date: 2013-02-07 +Version: 0.9.1 +Date: 2013-03-01 Title: Connect MonetDB to R Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email = "han...@cwi.nl"), person("Thomas Lumley", role = "ctb"), diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS --- a/clients/R/MonetDB.R/NEWS +++ b/clients/R/MonetDB.R/NEWS @@ -1,3 +1,9 @@ +0.9.1 +- dplyr compatibility first iteration +#- fixed leaking of socket variable +#- fixed monetdb.server.setup for UNIX-like systems (Thanks, Enzo) +- fixed issue in dbClearResult() which produced a protocol error + 0.9 - various extensions to monetdb.read.csv - removed monet.frame from this package, moved to github diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R --- a/clients/R/MonetDB.R/R/monetdb.R +++ b/clients/R/MonetDB.R/R/monetdb.R @@ -110,6 +110,14 @@ setMethod("dbConnect", "MonetDBDriver", ### MonetDBConnection, #monetdb_mapi_conn setClass("MonetDBConnection", representation("DBIConnection",socket="externalptr",connenv="environment",fetchSize="integer")) +setMethod("dbGetInfo", "MonetDBConnection", def=function(dbObj, ...) { + envdata <- dbGetQuery(dbObj,"SELECT name, value from env()") + ll <- as.list(envdata$value) + names(ll) <- envdata$name + ll$name <- "MonetDBConnection" + return(ll) + }) + setMethod("dbDisconnect", "MonetDBConnection", def=function(conn, ...) { .Call("mapiDisconnect",conn@socket,PACKAGE=C_LIBRARY) return(invisible(TRUE)) @@ -120,6 +128,18 @@ setMethod("dbListTables", "MonetDBConnec df$name }) + +setMethod("dbCommit", "MonetDBConnection", def=function(conn, ...) { + dbSendQuery(conn,"commit") + invisible(TRUE) + }) + +setMethod("dbRollback", "MonetDBConnection", def=function(conn, ...) { + dbSendQuery(conn,"rollback") + invisible(TRUE) + + }) + setMethod("dbListFields", "MonetDBConnection", def=function(conn, name, ...) { if (!dbExistsTable(conn,name)) stop(paste0("Unknown table: ",name)); @@ -128,7 +148,7 @@ setMethod("dbListFields", "MonetDBConnec }) setMethod("dbExistsTable", "MonetDBConnection", def=function(conn, name, ...) { - tolower(name) %in% dbListTables(conn) + tolower(name) %in% tolower(dbListTables(conn)) }) @@ -458,8 +478,11 @@ setMethod("fetch", signature(res="MonetD setMethod("dbClearResult", "MonetDBResult", def = function(res, ...) { - .mapiRequest(res@env$conn,paste0("Xclose ",res@env$info$id),async=TRUE) - TRUE + resid <- res@env$info$id + if (!is.null(resid) && !is.na(resid) && is.numeric(resid)) { + .mapiRequest(res@env$conn,paste0("Xclose ",resid),async=TRUE) + } + invisible(TRUE) },valueClass = "logical") setMethod("dbHasCompleted", "MonetDBResult", def = function(res, ...) { @@ -509,8 +532,6 @@ Q_PREPARE <- 5 Q_BLOCK <- 6 - - REPLY_SIZE <- 100 # Apparently, -1 means unlimited, but we will start with a small result set. # The entire set might never be fetch()'ed after all! 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 @@ -2473,7 +2473,6 @@ void initLibraries(void); void initMALstack(MalBlkPtr mb, MalStkPtr stk); void initNamespace(void); void initParser(void); -void initProfiler(MalBlkPtr mb); int initQlog(void); int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc); int inlineProp; @@ -2714,7 +2713,7 @@ void printSignature(stream *fd, Symbol s void printStack(stream *f, MalBlkPtr mb, MalStkPtr s); str prodRef; int profilerAvailable(void); -void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, int pc, int start); +void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int start); void profilerGetCPUStat(lng *user, lng *nice, lng *sys, lng *idle, lng *iowait); void profilerHeartbeatEvent(str msg, lng ticks); str profilerRef; @@ -2792,7 +2791,7 @@ str runMALdataflow(Client cntxt, MalBlkP str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); str runScenario(Client c); int runonceProp; -void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int stkpc, RuntimeProfile prof, int start); +void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, RuntimeProfile prof); void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, RuntimeProfile prof); void runtimeProfileFinish(Client cntxt, MalBlkPtr mb); void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk); diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -36,7 +36,7 @@ HOST=[$target] AC_DEFINE_UNQUOTED(HOST, "$HOST", [Host identifier]) if test x"$target_os" = xcygwin; then - AC_DEFINE(WIN32, 1, [Define on Microsoft Windows (also under Cygwin)]) + AC_DEFINE(WIN32, 1, [Define on Microsoft Windows (also under Cygwin)]) fi AM_CONDITIONAL(NOT_WIN32, test x"$target_os" != xcygwin) AM_CONDITIONAL(NATIVE_WIN32, false) @@ -478,7 +478,7 @@ AC_SUBST(LINUX_DIST) AC_DEFUN([MCHECK_ADD_FLAG], [ - cache_var=AS_TR_SH([m_cv_cc_has_$1]) + cache_var=AS_TR_SH([m_cv_cc_has_$1]) AC_CACHE_CHECK([whether ${CC} supports $1], [${cache_var}], [ SAVE_FLAGS="${CFLAGS}" @@ -608,7 +608,7 @@ yes-*-*) ;; -*icc*-linux*|-*ecc*-linux*) dnl Intel ([ie]cc/[ie]cpc on Linux) - LDFLAGS="$LDFLAGS -i_dynamic" + LDFLAGS="$LDFLAGS -i_dynamic" dnl Let warning #140 "too many arguments in function call" dnl become an error to make configure tests work properly. CFLAGS="$CFLAGS -we140" @@ -913,11 +913,11 @@ if test "x$enable_optimize" = xyes; then dnl Optimization flags JAVACFLAGS="$JAVACFLAGS -g:none -O" case "$GCC-$CC" in - yes-*clang*) + yes-*clang*) CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -finline-functions" - ;; - yes-*) - dnl -fomit-frame-pointer crashes memprof + ;; + yes-*) + dnl -fomit-frame-pointer crashes memprof # -O1 on gcc enables all slight optimisations: # -fauto-inc-dec -fcprop-registers -fdce -fdefer-pop # -fdelayed-branch -fdse -fguess-branch-probability @@ -962,71 +962,71 @@ if test "x$enable_optimize" = xyes; then # - x86/x64: -fast switch results in json code producing wrong # results, or segaults (when used with Mtest) ;; - *) - case "$host-$icc_ver" in - dnl handle non-Intel compilers ($icc_ver=""), first - *solaris*-) CFLAGS="$CFLAGS -xO5" - ;; - *-*-*-) CFLAGS="$CFLAGS -O2" - ;; + *) + case "$host-$icc_ver" in + dnl handle non-Intel compilers ($icc_ver=""), first + *solaris*-) CFLAGS="$CFLAGS -xO5" + ;; + *-*-*-) CFLAGS="$CFLAGS -O2" + ;; - dnl With icc-8.*, Interprocedural (IP) Optimization does not seem to work with MonetDB: - dnl With "-ipo -ipo_obj", pass-through linker options ("-Wl,...") are not handled correctly, - dnl and with "-ip -ipo_obj", the resulting Mserver segfaults immediately. - dnl Hence, we skip Interprocedural (IP) Optimization with icc-8.*. - x86_64-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp7 -axWP ";; - x86_64-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp7 -axWP ";; + dnl With icc-8.*, Interprocedural (IP) Optimization does not seem to work with MonetDB: + dnl With "-ipo -ipo_obj", pass-through linker options ("-Wl,...") are not handled correctly, + dnl and with "-ip -ipo_obj", the resulting Mserver segfaults immediately. + dnl Hence, we skip Interprocedural (IP) Optimization with icc-8.*. + x86_64-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp7 -axWP ";; + x86_64-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp7 -axWP ";; -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -mp1 -O1 -restrict -unroll -axWPT ";; # K.O.! -# x86_64-*-*-10.*) CFLAGS="$CFLAGS ";; # OK. -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -mp1 ";; # OK. -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -O1 ";; # K.O.! -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -O2 ";; # OK. - x86_64-*-*-10.*) CFLAGS="$CFLAGS -O3 ";; # OK. -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -restrict ";; -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -unroll ";; -# x86_64-*-*-10.*) CFLAGS="$CFLAGS -axWPT ";; + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -mp1 -O1 -restrict -unroll -axWPT ";; # K.O.! + # x86_64-*-*-10.*) CFLAGS="$CFLAGS ";; # OK. + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -mp1 ";; # OK. + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -O1 ";; # K.O.! + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -O2 ";; # OK. + x86_64-*-*-10.*) CFLAGS="$CFLAGS -O3 ";; # OK. + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -restrict ";; + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -unroll ";; + # x86_64-*-*-10.*) CFLAGS="$CFLAGS -axWPT ";; - dnl We need to use -mp instead of -mp1 as otherwise nextafter() & nextafterf() do not work correctly for 0 - x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp -O3 -restrict -unroll -axSSE4.2 ";; + dnl We need to use -mp instead of -mp1 as otherwise nextafter() & nextafterf() do not work correctly for 0 + x86_64-*-*-11.*) CFLAGS="$CFLAGS -mp -O3 -restrict -unroll -axSSE4.2 ";; - i*86-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; - i*86-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; + i*86-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; + i*86-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -tpp6 -axKWNPB";; -# i*86-*-*-10.*) CFLAGS="$CFLAGS -mp1 -O1 -restrict -unroll -axWPT ";; # K.O.! -# i*86-*-*-10.*) CFLAGS="$CFLAGS ";; # OK. -# i*86-*-*-10.*) CFLAGS="$CFLAGS -mp1 ";; # OK. -# i*86-*-*-10.*) CFLAGS="$CFLAGS -O1 ";; # K.O.! -# i*86-*-*-10.*) CFLAGS="$CFLAGS -O2 ";; # OK. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
