Changeset: aab45ecfef5f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/aab45ecfef5f
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_aggr.c
gdk/gdk_calc.h
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_string.c
gdk/gdk_subquery.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_subquery.c
sql/common/sql_types.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_updates.c
sql/test/SQLancer/Tests/All
sql/test/SQLancer/Tests/sqlancer08.test
sql/test/miscellaneous/Tests/simple_plans.test
sql/test/subquery/Tests/subquery5.test
Branch: pushcands
Log Message:
Merged with default (needed for reference)
diffs (truncated from 282420 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -751,3 +751,10 @@ 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_5
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
97e76b882f9fb28327393d21708fb22f2f6c22f1 Jan2022_7
+f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_9
+f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_SP1_release
+00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_15
+00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_SP3_release
+db3cec8ea853884e857fcfb413428116cb95e786 Jul2021_17
+8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_19
+8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_SP4_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL
# SET(CMAKE_SKIP_RPATH TRUE)
endif()
-# required for some instalation files
+# required for some installation files
set(PROGRAM_PERMISSIONS_DEFAULT
OWNER_WRITE
OWNER_READ
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -114,7 +114,6 @@ BuildRequires: geos-devel >= 3.4.0
%endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
-BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(libxml-2.0)
%if %{with pcre}
BuildRequires: pkgconfig(libpcre) >= 4.5
@@ -796,7 +795,6 @@ fi
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
-DWITH_SNAPPY=OFF \
- -DWITH_UUID=ON \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
@@ -850,6 +848,14 @@ fi
%endif
%changelog
+* Mon Feb 07 2022 Sjoerd Mullender <[email protected]> - 11.43.9-20220207
+- Rebuilt.
+- GH#7237: SELECT with concurrent writes rarely returns corrupt data
+- GH#7238: query with system function: "index"(varchar, boolean) fails
+ with GDK error or assertion failure.
+- GH#7241: Replacing a view by a query on the view itself crashes the
+ server.
+
* Thu Feb 03 2022 Sjoerd Mullender <[email protected]> - 11.43.7-20220203
- Rebuilt.
- GH#7228: COMMIT: transaction is aborted because of concurrency
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -158,7 +158,7 @@ def main():
vcpkg.format(r'bin\getopt.dll'),
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
- vcpkg.format(r'bin\lzma.dll'),
+ vcpkg.format(r'bin\liblzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
id = comp(debug, id, 14,
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -86,7 +86,6 @@ 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
@@ -99,7 +98,7 @@ On Fedora, the following packages are re
``bison``, ``cmake``, ``gcc``, ``pkgconf``, ``python3``.
The following packages are optional but recommended:
-``bzip2-devel``, ``libuuid-devel``, ``pcre-devel``, ``readline-devel``,
+``bzip2-devel``, ``pcre-devel``, ``readline-devel``,
``xz-devel``, ``zlib-devel``.
The following packages are optional:
@@ -109,11 +108,10 @@ The following packages are optional:
``unixODBC-devel``, ``valgrind-devel``.
On Ubuntu and Debian the following packages are required:
-``bison``, ``cmake``, ``gcc``, ``libssl-dev``, ``pkg-config``,
-``python3``.
+``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``.
The following packages are optional but recommended:
-``libbz2-dev``, ``uuid-dev``, ``libpcre3-dev``, ``libreadline-dev``,
+``libbz2-dev``, ``libpcre3-dev``, ``libreadline-dev``,
``liblzma-dev``, ``zlib1g-dev``.
The following packages are optional:
diff --git a/clients/ChangeLog.Jan2022 b/clients/ChangeLog.Jan2022
--- a/clients/ChangeLog.Jan2022
+++ b/clients/ChangeLog.Jan2022
@@ -1,3 +1,10 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Feb 16 2022 Sjoerd Mullender <[email protected]>
+- Improved the handling of the \r (internal pager) command in mclient.
+ It now properly counts the header of table, and when a (very) long
+ table is being printed and aborted part way in the built-in pager, not
+ all data is transferred to the client (and then discarded). Instead
+ at most 1000 rows are transferred.
+
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
@@ -1,4 +1,5 @@
hash-threshold 100000
+
query TTTTT nosort
select * from sys.malfunctions() order by module, "function", address,
signature, comment
----
@@ -33208,56 +33209,6 @@ pattern batcalc.flt_noerror(X_0:bat[:str
CMDconvert_flt;
(empty)
batcalc
-hash
-command batcalc.hash(X_0:bat[:any_1]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:bte]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:dbl]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:flt]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:hge]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:int]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:lng]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:lng]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:oid]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
-hash
-command batcalc.hash(X_0:bat[:sht]):bat[:lng]
-MKEYbathash;
-(empty)
-batcalc
hge
pattern batcalc.hge(X_0:bat[:bit]):bat[:hge]
CMDconvertsignal_hge;
@@ -39388,11 +39339,6 @@ pattern batcalc.or(X_0:sht, X_1:bat[:sht
CMDbatOR;
(empty)
batcalc
-rotate_xor_hash
-command batcalc.rotate_xor_hash(X_0:bat[:lng], X_1:int,
X_2:bat[:any_1]):bat[:int]
-MKEYbulk_rotate_xor_hash;
-(empty)
-batcalc
round
pattern batcalc.round(X_0:bat[:bte], X_1:bte, X_2:bat[:oid], X_3:int,
X_4:int):bat[:bte]
bte_bat_round_wrap;
@@ -42319,9 +42265,44 @@ MANIFOLDremapMultiplex;
(empty)
batmkey
hash
-command batmkey.hash(X_0:bat[:any_1]):bat[:lng]
+pattern batmkey.hash(X_0:bat[:any]):bat[:lng]
MKEYbathash;
calculate a hash value
+batmkey
+hash
+pattern batmkey.hash(X_0:bat[:any], X_1:bat[:oid]):bat[:lng]
+MKEYbathash;
+calculate a hash value, with a candidate list
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:bat[:lng], X_1:int,
X_2:bat[:any]):bat[:lng]
+MKEYbulk_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b))
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:bat[:lng], X_1:int, X_2:bat[:any],
X_3:bat[:oid], X_4:bat[:oid]):bat[:lng]
+MKEYbulk_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b)), with candidate lists
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:bat[:lng], X_1:int, X_2:any):bat[:lng]
+MKEYbulkconst_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b))
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:bat[:lng], X_1:int, X_2:any,
X_3:bat[:oid]):bat[:lng]
+MKEYbulkconst_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b)), with a candidate list
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:lng, X_1:int, X_2:bat[:any]):bat[:lng]
+MKEYconstbulk_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b))
+batmkey
+rotate_xor_hash
+pattern batmkey.rotate_xor_hash(X_0:lng, X_1:int, X_2:bat[:any],
X_3:bat[:oid]):bat[:lng]
+MKEYconstbulk_rotate_xor_hash;
+pre: h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits),
[hash](b)), with a candidate list
batmmath
acos
pattern batmmath.acos(X_0:bat[:dbl]):bat[:dbl]
@@ -45817,6 +45798,11 @@ similarity
command battxtsim.similarity(X_0:bat[:str], X_1:bat[:str]):bat[:dbl]
fstrcmp0_impl_bulk;
Normalized edit distance between two strings
+baturl
+extractURLHost
+command baturl.extractURLHost(X_0:bat[:str], X_1:bit):bat[:str]
+BATextractURLHost;
+Extract host from BAT of URLs
batuuid
isaUUID
command batuuid.isaUUID(X_0:bat[:str]):bat[:bit]
@@ -55168,56 +55154,6 @@ command calc.flt(X_0:sht, X_1:int, X_2:i
sht_num2dec_flt;
cast number to decimal(flt) and check for overflow
calc
-hash
-pattern calc.hash(X_0:any):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:bte):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:dbl):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:flt):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:hge):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:int):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:lng):lng
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:lng):lng
-MKEYhash;
-(empty)
-calc
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
