Changeset: 90c0c827565f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90c0c827565f
Modified Files:
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/mal/batcalc.c
monetdb5/optimizer/opt_mergetable.c
Branch: noce
Log Message:
removed mal side (only) of functions with 'ce' bit batarg.
diffs (truncated from 642 to 300 lines):
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
@@ -493,213 +493,109 @@ scienceBinaryImpl(logbs)
#include "mel.h"
mel_func batmmath_init_funcs[] = {
pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "asin", CMDscience_bat_asin, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "acos", CMDscience_bat_acos, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "atan", CMDscience_bat_atan, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "cos", CMDscience_bat_cos, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "sin", CMDscience_bat_sin, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
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,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "tan", CMDscience_bat_tan, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "cosh", CMDscience_bat_cosh, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "sinh", CMDscience_bat_sinh, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "tanh", CMDscience_bat_tanh, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "radians", CMDscience_bat_radians, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "degrees", CMDscience_bat_degrees, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "exp", CMDscience_bat_exp, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "log", CMDscience_bat_log, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "log10", CMDscience_bat_log10, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "log2", CMDscience_bat_log2, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,3,
batarg("",flt),arg("x",flt),batarg("y",flt))),
- pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("r",bit))),
pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid))),
- pattern("batmmath", "log", CMDscience_bat_logbs, false, "", args(1,5,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "sqrt", CMDscience_bat_sqrt, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "cbrt", CMDscience_bat_cbrt, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "ceil", CMDscience_bat_ceil, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "fabs", CMDscience_bat_fabs, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,2,
batarg("",dbl),batarg("x",dbl))),
- pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("r",bit))),
pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,3,
batarg("",dbl),batarg("x",dbl),batarg("s",oid))),
- pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,4,
batarg("",dbl),batarg("x",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,2,
batarg("",flt),batarg("x",flt))),
- pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("r",bit))),
pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,3,
batarg("",flt),batarg("x",flt),batarg("s",oid))),
- pattern("batmmath", "floor", CMDscience_bat_floor, false, "", args(1,4,
batarg("",flt),batarg("x",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid))),
- pattern("batmmath", "atan2", CMDscience_bat_atan2, false, "", args(1,5,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),batarg("x",dbl),arg("y",dbl),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",flt),batarg("x",flt),arg("y",flt),batarg("s",oid),batarg("r",bit))),
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("r",bit))),
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,5,
batarg("",dbl),arg("x",dbl),batarg("y",dbl),batarg("s",oid),batarg("r",bit))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,3,
batarg("",flt),arg("x",flt),batarg("y",flt))),
- pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("r",bit))),
pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,4,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid))),
- pattern("batmmath", "pow", CMDscience_bat_pow, false, "", args(1,5,
batarg("",flt),arg("x",flt),batarg("y",flt),batarg("s",oid),batarg("r",bit))),
{ .imp=NULL }
};
#include "mal_import.h"
diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -1561,7 +1561,6 @@ batcalc_init(void)
specials[cur++] = TYPE_str;
mel_func_arg cand = { .type = TYPE_oid, .isbat=1 };
- mel_func_arg condexec = { .type = TYPE_bit, .isbat=1 };
int err=0;
/* for all numeric types, use reverse order */
@@ -1571,8 +1570,6 @@ batcalc_init(void)
err += melFunction(false, "batcalc", "iszero",
(fptr)&CMDbatISZERO, "CMDbatISZERO", false, "Unary check for zero over the tail
of the bat", 1, 2, ret, arg);
err += melFunction(false, "batcalc", "iszero",
(fptr)&CMDbatISZERO, "CMDbatISZERO", false, "Unary check for zero over the tail
of the bat with candidates list", 1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "iszero",
(fptr)&CMDbatISZERO, "CMDbatISZERO", false, "Unary check for zero over the tail
of the bat", 1, 3, ret, arg, condexec);
- err += melFunction(false, "batcalc", "iszero",
(fptr)&CMDbatISZERO, "CMDbatISZERO", false, "Unary check for zero over the tail
of the bat with candidates list", 1, 4, ret, arg, cand, condexec);
}
for(tp = types; tp < extra && !err; tp++) { /* bit + numeric */
mel_func_arg ret = { .type = *tp, .isbat =1 };
@@ -1580,8 +1577,6 @@ batcalc_init(void)
err += melFunction(false, "batcalc", "not", (fptr)&CMDbatNOT,
"CMDbatNOT", false, "Unary bitwise not over the tail of the bat", 1, 2, ret,
arg);
err += melFunction(false, "batcalc", "not", (fptr)&CMDbatNOT,
"CMDbatNOT", false, "Unary bitwise not over the tail of the bat with candidates
list", 1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "not", (fptr)&CMDbatNOT,
"CMDbatNOT", false, "Unary bitwise not over the tail of the bat", 1, 3, ret,
arg, condexec);
- err += melFunction(false, "batcalc", "not", (fptr)&CMDbatNOT,
"CMDbatNOT", false, "Unary bitwise not over the tail of the bat with candidates
list", 1, 4, ret, arg, cand, condexec);
}
for(tp = integer; tp < extra && !err; tp++) {
mel_func_arg ret = { .type = TYPE_bte, .isbat =1 };
@@ -1589,8 +1584,6 @@ batcalc_init(void)
err += melFunction(false, "batcalc", "sign", (fptr)&CMDbatSIGN,
"CMDbatSIGN", false, "Unary sign (-1,0,1) over the tail of the bat", 1, 2, ret,
arg);
err += melFunction(false, "batcalc", "sign", (fptr)&CMDbatSIGN,
"CMDbatSIGN", false, "Unary sign (-1,0,1) over the tail of the bat with
candidates list", 1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "sign", (fptr)&CMDbatSIGN,
"CMDbatSIGN", false, "Unary sign (-1,0,1) over the tail of the bat", 1, 3, ret,
arg, condexec);
- err += melFunction(false, "batcalc", "sign", (fptr)&CMDbatSIGN,
"CMDbatSIGN", false, "Unary sign (-1,0,1) over the tail of the bat with
candidates list", 1, 4, ret, arg, cand, condexec);
}
for(tp = integer; tp < extra && !err; tp++) {
mel_func_arg ret = { .type = *tp, .isbat =1 };
@@ -1598,23 +1591,15 @@ batcalc_init(void)
err += melFunction(false, "batcalc", "abs", (fptr)&CMDbatABS,
"CMDbatABS", false, "Unary abs over the tail of the bat", 1, 2, ret, arg);
err += melFunction(false, "batcalc", "abs", (fptr)&CMDbatABS,
"CMDbatABS", false, "Unary abs over the tail of the bat with candidates list",
1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "abs", (fptr)&CMDbatABS,
"CMDbatABS", false, "Unary abs over the tail of the bat", 1, 3, ret, arg,
condexec);
- err += melFunction(false, "batcalc", "abs", (fptr)&CMDbatABS,
"CMDbatABS", false, "Unary abs over the tail of the bat with candidates list",
1, 4, ret, arg, cand, condexec);
err += melFunction(false, "batcalc", "-", (fptr)&CMDbatNEG,
"CMDbatNEG", false, "Unary neg over the tail of the bat", 1, 2, ret, arg);
err += melFunction(false, "batcalc", "-", (fptr)&CMDbatNEG,
"CMDbatNEG", false, "Unary neg over the tail of the bat with candidates list",
1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "-", (fptr)&CMDbatNEG,
"CMDbatNEG", false, "Unary neg over the tail of the bat", 1, 3, ret, arg,
condexec);
- err += melFunction(false, "batcalc", "-", (fptr)&CMDbatNEG,
"CMDbatNEG", false, "Unary neg over the tail of the bat with candidates list",
1, 4, ret, arg, cand, condexec);
err += melFunction(false, "batcalc", "++", (fptr)&CMDbatINCR,
"CMDbatINCR", false, "Unary increment over the tail of the bat", 1, 2, ret,
arg);
err += melFunction(false, "batcalc", "++", (fptr)&CMDbatINCR,
"CMDbatINCR", false, "Unary increment over the tail of the bat with candidates
list", 1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "++", (fptr)&CMDbatINCR,
"CMDbatINCR", false, "Unary increment over the tail of the bat", 1, 3, ret,
arg, condexec);
- err += melFunction(false, "batcalc", "++", (fptr)&CMDbatINCR,
"CMDbatINCR", false, "Unary increment over the tail of the bat with candidates
list", 1, 4, ret, arg, cand, condexec);
err += melFunction(false, "batcalc", "--", (fptr)&CMDbatDECR,
"CMDbatDECR", false, "Unary decrement over the tail of the bat", 1, 2, ret,
arg);
err += melFunction(false, "batcalc", "--", (fptr)&CMDbatDECR,
"CMDbatDECR", false, "Unary decrement over the tail of the bat with candidates
list", 1, 3, ret, arg, cand);
- err += melFunction(false, "batcalc", "--", (fptr)&CMDbatDECR,
"CMDbatDECR", false, "Unary decrement over the tail of the bat", 1, 3, ret,
arg, condexec);
- err += melFunction(false, "batcalc", "--", (fptr)&CMDbatDECR,
"CMDbatDECR", false, "Unary decrement over the tail of the bat with candidates
list", 1, 4, ret, arg, cand, condexec);
}
/* possibly add the min/max + _no_nil */
/* binops on numeric types */
@@ -1713,19 +1698,10 @@ batcalc_init(void)
err += melFunction(false, "batcalc", funcs[f].op_ne,
funcs[f].fcn_ne, funcs[f].fname_ne, false, funcs[f].comment_v_ne, 1, 4, ret,
arg1, varg2, cand);
err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn, funcs[f].fname, false, funcs[f].comment_v_, 1, 4, ret, varg1,
arg2, cand);
err += melFunction(false, "batcalc", funcs[f].op_ne,
funcs[f].fcn_ne, funcs[f].fname_ne, false, funcs[f].comment_v__ne, 1, 4, ret,
varg1, arg2, cand);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn, funcs[f].fname, false, funcs[f].comment, 1, 6, ret, arg1, arg2,
cand, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op_ne,
funcs[f].fcn_ne, funcs[f].fname_ne, false, funcs[f].comment_ne, 1, 6, ret,
arg1, arg2, cand, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn, funcs[f].fname, false, funcs[f].comment_v, 1, 5, ret, arg1,
varg2, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op_ne,
funcs[f].fcn_ne, funcs[f].fname_ne, false, funcs[f].comment_v_ne, 1, 5, ret,
arg1, varg2, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn, funcs[f].fname, false, funcs[f].comment_v_, 1, 5, ret, varg1,
arg2, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op_ne,
funcs[f].fcn_ne, funcs[f].fname_ne, false, funcs[f].comment_v__ne, 1, 5, ret,
varg1, arg2, cand, condexec);
} else {
err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el, 1, 5, ret,
arg1, arg2, cand, cand);
err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el_v, 1, 4, ret,
arg1, varg2, cand);
err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el_v_, 1, 4, ret,
varg1, arg2, cand);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el, 1, 6, ret,
arg1, arg2, cand, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el_v, 1, 5, ret,
arg1, varg2, cand, condexec);
- err += melFunction(false, "batcalc", funcs[f].op,
funcs[f].fcn_el, funcs[f].fname_el, false, funcs[f].comment_el_v_, 1, 5, ret,
varg1, arg2, cand, condexec);
}
}
}
@@ -1779,12 +1755,6 @@ batcalc_init(void)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
