Changeset: a9666755add1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9666755add1 Removed Files: documentation/conf.py.in sql/test/miscellaneous/Tests/prepare.stable.out.int128 Modified Files: sql/server/rel_optimizer.c testing/Mtest.py.in Branch: mtest Log Message:
merge with default diffs (truncated from 174878 to 300 lines): diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,14 @@ +# .readthedocs.yml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: documentation/conf.py + +# Optionally build your docs in additional formats such as PDF +formats: + - pdf diff --git a/ChangeLog.Oct2020 b/ChangeLog.Oct2020 --- a/ChangeLog.Oct2020 +++ b/ChangeLog.Oct2020 @@ -5,7 +5,7 @@ - Finished a first version of the new monitoring function user_statistics(), which is only intended for the DBAs. For each database user who has logged in during the current mserver5 - session, it returns + session, it returns "username": login name of the database user, "querycount": the number of queries this user has executed since his/her first login, diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -12,6 +12,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/monet include("${CMAKE_CURRENT_LIST_DIR}/streamTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/mapiTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/matomicTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/mstringTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/gdkTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/monetdb5Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/sqlTargets.cmake") diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -116,9 +116,14 @@ BuildRequires: gcc BuildRequires: bison BuildRequires: /usr/bin/python3 %if %{?rhel:1}%{!?rhel:0} +# RH 7 (and for readline also 8) BuildRequires: bzip2-devel +BuildRequires: unixODBC-devel +BuildRequires: readline-devel %else BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(odbc) +BuildRequires: pkgconfig(readline) %endif %if %{with fits} BuildRequires: pkgconfig(cfitsio) @@ -128,23 +133,19 @@ BuildRequires: geos-devel >= 3.4.0 %endif BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(liblzma) -# BuildRequires: libmicrohttpd-devel -BuildRequires: libuuid-devel +BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(openssl) %if %{with pcre} BuildRequires: pkgconfig(libpcre) >= 4.5 %endif -BuildRequires: readline-devel -BuildRequires: unixODBC-devel -# BuildRequires: uriparser-devel BuildRequires: pkgconfig(zlib) %if %{with py3integration} -BuildRequires: python3-devel >= 3.5 +BuildRequires: pkgconfig(python3) >= 3.5 BuildRequires: python3-numpy %endif %if %{with rintegration} -BuildRequires: R-core-devel +BuildRequires: pkgconfig(libR) %endif %if (0%{?fedora} >= 22) @@ -762,6 +763,11 @@ fi %setup -q %build +%if (0%{?fedora} >= 33) +# on Fedora 33 we get a crash of the compiler when using -flto, so disable it +CFLAGS="${CFLAGS:-%optflags} -fno-lto" +export CFLAGS +%endif %cmake3 \ -DRELEASE_VERSION=ON \ -DASSERT=OFF \ diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -8,12 +8,13 @@ shifted to the spin-off company `MonetDB Via the MonetDB project we have brought the MonetDB system in open source, where it is accessible at https://www.monetdb.org/Downloads/. Even though development happens mostly in a company, the MonetDB -database system will remain open source. +database system will remain open source. It is available under the +`Mozilla Public License 2.0`__. The MonetDB database system is a high-performance database kernel for query-intensive applications. The MonetDB source can be found at our `Mercurial server`__. There is also a `github mirror`__ that is updated -once a day. +once an hour. .. _CWI: https://www.cwi.nl/ __ CWI_ @@ -24,19 +25,110 @@ once a day. .. _solutions: https://www.monetdbsolutions.com __ solutions_ +.. _mpl: http://mozilla.org/MPL/2.0/ +__ mpl_ + .. _MonetDB: https://dev.monetdb.org/hg/MonetDB/ __ MonetDB_ .. _github: https://github.com/MonetDB/MonetDB __ github_ -If you got a source distribution, please compile and install MonetDB -first, following the instructions in the file `build.rst`__. +Building +-------- + +MonetDB is built using the ``cmake`` program. It is recommended to +build in a directory that is not inside the source tree. In order to +build, use the following commands when inside your build directory:: + + cmake [options] /path/to/monetdb/source + cmake --build . + cmake --build . --target install + +In order to install into a different directory than the default +``/usr/local``, add the option ``-DCMAKE_INSTALL_PREFIX``:: + + cmake -DCMAKE_INSTALL_PREFIX=/path/to/install/monetdb /path/to/monetdb/source + cmake --build . + cmake --build . --target install + +Build Options +............. + +There are many options that can be used to select how MonetDB is to be +built. Options can be turned ``ON`` or ``OFF`` using a ``-D`` flag on +the first of the ``cmake`` command lines. Except when specified +otherwise, options are ``ON`` when the relevant libraries can be found. +Available options are: -__ documentation/source/build.rst +============== =============================================================================================== +Option Explanation +============== =============================================================================================== +ASSERT Enable asserts (default=ON for development sources, OFF for tarball installation) +CINTEGRATION Enable support for C UDFs (default=ON except on Windows) +CMAKE_SUMMARY Show a summary of the cmake configuration (for debug purposes, default=OFF) +CMAKE_UNITTEST Build and run the unittest for the build system (default=OFF) +FITS Enable support for FITS +GEOM Enable support for geom module +INT128 Enable support for 128-bit integers +NETCDF Enable support for netcdf +ODBC Compile the MonetDB ODBC driver +PY3INTEGRATION Enable support for Python 3 integration into MonetDB +RINTEGRATION Enable support for R integration into MonetDB +SANITIZER Enable support for the GCC address sanitizer (default=OFF) +SHP Enable support for ESRI Shapefiles +STRICT Enable strict compiler flags (default=ON for development sources, OFF for tarball installation) +TESTING Enable support for testing +WITH_BZ2 Include bz2 support +WITH_CMOCKA Include cmocka support (default=OFF) +WITH_CRYPTO Only in very some special cases we build without crypto dependencies +WITH_CURL Include curl support +WITH_LZMA Include lzma support +WITH_PCRE Include pcre support +WITH_PROJ Include proj support +WITH_READLINE Include readline support +WITH_UUID Include uuid support +WITH_VALGRIND Include valgrind support +WITH_XML2 Include xml2 support +WITH_ZLIB Include zlib support +============== =============================================================================================== + +Required packages +................. + +On Fedora, the following packages are required: +``bison``, ``cmake``, ``gcc``, ``openssl-devel``, ``pkgconf``, +``python3``. + +The following packages are optional but recommended: +``bzip2-devel``, ``libuuid-devel``, ``pcre-devel``, ``readline-devel``, +``xz-devel``, ``zlib-devel``. + +The following packages are optional: +``cfitsio-devel``, ``gdal-devel``, ``geos-devel``, ``libasan``, +``libcurl-devel``, ``libxml2-devel``, ``netcdf-devel``, ``proj-devel``, +``python3-devel``, ``python3-numpy``, ``R-core-devel``, +``unixODBC-devel``, ``valgrind-devel``. + +On Ubuntu and Debian the following packages are required: +``bison``, ``cmake``, ``gcc``, ``libssl-dev``, ``pkg-config``, +``python3``. + +The following packages are optional but recommended: +``libbz2-dev``, ``uuid-dev``, ``libpcre3-dev``, ``libreadline-dev``, +``liblzma-dev``, ``zlib1g-dev``. + +The following packages are optional: +``libasan5``, ``libcfitsio-dev``, ``libcurl4-gnutls-dev``, +``libgdal-dev``, ``libgeos-dev``, ``libnetcdf-dev``, ``libproj-dev``, +``libxml2-dev``, ``python3-dev``, ``python3-numpy``, ``r-base-dev``, +``unixodbc-dev``, ``valgrind``. + +``cmake`` must be at least version 3.12, ``python`` must be at least +version 3.5. Bugs -==== +---- We of course hope there aren't any, but if you do find one, you can report bugs in our `bugzilla`__ instance. diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -16,4 +16,11 @@ if(WIN32) COMPONENT server) endif() +if(DEVELOPMENT AND NOT WIN32) + install(FILES + Maddlog + PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT} + DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() + # vim: set ts=2:sw=2:et diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -1322,110 +1322,302 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "*", "pattern batcalc.*(X_1:sht, X_2:bat[:sht], X_3:bat[:oid]):bat[:int] ", "CMDbatMULenlarge;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:sht, X_2:bat[:sht], X_3:bat[:oid]):bat[:lng] ", "CMDbatMULenlarge;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:bte, X_3:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:dbl, X_3:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:dbl, X_3:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:dbl, X_3:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:dbl, X_3:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:dbl, X_3:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:flt, X_3:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:flt, X_3:bat[:oid]):bat[:flt] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:flt, X_3:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:flt, X_3:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:flt, X_3:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:int, X_3:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:lng, X_3:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] [ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:sht] ", "CMDbatMULsignal;", "" ] +[ "batcalc", "*", "pattern batcalc.*(X_1:bat[:dbl], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMULsignal;", "" ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
