Changeset: ee2d8c8d65c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee2d8c8d65c3
Added Files:
clients/R/MonetDB.R/man/MonetDBLite.Rd
clients/R/MonetDB.R/man/sqlitecompat.Rd
monetdb5/extras/rapi/converters.c.h
tools/embedded/Makefile.ag
tools/embedded/Tests/All
tools/embedded/Tests/dbi.R
tools/embedded/Tests/dbi.reqtests
tools/embedded/Tests/dbi.stable.err
tools/embedded/Tests/dbi.stable.out
tools/embedded/Tests/deps-test.R
tools/embedded/Tests/deps-test.stable.err
tools/embedded/Tests/deps-test.stable.out
tools/embedded/Tests/deps-test.timeout
tools/embedded/Tests/dplyr.R
tools/embedded/Tests/install-binary.R
tools/embedded/Tests/install-binary.stable.err
tools/embedded/Tests/install-binary.stable.out
tools/embedded/Tests/install-source.R
tools/embedded/Tests/install-source.stable.err
tools/embedded/Tests/install-source.stable.out
tools/embedded/Tests/install-source.timeout
tools/embedded/Tests/install.reqtests
tools/embedded/Tests/lowlevel.R
tools/embedded/Tests/lowlevel.reqtests
tools/embedded/Tests/lowlevel.stable.err
tools/embedded/Tests/lowlevel.stable.out
tools/embedded/build-on-windows.bat
tools/embedded/build-rpkg.sh
tools/embedded/demo.c
tools/embedded/embedded.c
tools/embedded/embedded.h
tools/embedded/embeddedr.c
tools/embedded/embeddedr.h
tools/embedded/inlined_scripts.c
tools/embedded/inlined_scripts.py
tools/embedded/inlined_scripts.sh
tools/embedded/pcre-for-osx.h
tools/embedded/pkg-excludes
tools/embedded/rpackage/DESCRIPTION
tools/embedded/rpackage/NAMESPACE
tools/embedded/rpackage/R/monetdb.R
tools/embedded/rpackage/configure
tools/embedded/rpackage/configure.win
tools/embedded/rpackage/man/embedded.Rd
tools/embedded/undef.h
tools/embedded/windows/libtool.sh
tools/embedded/windows/pmc.sh
tools/embedded/windows/sedscript.tpl
Removed Files:
clients/R/MonetDB.R/src/Makevars.win
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
clients/Makefile.ag
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/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/MonetDB.R/R/mapi.R
clients/R/MonetDB.R/man/MonetDB.R.Rd
clients/R/MonetDB.R/man/control.Rd
clients/R/MonetDB.R/man/monetdb.read.csv.Rd
clients/R/MonetDB.R/man/src_monetdb.Rd
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr.R
clients/R/Tests/install.R
clients/R/build-for-cran.sh
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
common/stream/stream.c
common/stream/stream.h
common/utils/mcrypt.c
common/utils/mcrypt.h
common/utils/mutils.c
common/utils/mutils.h
common/utils/muuid.c
configure.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/extras/rapi/Makefile.ag
monetdb5/extras/rapi/Tests/rapi02.malC
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/extras/rapi/rapi.c
monetdb5/mal/Tests/tst830.malC
monetdb5/mal/mal.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/Tests/All
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/optimizer/opt_remoteQueries.c
sql/backends/monet5/Tests/rapi09.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.out
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_execute.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_planner.c
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/storage/bat/res_table.c
sql/storage/store.c
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
sql/test/Triggers/trigger_insert.sql
testing/Mtest.py.in
tools/Makefile.ag
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with embedded branch.
diffs (truncated from 23062 to 300 lines):
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
@@ -112,10 +112,12 @@
/* Define to 1 if you have the `ctime_r' function. */
#define HAVE_CTIME_R 1
+#ifdef _MSC_VER
/* Define if you have ctime_r(time_t*,char *buf,size_t s) */
#define HAVE_CTIME_R3 1
/* there is something very similar to ctime_r on Windows: */
#define ctime_r(t,b,s) (ctime_s(b,s,t) ? NULL : (b))
+#endif
/* Define if you have the cURL library */
/* #undef HAVE_CURL */
@@ -146,7 +148,7 @@
/* #undef HAVE_FDATASYNC */
/* Define to 1 if you have the <fenv.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_FENV_H 1
#endif
@@ -157,7 +159,7 @@
#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */
/* Define to 1 if you have the `fpclassify' function. */
-#if _MSC_VER > 1600
+#if defined(_MSC_VER) && _MSC_VER > 1600
#define HAVE_FPCLASSIFY 1
#endif
@@ -172,7 +174,9 @@
/* Define to 1 if you have the `ftruncate' function. */
#define HAVE_FTRUNCATE 1
+#ifdef _MSC_VER
#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0))
+#endif
/* Define if you use garbage collection */
/* #undef HAVE_GC */
@@ -208,7 +212,9 @@
/* #undef HAVE_GETTIMEOFDAY */
/* Define to 1 if you have the `_get_timezone' function. */
+#ifdef _MSC_VER
#define HAVE__GET_TIMEZONE 1
+#endif
/* Define if you have the gsl library */
/* #undef HAVE_GSL */
@@ -234,7 +240,7 @@
#define HAVE_IO_H 1
/* Define to 1 if you have the `isinf' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_ISINF 1
#endif
@@ -303,7 +309,7 @@
/* Define to 1 if you have the `llabs' function. */
#define HAVE_LLABS 1
-#if _MSC_VER <= 1500
+#if defined(_MSV_VER) && _MSC_VER <= 1500
#define llabs _abs64
#endif
@@ -319,10 +325,10 @@
/* #undef HAVE_LOCKF */
/* Define to 1 if the system has the type `long long'. */
-#if _MSC_VER > 1600 || (defined(__ICL) && __ICL >= 1010)
+#if (defined(_MSC_VER) && _MSC_VER > 1600) || (defined(__ICL) && __ICL >=
1010) || defined(__MINGW32__)
#define HAVE_LONG_LONG 1
#else
-#if _MSC_VER >= 1300
+#if defined(_MSC_VER) && _MSC_VER >= 1300
/* Visual Studio .NET 2003 does have long long, but the printf %lld
* format is interpreted the same as %ld, i.e. useless
*/
@@ -376,7 +382,7 @@
/* #undef HAVE_NL_LANGINFO */
/* Define to 1 if you have the `nextafterf' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_NEXTAFTERF 1
#endif
@@ -454,7 +460,7 @@
/* #undef HAVE_RLIMIT_H */
/* Define to 1 if you have the `round' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSV_VER) || _MSC_VER > 1600
#define HAVE_ROUND 1
#endif
@@ -525,7 +531,7 @@
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_STDINT_H 1
#endif
@@ -542,7 +548,7 @@
/* #undef HAVE_STRCASESTR */
/* Define to 1 if you have the `strftime' function. */
-#if _MSC_VER >= 1500
+#if !defined(_MSC_VER) || _MSC_VER >= 1500
#define HAVE_STRFTIME 1
#endif
@@ -571,24 +577,24 @@
#define HAVE_STRTOD 1
/* Define to 1 if you have the `strtof' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_STRTOF 1
#endif
#define strtok_r(t,d,c) strtok_s(t,d,c)
/* Define to 1 if you have the `strtoll' function. */
-#if _MSC_VER >= 1300
+#if !defined(_MSC_VER) || _MSC_VER >= 1300
#define HAVE_STRTOLL 1
-#if _MSC_VER <= 1600 && !defined(strtoll)
+#if defined(_MSC_VER) && _MSC_VER <= 1600 && !defined(strtoll)
#define strtoll _strtoi64
#endif
#endif
/* Define to 1 if you have the `strtoull' function. */
-#if _MSC_VER >= 1300
+#if !defined(_MSC_VER) || _MSC_VER >= 1300
#define HAVE_STRTOULL 1
-#if _MSC_VER <= 1600 && !defined(strtoull)
+#if defined(_MSC_VER) && _MSC_VER <= 1600 && !defined(strtoull)
#define strtoull _strtoui64
#endif
#endif
@@ -665,7 +671,7 @@
#define HAVE_TIME_H 1
/* Define to 1 if you have the `trunc' function. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_TRUNC 1
#endif
@@ -693,8 +699,10 @@
/* Define if you have valgrind installed and want to use it */
/* #undef HAVE_VALGRIND */
+#ifdef _MSC_VER
/* Define to 1 if you have the `_wfopen' function. */
#define HAVE__WFOPEN 1
+#endif
/* Define to 1 if you have the <winsock2.h> header file. */
#define HAVE_WINSOCK2_H 1
@@ -703,7 +711,7 @@
#define HAVE_WINSOCK_H 1
/* Define to 1 if you have the <xmmintrin.h> header file. */
-#if _MSC_VER > 1600
+#if !defined(_MSC_VER) || _MSC_VER > 1600
#define HAVE_XMMINTRIN_H 1
#endif
@@ -1003,7 +1011,7 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
-#if _MSC_VER < 1900
+#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf c99_snprintf
#define vsnprintf c99_vsnprintf
@@ -1047,7 +1055,7 @@ c99_snprintf(char *outBuf, size_t size,
#define ssize_t int
#endif
-#if _MSC_VER <= 1600
+#if defined(_MSC_VER) && _MSC_VER <= 1600
/* no va_copy in win32 */
#define va_copy(x,y) ((x) = (y))
#endif
@@ -1123,4 +1131,9 @@ typedef __uint128_t uhge;
#define PTRFMT "%p"
#define PTRFMTCAST
+#ifdef HAVE_EMBEDDED_R
+#define _MSC_EXTENSIONS 1
+#undef HAVE_CTIME_R
+#endif
+
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -144,12 +144,14 @@ BZ_LIBS = "$(LIBBZIP2)\lib\libbz2$(DEBUG
BZ_CFLAGS = -DHAVE_LIBBZ2 "-I$(LIBBZIP2)\include"
!ENDIF
+!IFDEF HAVE_LIBXML
# This is the location of the libxml2 library
!IFNDEF LIBXML2
LIBXML2 = C:\libxml2-2.6.30.win$(bits)
!ENDIF
-libxml2_CFLAGS = "-I$(LIBXML2)\include" $(zlib_CFLAGS) $(ICONV_CFLAGS)
+libxml2_CFLAGS = -DHAVE_LIBXML "-I$(LIBXML2)\include" $(zlib_CFLAGS)
$(ICONV_CFLAGS)
libxml2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib" $(zlib_LIBS)
$(ICONV_LIBS)
+!ENDIF
!IFNDEF LIBGEOS
LIBGEOS = C:\geos-3.0.win$(bits)
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,16 +1,16 @@
Package: MonetDB.R
-Version: 1.0.0
+Version: 1.0.1
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
- person("Thomas Lumley", role = "ctb"),
- person("Anthony Damico", role = "ctb"))
-Author: Hannes Muehleisen [aut, cre], Thomas Lumley [ctb], Anthony Damico [ctb]
+ person("Anthony Damico", role = "aut"),
+ person("Thomas Lumley", role = "ctb"))
+Author: Hannes Muehleisen [aut, cre], Anthony Damico [aut], Thomas Lumley [ctb]
Maintainer: Hannes Muehleisen <han...@cwi.nl>
-Depends: DBI (>= 0.3.1)
-Imports: digest (>= 0.6.4), methods, codetools
-Enhances: dplyr (>= 0.3.0)
+Imports: DBI (>= 0.3.1), digest (>= 0.6.4), methods, codetools
+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
-SystemRequirements: MonetDB, available from 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
@@ -2,9 +2,10 @@ import(DBI,digest,methods,codetools,util
# export only driver constructor, everything else is DBI stuff..
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
-exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,mdbapply)
+exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,mdbapply,isIdCurrent,initExtension)
# shorthands
export(mc,mq)
useDynLib(MonetDB.R)
@@ -15,6 +16,8 @@ export(monetdb.server.start)
export(monetdb.server.stop)
export(monetdbd.liststatus)
export(monetdb.liststatus)
+export(monetdb.server.shutdown)
+export(monetdb.server.getpid)
# dplyr.R
export(src_monetdb)
@@ -22,7 +25,9 @@ export(src_translate_env.src_monetdb)
export(src_desc.src_monetdb)
export(tbl.src_monetdb)
export(db_query_fields.MonetDBConnection)
+export(db_query_fields.MonetDBEmbeddedConnection)
export(db_query_rows.MonetDBConnection)
+export(db_query_rows.MonetDBEmbeddedConnection)
export(db_save_query.MonetDBConnection)
export(db_insert_into.MonetDBConnection)
export(db_create_index.MonetDBConnection)
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,17 +1,35 @@
+1.0.1
+- added isIdCurrent for improved compatibility with RSQLite
+- new option monetdb.log.query allows export of dbSendQuery statements to file
+- no longer depends on DBI but imports it. Preferred way of constructing
connections: library(DBI); con <- dbConnect(MonetDB.R::MonetDB(), ...)
+
1.0.0
- Added support for esoteric data types such as MONTH_INTERVAL (Thanks, Roman)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
