Changeset: 033fc910a85b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/033fc910a85b Modified Files: sql/server/rel_optimize_proj.c Branch: const_aggr_elim Log Message:
merges with default diffs (truncated from 38781 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -836,3 +836,4 @@ dce400b68239412b1835fb28bd183bf50f5e8692 ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_5 ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_SP1_release 30e6380820842b9e0325536eb22d7cb3843ab095 Aug2024_7 +30e6380820842b9e0325536eb22d7cb3843ab095 Aug2024_SP2_release diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -5,7 +5,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -4,7 +4,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. @@ -923,6 +923,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd -DWITH_PCRE=ON \ -DWITH_PROJ=OFF \ -DWITH_READLINE=ON \ + -DWITH_SQLPARSE=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_XML2=ON \ -DWITH_ZLIB=ON diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -4,7 +4,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -4,7 +4,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -149,6 +149,6 @@ This Source Code Form is subject to the 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 2024 MonetDB Foundation; +Copyright 2024, 2025 MonetDB Foundation; Copyright August 2008 - 2023 MonetDB B.V.; Copyright 1997 - July 2008 CWI. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -5,7 +5,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -5,7 +5,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -7,7 +7,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in --- a/buildtools/conf/monetdbd.conf.in +++ b/buildtools/conf/monetdbd.conf.in @@ -1,3 +1,6 @@ # this file is for systemd # monetdbd needs a directory in /run that is owned by monetdb:monetdb d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb - +# do not touch our socket files +x /tmp/.s.monetdb.* +x /tmp/.s.merovingian.* diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -5,7 +5,7 @@ This Source Code Form is subject to the 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 2024 MonetDB Foundation; +Copyright 2024, 2025 MonetDB Foundation; Copyright August 2008 - 2023 MonetDB B.V.; Copyright 1997 - July 2008 CWI. --> diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -5,7 +5,7 @@ * 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 2024 MonetDB Foundation; + * Copyright 2024, 2025 MonetDB Foundation; * Copyright August 2008 - 2023 MonetDB B.V.; * Copyright 1997 - July 2008 CWI. */ diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -5,13 +5,15 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] add_subdirectory(mapilib) -add_subdirectory(mapiclient) +if(WITH_MAPI_CLIENT) + add_subdirectory(mapiclient) +endif() add_subdirectory(odbc) if(TESTING) add_subdirectory(examples) diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -5,7 +5,7 @@ # 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 2024 MonetDB Foundation; +# Copyright 2024, 2025 MonetDB Foundation; # Copyright August 2008 - 2023 MonetDB B.V.; # Copyright 1997 - July 2008 CWI. #]] diff --git a/clients/NT/mclient.bat.in b/clients/NT/mclient.bat.in --- a/clients/NT/mclient.bat.in +++ b/clients/NT/mclient.bat.in @@ -4,7 +4,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 2024 MonetDB Foundation; +@REM Copyright 2024, 2025 MonetDB Foundation; @REM Copyright August 2008 - 2023 MonetDB B.V.; @REM Copyright 1997 - July 2008 CWI. diff --git a/clients/NT/msqldump.bat.in b/clients/NT/msqldump.bat.in --- a/clients/NT/msqldump.bat.in +++ b/clients/NT/msqldump.bat.in @@ -4,7 +4,7 @@ @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. @REM -@REM Copyright 2024 MonetDB Foundation; +@REM Copyright 2024, 2025 MonetDB Foundation; @REM Copyright August 2008 - 2023 MonetDB B.V.; @REM Copyright 1997 - July 2008 CWI. diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -43710,12 +43710,12 @@ str_2dec_lng; cast to dec(lng) and check for overflow calc max -pattern calc.max(X_0:any_1, X_1:any_1):any_1 +pattern calc.max(X_0:any_1, X_1:any_1...):any_1 CALCmax; Return max of V1 and V2 calc max_no_nil -pattern calc.max_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.max_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmax_no_nil; Return max of V1 and V2, ignoring nil values calc @@ -43730,12 +43730,12 @@ mbrFromString; (empty) calc min -pattern calc.min(X_0:any_1, X_1:any_1):any_1 +pattern calc.min(X_0:any_1, X_1:any_1...):any_1 CALCmin; Return min of V1 and V2 calc min_no_nil -pattern calc.min_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.min_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmin_no_nil; Return min of V1 and V2, ignoring nil values calc diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -32325,12 +32325,12 @@ str_2dec_lng; cast to dec(lng) and check for overflow calc max -pattern calc.max(X_0:any_1, X_1:any_1):any_1 +pattern calc.max(X_0:any_1, X_1:any_1...):any_1 CALCmax; Return max of V1 and V2 calc max_no_nil -pattern calc.max_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.max_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmax_no_nil; Return max of V1 and V2, ignoring nil values calc @@ -32345,12 +32345,12 @@ mbrFromString; (empty) calc min -pattern calc.min(X_0:any_1, X_1:any_1):any_1 +pattern calc.min(X_0:any_1, X_1:any_1...):any_1 CALCmin; Return min of V1 and V2 calc min_no_nil -pattern calc.min_no_nil(X_0:any_1, X_1:any_1):any_1 +pattern calc.min_no_nil(X_0:any_1, X_1:any_1...):any_1 CALCmin_no_nil; Return min of V1 and V2, ignoring nil values calc diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -180,7 +180,7 @@ gdk_return BATprod(void *res, int tp, BA BAT *BATproject(BAT *restrict l, BAT *restrict r); BAT *BATproject2(BAT *restrict l, BAT *restrict r1, BAT *restrict r2); BAT *BATprojectchain(BAT **bats); -gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT *sl, BAT *sr, bool li, bool hi, bool anti, bool symmetric, BUN estimate) __attribute__((__warn_unused_result__)); +gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT *sl, BAT *sr, bool li, bool hi, bool anti, bool symmetric, BUN estimate) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__warn_unused_result__)); gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force) __attribute__((__warn_unused_result__)); void BATrmprop(BAT *b, enum prop_t idx); void BATrmprop_nolock(BAT *b, enum prop_t idx); @@ -246,29 +246,29 @@ BAT *COLnew(oid hseq, int tltype, BUN ca BAT *COLnew2(oid hseq, int tt, BUN cap, role_t role, uint16_t width) __attribute__((__warn_unused_result__)); size_t GDK_mem_maxsize; size_t GDK_vm_maxsize; -gdk_return GDKanalytical_correlation(BAT *r, BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s, BAT *e, int tpe, int frame_type); -gdk_return GDKanalytical_covariance_pop(BAT *r, BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s, BAT *e, int tpe, int frame_type); -gdk_return GDKanalytical_covariance_samp(BAT *r, BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s, BAT *e, int tpe, int frame_type); -gdk_return GDKanalytical_stddev_pop(BAT *r, BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tpe, int frame_type); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
