Changeset: a36e2079cba3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a36e2079cba3 Added Files: buildtools/selinux/monetdb.fc buildtools/selinux/monetdb.if buildtools/selinux/monetdb.te debian/libmonetdb-client9.install debian/libmonetdb15.install sql/backends/monet5/Tests/pyloader08.sql sql/backends/monet5/Tests/pyloader08.stable.err sql/backends/monet5/Tests/pyloader08.stable.out sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.err sql/jdbc/tests/Tests/Bug_PrepStmtSetObject_CLOB_6349.stable.out sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.sql sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out sql/test/BugTracker-2017/Tests/multiplevalues.Bug-6336.sql sql/test/BugTracker-2017/Tests/name-interference.Bug-6348.sql sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql Removed Files: debian/libmonetdb-client8.install debian/libmonetdb13.install Modified Files: .hgignore .hgtags ChangeLog-Archive ChangeLog.Jul2017 MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog.Jul2017 buildtools/Makefile.ag clients/ChangeLog-Archive clients/ChangeLog.Jul2017 clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mhelp.c clients/mapiclient/mnc.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c common/stream/stream.h common/utils/mutils.c common/utils/prompt.c configure.ag debian/changelog debian/control gdk/ChangeLog-Archive gdk/ChangeLog.Jul2017 gdk/gdk_posix.c gdk/gdk_storage.c gdk/gdk_value.c gdk/libbat.rc libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2017 monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_type.c monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/calc.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/remote.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pushselect.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Jul2017 sql/backends/monet5/Tests/pyloader01.stable.out sql/backends/monet5/Tests/pyloader02.stable.out sql/backends/monet5/Tests/pyloader03.stable.out sql/backends/monet5/Tests/pyloader04.stable.out sql/backends/monet5/Tests/pyloader05.stable.out sql/backends/monet5/UDF/pyapi/connection.c sql/backends/monet5/UDF/pyapi/connection.h sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat sql/backends/monet5/UDF/pyapi/pyloader.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/mal_backend.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/netcdf.c sql/common/sql_types.c sql/include/sql_catalog.h sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/server/rel_distribute.c sql/server/rel_distribute.h sql/server/rel_dump.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_updates.c sql/server/sql_parser.y sql/storage/bat/bat_table.c sql/storage/store.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/insert.stable.err sql/test/remote/Tests/ssbm.stable.out testing/Mtest.py.in tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Jul2017 tools/merovingian/daemon/Makefile.ag tools/merovingian/daemon/client.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/monetdbd.service.in tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/proxy.c tools/merovingian/utils/control.c tools/merovingian/utils/utils.c vertoo.data Branch: jitudf Log Message:
Merge with default. diffs (truncated from 47710 to 300 lines): diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -64,6 +64,10 @@ lex.yy.c *.dll # other files we don't want +GTAGS +gtags.files +GPATH +GRTAGS TAGS tags *.pyo diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -673,3 +673,5 @@ c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_23 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release +e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_1 +e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,31 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> - 11.27.1-20170705 +- Added a new server-side protocol implementation. The new protocol + is backwards compatible with the old protocol. Clients can choose + whether they want to use the old or the new protocol during the initial + handshake with the server. The new protocol is a binary column-based + protocol that is significantly faster than the old protocol when + transferring large result sets. In addition, the new protocol supports + compression using Snappy or LZ4. + +* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- Moved the sphinx extension module to its own repository. + See https://dev.monetdb.org/hg/MonetDB-sphinx/. + +* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- Removed GSL module: it's now a separate (extension) package. + See https://dev.monetdb.org/hg/MonetDB-gsl/. +- The PCRE library is now optional for systems that support POSIX regular + expressions. + +* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> - 11.27.1-20170705 +- Added 5 new sys schema tables: function_languages, function_types, + key_types, index_types and privilege_codes. They are pre-loaded with + static content and contain descriptive names for the various integer + type and code values. See also sql/scripts/51_sys_schema_extension.sql + * Thu Sep 22 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214 - The Perl, PHP, and Python clients, and the JDBC driver each now have their own repositories and release cycles. The Python client is diff --git a/ChangeLog.Jul2017 b/ChangeLog.Jul2017 --- a/ChangeLog.Jul2017 +++ b/ChangeLog.Jul2017 @@ -1,27 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> -- Added a new server-side protocol implementation. The new protocol - is backwards compatible with the old protocol. Clients can choose - whether they want to use the old or the new protocol during the initial - handshake with the server. The new protocol is a binary column-based - protocol that is significantly faster than the old protocol when - transferring large result sets. In addition, the new protocol supports - compression using Snappy or LZ4. - -* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org> -- Moved the sphinx extension module to its own repository. - See https://dev.monetdb.org/hg/MonetDB-sphinx/. - -* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org> -- Removed GSL module: it's now a separate (extension) package. - See https://dev.monetdb.org/hg/MonetDB-gsl/. -- The PCRE library is now optional for systems that support POSIX regular - expressions. - -* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> -- Added 5 new sys schema tables: function_languages, function_types, - key_types, index_types and privilege_codes. They are pre-loaded with - static content and contain descriptive names for the various integer - type and code values. See also sql/scripts/51_sys_schema_extension.sql diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -132,12 +132,14 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Dec2016-SP5/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jul2017/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist +# we need checkpolicy and selinux-policy-devel for the SELinux policy %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora BuildRequires: systemd +BuildRequires: checkpolicy, selinux-policy-devel, hardlink %endif BuildRequires: bison BuildRequires: bzip2-devel @@ -407,7 +409,7 @@ Recommends: perl-DBD-monetdb >= 1.0 Recommends: php-monetdb >= 1.0 %endif Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} -Requires: python-pymonetdb >= 1.0 +Requires: python-pymonetdb >= 1.0.6 %description client-tests MonetDB is a database management system that is developed from a @@ -591,6 +593,8 @@ Recommends: MonetDB5-server-hugeint%{?_i %endif Suggests: %{name}-client%{?_isa} = %{version}-%{release} %endif +# versions up to 1.0.5 don't accept the queryid field in the result set +Conflicts: python-pymonetdb < 1.0.6 %description -n MonetDB5-server MonetDB is a database management system that is developed from a @@ -781,7 +785,7 @@ systemd-tmpfiles --create %{_sysconfdir} # no _unitdir macro %exclude %{_prefix}/lib/systemd/system/monetdbd.service %endif -%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties +%config(noreplace) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties %{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql @@ -877,6 +881,62 @@ developer, but if you do want to test, t %dir %{python2_sitelib}/MonetDBtesting %{python2_sitelib}/MonetDBtesting/* +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +%package selinux +Summary: MonetDB - Monet Database Management System +Group: Applications/Databases +%if "%{_selinux_policy_version}" != "" +Requires: selinux-policy >= %{_selinux_policy_version} +%endif +Requires: %{name}-SQL-server5 = %{version}-%{release} +Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, MonetDB-SQL-server5, MonetDB5-server +Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles, MonetDB-SQL-server5, MonetDB5-server +BuildArch: noarch + +%global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null) +%global selinux_variants %([ -z "%{selinux_types}" ] && echo mls targeted || echo %{selinux_types}) + +%description selinux +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 SELinux policy for running MonetDB under +control of systemd. + +%post selinux +for selinuxvariant in %{selinux_variants} +do + /usr/sbin/semodule -s ${selinuxvariant} -i \ + %{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || : +done +/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : +/usr/bin/systemctl try-restart monetdbd.service + +%postun selinux +if [ $1 -eq 0 ] ; then + active=`/usr/bin/systemctl is-active monetdbd.service` + if [ $active = active ]; then + /usr/bin/systemctl stop monetdbd.service + fi + for selinuxvariant in %{selinux_variants} + do + /usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || : + done + /sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb %{_localstatedir}/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5 %{_unitdir}/monetdbd.service &> /dev/null || : + if [ $active = active ]; then + /usr/bin/systemctl start monetdbd.service + fi +fi + +%files selinux +%defattr(-,root,root,0755) +%doc buildtools/selinux/* +%{_datadir}/selinux/*/monetdb.pp + +%endif + %prep %setup -q @@ -938,6 +998,15 @@ fi make %{?_smp_mflags} +cd buildtools/selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv monetdb.pp monetdb.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - + %install %make_install @@ -953,11 +1022,166 @@ rm -f %{buildroot}%{_libdir}/monetdb5/*. # internal development stuff rm -f %{buildroot}%{_bindir}/Maddlog +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 buildtools/selinux/monetdb.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/monetdb.pp +done +/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog +* Wed Jul 05 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- Rebuilt. +- BZ#3465: Request: add support for CREATE VIEW with ORDER BY clause +- BZ#3545: monetdb commands don't work with -h -P -p options (locally + and remotely) +- BZ#3996: select * from sys.connections always returns 0 rows. Expected + to see at least one row for the active connection. +- BZ#6187: Nested WITH queries not supported +- BZ#6225: Order of evaluation of the modulo operator +- BZ#6289: Crashes and hangs with remote tables +- BZ#6292: Runaway SQL optimizer in too many nested operators +- BZ#6310: Name resolution error (sqlsmith) +- BZ#6312: Object not found in LIMIT clause (sqlsmith) +- BZ#6313: Null type resolution in disjunction fails (sqlsmith) +- BZ#6319: Server crash on LATERAL (sqlsmith) +- BZ#6322: Crash on disjunction with LIMIT (sqlsmith) +- BZ#6323: Deadlock calling sys.bbp() +- BZ#6324: Sqlitelogictest crash in a IN query (8th) +- BZ#6327: The daemon does not respect the actual name of the mserver5 + executable +- BZ#6330: Sqlitelogictest crash on a complex SELECT query +- BZ#6331: sys.statistics column "nils" always contains 0. Expected a + positive value for columns that have one or more nils/NULLs +- BZ#6332: Sqlitelogictest crash related to an undefined MAL function + +* Mon May 29 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.27.1-20170705 +- merovingian: Added handling of a dbextra property per database at the daemon + level. The user can set the dbextra property for a database using the + command: $ monetdb set dbextra=<path> <database> and the daemon will + make sure to start the new server using the correct + --dbextra parameter. + +* Mon May 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- monetdb5: The "sub" prefix of many functions, both at the MAL and the C level, + has been removed. + +* Mon May 29 2017 Mark Raasveldt <m.raasve...@cwi.nl> - 11.27.1-20170705 +- MonetDB: Added a new server-side protocol implementation. The new protocol + is backwards compatible with the old protocol. Clients can choose + whether they want to use the old or the new protocol during the initial + handshake with the server. The new protocol is a binary column-based + protocol that is significantly faster than the old protocol when + transferring large result sets. In addition, the new protocol supports + compression using Snappy or LZ4. + +* Mon May 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- gdk: Improved error checking in the logger code (dealing with the write-ahead + log); changed return types a several functions from int to gdk_return + (i.e., they now return GDK_SUCCEED or GDK_FAIL). The logger no longer + calls GDKfatal on error. Instead the caller is responsible for dealing + with errors. + +* Mon May 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- sql: Made the operator precedence of % equal to those of * and /. All three + are evaluated from left to right. + +* Mon May 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- MonetDB: Moved the sphinx extension module to its own repository. + See https://dev.monetdb.org/hg/MonetDB-sphinx/. + +* Mon May 29 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705 +- gdk: BATsort may now create an order index as a by product. +- gdk: Quantile calculations now use the order index if available (and use + BATsort otherwise, producing an order index). +- gdk: Quantiles calculate a position in the sorted column. If this position + is not an integer, we now choose the nearest position, favoring the + lower if the distance to the two adjacent positions is equal (round + down to nearest integer). + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
