Changeset: 9e7752ffe37d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e7752ffe37d
Added Files:
debian/libmonetdb5-server-cfitsio.install
debian/monetdb-python3.install
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
buildtools/doc/windowsbuild.rst
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
debian/control
debian/fix-deb.sh
debian/rules
gdk/libbat.rc
libversions
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/modules/mal/pcre.c
monetdb5/tools/libmonetdb5.rc
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Aug2018
vertoo.config
vertoo.data
Branch: analytics
Log Message:
Merge with default.
diffs (truncated from 1058 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -706,3 +706,9 @@ 9c824ea44063e239b7251dce71f9af741c682211
2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3
9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release
2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5
+2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
+3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
+a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -83,12 +83,17 @@
# On Fedora and RHEL 7, create the MonetDB-python2 package.
# On RHEL 6, numpy is too old.
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
-%bcond_without pyintegration
+%bcond_without py2integration
+%endif
+%if %{?rhel:0}%{!?rhel:1}
+# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
+# is too old (in both cases 3.4).
+%bcond_without py3integration
%endif
%if %{fedpkgs}
-# By default, do not create the MonetDB-cfitsio package.
-%bcond_with fits
+# By default, create the MonetDB-cfitsio package.
+%bcond_without fits
%endif
%{!?__python2: %global __python2 %__python}
@@ -151,7 +156,7 @@ BuildRequires: pkgconfig(zlib)
%if %{with samtools}
BuildRequires: samtools-devel
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
BuildRequires: python-devel
%if %{?rhel:1}%{!?rhel:0}
# RedHat Enterprise Linux calls it simply numpy
@@ -165,6 +170,10 @@ BuildRequires: numpy
%endif
%endif
%endif
+%if %{with py3integration}
+BuildRequires: python3-devel >= 3.5
+BuildRequires: python3-numpy
+%endif
%if %{with rintegration}
BuildRequires: R-core-devel
%endif
@@ -508,7 +517,7 @@ install it.
%{_libdir}/monetdb5/lib_rapi.so
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%package python2
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
@@ -534,6 +543,32 @@ install it.
%{_libdir}/monetdb5/lib_pyapi.so
%endif
+%if %{with py3integration}
+%package python3
+Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
+Group: Applications/Databases
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+
+%description python3
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains the interface to use the Python language from
+within SQL queries. This package is for Python 3.
+
+NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES. If you don't
+know how this package affects the security of your system, do not
+install it.
+
+%files python3
+%defattr(-,root,root)
+%{_libdir}/monetdb5/pyapi3.*
+%{_libdir}/monetdb5/autoload/*_pyapi3.mal
+%{_libdir}/monetdb5/lib_pyapi3.so
+%endif
+
%if %{with fits}
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
@@ -609,9 +644,12 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/lidar.mal
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%exclude %{_libdir}/monetdb5/pyapi.mal
%endif
+%if %{with py3integration}
+%exclude %{_libdir}/monetdb5/pyapi3.mal
+%endif
%if %{with rintegration}
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
@@ -627,9 +665,12 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
%endif
-%if %{with pyintegration}
+%if %{with py2integration}
%exclude %{_libdir}/monetdb5/autoload/*_pyapi.mal
%endif
+%if %{with py3integration}
+%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
+%endif
%if %{with rintegration}
%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
%endif
@@ -731,7 +772,6 @@ systemd-tmpfiles --create %{_sysconfdir}
# RHEL >= 7, and all current Fedora
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%{_unitdir}/monetdbd.service
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
%else
# RedHat Enterprise Linux < 7
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
@@ -740,6 +780,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%exclude %{_prefix}/lib/systemd/system/monetdbd.service
%endif
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
@@ -920,8 +961,8 @@ fi
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=no \
- --enable-py3integration=no \
-
--enable-pyintegration=%{?with_pyintegration:yes}%{!?with_pyintegration:no} \
+
--enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \
+
--enable-py3integration=%{?with_py3integration:yes}%{!?with_py3integration:no} \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sanitizer=no \
--enable-shp=no \
@@ -941,7 +982,7 @@ fi
--with-proj=no \
--with-pthread=yes \
--with-python2=yes \
- --with-python3=no \
+ --with-python3=yes \
--with-readline=yes \
--with-regex=%{?with_pcre:PCRE}%{!?with_pcre:POSIX} \
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
@@ -997,6 +1038,23 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Wed Aug 29 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.7-20180829
+- Rebuilt.
+
+* Wed Aug 29 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.5-20180829
+- Rebuilt.
+- BZ#6506: Improper performance counters
+- BZ#6606: Misleading parameter name in generate_series function
+- BZ#6639: COMMENT ON TABLE abc IS NULL invalidly sets the remark column
+ to null where remark column is defined as NOT NULLable
+
+* Tue Aug 28 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.5-20180829
+- buildtools: Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
+ Debian/Ubuntu package.
+
+* Mon Aug 27 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.5-20180829
+- merovingian: Added a "logrotate" configuration file. See
/etc/logrotate.d/monetdbd.
+
* Tue Aug 21 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.3-20180821
- Rebuilt.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed Aug 29 2018 Sjoerd Mullender <sjo...@acm.org>
+- We now also build the Python 3 integration packages for Fedora, Debian,
+ and Ubuntu (not for Debian 8 or Ubuntu 14.04 which are too old).
+
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 28 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.5-20180829
+- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
+ Debian/Ubuntu package.
+
* Wed May 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.1-20180815
- On Windows, the separate MonetDB5-Geom installer has been incorporated
into the main MonetDB5-SQL installer and is therefore no longer
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -183,7 +183,7 @@ compiler uses to determine which files t
downloaded from http://www.python.org/. Just download and install the
Windows binary distribution.
-.. Say something about pyintegration.
+.. Say something about py2integration.
Note that you can use either or both Python2 and Python3, and on 64
bit architectures, either the 32 bit or 64 bit version of Python. All
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -285,12 +285,12 @@ AC_ARG_ENABLE([rintegration],
[enable_rintegration=$enableval],
[enable_rintegration=$dft_rintegration])
-dft_pyintegration=auto
-AC_ARG_ENABLE([pyintegration],
- [AS_HELP_STRING([--enable-pyintegration],
+dft_py2integration=auto
+AC_ARG_ENABLE([py2integration],
+ [AS_HELP_STRING([--enable-py2integration],
[enable support for Python 2 integration into MonetDB
(default=auto)])],
- [enable_pyintegration=$enableval],
- [enable_pyintegration=$dft_pyintegration])
+ [enable_py2integration=$enableval],
+ [enable_py2integration=$dft_py2integration])
dft_py3integration=auto
AC_ARG_ENABLE(py3integration,
@@ -354,7 +354,8 @@ AC_ARG_ENABLE([sanitizer],
AC_ARG_ENABLE([static-analysis],
[AS_HELP_STRING([--enable-static-analysis], [configure for static code
analysis (use only if you know what you are doing)])],
- AC_DEFINE([STATIC_CODE_ANALYSIS], 1, [compiling for static code
analysis]))
+ [AS_VAR_IF([enableval], [yes],
+ [AC_DEFINE([STATIC_CODE_ANALYSIS], 1, [compiling for static
code analysis])])])
# RIPEMD160 is patent free, academic and European, but unfortunately
# can't use it by default, as that would exclude JDBC usage (Java
@@ -1183,7 +1184,9 @@ AS_VAR_IF([have_python3], [no],
# and no interpreter
PYTHON3=false
# and no Python 3 integration
- enable_py3integration=no],
+ AS_CASE([$enable_py3integration],
+ [no|auto], [enable_py3integration=no],
+ [AC_MSG_ERROR([--enable-py3integration requires Python 3])])],
[have_python3_libdir=auto
AC_ARG_WITH([python3-libdir],
@@ -1835,27 +1838,27 @@ AM_CONDITIONAL([HAVE_LIBR], [test x"$hav
# Python API (Python UDFs)
have_libpy=no
-AS_VAR_IF([enable_pyintegration], [no], [], [
- AS_CASE([$enable_pyintegration],
+AS_VAR_IF([enable_py2integration], [no], [], [
+ AS_CASE([$enable_py2integration],
[yes|auto], [XPATH="$PATH"],
- [/*], [XPATH="$enable_pyintegration"
- enable_pyintegration=yes],
- [AC_MSG_ERROR([--enable-pyintegration value must be
yes|no|auto|absolute path of python-config])])
+ [/*], [XPATH="$enable_py2integration"
+ enable_py2integration=yes],
+ [AC_MSG_ERROR([--enable-py2integration value must be
yes|no|auto|absolute path of python-config])])
AS_VAR_IF([have_py2config], [], [
AC_PATH_PROG([PY2CONFIG], [python2-config], [no], [$PATH])
AS_VAR_IF([PY2CONFIG], [no], [
AC_PATH_PROG([PYCMD2], [python-config], [no], [$PATH])
AS_VAR_IF([PYCMD2], [no], [
- AS_VAR_IF([enable_pyintegration], [yes],
+ AS_VAR_IF([enable_py2integration], [yes],
[AC_MSG_ERROR([python2-config library
required for Python integration support])],
[have_libpy=no
why_not_libpy="(python2-config command
not found)"
- enable_pyintegration=no
- why_not_pyintegration="(python2-config
command not found)"])
+ enable_py2integration=no
+
why_not_py2integration="(python2-config command not found)"])
], [PY2CONFIG="$PYCMD2"])
], [])
], [PY2CONFIG="$have_py2config"])
- AS_VAR_IF([enable_pyintegration], [no], [], [
+ AS_VAR_IF([enable_py2integration], [no], [], [
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
