Changeset: f70da6f9107c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f70da6f9107c
Modified Files:
        gdk/gdk.h
        gdk/gdk_batop.c
        gdk/gdk_private.h
        monetdb5/modules/atoms/CMakeLists.txt
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_cat.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_upgrades.c
        sql/server/rel_dump.c
        sql/server/rel_exp.c
        sql/server/rel_exp.h
        sql/server/rel_optimizer.c
        sql/server/rel_psm.c
        sql/server/rel_rel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_updates.c
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
        sql/test/SQLancer/Tests/sqlancer19.SQL.py
Branch: properties
Log Message:

Merged with default


diffs (truncated from 293191 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -753,3 +753,4 @@ 9fbec5dab8167d2189582fbe75e5f9c8bef82380
 97e76b882f9fb28327393d21708fb22f2f6c22f1 Jan2022_7
 f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_9
 f458e1c71c73d6bd9636369c1406eadb74f016bf Jan2022_SP1_release
+00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_15
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
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:
@@ -112,7 +111,7 @@ On Ubuntu and Debian the following packa
 ``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/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] 
@@ -55168,56 +55149,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
-hash
-pattern calc.hash(X_0:oid):lng 
-MKEYhash;
-(empty)
-calc
-hash
-pattern calc.hash(X_0:sht):lng 
-MKEYhash;
-(empty)
-calc
 hge
 pattern calc.hge(X_0:bit):hge 
 CMDvarCONVERT;
@@ -57393,11 +57324,6 @@ command calc.ptr(X_0:ptr):ptr
 CMDvarCONVERTptr;
 Cast VALUE to ptr
 calc
-rotate_xor_hash
-pattern calc.rotate_xor_hash(X_0:lng, X_1:int, X_2:any_1):lng 
-MKEYrotate_xor_hash;
-(empty)
-calc
 round
 command calc.round(X_0:bte, X_1:bte, X_2:int, X_3:int):bte 
 bte_round_wrap;
@@ -61173,80 +61099,15 @@ pattern mdb.var():void
 MDBvar;
 Dump the symboltable of current routine on standard out.
 mkey
-bulk_rotate_xor_hash
-command mkey.bulk_rotate_xor_hash(X_0:bat[:lng], X_1:int, 
X_2:bat[:any_1]):bat[:lng] 
-MKEYbulk_rotate_xor_hash;
-pre:  h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits), 
[hash](b))
-mkey
-bulk_rotate_xor_hash
-pattern mkey.bulk_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))
-mkey
-bulk_rotate_xor_hash
-command mkey.bulk_rotate_xor_hash(X_0:lng, X_1:int, X_2:bat[:any_1]):bat[:lng] 
-MKEYconstbulk_rotate_xor_hash;
-pre:  h and b should be synced on head@post: [:xor=]([:rotate=](h, nbits), 
[hash](b))
-mkey
-bulk_rotate_xor_hash
-pattern mkey.bulk_rotate_xor_hash(X_0:lng, X_1:int, X_2:any):lng 
-MKEYrotate_xor_hash;
-post: [:xor=]([:rotate=](h, nbits), [hash](b))
-mkey
 hash
 pattern mkey.hash(X_0:any):lng 
 MKEYhash;
 calculate a hash value
 mkey
-hash
-pattern mkey.hash(X_0:bit):lng 
-MKEYhash;
-calculate a hash value
-mkey
-hash
-pattern mkey.hash(X_0:bte):lng 
-MKEYhash;
-calculate a hash value
-mkey
-hash
-pattern mkey.hash(X_0:dbl):lng 
-MKEYhash;
-calculate a hash value
-mkey
-hash
-pattern mkey.hash(X_0:flt):lng 
-MKEYhash;
-calculate a hash value
-mkey
-hash
-pattern mkey.hash(X_0:hge):lng 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to