[Tarantool-patches] [PATCH v2 05/10] sql: use has_vararg for built-in functions

[imeevma at tarantool.org]

After this patch, the has_varargs option will be used to determine that
the function has a variable number of arguments.

Part of #4159
---
 src/box/sql/func.c    | 3 ++-
 src/box/sql/resolve.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index e5da21191..1afee4924 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -2182,7 +2182,7 @@ sql_func_by_signature(const char *name, int argc)
 	if (base == NULL || !base->def->exports.sql)
 		return NULL;
 
-	if (base->def->param_count != -1 && base->def->param_count != argc)
+	if (!base->def->opts.has_vararg && base->def->param_count != argc)
 		return NULL;
 	return base;
 }
@@ -2928,6 +2928,7 @@ func_sql_builtin_new(struct func_def *def)
 	def->returns = sql_builtins[idx].returns;
 	def->aggregate = sql_builtins[idx].aggregate;
 	def->exports.sql = sql_builtins[idx].export_to_sql;
+	def->opts.has_vararg = sql_builtins[idx].param_count == -1;
 	return &func->base;
 }
 
diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c
index 6f625dc18..5238555c3 100644
--- a/src/box/sql/resolve.c
+++ b/src/box/sql/resolve.c
@@ -614,7 +614,7 @@ resolveExprStep(Walker * pWalker, Expr * pExpr)
 				pNC->nErr++;
 				return WRC_Abort;
 			}
-			if (func->def->param_count != -1 &&
+			if (!func->def->opts.has_vararg &&
 			    func->def->param_count != n) {
 				uint32_t argc = func->def->param_count;
 				const char *err = tt_sprintf("%d", argc);
-- 
2.25.1