Changeset: 0f24db5b9167 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f24db5b9167
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/kernel/batmmath.c
Branch: default
Log Message:
batmmath functions with two args should accept two BAT args (with cand lists).
diffs (125 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
@@ -5310,8 +5310,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_atan;", "" ]
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_atan;", "" ]
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_atan;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ",
"CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:dbl):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ",
"CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:flt):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:dbl,
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
@@ -5358,8 +5362,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_log;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_log;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_log;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDscience_bat_logbs;", ""
]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:dbl):bat[:dbl]
", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:bat[:flt],
X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDscience_bat_logbs;", ""
]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:flt):bat[:flt]
", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:dbl, X_2:bat[:dbl]):bat[:dbl]
", "CMDscience_bat_logbs;", "" ]
@@ -5374,8 +5382,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_log2;", "" ]
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_log2;", "" ]
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_log2;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:dbl):bat[:dbl]
", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:bat[:flt],
X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:flt):bat[:flt]
", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:dbl, X_2:bat[:dbl]):bat[:dbl]
", "CMDscience_bat_pow;", "" ]
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
@@ -7510,8 +7510,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_atan;", "" ]
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_atan;", "" ]
[ "batmmath", "atan", "pattern batmmath.atan(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_atan;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ",
"CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl],
X_2:dbl):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
+[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ",
"CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt],
X_2:flt):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_atan2;", "" ]
[ "batmmath", "atan2", "pattern batmmath.atan2(X_1:dbl,
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_atan2;", "" ]
@@ -7558,8 +7562,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_log;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_log;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_log;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDscience_bat_logbs;", ""
]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:dbl):bat[:dbl]
", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_logbs;", "" ]
+[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:bat[:flt],
X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDscience_bat_logbs;", ""
]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:flt):bat[:flt]
", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_logbs;", "" ]
[ "batmmath", "log", "pattern batmmath.log(X_1:dbl, X_2:bat[:dbl]):bat[:dbl]
", "CMDscience_bat_logbs;", "" ]
@@ -7574,8 +7582,12 @@ stdout of test 'MAL-signatures` in direc
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:dbl],
X_2:bat[:oid]):bat[:dbl] ", "CMDscience_bat_log2;", "" ]
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:flt]):bat[:flt] ",
"CMDscience_bat_log2;", "" ]
[ "batmmath", "log2", "pattern batmmath.log2(X_1:bat[:flt],
X_2:bat[:oid]):bat[:flt] ", "CMDscience_bat_log2;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl],
X_2:bat[:dbl]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:bat[:dbl],
X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:dbl):bat[:dbl]
", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:dbl], X_2:dbl,
X_3:bat[:oid]):bat[:dbl] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt],
X_2:bat[:flt]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
+[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:bat[:flt],
X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:flt):bat[:flt]
", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:bat[:flt], X_2:flt,
X_3:bat[:oid]):bat[:flt] ", "CMDscience_bat_pow;", "" ]
[ "batmmath", "pow", "pattern batmmath.pow(X_1:dbl, X_2:bat[:dbl]):bat[:dbl]
", "CMDscience_bat_pow;", "" ]
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
@@ -495,8 +495,12 @@ mel_func batmmath_init_funcs[] = {
pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),arg("y",dbl))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid))),
+ pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl))),
+ pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,5,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",flt),batarg("x",flt),arg("y",flt))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,4,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid))),
+ pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("y",flt))),
+ pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,5,
batarg("",flt),batarg("x",flt),batarg("y",flt),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",dbl),arg("x",dbl),batarg("y",dbl))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,4,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",flt),arg("x",flt),batarg("y",flt))),
@@ -523,16 +527,24 @@ mel_func batmmath_init_funcs[] = {
pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),arg("y",dbl))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid))),
+ pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl))),
+ pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,5,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",flt),batarg("x",flt),arg("y",flt))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,4,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid))),
+ pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("y",flt))),
+ pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,5,
batarg("",flt),batarg("x",flt),batarg("y",flt),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",dbl),arg("x",dbl),batarg("y",dbl))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,4,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,3,
batarg("",flt),arg("x",flt),batarg("y",flt))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),arg("y",dbl))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid))),
+ pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl))),
+ pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,5,
batarg("",dbl),batarg("x",dbl),batarg("y",dbl),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",flt),batarg("x",flt),arg("y",flt))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,4,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid))),
+ pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("y",flt))),
+ pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,5,
batarg("",flt),batarg("x",flt),batarg("y",flt),batarg("s1",oid),batarg("s2",oid))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",dbl),arg("x",dbl),batarg("y",dbl))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,4,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",flt),arg("x",flt),batarg("y",flt))),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
