Changeset: dcc0c57d7318 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dcc0c57d7318 Modified Files: ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_join.c gdk/gdk_private.h gdk/gdk_storage.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_prelude.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batstr.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/server/rel_optimizer.c sql/server/rel_updates.c sql/storage/store.c sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 tools/merovingian/daemon/controlrunner.c tools/monetdbe/monetdbe.c Branch: unlock Log Message:
Merge with default branch. diffs (truncated from 10318 to 300 lines): diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ +--- +name: Bug report +about: Create a report to help us improve the sytem +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Create a setting with minimal input for an external user to demonstrate him the buggy behavior. +This includes the relevant part of the database schema description. +Performance trace of the roque query (using the TRACE command) + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Software versions** + - MonetDB version number [a milestone label] + - OS and version: [e.g. Ubuntu 18.04] + - Installed from release package or self-installed and compiled + + +**Issue labeling ** +Make liberal use of the labels to characterise the issue topics. e.g. identify severity, version, etc.. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -783,3 +783,9 @@ bb157905ecb86908dcfb112d102a8c6152557b5d 94231c85384d893701beeeb69996f57c70fade4d Oct2020_root 017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_1 017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3 +017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release +bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5 +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release +bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at [email protected]. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -147,6 +147,18 @@ BuildRequires: python3-numpy %if %{with rintegration} BuildRequires: pkgconfig(libR) %endif +# if we were to compile with cmocka support (-DWITH_CMOCKA=ON): +# BuildRequires: pkgconfig(cmocka) +# if we were to compile with lz4 support (-DWITH_LZ4=ON): +# BuildRequires: pkgconfig(liblz4) +# if we were to compile with NetCDF support (-DNETCDF=ON): +# BuildRequires: pkgconfig(netcdf) +# if we were to compile with proj support (-DWITH_PROJ=ON): +# BuildRequires: pkgconfig(proj) +# if we were to compile with snappy support (-DWITH_SNAPPY=ON): +# BuildRequires: pkgconfig(snappy) +# if we were to compile with valgrind support (-DWITH_VALGRIND=ON): +# BuildRequires: pkgconfig(valgrind) %if (0%{?fedora} >= 22) Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} @@ -245,6 +257,7 @@ Summary: MonetDB - Monet Database Manage Group: Applications/Databases %if (0%{?fedora} >= 22) Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} +Recommends: MonetDB5-server%{?_isa} = %{version}-%{release} %endif %description client @@ -339,7 +352,7 @@ Requires: %{name}-client-odbc%{?_isa} = Recommends: perl-DBD-monetdb >= 1.0 Recommends: php-monetdb >= 1.0 %endif -Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Requires: python3-pymonetdb >= 1.0.6 %description client-tests @@ -382,7 +395,7 @@ automatic index management, extensibilit accelerators. It also has an SQL front end. This package contains the GIS (Geographic Information System) -extensions for %{name}-SQL-server5. +extensions for MonetDB5-server. %files geom-MonetDB5 %defattr(-,root,root) @@ -393,7 +406,7 @@ extensions for %{name}-SQL-server5. %package R Summary: Integration of MonetDB and R, allowing use of R from within SQL Group: Applications/Databases -Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description R MonetDB is a database management system that is developed from a @@ -418,7 +431,7 @@ install it. %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} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description python3 MonetDB is a database management system that is developed from a @@ -442,7 +455,7 @@ install it. %package cfitsio Summary: MonetDB: Add on module that provides support for FITS files Group: Applications/Databases -Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description cfitsio MonetDB is a database management system that is developed from a @@ -484,8 +497,9 @@ automatic index management, extensibilit accelerators. It also has an SQL front end. This package contains the MonetDB server component. You need this -package if you want to use the MonetDB database system. If you want -to use the SQL front end, you also need %{name}-SQL-server5. +package if you want to use the MonetDB database system. If you want to +use the monetdb and monetdbd programs to manage your databases +(recommended), you also need %{name}-SQL-server5. %pre -n MonetDB5-server %{?sysusers_create_package:echo 'u monetdb - "MonetDB Server" /var/lib/monetdb' | systemd-sysusers --replace=%_sysusersdir/monetdb.conf -} @@ -519,6 +533,7 @@ exit 0 %{_bindir}/mserver5 %exclude %{_bindir}/stethoscope %{_libdir}/libmonetdb5.so.* +%{_libdir}/libmonetdbsql.so* %dir %{_libdir}/monetdb5 %if %{with cintegration} %{_libdir}/monetdb5/lib_capi.so @@ -572,8 +587,8 @@ main-memory perspective with use of a fu automatic index management, extensibility of data types and search accelerators. It also has an SQL front end. -This package contains the SQL front end for MonetDB. If you want to -use SQL with MonetDB, you will need to install this package. +This package contains the monetdb and monetdbd programs and the systemd +configuration. %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 %post SQL-server5 @@ -605,7 +620,6 @@ use SQL with MonetDB, you will need to i %config(noreplace) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties %verify(not mtime) %attr(664,monetdb,monetdb) %{_localstatedir}/monetdb5/dbfarm/.merovingian_lock %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd -%{_libdir}/libmonetdbsql.so* %doc %{_mandir}/man1/monetdb.1.gz %doc %{_mandir}/man1/monetdbd.1.gz %dir %{_datadir}/doc/MonetDB-SQL @@ -770,6 +784,8 @@ export CFLAGS %endif %cmake3 \ -DRELEASE_VERSION=ON \ + -DRUNDIR=%{_rundir}/monetdb \ + -DLOGDIR=%{_localstatedir}/log/monetdb \ -DASSERT=OFF \ -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \ -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \ @@ -844,6 +860,16 @@ fi %postun -p /sbin/ldconfig %changelog +* Tue Oct 13 2020 Sjoerd Mullender <[email protected]> - 11.39.5-20201013 +- Rebuilt. + +* Mon Oct 12 2020 Sjoerd Mullender <[email protected]> - 11.39.5-20201013 +- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb + configuration file. + +* Fri Oct 09 2020 Sjoerd Mullender <[email protected]> - 11.39.3-20201009 +- Rebuilt. + * Tue Oct 06 2020 Sjoerd Mullender <[email protected]> - 11.39.1-20201006 - Rebuilt. - BZ#3553: All schema access to ubiquitous functions @@ -936,7 +962,7 @@ fi Instead do SET current_timezone = interval '1' hour; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
