Changeset: c735d2ddaad6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c735d2ddaad6
Modified Files:
clients/Tests/MAL-signatures.stable.out
gdk/gdk_calc.c
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
Branch: unlock
Log Message:
merged
diffs (truncated from 1161 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
@@ -3525,20 +3525,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;", "" ]
@@ -3825,17 +3839,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;", "" ]
@@ -4251,17 +4277,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;", "" ]
@@ -4320,20 +4358,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;",
"" ]
@@ -4388,20 +4440,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;",
"" ]
@@ -5028,20 +5094,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;",
"" ]
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -14388,7 +14388,10 @@ BATconvert(BAT *b, BAT *s, int tp, bool
scale1 == 0 && scale2 == 0 && precision == 0 &&
(tp != TYPE_str ||
BATatoms[b->ttype].atomToStr == BATatoms[TYPE_str].atomToStr)) {
- return COLcopy(b, tp, false, TRANSIENT);
+ bn = COLcopy(b, tp, false, TRANSIENT);
+ if (bn && s)
+ bn->hseqbase = s->hseqbase;
+ return bn;
}
if (ATOMstorage(tp) == TYPE_ptr) {
GDKerror("type combination (convert(%s)->%s) "
diff --git
a/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err
b/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err
--- a/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err
+++ b/sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err
@@ -31,7 +31,7 @@ stderr of test 'too-large-decimals.Bug-6
MAPI = (monetdb) /var/tmp/mtest-18303/.s.monetdb.32047
QUERY = INSERT INTO test_table4 VALUES (531421754532.553234531231250);
-ERROR = !too many digits (14 > 12)
+ERROR = !overflow in conversion to DECIMAL(12,2).
CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = INSERT INTO test_table4 VALUES (531421754532);
diff --git
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
---
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
+++
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
@@ -43,424 +43,469 @@ function user.main():void;
X_64:bat[:timestamp] := algebra.projection(C_58:bat[:oid],
X_61:bat[:timestamp]);
X_65:bat[:timestamp] := bat.replace(X_56:bat[:timestamp], C_58:bat[:oid],
X_64:bat[:timestamp], true:bit);
X_66:bat[:bit] := batcalc.not(X_51:bat[:bit]);
- X_69:bat[:bit] := batcalc.isnil(X_66:bat[:bit]);
+ X_69:bat[:bit] := batcalc.isnil(X_51:bat[:bit]);
X_71:bat[:bit] := batcalc.or(X_66:bat[:bit], X_69:bat[:bit]);
- X_76:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2000-04-02
10:00:00.000000":timestamp, "2000-10-29 09:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_78:bat[:bit] := batcalc.and(X_71:bat[:bit], X_76:bat[:bit]);
- C_81:bat[:oid] := algebra.thetaselect(X_78:bat[:bit], true:bit, "==":str);
- X_85:bat[:timestamp] :=
batmtime.timestamp_add_msec_interval(X_45:bat[:timestamp], -25200000:lng);
- X_86:bat[:timestamp] := algebra.projection(C_81:bat[:oid],
X_85:bat[:timestamp]);
- X_87:bat[:timestamp] := bat.replace(X_65:bat[:timestamp], C_81:bat[:oid],
X_86:bat[:timestamp], true:bit);
- X_88:bat[:bit] := batcalc.not(X_76:bat[:bit]);
- X_89:bat[:bit] := batcalc.isnil(X_88:bat[:bit]);
- X_90:bat[:bit] := batcalc.or(X_88:bat[:bit], X_89:bat[:bit]);
- X_91:bat[:bit] := batcalc.and(X_71:bat[:bit], X_90:bat[:bit]);
- X_96:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2000-10-29
09:00:00.000000":timestamp, "2001-04-01 10:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_99:bat[:bit] := batcalc.and(X_91:bat[:bit], X_96:bat[:bit]);
- C_102:bat[:oid] := algebra.thetaselect(X_99:bat[:bit], true:bit, "==":str);
- X_108:bat[:timestamp] := algebra.projection(C_102:bat[:oid],
X_61:bat[:timestamp]);
- X_109:bat[:timestamp] := bat.replace(X_87:bat[:timestamp],
C_102:bat[:oid], X_108:bat[:timestamp], true:bit);
- X_111:bat[:bit] := batcalc.not(X_96:bat[:bit]);
- X_113:bat[:bit] := batcalc.isnil(X_111:bat[:bit]);
- X_115:bat[:bit] := batcalc.or(X_111:bat[:bit], X_113:bat[:bit]);
- X_117:bat[:bit] := batcalc.and(X_91:bat[:bit], X_115:bat[:bit]);
- X_122:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2001-04-01
10:00:00.000000":timestamp, "2001-10-28 09:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_123:bat[:bit] := batcalc.and(X_117:bat[:bit], X_122:bat[:bit]);
- C_125:bat[:oid] := algebra.thetaselect(X_123:bat[:bit], true:bit,
"==":str);
- X_130:bat[:timestamp] := algebra.projection(C_125:bat[:oid],
X_85:bat[:timestamp]);
- X_131:bat[:timestamp] := bat.replace(X_109:bat[:timestamp],
C_125:bat[:oid], X_130:bat[:timestamp], true:bit);
- X_132:bat[:bit] := batcalc.not(X_122:bat[:bit]);
- X_134:bat[:bit] := batcalc.isnil(X_132:bat[:bit]);
- X_135:bat[:bit] := batcalc.or(X_132:bat[:bit], X_134:bat[:bit]);
- X_136:bat[:bit] := batcalc.and(X_117:bat[:bit], X_135:bat[:bit]);
- X_141:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2001-10-28
09:00:00.000000":timestamp, "2002-04-07 10:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_144:bat[:bit] := batcalc.and(X_136:bat[:bit], X_141:bat[:bit]);
- C_146:bat[:oid] := algebra.thetaselect(X_144:bat[:bit], true:bit,
"==":str);
- X_152:bat[:timestamp] := algebra.projection(C_146:bat[:oid],
X_61:bat[:timestamp]);
- X_153:bat[:timestamp] := bat.replace(X_131:bat[:timestamp],
C_146:bat[:oid], X_152:bat[:timestamp], true:bit);
- X_154:bat[:bit] := batcalc.not(X_141:bat[:bit]);
- X_156:bat[:bit] := batcalc.isnil(X_154:bat[:bit]);
- X_158:bat[:bit] := batcalc.or(X_154:bat[:bit], X_156:bat[:bit]);
- X_160:bat[:bit] := batcalc.and(X_136:bat[:bit], X_158:bat[:bit]);
- X_165:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2002-04-07
10:00:00.000000":timestamp, "2002-10-27 09:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_166:bat[:bit] := batcalc.and(X_160:bat[:bit], X_165:bat[:bit]);
- C_169:bat[:oid] := algebra.thetaselect(X_166:bat[:bit], true:bit,
"==":str);
- X_174:bat[:timestamp] := algebra.projection(C_169:bat[:oid],
X_85:bat[:timestamp]);
- X_175:bat[:timestamp] := bat.replace(X_153:bat[:timestamp],
C_169:bat[:oid], X_174:bat[:timestamp], true:bit);
- X_177:bat[:bit] := batcalc.not(X_165:bat[:bit]);
- X_178:bat[:bit] := batcalc.isnil(X_177:bat[:bit]);
- X_179:bat[:bit] := batcalc.or(X_177:bat[:bit], X_178:bat[:bit]);
- X_180:bat[:bit] := batcalc.and(X_160:bat[:bit], X_179:bat[:bit]);
- X_185:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2002-10-27
09:00:00.000000":timestamp, "2003-04-06 10:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_188:bat[:bit] := batcalc.and(X_180:bat[:bit], X_185:bat[:bit]);
- C_190:bat[:oid] := algebra.thetaselect(X_188:bat[:bit], true:bit,
"==":str);
- X_196:bat[:timestamp] := algebra.projection(C_190:bat[:oid],
X_61:bat[:timestamp]);
- X_197:bat[:timestamp] := bat.replace(X_175:bat[:timestamp],
C_190:bat[:oid], X_196:bat[:timestamp], true:bit);
- X_198:bat[:bit] := batcalc.not(X_185:bat[:bit]);
- X_200:bat[:bit] := batcalc.isnil(X_198:bat[:bit]);
- X_203:bat[:bit] := batcalc.or(X_198:bat[:bit], X_200:bat[:bit]);
- X_205:bat[:bit] := batcalc.and(X_180:bat[:bit], X_203:bat[:bit]);
- X_210:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2003-04-06
10:00:00.000000":timestamp, "2003-10-26 09:00:00.000000":timestamp, false:bit,
true:bit, false:bit, false:bit, false:bit);
- X_212:bat[:bit] := batcalc.and(X_205:bat[:bit], X_210:bat[:bit]);
- C_214:bat[:oid] := algebra.thetaselect(X_212:bat[:bit], true:bit,
"==":str);
- X_219:bat[:timestamp] := algebra.projection(C_214:bat[:oid],
X_85:bat[:timestamp]);
- X_220:bat[:timestamp] := bat.replace(X_197:bat[:timestamp],
C_214:bat[:oid], X_219:bat[:timestamp], true:bit);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
