Changeset: f7cd1ca1d450 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7cd1ca1d450 Modified Files: clients/Tests/exports.stable.out common/stream/stream.c common/stream/stream.h common/stream/stream_internal.h sql/backends/monet5/CMakeLists.txt sql/backends/monet5/sql.c sql/server/rel_updates.c sql/server/sql_parser.y sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/miscellaneous/Tests/simple_plans.stable.out Branch: copybinary Log Message:
Merge branch 'default' into 'copybinary' diffs (truncated from 150942 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -789,3 +789,5 @@ cb4b3f021774b60ffd84c3004d341ec04de736f3 bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5 cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release +ac8254a47e87d0be9df2a623e2c2fcf67c0f982d Oct2020_7 +ac8254a47e87d0be9df2a623e2c2fcf67c0f982d Oct2020_SP1_release diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,4 +183,5 @@ if(CMAKE_SUMMARY) monetdb_cmake_summary() endif() + # vim: set ts=2:sw=2:et diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -97,7 +97,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Oct2020/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Oct2020-SP1/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -153,17 +153,21 @@ BuildRequires: python3-numpy %endif %if %{with rintegration} BuildRequires: pkgconfig(libR) +%if (0%{?fedora} == 32) +# work around a packaging bug on Fedora 32 (18 Nov 2020) +# problem is things like: +# file /etc/texlive/web2c/updmap.cfg conflicts between attempted installs of texlive-tetex-7:20190410-12.fc32.noarch and texlive-texlive-scripts-7:20200327-16.fc32.noarch +# texlive-tetex is obsoleted by texlive-obsolete +BuildRequires: texlive-obsolete %endif -# if we were to compile with cmocka support (-DWITH_CMOCKA=ON): -# BuildRequires: pkgconfig(cmocka) -# 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) +%endif +# optional packages: +# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON +# BuildRequires: pkgconfig(gdal) # -DSHP=ON +# BuildRequires: pkgconfig(netcdf) # -DNETCDF=ON +# BuildRequires: pkgconfig(proj) # -DWITH_PROJ=ON +# BuildRequires: pkgconfig(snappy) # -DWITH_SNAPPY=ON +# BuildRequires: pkgconfig(valgrind) # -DWITH_VALGRIND=ON %if (0%{?fedora} >= 22) Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} @@ -861,11 +865,36 @@ else fi %endif +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +# fix up some paths (/var/run -> /run) +# needed because CMAKE_INSTALL_RUNSTATEDIR refers to /var/run +sed -i 's|/var/run|/run|' \ + %{buildroot}%{_tmpfilesdir}/monetdbd.conf \ + %{buildroot}%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties \ + %{buildroot}%{_unitdir}/monetdbd.service +%endif + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog +* Wed Nov 18 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.7-20201118 +- Rebuilt. +- BZ#6890: Add support of xz/lzma (de)compression on MS Windows +- BZ#6891: Add support of lz4 (de)compression on MS Windows +- BZ#6971: Parsing table returning function on remote server fails +- BZ#6981: Oct2020: PREPARE DDL statement silently fails +- BZ#6983: monetdb allows to use non-existing optimizer pipe +- BZ#6998: MAL profiler buffer limitations +- BZ#7001: crossproduct generated for a simple (semi-)join +- BZ#7003: Segfault on large chain of constant decimal multiplication +- BZ#7005: Dropping a STREAM TABLE does not remove the associated column + info from sys._columns +- BZ#7010: deallocate <id> results in all prepared statements being + deallocated (not error-related) +- BZ#7011: uuid() called only once when used in projection list + * Tue Oct 13 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.5-20201013 - Rebuilt. diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -80,9 +80,9 @@ def main(): r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb', r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb', r'bin\stream.dll', # r'lib\stream.pdb', - vcpkg.format(r'bin\libiconv.dll'), + vcpkg.format(r'bin\iconv-2.dll'), vcpkg.format(r'bin\bz2.dll'), - vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll + vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)), vcpkg.format(r'bin\zlib1.dll')]) print(r' </Directory>') diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -145,10 +145,10 @@ def main(): r'bin\monetdb5.dll', r'bin\monetdbsql.dll', r'bin\stream.dll', - vcpkg.format(r'bin\libiconv.dll'), + vcpkg.format(r'bin\iconv-2.dll'), vcpkg.format(r'bin\bz2.dll'), + vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll vcpkg.format(r'bin\getopt.dll'), - vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)), vcpkg.format(r'bin\libxml2.dll'), vcpkg.format(r'bin\lz4.dll'), @@ -199,10 +199,10 @@ def main(): r'lib\monetdb5.lib', r'lib\monetdbsql.lib', r'lib\stream.lib', - vcpkg.format(r'lib\libiconv.lib'), + vcpkg.format(r'lib\iconv.lib'), vcpkg.format(r'lib\bz2.lib'), + vcpkg.format(r'lib\charset.lib'), vcpkg.format(r'lib\getopt.lib'), - vcpkg.format(r'lib\libcharset.lib'), vcpkg.format(r'lib\libcrypto.lib'), vcpkg.format(r'lib\libxml2.lib'), vcpkg.format(r'lib\lz4.lib'), diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -131,10 +131,16 @@ Bugs ---- We of course hope there aren't any, but if you do find one, you can -report bugs in our `bugzilla`__ instance. +report bugs in our `github`__ repository. + +Please note that we do not accept github Pull Requests. See the +`developers`__ page for instructions. -.. _bugzilla: https://bugs.monetdb.org -__ bugzilla_ +.. _github: https://github.com/MonetDB/MonetDB/issues +__ github_ + +.. _developers: https://www.monetdb.org/Developers +__ developers_ Copyright Notice ================ diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c new file mode 100644 --- /dev/null +++ b/buildtools/coverity_model.c @@ -0,0 +1,185 @@ +/* + * 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 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +/* + * This file contains a model for Coverity Scan. + * This file is not a normal source file. It is not compiled by any + * compiler, but instead it is uploaded to the Coverity site and used + * during any analysis they do on our code. + * + * We model our use of the various allocation functions. + * Things we want to do is model that GDKmalloc and friends are paired + * with GDKfree, and that exceptions created by createException and + * createMalException should be freed with freeException. + * + * author: Sjoerd Mullender + */ + +typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return; +typedef struct {} *MalBlkPtr; + +void +GDKfree(void *blk) +{ + if (blk) { + __coverity_free__(blk); + __coverity_mark_as_afm_freed__(blk, "GDKfree"); + } +} + +void * +GDKmalloc(size_t size) +{ + int has_memory; + __coverity_negative_sink__(size); + if(has_memory) { + void *p = __coverity_alloc__(size); + __coverity_mark_as_afm_allocated__(p, "GDKfree"); + __coverity_mark_as_uninitialized_buffer__(p); + return p; + } + return 0; +} + +void * +GDKzalloc(size_t size) +{ + void *p = GDKmalloc(size); + if (p) { + for (size_t i = 0; i < size; i++) + ((char *) p)[i] = 0; + } + return p; +} + +char * +GDKstrdup(const char *s) +{ + char *p; + size_t i; + int has_memory; + if (s == 0) + return 0; + __coverity_string_null_sink__(s); + __coverity_string_size_sink__(s); + if (has_memory) { + p = __coverity_alloc_nosize__(); + __coverity_mark_as_afm_allocated__(p, "GDKfree"); + for (i = 0; (p[i] = s[i]); i++) + ; + return p; + } + return 0; +} + +char * +GDKstrndup(const char *s, size_t size) +{ + char *p; + size_t i; + __coverity_negative_sink__(size); + if (s == 0) + return 0; + p = GDKmalloc(size + 1); + if (p) { + for (i = 0; i < size && (p[i] = s[i]); i++) + ; + p[i] = 0; + } + return p; +} + +void * +GDKrealloc(void *blk, size_t size) +{ + void *p = GDKmalloc(size); + if (p != 0) + GDKfree(blk); + return p; +} + +void * +GDKmmap(const char *path, int mode, size_t size) +{ + int has_memory; + __coverity_negative_sink__(size); + if (has_memory) { + void *p = __coverity_alloc__(size); + __coverity_mark_as_afm_allocated__(p, "GDKmunmap"); + __coverity_writeall__(p); + return p; + } + return 0; +} + +gdk_return +GDKmunmap(void *p, size_t size) +{ + int failed; + __coverity_free__(p); + __coverity_mark_as_afm_freed__(p, "GDKmunmap"); + return failed ? GDK_FAIL : GDK_SUCCEED; +} + +void * _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
