* [Tarantool-patches] [PATCH v2 3/4] sql: introduce custom aggregate functions
2022-02-10 9:14 [Tarantool-patches] [PATCH v2 0/4] Introduce custom aggregate functions Mergen Imeev via Tarantool-patches
2022-02-10 9:14 ` [Tarantool-patches] [PATCH v2 1/4] sql: fix COUNT() optimization conditions Mergen Imeev via Tarantool-patches
2022-02-10 9:14 ` [Tarantool-patches] [PATCH v2 2/4] sql: drop unnecessary P2 register for OP_AggFinal Mergen Imeev via Tarantool-patches
@ 2022-02-10 9:14 ` Mergen Imeev via Tarantool-patches
2022-02-10 9:14 ` [Tarantool-patches] [PATCH v2 4/4] sql: introduce FINALIZE for custom aggregate Mergen Imeev via Tarantool-patches
2022-02-14 8:26 ` [Tarantool-patches] [PATCH v2 0/4] Introduce custom aggregate functions Kirill Yukhin via Tarantool-patches
4 siblings, 0 replies; 7+ messages in thread
From: Mergen Imeev via Tarantool-patches @ 2022-02-10 9:14 UTC (permalink / raw)
To: kyukhin; +Cc: tarantool-patches
This patch introduces user-defined aggregate functions in SQL.
Part of #2579
---
src/box/alter.cc | 13 ++
src/box/lua/schema.lua | 2 +-
src/box/sql/expr.c | 17 ++-
src/box/sql/func.c | 18 ++-
src/box/sql/select.c | 31 +++--
test/sql-tap/CMakeLists.txt | 2 +
test/sql-tap/gh-2579-custom-aggregate.c | 28 +++++
.../sql-tap/gh-2579-custom-aggregate.test.lua | 114 ++++++++++++++++++
8 files changed, 205 insertions(+), 20 deletions(-)
create mode 100644 test/sql-tap/gh-2579-custom-aggregate.c
create mode 100755 test/sql-tap/gh-2579-custom-aggregate.test.lua
diff --git a/src/box/alter.cc b/src/box/alter.cc
index 65c1cb952..b85d279e3 100644
--- a/src/box/alter.cc
+++ b/src/box/alter.cc
@@ -3460,6 +3460,13 @@ func_def_new_from_tuple(struct tuple *tuple)
def->name, "invalid aggregate value");
return NULL;
}
+ if (def->aggregate == FUNC_AGGREGATE_GROUP &&
+ def->exports.lua) {
+ diag_set(ClientError, ER_CREATE_FUNCTION, def->name,
+ "aggregate function can only be accessed in "
+ "SQL");
+ return NULL;
+ }
const char *param_list = tuple_field_with_type(tuple,
BOX_FUNC_FIELD_PARAM_LIST, MP_ARRAY);
if (param_list == NULL)
@@ -3482,6 +3489,12 @@ func_def_new_from_tuple(struct tuple *tuple)
return NULL;
}
}
+ if (def->aggregate == FUNC_AGGREGATE_GROUP && argc == 0) {
+ diag_set(ClientError, ER_CREATE_FUNCTION, def->name,
+ "aggregate function must have at least one "
+ "argument");
+ return NULL;
+ }
def->param_count = argc;
const char *opts = tuple_field(tuple, BOX_FUNC_FIELD_OPTS);
if (opts_decode(&def->opts, func_opts_reg, &opts,
diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index 2c02949c5..23d6d0f64 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -2603,7 +2603,7 @@ box.schema.func.create = function(name, opts)
language = 'string', body = 'string',
is_deterministic = 'boolean',
is_sandboxed = 'boolean',
- is_multikey = 'boolean',
+ is_multikey = 'boolean', aggregate = 'string',
takes_raw_args = 'boolean',
comment = 'string',
param_list = 'table', returns = 'string',
diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index eb169aeb8..920ad9d08 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -5469,6 +5469,17 @@ analyzeAggregate(Walker * pWalker, Expr * pExpr)
(pExpr, EP_xIsSelect));
pItem = &pAggInfo->aFunc[i];
pItem->pExpr = pExpr;
+ int n = pExpr->x.pList == NULL ?
+ 0 : pExpr->x.pList->nExpr;
+ /*
+ * Allocate n MEMs for arguments
+ * and one more MEM for
+ * accumulator. This makes it
+ * easier to pass these n + 1
+ * MEMs to the user-defined
+ * aggregate function.
+ */
+ pParse->nMem += n;
pItem->iMem = ++pParse->nMem;
assert(!ExprHasProperty
(pExpr, EP_IntValue));
@@ -5479,12 +5490,6 @@ analyzeAggregate(Walker * pWalker, Expr * pExpr)
true;
return WRC_Abort;
}
- assert(pItem->func->def->
- language ==
- FUNC_LANGUAGE_SQL_BUILTIN &&
- pItem->func->def->
- aggregate ==
- FUNC_AGGREGATE_GROUP);
if (pExpr->flags & EP_Distinct) {
pItem->iDistinct =
pParse->nTab++;
diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index b69bf7fd6..dc2fd771a 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -2060,9 +2060,16 @@ sql_func_find(struct Expr *expr)
return NULL;
}
int n = expr->x.pList != NULL ? expr->x.pList->nExpr : 0;
- if (func->def->param_count != n) {
+ /*
+ * Aggregate functions accept state for the last argument, so it accepts
+ * one argument less than it is said in definition.
+ */
+ int argc = func->def->aggregate == FUNC_AGGREGATE_GROUP ?
+ func->def->param_count - 1 : func->def->param_count;
+ assert(argc >= 0);
+ if (argc != n) {
diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, name,
- tt_sprintf("%d", func->def->param_count), n);
+ tt_sprintf("%d", argc), n);
return NULL;
}
return func;
@@ -2072,9 +2079,12 @@ uint32_t
sql_func_flags(const char *name)
{
struct sql_func_dictionary *dict = built_in_func_get(name);
- if (dict == NULL)
+ if (dict != NULL)
+ return dict->flags;
+ struct func *func = func_by_name(name, strlen(name));
+ if (func == NULL || func->def->aggregate != FUNC_AGGREGATE_GROUP)
return 0;
- return dict->flags;
+ return SQL_FUNC_AGG;
}
static struct func_vtab func_sql_builtin_vtab;
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 6159a9670..dcea48c6e 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -4648,8 +4648,6 @@ is_simple_count(struct Select *select, struct AggInfo *agg_info)
return NULL;
if (NEVER(agg_info->nFunc == 0))
return NULL;
- assert(agg_info->aFunc->func->def->language ==
- FUNC_LANGUAGE_SQL_BUILTIN);
if (strcmp(agg_info->aFunc->func->def->name, "COUNT") != 0 ||
(agg_info->aFunc->pExpr->x.pList != NULL &&
agg_info->aFunc->pExpr->x.pList->nExpr > 0))
@@ -5562,6 +5560,15 @@ resetAccumulator(Parse * pParse, AggInfo * pAggInfo)
}
}
+static inline void
+finalize_agg_function(struct Vdbe *vdbe, const struct AggInfo_func *agg_func)
+{
+ if (agg_func->func->def->language == FUNC_LANGUAGE_SQL_BUILTIN) {
+ sqlVdbeAddOp1(vdbe, OP_AggFinal, agg_func->iMem);
+ sqlVdbeAppendP4(vdbe, agg_func->func, P4_FUNC);
+ }
+}
+
/*
* Invoke the OP_AggFinalize opcode for every aggregate function
* in the AggInfo structure.
@@ -5574,8 +5581,7 @@ finalizeAggFunctions(Parse * pParse, AggInfo * pAggInfo)
struct AggInfo_func *pF;
for (i = 0, pF = pAggInfo->aFunc; i < pAggInfo->nFunc; i++, pF++) {
assert(!ExprHasProperty(pF->pExpr, EP_xIsSelect));
- sqlVdbeAddOp1(v, OP_AggFinal, pF->iMem);
- sqlVdbeAppendP4(v, pF->func, P4_FUNC);
+ finalize_agg_function(v, pF);
}
}
@@ -5602,7 +5608,7 @@ updateAccumulator(Parse * pParse, AggInfo * pAggInfo)
assert(!ExprHasProperty(pF->pExpr, EP_xIsSelect));
if (pList) {
nArg = pList->nExpr;
- regAgg = sqlGetTempRange(pParse, nArg);
+ regAgg = pF->iMem - nArg;
sqlExprCodeExprList(pParse, pList, regAgg, 0,
SQL_ECEL_DUP);
} else {
@@ -5642,10 +5648,17 @@ updateAccumulator(Parse * pParse, AggInfo * pAggInfo)
pParse->is_aborted = true;
return;
}
- sqlVdbeAddOp3(v, OP_AggStep, nArg, regAgg, pF->iMem);
- sqlVdbeAppendP4(v, ctx, P4_FUNCCTX);
- sql_expr_type_cache_change(pParse, regAgg, nArg);
- sqlReleaseTempRange(pParse, regAgg, nArg);
+ if (pF->func->def->language == FUNC_LANGUAGE_SQL_BUILTIN) {
+ sqlVdbeAddOp3(v, OP_AggStep, nArg, regAgg, pF->iMem);
+ sqlVdbeAppendP4(v, ctx, P4_FUNCCTX);
+ } else {
+ const char *name = pF->func->def->name;
+ uint32_t len = pF->func->def->name_len;
+ const char *str = sqlDbStrNDup(pParse->db, name, len);
+ assert(regAgg == pF->iMem - nArg);
+ sqlVdbeAddOp4(v, OP_FunctionByName, nArg + 1, regAgg,
+ pF->iMem, str, P4_DYNAMIC);
+ }
if (addrNext) {
sqlVdbeResolveLabel(v, addrNext);
sqlExprCacheClear(pParse);
diff --git a/test/sql-tap/CMakeLists.txt b/test/sql-tap/CMakeLists.txt
index c4ec1214a..136a517d4 100644
--- a/test/sql-tap/CMakeLists.txt
+++ b/test/sql-tap/CMakeLists.txt
@@ -3,6 +3,8 @@ build_module(gh-5938-wrong-string-length gh-5938-wrong-string-length.c)
target_link_libraries(gh-5938-wrong-string-length msgpuck)
build_module(gh-6024-funcs-return-bin gh-6024-funcs-return-bin.c)
target_link_libraries(gh-6024-funcs-return-bin msgpuck)
+build_module(gh-2579-custom-aggregate gh-2579-custom-aggregate.c)
+target_link_libraries(gh-2579-custom-aggregate msgpuck)
build_module(sql_uuid sql_uuid.c)
target_link_libraries(sql_uuid msgpuck core)
build_module(decimal decimal.c)
diff --git a/test/sql-tap/gh-2579-custom-aggregate.c b/test/sql-tap/gh-2579-custom-aggregate.c
new file mode 100644
index 000000000..f7d8a70a4
--- /dev/null
+++ b/test/sql-tap/gh-2579-custom-aggregate.c
@@ -0,0 +1,28 @@
+#include "msgpuck.h"
+#include "module.h"
+
+enum {
+ BUF_SIZE = 512,
+};
+
+int
+f3(box_function_ctx_t *ctx, const char *args, const char *args_end)
+{
+ (void)args_end;
+ uint32_t arg_count = mp_decode_array(&args);
+ if (arg_count != 2) {
+ return box_error_set(__FILE__, __LINE__, ER_PROC_C,
+ "invalid argument count");
+ }
+ int num = mp_decode_uint(&args);
+ int sum = 0;
+ if (mp_typeof(*args) != MP_UINT)
+ mp_decode_nil(&args);
+ else
+ sum = mp_decode_uint(&args);
+ sum += num * num;
+ char res[BUF_SIZE];
+ char *end = mp_encode_uint(res, sum);
+ box_return_mp(ctx, res, end);
+ return 0;
+}
diff --git a/test/sql-tap/gh-2579-custom-aggregate.test.lua b/test/sql-tap/gh-2579-custom-aggregate.test.lua
new file mode 100755
index 000000000..afd08888e
--- /dev/null
+++ b/test/sql-tap/gh-2579-custom-aggregate.test.lua
@@ -0,0 +1,114 @@
+#!/usr/bin/env tarantool
+local build_path = os.getenv("BUILDDIR")
+package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..
+ '/test/sql-tap/?.dylib;'..package.cpath
+
+local test = require("sqltester")
+test:plan(5)
+
+test:execsql([[
+ CREATE TABLE t (i INT PRIMARY KEY);
+ INSERT INTO t VALUES(1), (2), (3), (4), (5);
+]])
+
+-- Make sure that persistent aggregate functions work as intended.
+box.schema.func.create("F1", {
+ language = "Lua",
+ body = [[
+ function(x, state)
+ if state == nil then
+ state = {sum = 0, count = 0}
+ end
+ state.sum = state.sum + x
+ state.count = state.count + 1
+ return state
+ end
+ ]],
+ param_list = {"integer", "map"},
+ returns = "map",
+ aggregate = "group",
+ exports = {"SQL"},
+})
+
+test:do_execsql_test(
+ "gh-2579-1",
+ [[
+ SELECT f1(i) from t;
+ ]], {
+ {sum = 15, count = 5}
+ })
+
+-- Make sure that non-persistent aggregate functions work as intended.
+local f2 = function(x, state)
+ if state == nil then
+ state = {}
+ end
+ table.insert(state, x)
+ return state
+end
+
+rawset(_G, 'F2', f2)
+
+box.schema.func.create("F2", {
+ language = "Lua",
+ param_list = {"integer", "array"},
+ returns = "array",
+ aggregate = "group",
+ exports = {"SQL"},
+})
+
+test:do_execsql_test(
+ "gh-2579-2",
+ [[
+ SELECT f2(i) from t;
+ ]], {
+ {1, 2, 3, 4, 5}
+ })
+
+-- Make sure that C aggregate functions work as intended.
+box.schema.func.create("gh-2579-custom-aggregate.f3", {
+ language = "C",
+ param_list = {"integer", "integer"},
+ returns = "integer",
+ aggregate = "group",
+ exports = {"SQL"},
+})
+
+test:do_execsql_test(
+ "gh-2579-3",
+ [[
+ SELECT "gh-2579-custom-aggregate.f3"(i) from t;
+ ]], {
+ 55
+ })
+
+-- Make sure aggregate functions can't be called in Lua.
+test:do_test(
+ "gh-2579-4",
+ function()
+ local def = {aggregate = 'group', exports = {'LUA', 'SQL'}}
+ local res = {pcall(box.schema.func.create, 'F4', def)}
+ return {tostring(res[2])}
+ end, {
+ "Failed to create function 'F4': aggregate function can only be "..
+ "accessed in SQL"
+ })
+
+-- Make sure aggregate functions can't have less that 1 argument.
+test:do_test(
+ "gh-2579-5",
+ function()
+ local def = {aggregate = 'group', exports = {'SQL'}}
+ local res = {pcall(box.schema.func.create, 'F4', def)}
+ return {tostring(res[2])}
+ end, {
+ "Failed to create function 'F4': aggregate function must have at "..
+ "least one argument"
+ })
+
+box.schema.func.drop('gh-2579-custom-aggregate.f3')
+box.schema.func.drop('F2')
+box.schema.func.drop('F1')
+test:execsql([[DROP TABLE t;]])
+
+test:finish_test()
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [Tarantool-patches] [PATCH v2 4/4] sql: introduce FINALIZE for custom aggregate
2022-02-10 9:14 [Tarantool-patches] [PATCH v2 0/4] Introduce custom aggregate functions Mergen Imeev via Tarantool-patches
` (2 preceding siblings ...)
2022-02-10 9:14 ` [Tarantool-patches] [PATCH v2 3/4] sql: introduce custom aggregate functions Mergen Imeev via Tarantool-patches
@ 2022-02-10 9:14 ` Mergen Imeev via Tarantool-patches
2022-02-14 8:26 ` [Tarantool-patches] [PATCH v2 0/4] Introduce custom aggregate functions Kirill Yukhin via Tarantool-patches
4 siblings, 0 replies; 7+ messages in thread
From: Mergen Imeev via Tarantool-patches @ 2022-02-10 9:14 UTC (permalink / raw)
To: kyukhin; +Cc: tarantool-patches
This patch introduces a way to create a FINALIZER for user-defined
aggregate functions.
Closes #2579
@TarantoolBot document
Title: User-defined aggregate functions
User-defined aggregate functions are now available. To create a
user-defined aggregate function, the 'aggregate' option should be set to
'group'. The function must have at least one argument. The last
argument is always the result of the function in the previous step, or
NULL if it is the first step. The last argument will be added
automatically.
Example:
```
box.schema.func.create("F1", {language = "Lua",
body = [[
function(x, state)
if state == nil then
state = {sum = 0, count = 0}
end
state.sum = state.sum + x
state.count = state.count + 1
return state
end
]],
param_list = {"integer", "map"},
returns = "map",
aggregate = "group",
exports = {"SQL"},
})
box.execute('CREATE TABLE t (i INT PRIMARY KEY);')
box.execute('INSERT INTO t VALUES(1), (2), (3), (4), (5);')
box.execute('SELECT f1(i) FROM t;')
```
The result will be:
```
tarantool> box.execute([[select f1(i) from t;]])
---
- metadata:
- name: COLUMN_1
type: map
rows:
- [{'sum': 15, 'count': 5}]
...
```
To create a finalizer for a function, another function should be
created. This function should follow the following rules:
1) its name should be '<function name>_finalize';
2) it must take exactly one argument;
3) it must be a non-aggregate function.
If an aggregate function has a finalizer, the result of the aggregate
function will be determined by the finalizer.
Example:
```
box.schema.func.create("F1_finalize", {
language = "Lua",
body = [[
function(state)
if state == nil then
return 0
end
return state.sum / state.count
end
]],
param_list = {"map"},
returns = "number",
exports = {'LUA', 'SQL'},
})
box.execute('SELECT f1(i) FROM t;')
```
The result will be:
```
tarantool> box.execute([[select f1(i) from t;]])
---
- metadata:
- name: COLUMN_1
type: number
rows:
- [3]
...
```
---
.../gh-2579-introduce-custom-aggregates.md | 3 +
src/box/sql/func.c | 13 ++
src/box/sql/resolve.c | 12 ++
src/box/sql/select.c | 7 ++
src/box/sql/sqlInt.h | 4 +
.../sql-tap/gh-2579-custom-aggregate.test.lua | 113 +++++++++++++++++-
6 files changed, 151 insertions(+), 1 deletion(-)
create mode 100644 changelogs/unreleased/gh-2579-introduce-custom-aggregates.md
diff --git a/changelogs/unreleased/gh-2579-introduce-custom-aggregates.md b/changelogs/unreleased/gh-2579-introduce-custom-aggregates.md
new file mode 100644
index 000000000..7975f9f08
--- /dev/null
+++ b/changelogs/unreleased/gh-2579-introduce-custom-aggregates.md
@@ -0,0 +1,3 @@
+## feature/sql
+
+* user-defined aggregate functions are now available in SQL (gh-2579).
diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index dc2fd771a..21d3f80e5 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -2075,6 +2075,19 @@ sql_func_find(struct Expr *expr)
return func;
}
+struct func *
+sql_func_finalize(const char *name)
+{
+ const char *finalize_name = tt_sprintf("%s_finalize", name);
+ uint32_t len = strlen(finalize_name);
+ struct func *finalize = func_by_name(finalize_name, len);
+ if (finalize == NULL ||
+ finalize->def->param_count != 1 ||
+ finalize->def->aggregate == FUNC_AGGREGATE_GROUP)
+ return NULL;
+ return finalize;
+}
+
uint32_t
sql_func_flags(const char *name)
{
diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c
index 22b4e6799..095e6d6a8 100644
--- a/src/box/sql/resolve.c
+++ b/src/box/sql/resolve.c
@@ -663,6 +663,18 @@ resolveExprStep(Walker * pWalker, Expr * pExpr)
return WRC_Abort;
}
pExpr->type = func->def->returns;
+ /*
+ * In case a user-defined aggregate function was called,
+ * the result type will be the result type of the
+ * FINALIZE part of the function.
+ */
+ if (func->def->language != FUNC_LANGUAGE_SQL_BUILTIN &&
+ func->def->aggregate == FUNC_AGGREGATE_GROUP) {
+ const char *name = pExpr->u.zToken;
+ struct func *finalize = sql_func_finalize(name);
+ if (finalize != NULL)
+ pExpr->type = finalize->def->returns;
+ }
assert(!func->def->is_deterministic ||
(pNC->ncFlags & NC_IdxExpr) == 0);
if (func->def->is_deterministic)
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index dcea48c6e..a3fe2f60f 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -5566,7 +5566,14 @@ finalize_agg_function(struct Vdbe *vdbe, const struct AggInfo_func *agg_func)
if (agg_func->func->def->language == FUNC_LANGUAGE_SQL_BUILTIN) {
sqlVdbeAddOp1(vdbe, OP_AggFinal, agg_func->iMem);
sqlVdbeAppendP4(vdbe, agg_func->func, P4_FUNC);
+ return;
}
+ if (sql_func_finalize(agg_func->pExpr->u.zToken) == NULL)
+ return;
+ const char *name = tt_sprintf("%s_finalize", agg_func->pExpr->u.zToken);
+ const char *str = sqlDbStrDup(sql_get(), name);
+ sqlVdbeAddOp4(vdbe, OP_FunctionByName, 1, agg_func->iMem,
+ agg_func->iMem, str, P4_DYNAMIC);
}
/*
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index f49522dc8..8d0321f56 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -4308,6 +4308,10 @@ sql_func_find(struct Expr *expr);
int
sql_emit_args_types(struct Vdbe *v, int reg, struct func *base, uint32_t argc);
+/** Return a function that is a finalizer for function with given name. */
+struct func *
+sql_func_finalize(const char *name);
+
/**
* Return the parameters of the function with the given name. If the function
* with the given name does not exist, or the function is not a built-in SQL
diff --git a/test/sql-tap/gh-2579-custom-aggregate.test.lua b/test/sql-tap/gh-2579-custom-aggregate.test.lua
index afd08888e..e4758e556 100755
--- a/test/sql-tap/gh-2579-custom-aggregate.test.lua
+++ b/test/sql-tap/gh-2579-custom-aggregate.test.lua
@@ -4,7 +4,7 @@ package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..
'/test/sql-tap/?.dylib;'..package.cpath
local test = require("sqltester")
-test:plan(5)
+test:plan(9)
test:execsql([[
CREATE TABLE t (i INT PRIMARY KEY);
@@ -106,6 +106,117 @@ test:do_test(
"least one argument"
})
+-- Make sure finalizers of aggregate functions work as intended.
+box.schema.func.create("F1_finalize", {
+ language = "Lua",
+ body = [[
+ function(state)
+ if state == nil then
+ return 0
+ end
+ return state.sum / state.count
+ end
+ ]],
+ param_list = {"map"},
+ returns = "number",
+ exports = {'LUA', 'SQL'},
+})
+
+test:do_execsql_test(
+ "gh-2579-6",
+ [[
+ SELECT f1(i), typeof(f1(i)) from t;
+ ]], {
+ 3, "integer"
+ })
+
+--
+-- Make sure that the finalizers of the aggregate function and the aggregate
+-- function can be of different types.
+--
+box.schema.func.create("F2_finalize", {
+ language = "Lua",
+ body = [[
+ function(state)
+ if state == nil then
+ return 0
+ end
+ return state[#state]
+ end
+ ]],
+ param_list = {"array"},
+ returns = "number",
+ exports = {'LUA', 'SQL'},
+})
+
+test:do_execsql_test(
+ "gh-2579-7",
+ [[
+ SELECT f2(i) from t;
+ ]], {
+ 5
+ })
+
+-- Make sure that aggregate function cannot become finalizer.
+box.schema.func.drop("F2_finalize")
+box.schema.func.create("F2_finalize", {
+ language = "Lua",
+ body = [[
+ function(state)
+ if state == nil then
+ return 0
+ end
+ sum = 0
+ for k, v in pairs(state) do
+ sum = sum + v
+ end
+ return sum
+ end
+ ]],
+ aggregate = "group",
+ param_list = {"array"},
+ returns = "number",
+ exports = {'SQL'},
+})
+
+test:do_execsql_test(
+ "gh-2579-8",
+ [[
+ SELECT f2(i), typeof(f2(i)) from t;
+ ]], {
+ {1, 2, 3, 4, 5}, "array"
+ })
+
+--
+-- Make sure that function with number of arguments not equal to 1 cannot become
+-- finalizer.
+--
+box.schema.func.drop("F2_finalize")
+box.schema.func.create("F2_finalize", {
+ language = "Lua",
+ body = [[
+ function(state, x)
+ if state == nil then
+ return 0
+ end
+ return state[#state] * x
+ end
+ ]],
+ param_list = {"map", "integer"},
+ returns = "number",
+ exports = {'LUA', 'SQL'},
+})
+
+test:do_execsql_test(
+ "gh-2579-9",
+ [[
+ SELECT f2(i), typeof(f2(i)), "F2_finalize"(f2(i), 2) from t;
+ ]], {
+ {1, 2, 3, 4, 5}, "array", 10
+ })
+
+box.schema.func.drop('F2_finalize')
+box.schema.func.drop('F1_finalize')
box.schema.func.drop('gh-2579-custom-aggregate.f3')
box.schema.func.drop('F2')
box.schema.func.drop('F1')
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread