Changeset: baea7d5c43d4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/baea7d5c43d4 Modified Files: clients/mapiclient/dump.c clients/mapiclient/mclient.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_rel.c sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: mangled Log Message:
Merge with default. diffs (truncated from 233225 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -827,3 +827,6 @@ e730f4981db58bb336d6b17a022eec95d9f0eae5 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_3 e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release +9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_5 +34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release +9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Jan 12 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 +- A couple of concurrency issues have been fixed. + * Mon Aug 10 2020 Ying Zhang <y.zh...@cwi.nl> - 11.39.1-20201006 - Finished a first version of the new monitoring function user_statistics(), which is only intended for the DBAs. diff --git a/ChangeLog.Jan2022 b/ChangeLog.Jan2022 --- a/ChangeLog.Jan2022 +++ b/ChangeLog.Jan2022 @@ -1,6 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Wed Jan 12 2022 Sjoerd Mullender <sjo...@acm.org> -- A couple of concurrency issues have been fixed. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -850,6 +850,28 @@ fi %endif %changelog +* Tue Jan 18 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 +- Rebuilt. + +* Thu Jan 13 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 +- NT: We now build Windows binaries using Visual Studio 2022. + +* Wed Jan 12 2022 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.43.5-20220118 +- gdk: Implement string imprints (strimps for short) a pre-filter structure + for strings in order to accelerate LIKE queries. If a strimp exists + for a specific string column the strings are pre-filtered, rejecting + strings that cannot possibly match, before the more expensive and + accurate matching algorithms run. + +* Wed Jan 12 2022 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.43.5-20220118 +- sql: Add string imprints to the existing imprints index creation syntax. On + string column "col" of a table "tbl" marked read only ("ALTER TABLE tbl + SET READ ONLY") the user can create a string imprint using the syntax: + "CREATE IMPRINTS INDEX index_name ON tbl(col);". + +* Wed Jan 12 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 +- MonetDB: A couple of concurrency issues have been fixed. + * Tue Jan 11 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.3-20220111 - Rebuilt. - GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other diff --git a/NT/ChangeLog-Archive b/NT/ChangeLog-Archive --- a/NT/ChangeLog-Archive +++ b/NT/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Jan 13 2022 Sjoerd Mullender <sjo...@acm.org> - 11.43.5-20220118 +- We now build Windows binaries using Visual Studio 2022. + * Fri Apr 23 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503 - Added the monetdbe library to the Windows installer. diff --git a/NT/ChangeLog.Jan2022 b/NT/ChangeLog.Jan2022 --- a/NT/ChangeLog.Jan2022 +++ b/NT/ChangeLog.Jan2022 @@ -1,6 +1,3 @@ # ChangeLog file for NT # This file is updated with Maddlog -* Thu Jan 13 2022 Sjoerd Mullender <sjo...@acm.org> -- We now build Windows binaries using Visual Studio 2022. - diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -82,10 +82,10 @@ def main(): id = 1 print(r' <Directory Id="lib" Name="lib">') id = comp(features, id, 14, - [r'bin\mapi.dll', # r'lib\mapi.pdb', - r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb', - r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb', - r'bin\stream.dll', # r'lib\stream.pdb', + [r'bin\mapi.dll', r'lib\mapi.pdb', + 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\iconv-2.dll'), vcpkg.format(r'bin\bz2.dll'), vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -86,7 +86,7 @@ def main(): print(r' </Property>') print(r' <Property Id="DEBUGEXISTS">') print(r' <DirectorySearch Id="CheckFileDir1" Path="[INSTALLDIR]\bin" Depth="0">') - print(r' <FileSearch Id="CheckFile1" Name="libbat.pdb"/>') + print(r' <FileSearch Id="CheckFile1" Name="mserver5.pdb"/>') print(r' </DirectorySearch>') print(r' </Property>') print(r' <Property Id="INCLUDEEXISTS">') @@ -161,14 +161,14 @@ def main(): vcpkg.format(r'bin\lzma.dll'), vcpkg.format(r'bin\pcre.dll'), vcpkg.format(r'bin\zlib1.dll')]) - # id = comp(debug, id, 14, - # [r'bin\mclient.pdb', - # r'bin\mserver5.pdb', - # r'bin\msqldump.pdb', - # r'lib\libbat.pdb', - # r'lib\libmapi.pdb', - # r'lib\libmonetdb5.pdb', - # r'lib\libstream.pdb']) + id = comp(debug, id, 14, + [r'bin\mclient.pdb', + r'bin\mserver5.pdb', + r'bin\msqldump.pdb', + r'lib\bat.pdb', + r'lib\mapi.pdb', + r'lib\monetdb5.pdb', + r'lib\stream.pdb']) id = comp(geom, id, 14, [vcpkg.format(r'bin\geos_c.dll'), vcpkg.format(r'bin\geos.dll')]) diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,5 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures -#MERCURIAL?malcheck +HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures-hge +!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures +NOT_WIN32&MERCURIAL?melcheck mclient-uri diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test new file mode 100644 --- /dev/null +++ b/clients/Tests/MAL-signatures-hge.test @@ -0,0 +1,65665 @@ +hash-threshold 100000 +query TTTTT nosort +select * from sys.malfunctions() order by module, "function", address, signature, comment +---- +aggr +all +command aggr.all(X_0:bat[:any_1]):any_1 +SQLall; +if all values in b are equal return this, else nil +aggr +allnotequal +pattern aggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit +SQLallnotequal; +if all values in r are not equal to l return true, else if r has nil nil else false +aggr +anyequal +pattern aggr.anyequal(X_0:any_1, X_1:any_1):bit +CMDvarEQ; +(empty) +aggr +anyequal +pattern aggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit +SQLanyequal; +if any value in r is equal to l return true, else if r has nil nil else false +aggr +avg +command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on bte +aggr +avg +command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on dbl +aggr +avg +command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on flt +aggr +avg +command aggr.avg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on hge +aggr +avg +command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on int +aggr +avg +command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on lng +aggr +avg +command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] +AGGRavg13_dbl; +Grouped tail average on sht +aggr +avg +command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on bte +aggr +avg +command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on dbl +aggr +avg +command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on flt +aggr +avg +command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on int +aggr +avg +command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on lng +aggr +avg +command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] +AGGRavg14_dbl; +Grouped tail average on sht +aggr +avg +command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on bte, also returns count +aggr +avg +command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on dbl, also returns count +aggr +avg +command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on flt, also returns count +aggr +avg +command aggr.avg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on hge, also returns count +aggr +avg +command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on int, also returns count +aggr +avg +command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on lng, also returns count +aggr +avg +command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) +AGGRavg23_dbl; +Grouped tail average on sht, also returns count +aggr +avg +command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:int) (X_4:bat[:dbl], X_5:bat[:lng]) +AGGRavg24_dbl; +Grouped tail average on bte, also returns count +aggr +avg +command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:int) (X_4:bat[:dbl], X_5:bat[:lng]) +AGGRavg24_dbl; +Grouped tail average on dbl, also returns count +aggr +avg +command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:int) (X_4:bat[:dbl], X_5:bat[:lng]) +AGGRavg24_dbl; +Grouped tail average on flt, also returns count +aggr +avg +command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:int) (X_4:bat[:dbl], X_5:bat[:lng]) +AGGRavg24_dbl; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list