Changeset: 746265940ef0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=746265940ef0
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
Branch: opt_pushoptimizer
Log Message:
Merge with default
diffs (truncated from 2388 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -3505,20 +3505,34 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str]):bat[:bte] ",
"CMDconvertsignal_bte;", "" ]
[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str],
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:bte]):bat[:bte]
", "batbte_dec2_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:bte] ", "batbte_dec2_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:bte] ", "batbte_dec2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ", "batbte_dec2dec_cand_bte;",
"" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:bte], X_2:int,
X_3:int):bat[:bte] ", "batbte_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batbte_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:dbl], X_2:int,
X_3:int):bat[:bte] ", "batdbl_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:dbl], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batdbl_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:flt], X_2:int,
X_3:int):bat[:bte] ", "batflt_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:flt], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batflt_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:int]):bat[:bte]
", "batint_dec2_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:bte] ", "batint_dec2_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:bte] ", "batint_dec2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ", "batint_dec2dec_cand_bte;",
"" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:int], X_2:int,
X_3:int):bat[:bte] ", "batint_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batint_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:lng]):bat[:bte]
", "batlng_dec2_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:bte] ", "batlng_dec2_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:bte] ", "batlng_dec2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ", "batlng_dec2dec_cand_bte;",
"" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:lng], X_2:int,
X_3:int):bat[:bte] ", "batlng_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batlng_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:oid], X_2:int,
X_3:int):bat[:bte] ", "batnil_2dec_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht]):bat[:bte]
", "batsht_dec2_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:bte] ", "batsht_dec2_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:bte] ", "batsht_dec2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ", "batsht_dec2dec_cand_bte;",
"" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:int,
X_3:int):bat[:bte] ", "batsht_num2dec_bte;", "" ]
+[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:bte] ", "batsht_num2dec_cand_bte;", "" ]
[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:str], X_2:int,
X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ]
[ "batcalc", "bte_noerror", "pattern
batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ", "CMDconvert_bte;",
"" ]
[ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit],
X_2:bat[:oid]):bat[:bte] ", "CMDconvert_bte;", "" ]
@@ -3805,17 +3819,29 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "dbl", "pattern batcalc.dbl(X_1:bat[:sht],
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;", "" ]
[ "batcalc", "dbl", "pattern batcalc.dbl(X_1:bat[:str]):bat[:dbl] ",
"CMDconvertsignal_dbl;", "" ]
[ "batcalc", "dbl", "pattern batcalc.dbl(X_1:bat[:str],
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:dbl] ", "batbte_dec2_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:bte]):bat[:dbl]
", "batbte_dec2_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ", "batbte_dec2dec_cand_dbl;",
"" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:dbl] ", "batbte_dec2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:dbl] ", "batbte_num2dec_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:bte], X_2:int,
X_3:int):bat[:dbl] ", "batbte_num2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:dbl] ", "batint_dec2_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:int]):bat[:dbl]
", "batint_dec2_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ", "batint_dec2dec_cand_dbl;",
"" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:dbl] ", "batint_dec2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:dbl] ", "batint_num2dec_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:int], X_2:int,
X_3:int):bat[:dbl] ", "batint_num2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:dbl] ", "batlng_dec2_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:lng]):bat[:dbl]
", "batlng_dec2_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ", "batlng_dec2dec_cand_dbl;",
"" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:dbl] ", "batlng_dec2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:dbl] ", "batlng_num2dec_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:lng], X_2:int,
X_3:int):bat[:dbl] ", "batlng_num2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:dbl] ", "batsht_dec2_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:sht]):bat[:dbl]
", "batsht_dec2_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ", "batsht_dec2dec_cand_dbl;",
"" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:dbl] ", "batsht_dec2dec_dbl;", "" ]
+[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:dbl] ", "batsht_num2dec_cand_dbl;", "" ]
[ "batcalc", "dbl", "command batcalc.dbl(X_1:bat[:sht], X_2:int,
X_3:int):bat[:dbl] ", "batsht_num2dec_dbl;", "" ]
[ "batcalc", "dbl_noerror", "pattern
batcalc.dbl_noerror(X_1:bat[:bit]):bat[:dbl] ", "CMDconvert_dbl;",
"" ]
[ "batcalc", "dbl_noerror", "pattern batcalc.dbl_noerror(X_1:bat[:bit],
X_2:bat[:oid]):bat[:dbl] ", "CMDconvert_dbl;", "" ]
@@ -4231,17 +4257,29 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "flt", "pattern batcalc.flt(X_1:bat[:sht],
X_2:bat[:oid]):bat[:flt] ", "CMDconvertsignal_flt;", "" ]
[ "batcalc", "flt", "pattern batcalc.flt(X_1:bat[:str]):bat[:flt] ",
"CMDconvertsignal_flt;", "" ]
[ "batcalc", "flt", "pattern batcalc.flt(X_1:bat[:str],
X_2:bat[:oid]):bat[:flt] ", "CMDconvertsignal_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:flt] ", "batbte_dec2_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:bte]):bat[:flt]
", "batbte_dec2_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ", "batbte_dec2dec_cand_flt;",
"" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:flt] ", "batbte_dec2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:flt] ", "batbte_num2dec_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:bte], X_2:int,
X_3:int):bat[:flt] ", "batbte_num2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:flt] ", "batint_dec2_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:int]):bat[:flt]
", "batint_dec2_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ", "batint_dec2dec_cand_flt;",
"" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:flt] ", "batint_dec2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:flt] ", "batint_num2dec_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:int], X_2:int,
X_3:int):bat[:flt] ", "batint_num2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:flt] ", "batlng_dec2_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:lng]):bat[:flt]
", "batlng_dec2_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ", "batlng_dec2dec_cand_flt;",
"" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:flt] ", "batlng_dec2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:flt] ", "batlng_num2dec_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:lng], X_2:int,
X_3:int):bat[:flt] ", "batlng_num2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:flt] ", "batsht_dec2_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:sht]):bat[:flt]
", "batsht_dec2_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ", "batsht_dec2dec_cand_flt;",
"" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:flt] ", "batsht_dec2dec_flt;", "" ]
+[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:flt] ", "batsht_num2dec_cand_flt;", "" ]
[ "batcalc", "flt", "command batcalc.flt(X_1:bat[:sht], X_2:int,
X_3:int):bat[:flt] ", "batsht_num2dec_flt;", "" ]
[ "batcalc", "flt_noerror", "pattern
batcalc.flt_noerror(X_1:bat[:bit]):bat[:flt] ", "CMDconvert_flt;",
"" ]
[ "batcalc", "flt_noerror", "pattern batcalc.flt_noerror(X_1:bat[:bit],
X_2:bat[:oid]):bat[:flt] ", "CMDconvert_flt;", "" ]
@@ -4300,20 +4338,34 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:sht],
X_2:bat[:oid]):bat[:int] ", "CMDconvertsignal_int;", "" ]
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str]):bat[:int] ",
"CMDconvertsignal_int;", "" ]
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str],
X_2:bat[:oid]):bat[:int] ", "CMDconvertsignal_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:int] ", "batbte_dec2_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:bte]):bat[:int]
", "batbte_dec2_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ", "batbte_dec2dec_cand_int;",
"" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:int] ", "batbte_dec2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batbte_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:bte], X_2:int,
X_3:int):bat[:int] ", "batbte_num2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:dbl], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batdbl_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:dbl], X_2:int,
X_3:int):bat[:int] ", "batdbl_num2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:flt], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batflt_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:flt], X_2:int,
X_3:int):bat[:int] ", "batflt_num2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:int] ", "batint_dec2_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:int]):bat[:int]
", "batint_dec2_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ", "batint_dec2dec_cand_int;",
"" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:int] ", "batint_dec2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batint_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:int], X_2:int,
X_3:int):bat[:int] ", "batint_num2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:int] ", "batlng_dec2_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:lng]):bat[:int]
", "batlng_dec2_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ", "batlng_dec2dec_cand_int;",
"" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:int] ", "batlng_dec2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batlng_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:lng], X_2:int,
X_3:int):bat[:int] ", "batlng_num2dec_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:oid], X_2:int,
X_3:int):bat[:int] ", "batnil_2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:int] ", "batsht_dec2_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht]):bat[:int]
", "batsht_dec2_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ", "batsht_dec2dec_cand_int;",
"" ]
[ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:int] ", "batsht_dec2dec_int;", "" ]
+[ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:int] ", "batsht_num2dec_cand_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:int,
X_3:int):bat[:int] ", "batsht_num2dec_int;", "" ]
[ "batcalc", "int", "command batcalc.int(X_1:bat[:str], X_2:int,
X_3:int):bat[:int] ", "batstr_2dec_int;", "" ]
[ "batcalc", "int_noerror", "pattern
batcalc.int_noerror(X_1:bat[:bit]):bat[:int] ", "CMDconvert_int;",
"" ]
@@ -4368,20 +4420,34 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:sht],
X_2:bat[:oid]):bat[:lng] ", "CMDconvertsignal_lng;", "" ]
[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str]):bat[:lng] ",
"CMDconvertsignal_lng;", "" ]
[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str],
X_2:bat[:oid]):bat[:lng] ", "CMDconvertsignal_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:lng] ", "batbte_dec2_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:bte]):bat[:lng]
", "batbte_dec2_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ", "batbte_dec2dec_cand_lng;",
"" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:lng] ", "batbte_dec2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batbte_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:bte], X_2:int,
X_3:int):bat[:lng] ", "batbte_num2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:dbl], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batdbl_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:dbl], X_2:int,
X_3:int):bat[:lng] ", "batdbl_num2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:flt], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batflt_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:flt], X_2:int,
X_3:int):bat[:lng] ", "batflt_num2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:lng] ", "batint_dec2_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:int]):bat[:lng]
", "batint_dec2_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ", "batint_dec2dec_cand_lng;",
"" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:lng] ", "batint_dec2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batint_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:int], X_2:int,
X_3:int):bat[:lng] ", "batint_num2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:lng] ", "batlng_dec2_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:lng]):bat[:lng]
", "batlng_dec2_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ", "batlng_dec2dec_cand_lng;",
"" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:lng] ", "batlng_dec2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batlng_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:lng], X_2:int,
X_3:int):bat[:lng] ", "batlng_num2dec_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:oid], X_2:int,
X_3:int):bat[:lng] ", "batnil_2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:lng] ", "batsht_dec2_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht]):bat[:lng]
", "batsht_dec2_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ", "batsht_dec2dec_cand_lng;",
"" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:lng] ", "batsht_dec2dec_lng;", "" ]
+[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:lng] ", "batsht_num2dec_cand_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:int,
X_3:int):bat[:lng] ", "batsht_num2dec_lng;", "" ]
[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:str], X_2:int,
X_3:int):bat[:lng] ", "batstr_2dec_lng;", "" ]
[ "batcalc", "lng_noerror", "pattern
batcalc.lng_noerror(X_1:bat[:bit]):bat[:lng] ", "CMDconvert_lng;",
"" ]
@@ -5008,20 +5074,34 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:sht],
X_2:bat[:oid]):bat[:sht] ", "CMDconvertsignal_sht;", "" ]
[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str]):bat[:sht] ",
"CMDconvertsignal_sht;", "" ]
[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str],
X_2:bat[:oid]):bat[:sht] ", "CMDconvertsignal_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:bte],
X_3:bat[:oid]):bat[:sht] ", "batbte_dec2_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:bte]):bat[:sht]
", "batbte_dec2_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:bte],
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ", "batbte_dec2dec_cand_sht;",
"" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:bte], X_3:int,
X_4:int):bat[:sht] ", "batbte_dec2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:bte], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batbte_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:bte], X_2:int,
X_3:int):bat[:sht] ", "batbte_num2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:dbl], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batdbl_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:dbl], X_2:int,
X_3:int):bat[:sht] ", "batdbl_num2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:flt], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batflt_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:flt], X_2:int,
X_3:int):bat[:sht] ", "batflt_num2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:int],
X_3:bat[:oid]):bat[:sht] ", "batint_dec2_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:int]):bat[:sht]
", "batint_dec2_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:int],
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ", "batint_dec2dec_cand_sht;",
"" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:int], X_3:int,
X_4:int):bat[:sht] ", "batint_dec2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:int], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batint_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:int], X_2:int,
X_3:int):bat[:sht] ", "batint_num2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:lng],
X_3:bat[:oid]):bat[:sht] ", "batlng_dec2_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:lng]):bat[:sht]
", "batlng_dec2_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:lng],
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ", "batlng_dec2dec_cand_sht;",
"" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:lng], X_3:int,
X_4:int):bat[:sht] ", "batlng_dec2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:lng], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batlng_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:lng], X_2:int,
X_3:int):bat[:sht] ", "batlng_num2dec_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:oid], X_2:int,
X_3:int):bat[:sht] ", "batnil_2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht],
X_3:bat[:oid]):bat[:sht] ", "batsht_dec2_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht]):bat[:sht]
", "batsht_dec2_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht],
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ", "batsht_dec2dec_cand_sht;",
"" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht], X_3:int,
X_4:int):bat[:sht] ", "batsht_dec2dec_sht;", "" ]
+[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:bat[:oid],
X_3:int, X_4:int):bat[:sht] ", "batsht_num2dec_cand_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:int,
X_3:int):bat[:sht] ", "batsht_num2dec_sht;", "" ]
[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:str], X_2:int,
X_3:int):bat[:sht] ", "batstr_2dec_sht;", "" ]
[ "batcalc", "sht_noerror", "pattern
batcalc.sht_noerror(X_1:bat[:bit]):bat[:sht] ", "CMDconvert_sht;",
"" ]
@@ -5356,6 +5436,10 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_cosh;", "" ]
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_cosh;", "" ]
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_cosh;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_cot;", "" ]
[ "batmmath", "degrees", "pattern
batmmath.degrees(X_1:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_degrees;",
"" ]
[ "batmmath", "degrees", "pattern batmmath.degrees(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_degrees;", "" ]
[ "batmmath", "degrees", "pattern
batmmath.degrees(X_1:bat[:flt]):bat[:flt] ", "CMDscience_bat_degrees;",
"" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -7680,6 +7680,10 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_cosh;", "" ]
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_cosh;", "" ]
[ "batmmath", "cosh", "pattern batmmath.cosh(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_cosh;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:dbl]):bat[:dbl] ",
"CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_cot;", "" ]
+[ "batmmath", "cot", "pattern batmmath.cot(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_cot;", "" ]
[ "batmmath", "degrees", "pattern
batmmath.degrees(X_1:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_degrees;",
"" ]
[ "batmmath", "degrees", "pattern batmmath.degrees(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_degrees;", "" ]
[ "batmmath", "degrees", "pattern
batmmath.degrees(X_1:bat[:flt]):bat[:flt] ", "CMDscience_bat_degrees;",
"" ]
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -883,7 +883,7 @@ VARcalcsign(ValPtr ret, const ValRecord
const TYPE *restrict src = (const TYPE *) Tloc(b, 0); \
for (i = 0; i < ci.ncand; i++) { \
x = canditer_next(&ci) - b->hseqbase; \
- dst[i] = (bit) (is_##TYPE##_nil(src[i]) ^ NOTNIL); \
+ dst[i] = (bit) (is_##TYPE##_nil(src[x]) ^ NOTNIL); \
} \
} while (0)
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -379,6 +379,18 @@ CMDscience_bat_##FUNC(Client cntxt, MalB
}
static double
+cot(double x)
+{
+ return (1/tan(x));
+}
+
+static float
+cotf(float x)
+{
+ return (1/tan(x));
+}
+
+static double
radians(double x)
{
return x * (M_PI / 180.0);
@@ -402,12 +414,13 @@ degreesf(float x)
return (float) (x * (180.0 / M_PI));
}
+scienceImpl(acos)
scienceImpl(asin)
-scienceImpl(acos)
scienceImpl(atan)
scienceImpl(cos)
scienceImpl(sin)
scienceImpl(tan)
+scienceImpl(cot)
scienceImpl(cosh)
scienceImpl(sinh)
scienceImpl(tanh)
@@ -457,6 +470,10 @@ mel_func batmmath_init_funcs[] = {
pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
+ pattern("batmmath", "cot", CMDscience_bat_cot, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
+ pattern("batmmath", "cot", CMDscience_bat_cot, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
+ pattern("batmmath", "cot", CMDscience_bat_cot, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
+ pattern("batmmath", "cot", CMDscience_bat_cot, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -154,7 +154,6 @@ MATHbinary_ROUND##TYPE(TYPE *res, const
unopM5(_ACOS,acos)
unopM5(_ASIN,asin)
unopM5(_ATAN,atan)
-binopM5(_ATAN2,atan2)
unopM5(_COS,cos)
unopM5(_SIN,sin)
unopM5(_TAN,tan)
@@ -170,11 +169,9 @@ unopM5(_EXP,exp)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
