Changeset: f6a30ee70b5e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f6a30ee70b5e Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test sql/test/emptydb/Tests/check.stable.out Branch: nested Log Message:
Approvals. diffs (truncated from 1937 to 300 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -33771,7 +33771,7 @@ return the next value of the sequence batsql next_value_ms pattern batsql.next_value_ms(X_0:bat[:any_1], X_1:str, X_2:str):bat[:lng] -mvc_next_value_bulk; +mvc_next_value_bulk return the next value of the sequence batsql nth_value @@ -33856,7 +33856,7 @@ return the ranked groups batsql renumber pattern batsql.renumber(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int]):bat[:int] -mvc_renumber_bulk; +mvc_renumber_bulk return the input b renumbered using values from base batsql row_number @@ -48601,7 +48601,7 @@ if cmp then true, (nl or nr) nil then ni sql append pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:int, X_4:oid, X_5:bat[:oid], X_6:any):int -mvc_append_wrap; +mvc_append_wrap Append to the column tname.col_id (possibly optimized to replace the insert bat of tname.col_id. Returns sequence number for order dependence. sql append @@ -48696,22 +48696,22 @@ return the average of groups sql bind pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) -mvc_bind_wrap; +mvc_bind_wrap Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates sql bind pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1] -mvc_bind_wrap; +mvc_bind_wrap Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates sql bind pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int) (X_7:bat[:oid], X_8:bat[:any_1]) -mvc_bind_wrap; +mvc_bind_wrap Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates sql bind pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int):bat[:any_1] -mvc_bind_wrap; +mvc_bind_wrap Bind the 'schema.table.column' BAT partition with access kind:@0 - base table@1 - inserts@2 - updates sql bind @@ -49016,22 +49016,22 @@ dump the trace statistics sql emptybind pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) -mvc_bind_wrap; +mvc_bind_wrap (empty) sql emptybind pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1] -mvc_bind_wrap; +mvc_bind_wrap (empty) sql emptybind pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int) (X_7:bat[:oid], X_8:bat[:any_1]) -mvc_bind_wrap; +mvc_bind_wrap (empty) sql emptybind pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int):bat[:any_1] -mvc_bind_wrap; +mvc_bind_wrap (empty) sql emptybind @@ -49146,7 +49146,7 @@ return the first value of groups sql from_json pattern sql.from_json(X_0:json, X_1:ptr):bat[:any]... -SQLfrom_json; +SQLfrom_json Reads json string into table of nested structures sql getVariable @@ -49261,7 +49261,7 @@ return the next value of the sequence sql next_value_ms pattern sql.next_value_ms(X_0:any_1, X_1:str, X_2:str):lng -mvc_next_value; +mvc_next_value return the next value of the sequence sql nth_value @@ -49441,7 +49441,7 @@ Compile the relational statement (rel_sm sql renumber pattern sql.renumber(X_0:int, X_1:int, X_2:int):int -mvc_renumber; +mvc_renumber return the input b renumbered using values from base sql restart @@ -50066,7 +50066,7 @@ Catalog operation create_trigger sqlcatalog create_type pattern sqlcatalog.create_type(X_0:str, X_1:str, X_2:ptr):void -SQLcreate_type; +SQLcreate_type Catalog operation create_type sqlcatalog create_type diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -24949,6 +24949,11 @@ unsafe pattern batsql.next_value(X_0:lng mvc_next_value_bulk return the next value of the sequence batsql +next_value_ms +pattern batsql.next_value_ms(X_0:bat[:any_1], X_1:str, X_2:str):bat[:lng] +mvc_next_value_bulk +return the next value of the sequence +batsql nth_value pattern batsql.nth_value(X_0:bat?[:any_1], X_1:bat?[:lng], X_2:bat?[:bit], X_3:bat?[:bit], X_4:int, X_5:bat?[:oid], X_6:bat?[:oid]):bat[:any_1] SQLnth_value @@ -25004,6 +25009,11 @@ pattern batsql.rank(X_0:bat[:any_1], X_1 SQLrank return the ranked groups batsql +renumber +pattern batsql.renumber(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int]):bat[:int] +mvc_renumber_bulk +return the input b renumbered using values from base +batsql row_number pattern batsql.row_number(X_0:bat[:any_1], X_1:bat?[:bit], X_2:bat?[:bit]):bat[:int] SQLrow_number @@ -37070,6 +37080,11 @@ SQLany_cmp if cmp then true, (nl or nr) nil then nil, else false sql append +pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:int, X_4:oid, X_5:bat[:oid], X_6:any):int +mvc_append_wrap +Append to the column tname.col_id (possibly optimized to replace the insert bat of tname.col_id. Returns sequence number for order dependence. +sql +append pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:oid, X_5:bat[:oid], X_6:any):int mvc_append_wrap Append to the column tname.cname (possibly optimized to replace the insert bat of tname.cname. Returns sequence number for order dependence. @@ -37150,6 +37165,26 @@ SQLavginteger return the average of groups sql bind +pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) +mvc_bind_wrap +Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates +sql +bind +pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1] +mvc_bind_wrap +Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates +sql +bind +pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int) (X_7:bat[:oid], X_8:bat[:any_1]) +mvc_bind_wrap +Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates +sql +bind +pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int):bat[:any_1] +mvc_bind_wrap +Bind the 'schema.table.column' BAT partition with access kind:@0 - base table@1 - inserts@2 - updates +sql +bind pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) mvc_bind_wrap Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 - inserts@2 - updates @@ -37435,6 +37470,26 @@ dump_trace dump the trace statistics sql emptybind +pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) +mvc_bind_wrap +(empty) +sql +emptybind +pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1] +mvc_bind_wrap +(empty) +sql +emptybind +pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int) (X_7:bat[:oid], X_8:bat[:any_1]) +mvc_bind_wrap +(empty) +sql +emptybind +pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int, X_6:int):bat[:any_1] +mvc_bind_wrap +(empty) +sql +emptybind pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int) (X_5:bat[:oid], X_6:bat[:any_1]) mvc_bind_wrap (empty) @@ -37544,6 +37599,11 @@ pattern sql.first_value(X_0:any_1, X_1:b SQLfirst_value return the first value of groups sql +from_json +pattern sql.from_json(X_0:json, X_1:ptr):bat[:any]... +SQLfrom_json +Reads json string into table of nested structures +sql getVariable pattern sql.getVariable(X_0:int, X_1:str, X_2:str):any_1 getVariable @@ -37654,6 +37714,11 @@ unsafe pattern sql.next_value(X_0:str, X mvc_next_value return the next value of the sequence sql +next_value_ms +pattern sql.next_value_ms(X_0:any_1, X_1:str, X_2:str):lng +mvc_next_value +return the next value of the sequence +sql nth_value pattern sql.nth_value(X_0:any_1, X_1:lng, X_2:bit, X_3:bit, X_4:int, X_5:oid, X_6:oid):any_1 SQLnth_value @@ -37804,6 +37869,11 @@ unsafe pattern sql.register(X_0:str, X_1 RAstatement2 Compile the relational statement (rel_smt) and register it as mal function, mod.fname(signature) sql +renumber +pattern sql.renumber(X_0:int, X_1:int, X_2:int):int +mvc_renumber +return the input b renumbered using values from base +sql restart unsafe pattern sql.restart(X_0:str, X_1:str, X_2:lng):lng mvc_restart_seq @@ -38370,6 +38440,11 @@ SQLcreate_trigger Catalog operation create_trigger sqlcatalog create_type +pattern sqlcatalog.create_type(X_0:str, X_1:str, X_2:ptr):void +SQLcreate_type +Catalog operation create_type +sqlcatalog +create_type pattern sqlcatalog.create_type(X_0:str, X_1:str, X_2:str):void SQLcreate_type Catalog operation create_type 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 @@ -917,6 +917,7 @@ select 'null in fkeys.delete_action', de [ "sys._columns", "sys", "_columns", "number", "int", 31, 0, NULL, true, 8, NULL, NULL ] [ "sys._columns", "sys", "_columns", "storage", "varchar", 2048, 0, NULL, true, 9, NULL, NULL ] [ "sys._columns", "sys", "_columns", "column_type", "tinyint", 7, 0, NULL, true, 10, NULL, NULL ] +[ "sys._columns", "sys", "_columns", "multiset", "tinyint", 7, 0, NULL, true, 11, NULL, NULL ] [ "sys._columns", "sys", "_tables", "id", "int", 31, 0, NULL, true, 0, NULL, NULL ] [ "sys._columns", "sys", "_tables", "name", "varchar", 1024, 0, NULL, true, 1, NULL, NULL ] [ "sys._columns", "sys", "_tables", "schema_id", "int", 31, 0, NULL, true, 2, NULL, NULL ] @@ -933,6 +934,7 @@ select 'null in fkeys.delete_action', de [ "sys._columns", "sys", "args", "type_scale", "int", 31, 0, NULL, true, 5, NULL, NULL ] [ "sys._columns", "sys", "args", "inout", "tinyint", 7, 0, NULL, true, 6, NULL, NULL ] [ "sys._columns", "sys", "args", "number", "int", 31, 0, NULL, true, 7, NULL, NULL ] +[ "sys._columns", "sys", "args", "multiset", "tinyint", 7, 0, NULL, true, 8, NULL, NULL ] [ "sys._columns", "sys", "auths", "id", "int", 31, 0, NULL, true, 0, NULL, NULL ] [ "sys._columns", "sys", "auths", "name", "varchar", 1024, 0, NULL, true, 1, NULL, NULL ] [ "sys._columns", "sys", "auths", "grantor", "int", 31, 0, NULL, true, 2, NULL, NULL ] @@ -1661,6 +1663,7 @@ select 'null in fkeys.delete_action', de [ "sys._columns", "tmp", "_columns", "number", "int", 31, 0, NULL, true, 8, NULL, NULL ] [ "sys._columns", "tmp", "_columns", "storage", "varchar", 2048, 0, NULL, true, 9, NULL, NULL ] [ "sys._columns", "tmp", "_columns", "column_type", "tinyint", 7, 0, NULL, true, 10, NULL, NULL ] +[ "sys._columns", "tmp", "_columns", "multiset", "tinyint", 7, 0, NULL, true, 11, NULL, NULL ] [ "sys._columns", "tmp", "_tables", "id", "int", 31, 0, NULL, true, 0, NULL, NULL ] [ "sys._columns", "tmp", "_tables", "name", "varchar", 1024, 0, NULL, true, 1, NULL, NULL ] [ "sys._columns", "tmp", "_tables", "schema_id", "int", 31, 0, NULL, true, 2, NULL, NULL ] @@ -2184,6 +2187,7 @@ select 'null in fkeys.delete_action', de [ "sys.functions", "sys", "newurl", "SYSTEM", "create function newurl(protocol string, hostname string, \"port\" int, file string) returns url external name url.\"new\";", "url", "MAL", "Scalar function", false, false, false, true, NULL, "result", "url", 0, 0, "out", "protocol", "varchar", 0, 0, "in", "hostname", "varchar", 0, 0, "in", "port", "int", 31, 0, "in", "file", "varchar", 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 ] [ "sys.functions", "sys", "newurl", "SYSTEM", "create function newurl(protocol string, hostname string, file string) returns url external name url.\"new\";", "url", "MAL", "Scalar function", false, false, false, true, NULL, "result", "url", 0, 0, "out", "protocol", "varchar", 0, 0, "in", "hostname", "varchar", 0, 0, "in", "file", "varchar", 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 ] [ "sys.functions", "sys", "next_value_for", "SYSTEM", "next_value", "sql", "Internal C", "Scalar function", true, false, false, true, NULL, "res_0", "bigint", 63, 0, "out", "arg_1", "varchar", 0, 0, "in", "arg_2", "varchar", 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", "sys", "next_value_for", "SYSTEM", "next_value_ms", "sql", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0", "bigint", 63, 0, "out", "arg_1", "any", 0, 0, "in", "arg_2", "varchar", 0, 0, "in", "arg_3", "varchar", 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 ] [ "sys.functions", "sys", "nextafter", "SYSTEM", "nextafter", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0", "double", 53, 0, "out", "arg_1", "double", 53, 0, "in", "arg_2", "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 ] [ "sys.functions", "sys", "nextafter", "SYSTEM", "nextafter", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0", "real", 24, 0, "out", "arg_1", "real", 24, 0, "in", "arg_2", "real", 24, 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", "sys", "not", "SYSTEM", "not", "calc", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0", "boolean", 1, 0, "out", "arg_1", "boolean", 1, 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 ] @@ -2270,6 +2274,7 @@ select 'null in fkeys.delete_action', de [ "sys.functions", "sys", "regexp_replace", "SYSTEM", "create function sys.regexp_replace(ori string, pat string, rep string) returns string begin return sys.regexp_replace(ori, pat, rep, ''); end;", "sql", "SQL", "Scalar function", false, false, false, true, NULL, "result", "varchar", 0, 0, "out", "ori", "varchar", 0, 0, "in", "pat", "varchar", 0, 0, "in", "rep", "varchar", 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 ] [ "sys.functions", "sys", "regexp_replace", "SYSTEM", "create function sys.regexp_replace(ori string, pat string, rep string, flg string) returns string external name pcre.replace;", "pcre", "MAL", "Scalar function", false, false, false, true, NULL, "result", "varchar", 0, 0, "out", "ori", "varchar", 0, 0, "in", "pat", "varchar", 0, 0, "in", "rep", "varchar", 0, 0, "in", "flg", "varchar", 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 ] [ "sys.functions", "sys", "rejects", "SYSTEM", "create function sys.rejects() returns table(rowid bigint, fldid int, \"message\" string, \"input\" string) external name sql.copy_rejects;", "sql", "MAL", "Function returning a table", false, false, false, true, NULL, "rowid", "bigint", 63, 0, "out", "fldid", "int", 31, 0, "out", "message", "varchar", 0, 0, "out", "input", "varchar", 0, 0, "out", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
