Changeset: 4cdf237ca21b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4cdf237ca21b
Removed Files:
sql/scripts/11_times.sql
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/Makefile.ag
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
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/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Nov2019
Log Message:
Removed procedure sys.times(). There was no implementation for it.
diffs (truncated from 378 to 300 lines):
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
@@ -1984,6 +1984,7 @@ sql_update_nov2019(Client c, mvc *sql)
pos = 0;
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
+ "drop procedure sys.times();\n"
"create function sys.deltas (\"schema\" string)"
" returns table (\"id\" int, \"cleared\" boolean,
\"immutable\" bigint, \"inserted\" bigint, \"updates\" bigint, \"deletes\"
bigint, \"level\" int)"
" external name \"sql\".\"deltas\";\n"
diff --git a/sql/scripts/11_times.sql b/sql/scripts/11_times.sql
deleted file mode 100644
--- a/sql/scripts/11_times.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- This Source Code Form is subject to the terms of the Mozilla Public
--- License, v. 2.0. If a copy of the MPL was not distributed with this
--- file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
--- Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
-
--- Provide a simple equivalent for the UNIX times command
--- times 0 ms user 0 ms system 0 ms 0 reads 0 writes
-
-create procedure times()
-external name sql.times;
-
-grant execute on procedure times to public;
diff --git a/sql/scripts/Makefile.ag b/sql/scripts/Makefile.ag
--- a/sql/scripts/Makefile.ag
+++ b/sql/scripts/Makefile.ag
@@ -11,7 +11,6 @@ headers_sql = {
DIR = libdir/monetdb5/createdb
SOURCES = 09_like.sql \
10_math.sql \
- 11_times.sql \
12_url.sql \
13_date.sql \
14_inet.sql \
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5901,6 +5901,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -5901,6 +5901,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -5111,6 +5111,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5111,6 +5111,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5940,6 +5940,7 @@ commit;
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5111,6 +5111,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5940,6 +5940,7 @@ commit;
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5901,6 +5901,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -5111,6 +5111,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -5111,6 +5111,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -5940,6 +5940,7 @@ commit;
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
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
@@ -352,7 +352,6 @@ stdout of test 'check` in directory 'sql
\dSf sys."str_to_timestamp"
\dSf sys."text"
\dSf sys."time_to_str"
-\dSf sys."times"
\dSf sys."timestamp_to_str"
\dSf sys."tracelog"
\dSf sys."uuid"
@@ -840,7 +839,6 @@ SYSTEM FUNCTION sys.tan
SYSTEM FUNCTION sys.tanh
SYSTEM FUNCTION sys.text
SYSTEM FUNCTION sys.time_to_str
-SYSTEM PROCEDURE sys.times
SYSTEM FUNCTION sys.timestamp_to_str
SYSTEM FUNCTION sys.tracelog
SYSTEM FUNCTION sys.trim
@@ -1295,7 +1293,6 @@ create function str_to_time(s string, fo
create function str_to_timestamp(s string, format string) returns timestamp
external name mtime."str_to_timestamp";
create function "text" (p inet) returns clob external name inet."text";
create function time_to_str(d time, format string) returns string external
name mtime."time_to_str";
-create procedure times() external name sql.times;
create function timestamp_to_str(d timestamp, format string) returns string
external name mtime."timestamp_to_str";
create function sys.tracelog() returns table (event integer, clk varchar(20),
pc varchar(50), thread int, ticks bigint, rrsmb bigint, vmmb bigint, reads
bigint, writes bigint, minflt bigint, majflt bigint, nvcsw bigint, stmt string)
external name sql.dump_trace;
create function sys.uuid() returns uuid external name uuid."new";
@@ -3767,7 +3764,6 @@ drop function pcre_replace(string, strin
[ "sys", "tanh", "SYSTEM", "tanh", "mmath", "Internal C",
"Scalar function", false, false, false, "res_0", "real", 24,
0, "out", "arg_1", "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, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "text", "SYSTEM", "create function \"text\" (p inet)
returns clob external name inet.\"text\";", "inet", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"p", "inet", 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", "time_to_str", "SYSTEM", "create function time_to_str(d
time, format string) returns string external name mtime.\"time_to_str\";",
"mtime", "MAL", "Scalar function", false, false, false,
"result", "clob", 0, 0, "out", "d", "time", 1, 0,
"in", "format", "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", "times", "SYSTEM", "create procedure times()
external name sql.times;", "sql", "MAL", "Procedure", true, false,
false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "timestamp_to_str", "SYSTEM", "create function
timestamp_to_str(d timestamp, format string) returns string external name
mtime.\"timestamp_to_str\";", "mtime", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"d", "timestamp", 7, 0, "in", "format", "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", "tracelog", "SYSTEM", "create function sys.tracelog()
returns table (event integer, clk varchar(20), pc varchar(50), thread int,
ticks bigint, rrsmb bigint, vmmb bigint, reads bigint, writes bigint, minflt
bigint, majflt bigint, nvcsw bigint, stmt string) external name
sql.dump_trace;", "sql", "MAL", "Function returning a table", true,
false, false, "event", "int", 32, 0, "out", "clk",
"varchar", 20, 0, "out", "pc", "varchar", 50, 0,
"out", "thread", "int", 32, 0, "out", "ticks",
"bigint", 64, 0, "out", "rrsmb", "bigint", 64,
0, "out", "vmmb", "bigint", 64, 0, "out", "reads",
"bigint", 64, 0, "out", "writes", "bigint", 64,
0, "out", "minflt", "bigint", 64, 0, "out",
"majflt", "bigint", 64, 0, "out", "nvcsw",
"bigint", 64, 0, "out", "stmt", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "trim", "SYSTEM", "trim", "str", "Internal C", "Scalar
function", false, false, false, "res_0", "char", 0, 0,
"out", "arg_1", "char", 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 ]
@@ -4898,7 +4894,6 @@ drop function pcre_replace(string, strin
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "time_to_str", "public", "EXECUTE", "monetdb", 0
]
-[ "times", "public", "EXECUTE", "monetdb", 0 ]
[ "timestamp_to_str", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "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
@@ -352,7 +352,6 @@ stdout of test 'check` in directory 'sql
\dSf sys."str_to_timestamp"
\dSf sys."text"
\dSf sys."time_to_str"
-\dSf sys."times"
\dSf sys."timestamp_to_str"
\dSf sys."tracelog"
\dSf sys."uuid"
@@ -840,7 +839,6 @@ SYSTEM FUNCTION sys.tan
SYSTEM FUNCTION sys.tanh
SYSTEM FUNCTION sys.text
SYSTEM FUNCTION sys.time_to_str
-SYSTEM PROCEDURE sys.times
SYSTEM FUNCTION sys.timestamp_to_str
SYSTEM FUNCTION sys.tracelog
SYSTEM FUNCTION sys.trim
@@ -1295,7 +1293,6 @@ create function str_to_time(s string, fo
create function str_to_timestamp(s string, format string) returns timestamp
external name mtime."str_to_timestamp";
create function "text" (p inet) returns clob external name inet."text";
create function time_to_str(d time, format string) returns string external
name mtime."time_to_str";
-create procedure times() external name sql.times;
create function timestamp_to_str(d timestamp, format string) returns string
external name mtime."timestamp_to_str";
create function sys.tracelog() returns table (event integer, clk varchar(20),
pc varchar(50), thread int, ticks bigint, rrsmb bigint, vmmb bigint, reads
bigint, writes bigint, minflt bigint, majflt bigint, nvcsw bigint, stmt string)
external name sql.dump_trace;
create function sys.uuid() returns uuid external name uuid."new";
@@ -3767,7 +3764,6 @@ drop function pcre_replace(string, strin
[ "sys", "tanh", "SYSTEM", "tanh", "mmath", "Internal C",
"Scalar function", false, false, false, "res_0", "real", 24,
0, "out", "arg_1", "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, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "text", "SYSTEM", "create function \"text\" (p inet)
returns clob external name inet.\"text\";", "inet", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"p", "inet", 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", "time_to_str", "SYSTEM", "create function time_to_str(d
time, format string) returns string external name mtime.\"time_to_str\";",
"mtime", "MAL", "Scalar function", false, false, false,
"result", "clob", 0, 0, "out", "d", "time", 1, 0,
"in", "format", "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", "times", "SYSTEM", "create procedure times()
external name sql.times;", "sql", "MAL", "Procedure", true, false,
false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "timestamp_to_str", "SYSTEM", "create function
timestamp_to_str(d timestamp, format string) returns string external name
mtime.\"timestamp_to_str\";", "mtime", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"d", "timestamp", 7, 0, "in", "format", "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", "tracelog", "SYSTEM", "create function sys.tracelog()
returns table (event integer, clk varchar(20), pc varchar(50), thread int,
ticks bigint, rrsmb bigint, vmmb bigint, reads bigint, writes bigint, minflt
bigint, majflt bigint, nvcsw bigint, stmt string) external name
sql.dump_trace;", "sql", "MAL", "Function returning a table", true,
false, false, "event", "int", 32, 0, "out", "clk",
"varchar", 20, 0, "out", "pc", "varchar", 50, 0,
"out", "thread", "int", 32, 0, "out", "ticks",
"bigint", 64, 0, "out", "rrsmb", "bigint", 64,
0, "out", "vmmb", "bigint", 64, 0, "out", "reads",
"bigint", 64, 0, "out", "writes", "bigint", 64,
0, "out", "minflt", "bigint", 64, 0, "out",
"majflt", "bigint", 64, 0, "out", "nvcsw",
"bigint", 64, 0, "out", "stmt", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "trim", "SYSTEM", "trim", "str", "Internal C", "Scalar
function", false, false, false, "res_0", "char", 0, 0,
"out", "arg_1", "char", 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 ]
@@ -4898,7 +4894,6 @@ drop function pcre_replace(string, strin
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "time_to_str", "public", "EXECUTE", "monetdb", 0
]
-[ "times", "public", "EXECUTE", "monetdb", 0 ]
[ "timestamp_to_str", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "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
@@ -352,7 +352,6 @@ stdout of test 'check` in directory 'sql
\dSf sys."str_to_timestamp"
\dSf sys."text"
\dSf sys."time_to_str"
-\dSf sys."times"
\dSf sys."timestamp_to_str"
\dSf sys."tracelog"
\dSf sys."uuid"
@@ -840,7 +839,6 @@ SYSTEM FUNCTION sys.tan
SYSTEM FUNCTION sys.tanh
SYSTEM FUNCTION sys.text
SYSTEM FUNCTION sys.time_to_str
-SYSTEM PROCEDURE sys.times
SYSTEM FUNCTION sys.timestamp_to_str
SYSTEM FUNCTION sys.tracelog
SYSTEM FUNCTION sys.trim
@@ -1305,7 +1303,6 @@ create function str_to_time(s string, fo
create function str_to_timestamp(s string, format string) returns timestamp
external name mtime."str_to_timestamp";
create function "text" (p inet) returns clob external name inet."text";
create function time_to_str(d time, format string) returns string external
name mtime."time_to_str";
-create procedure times() external name sql.times;
create function timestamp_to_str(d timestamp, format string) returns string
external name mtime."timestamp_to_str";
create function sys.tracelog() returns table (event integer, clk varchar(20),
pc varchar(50), thread int, ticks bigint, rrsmb bigint, vmmb bigint, reads
bigint, writes bigint, minflt bigint, majflt bigint, nvcsw bigint, stmt string)
external name sql.dump_trace;
create function sys.uuid() returns uuid external name uuid."new";
@@ -3981,7 +3978,6 @@ drop function pcre_replace(string, strin
[ "sys", "tanh", "SYSTEM", "tanh", "mmath", "Internal C",
"Scalar function", false, false, false, "res_0", "real", 24,
0, "out", "arg_1", "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, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "text", "SYSTEM", "create function \"text\" (p inet)
returns clob external name inet.\"text\";", "inet", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"p", "inet", 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", "time_to_str", "SYSTEM", "create function time_to_str(d
time, format string) returns string external name mtime.\"time_to_str\";",
"mtime", "MAL", "Scalar function", false, false, false,
"result", "clob", 0, 0, "out", "d", "time", 1, 0,
"in", "format", "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", "times", "SYSTEM", "create procedure times()
external name sql.times;", "sql", "MAL", "Procedure", true, false,
false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "timestamp_to_str", "SYSTEM", "create function
timestamp_to_str(d timestamp, format string) returns string external name
mtime.\"timestamp_to_str\";", "mtime", "MAL", "Scalar function",
false, false, false, "result", "clob", 0, 0, "out",
"d", "timestamp", 7, 0, "in", "format", "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", "tracelog", "SYSTEM", "create function sys.tracelog()
returns table (event integer, clk varchar(20), pc varchar(50), thread int,
ticks bigint, rrsmb bigint, vmmb bigint, reads bigint, writes bigint, minflt
bigint, majflt bigint, nvcsw bigint, stmt string) external name
sql.dump_trace;", "sql", "MAL", "Function returning a table", true,
false, false, "event", "int", 32, 0, "out", "clk",
"varchar", 20, 0, "out", "pc", "varchar", 50, 0,
"out", "thread", "int", 32, 0, "out", "ticks",
"bigint", 64, 0, "out", "rrsmb", "bigint", 64,
0, "out", "vmmb", "bigint", 64, 0, "out", "reads",
"bigint", 64, 0, "out", "writes", "bigint", 64,
0, "out", "minflt", "bigint", 64, 0, "out",
"majflt", "bigint", 64, 0, "out", "nvcsw",
"bigint", 64, 0, "out", "stmt", "clob", 0, 0, "out",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys", "trim", "SYSTEM", "trim", "str", "Internal C", "Scalar
function", false, false, false, "res_0", "char", 0, 0,
"out", "arg_1", "char", 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 ]
@@ -5127,7 +5123,6 @@ drop function pcre_replace(string, strin
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "text", "public", "EXECUTE", "monetdb", 0 ]
[ "time_to_str", "public", "EXECUTE", "monetdb", 0
]
-[ "times", "public", "EXECUTE", "monetdb", 0 ]
[ "timestamp_to_str", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "public", "EXECUTE", "monetdb", 0
]
[ "tojsonarray", "public", "EXECUTE", "monetdb", 0
]
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5901,6 +5901,7 @@ set schema "sys";
Running database upgrade commands:
set schema "sys";
+drop procedure sys.times();
create function sys.deltas ("schema" string) returns table ("id" int,
"cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint,
"deletes" bigint, "level" int) external name "sql"."deltas";
create function sys.deltas ("schema" string, "table" string) returns table
("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates"
bigint, "deletes" bigint, "level" int) external name "sql"."deltas";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
