Changeset: 05e39c517279 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05e39c517279
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/json.mal
sql/ChangeLog
sql/backends/monet5/sql_upgrades.c
sql/scripts/40_json.sql
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:
Removed obsolete json.output(json) function. This fixes bug 6857
diffs (259 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
@@ -9545,13 +9545,11 @@ stdout of test 'MAL-signatures` in direc
[ "json", "length", "command json.length(X_1:json):int ",
"JSONlength;", "" ]
[ "json", "new", "command json.new(X_1:str):json ",
"JSONstr2json;", "" ]
[ "json", "number", "command json.number(X_1:json):dbl ",
"JSONjson2number;", "" ]
-[ "json", "output", "command json.output(X_1:bat[:any_1]):str ",
"JSONtextString;", "" ]
[ "json", "prelude", "command json.prelude():void ", "JSONprelude;",
"" ]
[ "json", "renderarray", "pattern json.renderarray(X_1:any...):json ",
"JSONrenderarray;", "" ]
[ "json", "renderobject", "pattern json.renderobject(X_1:any...):json ",
"JSONrenderobject;", "" ]
[ "json", "resultSet", "command json.resultSet(X_1:bat[:uuid],
X_2:bat[:lng], X_3:bat[:json]):json ", "JSONresultSet;", "" ]
[ "json", "str", "command json.str(X_1:json):str ",
"JSONjson2str;", "" ]
-[ "json", "suboutput", "command json.suboutput(X_1:bat[:any_1],
X_2:bat[:oid], X_3:bat[:lng], X_4:bit):bat[:str] ", "JSONtextGrouped;",
"" ]
[ "json", "text", "command json.text(X_1:json):str ",
"JSONjson2text;", "" ]
[ "json", "text", "command json.text(X_1:json, X_2:str):str ",
"JSONjson2textSeparator;", "" ]
[ "json", "unfold", "pattern json.unfold(X_2:json) (X_0:bat[:str],
X_1:bat[:json]) ", "JSONunfold;", "" ]
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
@@ -12893,13 +12893,11 @@ stdout of test 'MAL-signatures` in direc
[ "json", "length", "command json.length(X_1:json):int ",
"JSONlength;", "" ]
[ "json", "new", "command json.new(X_1:str):json ",
"JSONstr2json;", "" ]
[ "json", "number", "command json.number(X_1:json):dbl ",
"JSONjson2number;", "" ]
-[ "json", "output", "command json.output(X_1:bat[:any_1]):str ",
"JSONtextString;", "" ]
[ "json", "prelude", "command json.prelude():void ", "JSONprelude;",
"" ]
[ "json", "renderarray", "pattern json.renderarray(X_1:any...):json ",
"JSONrenderarray;", "" ]
[ "json", "renderobject", "pattern json.renderobject(X_1:any...):json ",
"JSONrenderobject;", "" ]
[ "json", "resultSet", "command json.resultSet(X_1:bat[:uuid],
X_2:bat[:lng], X_3:bat[:json]):json ", "JSONresultSet;", "" ]
[ "json", "str", "command json.str(X_1:json):str ",
"JSONjson2str;", "" ]
-[ "json", "suboutput", "command json.suboutput(X_1:bat[:any_1],
X_2:bat[:oid], X_3:bat[:lng], X_4:bit):bat[:str] ", "JSONtextGrouped;",
"" ]
[ "json", "text", "command json.text(X_1:json):str ",
"JSONjson2text;", "" ]
[ "json", "text", "command json.text(X_1:json, X_2:str):str ",
"JSONjson2textSeparator;", "" ]
[ "json", "unfold", "pattern json.unfold(X_2:json) (X_0:bat[:str],
X_1:bat[:json]) ", "JSONunfold;", "" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1417,8 +1417,6 @@ str JSONresultSet(json *res, bat *u, bat
str JSONstr2json(json *ret, str *j);
str JSONsubjson(bat *retval, bat *bid, bat *gid, bat *eid, bit *skipnils);
str JSONsubjsoncand(bat *retval, bat *bid, bat *gid, bat *eid, bat *id, bit
*skip_nils);
-str JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit *flg);
-str JSONtextString(str *ret, bat *bid);
ssize_t JSONtoString(str *s, size_t *len, const char *src, bool external);
str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str JSONvalueArray(json *ret, json *arg);
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -2092,26 +2092,6 @@ JSONfold(Client cntxt, MalBlkPtr mb, Mal
}
str
-JSONtextString(str *ret, bat *bid)
-{
- (void) ret;
- (void) bid;
- throw(MAL, "json.text", SQLSTATE(0A000) PROGRAM_NYI);
-}
-
-
-str
-JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit *flg)
-{
- (void) ret;
- (void) bid;
- (void) gid;
- (void) ext;
- (void) flg;
- throw(MAL, "json.text", SQLSTATE(0A000) PROGRAM_NYI);
-}
-
-str
JSONgroupStr(str *ret, const bat *bid)
{
BAT *b;
@@ -2584,8 +2564,6 @@ static mel_func json_init_funcs[] = {
command("json", "valuearray", JSONvalueArray, false, "Expands the outermost
JSON object values into a JSON value array.", args(1,2,
arg("",json),arg("val",json))),
command("json", "keys", JSONkeyTable, false, "Expands the outermost JSON
object names.", args(1,2, batarg("",str),arg("val",json))),
command("json", "values", JSONvalueTable, false, "Expands the outermost JSON
values.", args(1,2, batarg("",json),arg("val",json))),
- command("json", "output", JSONtextString, false, "Pack the values into a
single json structure", args(1,2, arg("",str),batargany("b",1))),
- command("json", "suboutput", JSONtextGrouped, false, "Pack the values into a
json structure", args(1,5,
batarg("",str),batargany("b",1),batarg("gid",oid),batarg("ext",lng),arg("flg",bit))),
command("json", "prelude", JSONprelude, false, "", noargs),
pattern("json", "renderobject", JSONrenderobject, false, "", args(1,2,
arg("",json),varargany("val",0))),
pattern("json", "renderarray", JSONrenderarray, false, "", args(1,2,
arg("",json),varargany("val",0))),
diff --git a/monetdb5/modules/atoms/json.h b/monetdb5/modules/atoms/json.h
--- a/monetdb5/modules/atoms/json.h
+++ b/monetdb5/modules/atoms/json.h
@@ -86,8 +86,6 @@ mal_export str JSONvalueTable(bat *ret,
mal_export str JSONkeyArray(json *ret, json *arg);
mal_export str JSONvalueArray(json *ret, json *arg);
-mal_export str JSONtextString(str *ret, bat *bid);
-mal_export str JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit
*flg);
mal_export str JSONdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
mal_export str JSONprelude(void *ret);
diff --git a/monetdb5/modules/atoms/json.mal b/monetdb5/modules/atoms/json.mal
--- a/monetdb5/modules/atoms/json.mal
+++ b/monetdb5/modules/atoms/json.mal
@@ -136,14 +136,6 @@ command values(val:json):bat[:json]
address JSONvalueTable
comment "Expands the outermost JSON values.";
-command output(b:bat[:any_1]):str
-address JSONtextString
-comment "Pack the values into a single json structure";
-
-command suboutput(b:bat[:any_1], gid:bat[:oid], ext:bat[:lng],
flg:bit):bat[:str]
-address JSONtextGrouped
-comment "Pack the values into a json structure";
-
command prelude()
address JSONprelude;
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -34,3 +34,6 @@
* Mon Jun 15 2020 Pedro Ferreira <[email protected]>
- Removed obsolete sys.getContent(url) function.
+
+* Tue Jun 16 2020 Pedro Ferreira <[email protected]>
+- Removed obsolete json.output(json) function.
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2966,7 +2966,10 @@ sql_update_default(Client c, mvc *sql, c
(int) F_UNION,
(int) F_UNION);
- pos += snprintf(buf + pos, bufsize - pos, "DROP
FUNCTION \"sys\".\"getContent\"(url);\n");
+ /* SQL functions without backend implementations */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "DROP FUNCTION
\"sys\".\"getContent\"(url);\n"
+ "DROP FUNCTION
\"json\".\"output\"(json);\n");
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", prev_schema);
assert(pos < bufsize);
diff --git a/sql/scripts/40_json.sql b/sql/scripts/40_json.sql
--- a/sql/scripts/40_json.sql
+++ b/sql/scripts/40_json.sql
@@ -84,9 +84,7 @@ GRANT EXECUTE ON FUNCTION json.text(json
-- The remainder awaits the implementation
-create aggregate json.output(js json)
-returns string external name json.output;
-GRANT EXECUTE ON AGGREGATE json.output(json) TO PUBLIC;
+-- create aggregate json.output(js json) returns string external name
json.output;
-- create function json.object(*) returns json external name json.objectrender;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -2229,7 +2229,6 @@ drop function pcre_replace(string, strin
[ "sys.functions", "json", "keyarray", "SYSTEM", "create
function json.keyarray(js json) returns json external name json.keyarray;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "json", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "length", "SYSTEM", "create
function json.length(js json) returns integer external name json.length;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "int", 32, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "number", "SYSTEM", "create
function json.number(js json) returns float external name json.number;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "double", 53, 0, "out", "js", "json", 0,
0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
-[ "sys.functions", "json", "output", "SYSTEM", "create
aggregate json.output(js json) returns string external name json.output;",
"json", "MAL", "Aggregate function", false, false, false, true,
"result", "clob", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json) returns string external name json.text;", "json", "MAL",
"Scalar function", false, false, false, true, "result", "clob",
0, 0, "out", "js", "json", 0, 0, "in", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json, e string) returns string external name json.text;", "json",
"MAL", "Scalar function", false, false, false, true, "result",
"clob", 0, 0, "out", "js", "json", 0, 0, "in", "e",
"clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "tojsonarray", "SYSTEM", "create
aggregate json.tojsonarray(x double) returns string external name
aggr.jsonaggr;", "aggr", "MAL", "Aggregate function", false, false,
false, true, "result", "clob", 0, 0, "out", "x",
"double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
@@ -4713,7 +4712,6 @@ drop function pcre_replace(string, strin
[ "type used by function", "json", "json", "json", "keyarray", "TYPE"
]
[ "type used by function", "json", "json", "json", "length", "TYPE"
]
[ "type used by function", "json", "json", "json", "number", "TYPE"
]
-[ "type used by function", "json", "json", "json", "output", "TYPE"
]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "valuearray", "TYPE"
]
@@ -5059,7 +5057,6 @@ drop function pcre_replace(string, strin
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "number", "public", "EXECUTE",
"monetdb", 0 ]
-[ "grant on function", "output", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "pause", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements_args", "public",
"EXECUTE", "monetdb", 0 ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -2229,7 +2229,6 @@ drop function pcre_replace(string, strin
[ "sys.functions", "json", "keyarray", "SYSTEM", "create
function json.keyarray(js json) returns json external name json.keyarray;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "json", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "length", "SYSTEM", "create
function json.length(js json) returns integer external name json.length;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "int", 32, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "number", "SYSTEM", "create
function json.number(js json) returns float external name json.number;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "double", 53, 0, "out", "js", "json", 0,
0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
-[ "sys.functions", "json", "output", "SYSTEM", "create
aggregate json.output(js json) returns string external name json.output;",
"json", "MAL", "Aggregate function", false, false, false, true,
"result", "clob", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json) returns string external name json.text;", "json", "MAL",
"Scalar function", false, false, false, true, "result", "clob",
0, 0, "out", "js", "json", 0, 0, "in", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json, e string) returns string external name json.text;", "json",
"MAL", "Scalar function", false, false, false, true, "result",
"clob", 0, 0, "out", "js", "json", 0, 0, "in", "e",
"clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "tojsonarray", "SYSTEM", "create
aggregate json.tojsonarray(x double) returns string external name
aggr.jsonaggr;", "aggr", "MAL", "Aggregate function", false, false,
false, true, "result", "clob", 0, 0, "out", "x",
"double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
@@ -4713,7 +4712,6 @@ drop function pcre_replace(string, strin
[ "type used by function", "json", "json", "json", "keyarray", "TYPE"
]
[ "type used by function", "json", "json", "json", "length", "TYPE"
]
[ "type used by function", "json", "json", "json", "number", "TYPE"
]
-[ "type used by function", "json", "json", "json", "output", "TYPE"
]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "valuearray", "TYPE"
]
@@ -5059,7 +5057,6 @@ drop function pcre_replace(string, strin
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "number", "public", "EXECUTE",
"monetdb", 0 ]
-[ "grant on function", "output", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "pause", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements_args", "public",
"EXECUTE", "monetdb", 0 ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -2251,7 +2251,6 @@ drop function pcre_replace(string, strin
[ "sys.functions", "json", "keyarray", "SYSTEM", "create
function json.keyarray(js json) returns json external name json.keyarray;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "json", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "length", "SYSTEM", "create
function json.length(js json) returns integer external name json.length;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "int", 32, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "number", "SYSTEM", "create
function json.number(js json) returns float external name json.number;",
"json", "MAL", "Scalar function", false, false, false, true,
"result", "double", 53, 0, "out", "js", "json", 0,
0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
-[ "sys.functions", "json", "output", "SYSTEM", "create
aggregate json.output(js json) returns string external name json.output;",
"json", "MAL", "Aggregate function", false, false, false, true,
"result", "clob", 0, 0, "out", "js", "json", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json) returns string external name json.text;", "json", "MAL",
"Scalar function", false, false, false, true, "result", "clob",
0, 0, "out", "js", "json", 0, 0, "in", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "text", "SYSTEM", "create function
json.text(js json, e string) returns string external name json.text;", "json",
"MAL", "Scalar function", false, false, false, true, "result",
"clob", 0, 0, "out", "js", "json", 0, 0, "in", "e",
"clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "json", "tojsonarray", "SYSTEM", "create
aggregate json.tojsonarray(x double) returns string external name
aggr.jsonaggr;", "aggr", "MAL", "Aggregate function", false, false,
false, true, "result", "clob", 0, 0, "out", "x",
"double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
@@ -4951,7 +4950,6 @@ drop function pcre_replace(string, strin
[ "type used by function", "json", "json", "json", "keyarray", "TYPE"
]
[ "type used by function", "json", "json", "json", "length", "TYPE"
]
[ "type used by function", "json", "json", "json", "number", "TYPE"
]
-[ "type used by function", "json", "json", "json", "output", "TYPE"
]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "text", "TYPE" ]
[ "type used by function", "json", "json", "json", "valuearray", "TYPE"
]
@@ -5306,7 +5304,6 @@ drop function pcre_replace(string, strin
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "newurl", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "number", "public", "EXECUTE",
"monetdb", 0 ]
-[ "grant on function", "output", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "pause", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "prepared_statements_args", "public",
"EXECUTE", "monetdb", 0 ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -61,8 +61,6 @@ stdout of test 'systemfunctions` in dire
[ "json", "length", 1, "json", "" ]
[ "json", "number", 0, "double", "create function
json.number(js json)\nreturns float external name json.number;" ]
[ "json", "number", 1, "json", "" ]
-[ "json", "output", 0, "clob", "create aggregate
json.output(js json)\nreturns string external name json.output;" ]
-[ "json", "output", 1, "json", "" ]
[ "json", "text", 0, "clob", "create function json.text(js json, e
string)\nreturns string external name json.text;" ]
[ "json", "text", 1, "json", "" ]
[ "json", "text", 2, "clob", "" ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -64,8 +64,6 @@ stdout of test 'systemfunctions` in dire
[ "json", "length", 1, "json", "" ]
[ "json", "number", 0, "double", "create function
json.number(js json)\nreturns float external name json.number;" ]
[ "json", "number", 1, "json", "" ]
-[ "json", "output", 0, "clob", "create aggregate
json.output(js json)\nreturns string external name json.output;" ]
-[ "json", "output", 1, "json", "" ]
[ "json", "text", 0, "clob", "create function json.text(js json, e
string)\nreturns string external name json.text;" ]
[ "json", "text", 1, "json", "" ]
[ "json", "text", 2, "clob", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
