Changeset: aabbafc9293b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aabbafc9293b
Added Files:
buildtools/ChangeLog.Jun2016
clients/ChangeLog.Jun2016
clients/mapilib/ChangeLog.Jun2016
clients/python2/ChangeLog.Jun2016
clients/python3/ChangeLog.Jun2016
common/stream/ChangeLog.Jun2016
gdk/ChangeLog.Jun2016
geom/ChangeLog.Jun2016
java/ChangeLog.Jun2016
monetdb5/ChangeLog.Jun2016
sql/ChangeLog.Jun2016
testing/ChangeLog.Jun2016
tools/merovingian/ChangeLog.Jun2016
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
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr.R
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
gdk/ChangeLog
gdk/libbat.rc
gdk/shared_memory.c
geom/ChangeLog
java/ChangeLog
monetdb5/ChangeLog
monetdb5/extras/pyapi/connection.c
monetdb5/extras/rapi/converters.c.h
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
testing/Mtest.py.in
tools/embedded/Tests/dbi.R
tools/embedded/Tests/dplyr.R
tools/embedded/build-on-windows.bat
tools/embedded/build-rpkg.sh
tools/embedded/embeddedr.h
tools/embedded/rpackage/DESCRIPTION
tools/embedded/rpackage/configure
vertoo.data
Branch: pythonudf
Log Message:
Merge with default.
diffs (truncated from 966 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -617,3 +617,4 @@ 25c9f569add9c341d40920f30936890ae6ea68a8
25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release
feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15
feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release
+ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.22.0
+%define version 11.24.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4374,7 +4374,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -4374,7 +4374,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.22.0"
+ "ProductVersion" = "8:11.24.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -813,13 +813,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.22.0"
+#define PACKAGE_STRING "MonetDB 11.24.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.22.0"
+#define PACKAGE_VERSION "11.24.0"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-VERSION=11.22.0
+VERSION=11.24.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,11 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Fri Feb 26 2016 Sjoerd Mullender <[email protected]>
-- A new package MonetDB-lidar (Fedora) or libmonetdb5-server-lidar
- (Debian/Ubuntu) has been created to work with LiDAR data.
-
-* Sat Jan 23 2016 Sjoerd Mullender <[email protected]>
-- Implemented a systemd configuration file for a monetdbd.service
- on Fedora.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Jun2016
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Jun2016
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jun2016
copy from clients/ChangeLog
copy to clients/ChangeLog.Jun2016
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
@@ -10,7 +10,6 @@ Imports: DBI (>= 0.3.1), digest (>= 0.6.
Enhances: dplyr (>= 0.3.0), MonetDBLite
Description: Allows to pull data from MonetDB into R. Includes a DBI
implementation and a dplyr backend.
License: MPL (== 2.0)
-URL: http://monetr.r-forge.r-project.org
+URL: http://www.monetdb.org
SystemRequirements: MonetDB, available from http://www.monetdb.org or
MonetDBLite R package
Collate: mapi.R dbi.R dbapply.R dplyr.R control.R
-Additional_repositories: http://dev.monetdb.org/Assets/R/
diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE
--- a/clients/R/MonetDB.R/NAMESPACE
+++ b/clients/R/MonetDB.R/NAMESPACE
@@ -4,7 +4,7 @@ import(DBI,digest,methods,codetools,util
export(MonetDB,MonetR,MonetDBR,MonetDB.R)
export(MonetDBLite,monetdblite,RMonetDBLite,rmonetdblite)
export(monet.read.csv,monetdb.read.csv)
-# this one is not in the DBI
+# those are not in the DBI
exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,mdbapply,isIdCurrent,initExtension)
# shorthands
export(mc,mq)
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -94,7 +94,7 @@ setMethod("dbConnect", "MonetDBDriver",
}
if (embedded != FALSE) {
- if (!require("MonetDBLite", character.only=T)) {
+ if (!requireNamespace("MonetDBLite", quietly=T)) {
stop("MonetDBLite package required for embedded mode")
}
MonetDBLite::monetdb_embedded_startup(embedded,
!getOption("monetdb.debug.embedded", FALSE))
diff --git a/clients/R/MonetDB.R/R/dplyr.R b/clients/R/MonetDB.R/R/dplyr.R
--- a/clients/R/MonetDB.R/R/dplyr.R
+++ b/clients/R/MonetDB.R/R/dplyr.R
@@ -4,10 +4,6 @@ src_monetdb <- function(dbname="demo", h
con <- DBI::dbConnect(MonetDB.R(), dbname = dbname , host = host, port =
port,
user = user, password = password, ...)
}
- pkgname <- "MonetDB.R"
- if (!(pkgname %in% loadedNamespaces())) {
- attachNamespace(pkgname)
- }
dplyr::src_sql("monetdb", con, info = DBI::dbGetInfo(con))
}
@@ -27,6 +23,8 @@ src_translate_env.src_monetdb <- functio
)
}
+src_desc <- function(x) UseMethod("src_desc")
+
src_desc.src_monetdb <- function(x) {
paste0("MonetDB ",x$info$monet_version, " (",x$info$monet_release, ")")
}
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -10,6 +10,9 @@ dd <- capture.output( suppressMessages (
library(dplyr, quietly=T)
+# FIXME: this should no longer be required
+library(MonetDB.R, quietly = T)
+
args <- commandArgs(trailingOnly = TRUE)
dbport <- 50000
dbname <- "mTests_clients_R"
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -10,6 +10,9 @@ dd <- capture.output( suppressMessages (
library(dplyr, quietly = T)
+# FIXME: this should no longer be required
+library(MonetDB.R, quietly = T)
+
args <- commandArgs(trailingOnly = TRUE)
dbport <- 50000
dbname <- "mTests_clients_R"
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jun2016
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Jun2016
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,22,0,1
- PRODUCTVERSION 11,22,0,1
+ FILEVERSION 11,24,0,1
+ PRODUCTVERSION 11,24,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.22.0\0"
+ VALUE "FileVersion", "11.24.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.22.0\0"
+ VALUE "ProductVersion", "11.24.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,22,0,1
- PRODUCTVERSION 11,22,0,1
+ FILEVERSION 11,24,0,1
+ PRODUCTVERSION 11,24,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.22.0\0"
+ VALUE "FileVersion", "11.24.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.22.0\0"
+ VALUE "ProductVersion", "11.24.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
