Changeset: 782be435a8d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=782be435a8d5
Added Files:
gdk/gdk_system_private.h
geom/sql/Tests/T1.sql
geom/sql/Tests/T10.sql
geom/sql/Tests/T10.stable.err
geom/sql/Tests/T10.stable.out
geom/sql/Tests/T11.sql
geom/sql/Tests/T11.stable.err
geom/sql/Tests/T11.stable.out
geom/sql/Tests/T12.sql
geom/sql/Tests/T12.stable.err
geom/sql/Tests/T12.stable.out
geom/sql/Tests/T13.sql
geom/sql/Tests/T14.sql
geom/sql/Tests/T15.sql
geom/sql/Tests/T16.sql
geom/sql/Tests/T16.stable.err
geom/sql/Tests/T16.stable.out
geom/sql/Tests/T17.sql
geom/sql/Tests/T18.sql
geom/sql/Tests/T19.sql
geom/sql/Tests/T2.sql
geom/sql/Tests/T20.sql
geom/sql/Tests/T21.sql
geom/sql/Tests/T21.stable.err
geom/sql/Tests/T21.stable.out
geom/sql/Tests/T22.sql
geom/sql/Tests/T23.sql
geom/sql/Tests/T24.sql
geom/sql/Tests/T25.sql
geom/sql/Tests/T26.sql
geom/sql/Tests/T26.stable.err
geom/sql/Tests/T26.stable.out
geom/sql/Tests/T27.sql
geom/sql/Tests/T28.sql
geom/sql/Tests/T29.sql
geom/sql/Tests/T3.sql
geom/sql/Tests/T30.sql
geom/sql/Tests/T31.sql
geom/sql/Tests/T32.sql
geom/sql/Tests/T33.sql
geom/sql/Tests/T33.stable.err
geom/sql/Tests/T33.stable.out
geom/sql/Tests/T34.sql
geom/sql/Tests/T35.sql
geom/sql/Tests/T37.sql
geom/sql/Tests/T37.stable.err
geom/sql/Tests/T37.stable.out
geom/sql/Tests/T38.sql
geom/sql/Tests/T38.stable.err
geom/sql/Tests/T38.stable.out
geom/sql/Tests/T39.sql
geom/sql/Tests/T39.stable.err
geom/sql/Tests/T39.stable.out
geom/sql/Tests/T4.sql
geom/sql/Tests/T40.sql
geom/sql/Tests/T40.stable.err
geom/sql/Tests/T40.stable.out
geom/sql/Tests/T41.sql
geom/sql/Tests/T41.stable.err
geom/sql/Tests/T41.stable.out
geom/sql/Tests/T42.sql
geom/sql/Tests/T42.stable.err
geom/sql/Tests/T42.stable.out
geom/sql/Tests/T43.sql
geom/sql/Tests/T44.sql
geom/sql/Tests/T44.stable.err
geom/sql/Tests/T44.stable.out
geom/sql/Tests/T45.sql
geom/sql/Tests/T45.stable.err
geom/sql/Tests/T45.stable.out
geom/sql/Tests/T46.sql
geom/sql/Tests/T46.stable.err
geom/sql/Tests/T46.stable.out
geom/sql/Tests/T47.sql
geom/sql/Tests/T47.stable.err
geom/sql/Tests/T47.stable.out
geom/sql/Tests/T48.sql
geom/sql/Tests/T48.stable.err
geom/sql/Tests/T48.stable.out
geom/sql/Tests/T49.sql
geom/sql/Tests/T5.sql
geom/sql/Tests/T5.stable.err
geom/sql/Tests/T5.stable.out
geom/sql/Tests/T50.sql
geom/sql/Tests/T50.stable.err
geom/sql/Tests/T50.stable.out
geom/sql/Tests/T51.sql
geom/sql/Tests/T51.stable.err
geom/sql/Tests/T51.stable.out
geom/sql/Tests/T52.sql
geom/sql/Tests/T52.stable.err
geom/sql/Tests/T52.stable.out
geom/sql/Tests/T6.sql
geom/sql/Tests/T6.stable.err
geom/sql/Tests/T6.stable.out
geom/sql/Tests/T7.sql
geom/sql/Tests/T8.sql
geom/sql/Tests/T8.stable.err
geom/sql/Tests/T8.stable.out
geom/sql/Tests/T9.sql
geom/sql/Tests/ogc_conformance.sql
geom/sql/Tests/ogc_conformance.stable.err
geom/sql/Tests/ogc_conformance.stable.out
geom/sql/Tests/ogc_destroy.stable.err
geom/sql/Tests/ogc_destroy.stable.out
geom/sql/Tests/ogc_dropconformance.sql
geom/sql/Tests/ogc_dropconformance.stable.err
geom/sql/Tests/ogc_dropconformance.stable.out
geom/sql/Tests/ogc_load.stable.err
geom/sql/Tests/ogc_load.stable.out
geom/sql/Tests/ogc_test.stable.err
geom/sql/Tests/ogc_test.stable.out
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
bootstrap
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/control.R
clients/R/MonetDB.R/R/monetdb.R
clients/R/db.tests/sqlsurvey.test.R
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
common/stream/stream.c
configure.ag
debian/changelog
debian/rules
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_heap.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_search.h
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/libbat.rc
geom/monetdb5/geom.c
geom/sql/Tests/All
geom/sql/Tests/ogc_geometry.sql
geom/sql/Tests/ogc_load.sql
geom/sql/Tests/ogc_test.sql
libversions
monetdb5/extras/jaql/json_jaql.c
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_readline.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pcre.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_result.c
sql/common/sql_changeset.c
sql/common/sql_hash.c
sql/common/sql_list.c
sql/common/sql_types.c
sql/storage/bat/bat_table.c
sql/storage/restrict/restrict_table.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_sequence.c
testing/Mtimeout.c
testing/difflib.c
testing/helpers.h
testing/listexports.py.in
tools/merovingian/client/monetdb.c
tools/mserver/mserver5.c
vertoo.data
Branch: multifarm
Log Message:
Merge with default branch.
diffs (truncated from 7408 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -559,3 +559,6 @@ fb702cba0210295b29825b095ed87d92b6645434
14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release
28bad4f9c07415a7f784ac6af2494b0333c866a6 Jan2014_11
fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release
+45d2af6f6cca3478319a11b5ddae69ecd9f19943 Jan2014_13
+fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release
+242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -58,7 +58,6 @@ BuildRequires: rubygems-devel
BuildRequires: unixODBC-devel
BuildRequires: zlib-devel
-%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~
s|$Config{vendorprefix}/||; print $x;')
# need to define python_sitelib on RHEL 5 and older
# no need to define python3_sitelib: it's defined by python3-devel
%if 0%{?rhel} && 0%{?rhel} <= 5
@@ -272,10 +271,15 @@ program.
Summary: MonetDB perl interface
Group: Applications/Databases
Requires: %{name}-client = %{version}-%{release}
-Requires: perl
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBI)
Requires: perl(Digest::SHA)
Requires: perl(Digest::MD5)
+# when not using BuildArch: noarch, globally replace perl_vendorlib by
+# perl_vendorarch
+BuildArch: noarch
+%{?perl_default_filter}
+%global __requires_exclude perl\\(DBD::monetdb|perl\\(MonetDB::|perl\\(Mapi\\)
%description client-perl
MonetDB is a database management system that is developed from a
@@ -288,7 +292,7 @@ program.
%files client-perl
%defattr(-,root,root)
-%{_prefix}/%{perl_libdir}/*
+%{perl_vendorlib}/*
%package -n rubygem-monetdb-sql
Summary: MonetDB ruby interface
@@ -756,6 +760,7 @@ developer, but if you do want to test, t
--with-java=no \
--with-mseed=no \
--with-perl=yes \
+ --with-perl-libdir=lib/perl5 \
--with-pthread=yes \
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
@@ -778,6 +783,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/monetdb5/dbfarm
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/monetdb
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/monetdb
+mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}
+if [ ! $RPM_BUILD_ROOT%{_prefix}/lib/perl5 -ef
$RPM_BUILD_ROOT%{perl_vendorlib} ]; then
+ mv $RPM_BUILD_ROOT%{_prefix}/lib/perl5/* $RPM_BUILD_ROOT%{perl_vendorlib}
+fi
# remove unwanted stuff
# .la files
@@ -798,6 +807,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Mar 06 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.13-20140306
+- Rebuilt.
+- BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting
+ types for the SQLColAttribute with the unixODBC library
+
* Mon Mar 03 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303
- Rebuilt.
- BZ#3442: COPY INTO ... LOCKED reports incorrect count
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -56,3 +56,6 @@ aclocal ${_m4_extra_dirs} &&
autoheader &&
automake --add-missing --copy --foreign &&
autoconf
+if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then
+ chmod +x buildtools/conf/install-sh
+fi
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.1
-Date: 2013-03-01
+Date: 2013-03-06
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
person("Thomas Lumley", role = "ctb"),
@@ -10,4 +10,8 @@ Description: Allows to pull data from Mo
License: MPL (== 1.1)
URL: http://monetr.r-forge.r-project.org
Maintainer: Hannes Muehleisen <han...@cwi.nl>
-SystemRequirements: MonetDB installation, available at http://www.monetdb.org
+SystemRequirements: MonetDB installation, available at
+ http://www.monetdb.org
+Author: Hannes Muehleisen [aut, cre],
+ Thomas Lumley [ctb],
+ Anthony Damico [ctb]
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)
export(MonetDB,MonetR,MonetDBR,MonetDB.R)
export(monet.read.csv,monetdb.read.csv)
# this one is not in the DBI
-exportMethods(dbSendUpdate,dbSendUpdateAsync)
+exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction)
export(monetdbGetTransferredBytes)
export(monetdbRtype)
@@ -18,6 +18,3 @@ export(monetdb.server.stop)
export(monetdbd.liststatus)
export(monetdb.liststatus)
useDynLib(MonetDB.R)
-
-
-
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,7 +1,8 @@
0.9.1
-- dplyr compatibility first iteration
-#- fixed leaking of socket variable
-#- fixed monetdb.server.setup for UNIX-like systems (Thanks, Enzo)
+- dbGetInfo() now supported on MonetDBConnection (dplyr compatibility)
+- dbTransaction(), dbCommit() and dbRollback() support
+- fixed leaking of socket variable in dbConnect()
+- fixed monetdb.server.setup for UNIX-like systems (Thanks, Enzo)
- fixed issue in dbClearResult() which produced a protocol error
0.9
diff --git a/clients/R/MonetDB.R/R/control.R b/clients/R/MonetDB.R/R/control.R
--- a/clients/R/MonetDB.R/R/control.R
+++ b/clients/R/MonetDB.R/R/control.R
@@ -100,7 +100,7 @@ monetdb.server.setup <-
# must be empty or not exist
# find the main path to the monetdb installation program
- monetdb.program.path ,
+ monetdb.program.path ="",
# choose a database name
dbname = "demo" ,
@@ -111,21 +111,11 @@ monetdb.server.setup <-
# cannot be accessed at the same time
dbport = 50000
){
-
-
-
-
+
# switch all slashes to match windows
monetdb.program.path <- normalizePath( monetdb.program.path , mustWork =
FALSE )
database.directory <- normalizePath( database.directory , mustWork = FALSE
)
-
-
- # determine that the monetdb.program.path has been correctly specified #
-
-
-
- # confirm that the database directory is either empty or does not exist
-
+
# if the database directory does not exist, print that it's being created
if ( !file.exists( database.directory ) ) {
@@ -146,7 +136,6 @@ monetdb.server.setup <-
}
-
# determine the batch file's location on the local disk
bfl <- normalizePath( file.path( database.directory ,dbname ) , mustWork
= FALSE )
@@ -221,7 +210,7 @@ monetdb.server.setup <-
if ( .Platform$OS.type == "unix" ) { # create shell script
bfl <- paste0(bfl,".sh")
bat.contents <- c('#!/bin/sh',
- paste0( monetdb.program.path,
+ paste0(
ifelse(monetdb.program.path=="","",paste0(monetdb.program.path,"/")) ,
'mserver5 --set
prefix=',monetdb.program.path,' --set exec_prefix=',monetdb.program.path,'
--dbpath ',paste0(database.directory,"/",dbname),' --set mapi_port=' ,
dbport, " --daemon yes > /dev/null &"
),paste0("echo $! >
",database.directory,"/mserver5.started.from.R.pid"))
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
@@ -25,7 +25,7 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB
setMethod("dbGetInfo", "MonetDBDriver", def=function(dbObj, ...)
list(name="MonetDBDriver",
- driver.version="0.9",
+ driver.version="0.9.1",
DBI.version="0.2-5",
client.version=NA,
max.connections=NA)
@@ -95,20 +95,20 @@ setMethod("dbConnect", "MonetDBDriver",
# make new socket with user-specified timeout
#socket <- socket <<- socketConnection(host = host,
port = port,
# blocking = TRUE, open="r+b",timeout = timeout)
- socket <- socket <<-
.Call("mapiConnect",host,port,timeout,PACKAGE=C_LIBRARY)
+ socket <-
.Call("mapiConnect",host,port,timeout,PACKAGE=C_LIBRARY)
.monetAuthenticate(socket,dbname,user,password,language=language)
connenv <- new.env(parent=emptyenv())
connenv$lock <- 0
connenv$deferred <- list()
connenv$exception <- list()
-
-
return(new("MonetDBConnection",socket=socket,connenv=connenv))
+
+
return(new("MonetDBConnection",socket=socket,connenv=connenv,Id=-1L))
},
valueClass="MonetDBConnection")
### MonetDBConnection, #monetdb_mapi_conn
-setClass("MonetDBConnection",
representation("DBIConnection",socket="externalptr",connenv="environment",fetchSize="integer"))
+setClass("MonetDBConnection",
representation("DBIConnection",socket="externalptr",connenv="environment",fetchSize="integer",Id="integer"))
setMethod("dbGetInfo", "MonetDBConnection", def=function(dbObj, ...) {
envdata <- dbGetQuery(dbObj,"SELECT name, value from
env()")
@@ -128,6 +128,11 @@ setMethod("dbListTables", "MonetDBConnec
df$name
})
+if (is.null(getGeneric("dbTransaction"))) setGeneric("dbTransaction",
function(conn,...) standardGeneric("dbTransaction"))
+setMethod("dbTransaction", signature(conn="MonetDBConnection"),
def=function(conn, ...) {
+ dbSendQuery(conn,"start transaction")
+ invisible(TRUE)
+ })
setMethod("dbCommit", "MonetDBConnection", def=function(conn, ...) {
dbSendQuery(conn,"commit")
@@ -137,7 +142,6 @@ setMethod("dbCommit", "MonetDBConnection
setMethod("dbRollback", "MonetDBConnection", def=function(conn, ...) {
dbSendQuery(conn,"rollback")
invisible(TRUE)
-
})
setMethod("dbListFields", "MonetDBConnection", def=function(conn, name, ...) {
@@ -151,12 +155,10 @@ setMethod("dbExistsTable", "MonetDBConne
tolower(name) %in% tolower(dbListTables(conn))
})
-
setMethod("dbGetException", "MonetDBConnection", def=function(conn, ...) {
conn@connenv$exception
})
-
setMethod("dbReadTable", "MonetDBConnection", def=function(conn, name, ...) {
if (!dbExistsTable(conn,name))
stop(paste0("Unknown table: ",name));
@@ -176,10 +178,6 @@ setMethod("dbSendQuery", signature(conn=
if (length(list(...))) statement <-
.bindParameters(statement, list(...))
if (!is.null(list)) statement <-
.bindParameters(statement, list)
}
-
-# removeme
-#write(statement,file="/export/scratch2/hannes/anthony-joinbug/log.sql",append=TRUE)
-
conn@connenv$exception <- list()
env <- NULL
if (DEBUG_QUERY) cat(paste("QQ:
'",statement,"'\n",sep=""))
@@ -264,7 +262,6 @@ setMethod("dbWriteTable", "MonetDBConnec
return(invisible(TRUE))
})
-
setMethod("dbDataType", signature(dbObj="MonetDBConnection", obj = "ANY"), def
= function(dbObj, obj, ...) {
if (is.logical(obj)) "BOOLEAN"
else if (is.integer(obj)) "INTEGER"
diff --git a/clients/R/db.tests/sqlsurvey.test.R
b/clients/R/db.tests/sqlsurvey.test.R
--- a/clients/R/db.tests/sqlsurvey.test.R
+++ b/clients/R/db.tests/sqlsurvey.test.R
@@ -1,6 +1,8 @@
library(MonetDB.R)
library(sqlsurvey)
+# install.packages("sqlsurvey",
repos=c("http://cran.r-project.org","http://R-Forge.R-project.org";), dep=TRUE)
+
db <- dbConnect( MonetDB.R() , "monetdb://localhost/monetdbrtest")
data( api )
@@ -45,7 +47,5 @@ svymean( ~dname , dclus1 , byvar = ~comp
dbGetQuery( db , 'select * from apiclus1 limit 2' )
dbRemoveTable(db,"apiclus1")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
