Changeset: d65956b0d95e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d65956b0d95e
Added Files:
sql/test/BugTracker-2015/Tests/schemadiff.SQL.py
sql/test/Users/Tests/columnRights.SQL.py
sql/test/Users/Tests/columnRights.stable.err
sql/test/Users/Tests/columnRights.stable.out
sql/test/Users/Tests/grantMonetdb.SQL.py
sql/test/Users/Tests/grantMonetdb.stable.err
sql/test/Users/Tests/grantMonetdb.stable.out
sql/test/Users/Tests/withGrantOption.SQL.py
sql/test/Users/Tests/withGrantOption.stable.err
sql/test/Users/Tests/withGrantOption.stable.out
Removed Files:
clients/R/Makefile.ag
clients/R/MonetDB.R/Makefile.ag
clients/R/MonetDB.R/src/Makefile.ag
clients/R/MonetDB.R/src/profiler-r.c
clients/R/MonetDB.R/src/profiler.c
clients/R/MonetDB.R/src/profiler.h
clients/mapiclient/mapisplit-dummy.c
clients/mapiclient/profiler-dummy.c
Modified Files:
MacOSX/MonetDB.pkgproj
MonetDB.spec
NT/monetdb_config.h.in
clients/Makefile.ag
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/dbapply.R
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/MonetDB.R/man/dbApply.Rd
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbapply.reqtests
clients/R/Tests/dbapply.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/dplyr.reqtests
clients/R/Tests/install.reqtests
clients/R/Tests/survey.reqtests
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/mapiclient/Makefile.ag
clients/mapiclient/ReadlineTools.c
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/dump.c
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/odbc/driver/Makefile.ag
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLTables.c
clients/python3/ChangeLog.Jul2015
common/options/monet_options.c
common/stream/stream.c
common/utils/mutils.c
configure.ag
debian/control
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/optimizer/opt_mergetable.c
sql/ChangeLog.Jul2015
sql/backends/monet5/sql_upgrades.c
sql/scripts/17_temporal.sql
sql/scripts/75_storagemodel.sql
sql/scripts/80_statistics.sql
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/All
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
Branch: pyapi
Log Message:
Merge with default.
diffs (truncated from 4236 to 300 lines):
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -504,7 +504,7 @@
<key>CONCLUSION_ACTION</key>
<integer>0</integer>
<key>IDENTIFIER</key>
-
<string>com.monetdbsolutions.pkg.monetdb</string>
+ <string>org.monetdb.pkg.monetdb</string>
<key>NAME</key>
<string>MonetDB</string>
<key>OVERWRITE_PERMISSIONS</key>
@@ -815,13 +815,6 @@
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
- <key>CERTIFICATE</key>
- <dict>
- <key>NAME</key>
- <string>Developer ID Installer: MonetDB
Solutions B.V. (YEJLE7L8A4)</string>
- <key>PATH</key>
-
<string>/Users/sjoerd/Library/Keychains/login.keychain</string>
- </dict>
<key>EXCLUDED_FILES</key>
<array>
<dict>
@@ -991,7 +984,7 @@
</dict>
</array>
<key>NAME</key>
- <string>MonetDB</string>
+ <string>MonetDB-unsigned</string>
</dict>
</dict>
<key>TYPE</key>
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -136,9 +136,9 @@ BuildRequires: R-core-devel
%endif
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
# need to define python_sitelib on RHEL 5 and older
@@ -233,7 +233,7 @@ library.
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
%endif
%description client
@@ -598,9 +598,11 @@ Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5
-Recommends: MonetDB5-server-hugeint
-Suggests: %{name}-client
+Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+%if %{bits} == 64
+Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description -n MonetDB5-server
@@ -655,7 +657,9 @@ fi
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
%exclude %{_libdir}/monetdb5/sql*.mal
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/*_hge.mal
+%endif
%{_libdir}/monetdb5/*.mal
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
@@ -685,6 +689,7 @@ fi
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
+%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
@@ -704,6 +709,7 @@ MonetDB5-server component.
%{_libdir}/monetdb5/*_hge.mal
%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/autoload/*_hge.mal
+%endif
%package -n MonetDB5-server-devel
Summary: MonetDB development files
@@ -738,8 +744,10 @@ Requires: %{_bindir}/systemd-tmpfiles
Obsoletes: MonetDB-SQL-devel
Obsoletes: %{name}-SQL
%if (0%{?fedora} >= 22)
-Recommends: %{name}-SQL-server5-hugeint
-Suggests: %{name}-client
+%if %{bits} == 64
+Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+%endif
+Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%description SQL-server5
@@ -781,16 +789,19 @@ systemd-tmpfiles --create %{_sysconfdir}
%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/createdb/*_bam.sql
%endif
+%{_libdir}/monetdb5/createdb/*.sql
+%{_libdir}/monetdb5/sql*.mal
+%if %{bits} == 64
%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/createdb/*.sql
%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/sql*.mal
+%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
+%if %{bits} == 64
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
@@ -811,6 +822,7 @@ frontend of MonetDB.
%{_libdir}/monetdb5/autoload/??_sql_hge.mal
%{_libdir}/monetdb5/createdb/*_hge.sql
%{_libdir}/monetdb5/sql*_hge.mal
+%endif
%package -n python-monetdb
Summary: Native MonetDB client Python API
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
@@ -49,6 +49,14 @@
#include <stddef.h>
#include <ws2tcpip.h>
+#include <sys/types.h>
+#include <stdio.h> /* NULL, printf etc. */
+#include <stdlib.h>
+#include <errno.h>
+#include <stdarg.h> /* va_alist.. */
+
+#include <assert.h>
+
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#define ALREADY_HAVE_WINDOWS_TYPE 1
@@ -995,9 +1003,37 @@
/* #undef size_t */
#if _MSC_VER < 1900
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
+#define snprintf c99_snprintf
+#define vsnprintf c99_vsnprintf
+
+/* Microsoft _snprintf returns -1 and does not null-terminate when the
+ * buffer is too small, so work around that */
+
+static inline int
+c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
+{
+ int count = -1;
+
+ if (size != 0)
+ count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
+ if (count == -1)
+ count = _vscprintf(format, ap);
+
+ return count;
+}
+
+static inline int
+c99_snprintf(char *outBuf, size_t size, const char *format, ...)
+{
+ int count;
+ va_list ap;
+
+ va_start(ap, format);
+ count = c99_vsnprintf(outBuf, size, format, ap);
+ va_end(ap);
+
+ return count;
+}
#endif
/* type used by connect */
@@ -1020,20 +1056,6 @@ typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t;
-#if _MSC_VER < 1500
-#ifndef vsnprintf
-#define vsnprintf _vsnprintf
-#endif
-#endif
-
-#include <sys/types.h>
-#include <stdio.h> /* NULL, printf etc. */
-#include <stdlib.h>
-#include <errno.h>
-#include <stdarg.h> /* va_alist.. */
-
-#include <assert.h>
-
/* normally defined in stdbool.h, but that doesn't exist on Windows */
#define true 1
#define false 0
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -4,6 +4,6 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3
NATIVE_WIN32?NT R
+SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3
NATIVE_WIN32?NT
-EXTRA_DIST_DIR = Tests
+EXTRA_DIST_DIR = Tests R nodejs
diff --git a/clients/R/Makefile.ag b/clients/R/Makefile.ag
deleted file mode 100644
--- a/clients/R/Makefile.ag
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 2008-2015 MonetDB B.V.
-
-SUBDIRS = MonetDB.R
-
-EXTRA_DIST_DIR = Tests
diff --git a/clients/R/MonetDB.R/Makefile.ag b/clients/R/MonetDB.R/Makefile.ag
deleted file mode 100644
--- a/clients/R/MonetDB.R/Makefile.ag
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 2008-2015 MonetDB B.V.
-
-SUBDIRS = src
-EXTRA_DIST = DESCRIPTION NAMESPACE NEWS
-EXTRA_DIST_DIR = R man
diff --git a/clients/R/MonetDB.R/src/Makefile.ag
b/clients/R/MonetDB.R/src/Makefile.ag
deleted file mode 100644
--- a/clients/R/MonetDB.R/src/Makefile.ag
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 2008-2015 MonetDB B.V.
-
-EXTRA_DIST = Makevars.win mapisplit.c mapisplit.h mapisplit-r.c profiler.c
profiler.h profiler-r.c
diff --git a/clients/R/MonetDB.R/src/profiler-r.c
b/clients/R/MonetDB.R/src/profiler-r.c
deleted file mode 100644
--- a/clients/R/MonetDB.R/src/profiler-r.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <R.h>
-#include <Rdefines.h>
-
-#include "profiler.h"
-
-SEXP profiler_start_listen() {
- SEXP port;
- int pret;
- port = NEW_INTEGER(1);
- pret = profiler_start();
- if (pret < 0) {
- error("Failed to listen for UDP messages");
- }
- INTEGER_POINTER(port)[0] = pret;
- return port;
-}
diff --git a/clients/R/MonetDB.R/src/profiler.c
b/clients/R/MonetDB.R/src/profiler.c
deleted file mode 100644
--- a/clients/R/MonetDB.R/src/profiler.c
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
