Changeset: 4455cbb4fe3b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4455cbb4fe3b
Modified Files:
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
Branch: Jan2022
Log Message:
Approvals.
diffs (88 lines):
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
@@ -1009,12 +1009,12 @@ CREATE TABLE "sys"."triggers" ("id" INTE
CREATE TABLE "sys"."types" ("id" INTEGER, "systemname" VARCHAR(256), "sqlname"
VARCHAR(1024), "digits" INTEGER, "scale" INTEGER, "radix" INTEGER, "eclass"
INTEGER, "schema_id" INTEGER);
CREATE TABLE "sys"."user_role" ("login_id" INTEGER, "role_id" INTEGER);
CREATE TABLE "sys"."value_partitions" ("table_id" INTEGER, "partition_id"
INTEGER, "value" VARCHAR(2048));
-CREATE TABLE "tmp"."_columns" ("id" INTEGER, "name" VARCHAR(1024), "type"
VARCHAR(1024), "type_digits" INTEGER, "type_scale" INTEGER, "table_id" INTEGER,
"default" VARCHAR(2048), "null" BOOLEAN, "number" INTEGER, "storage"
VARCHAR(2048));
-CREATE TABLE "tmp"."_tables" ("id" INTEGER, "name" VARCHAR(1024), "schema_id"
INTEGER, "query" VARCHAR(1048576), "type" SMALLINT, "system" BOOLEAN,
"commit_action" SMALLINT, "access" SMALLINT);
-CREATE TABLE "tmp"."idxs" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER,
"name" VARCHAR(1024));
-CREATE TABLE "tmp"."keys" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER,
"name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER);
-CREATE TABLE "tmp"."objects" ("id" INTEGER, "name" VARCHAR(1024), "nr"
INTEGER, "sub" INTEGER);
-CREATE TABLE "tmp"."triggers" ("id" INTEGER, "name" VARCHAR(1024), "table_id"
INTEGER, "time" SMALLINT, "orientation" SMALLINT, "event" SMALLINT, "old_name"
VARCHAR(1024), "new_name" VARCHAR(1024), "condition" VARCHAR(2048), "statement"
VARCHAR(2048));
+CREATE GLOBAL TEMPORARY TABLE "tmp"."_columns" ("id" INTEGER, "name"
VARCHAR(1024), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale"
INTEGER, "table_id" INTEGER, "default" VARCHAR(2048), "null" BOOLEAN, "number"
INTEGER, "storage" VARCHAR(2048)) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."_tables" ("id" INTEGER, "name"
VARCHAR(1024), "schema_id" INTEGER, "query" VARCHAR(1048576), "type" SMALLINT,
"system" BOOLEAN, "commit_action" SMALLINT, "access" SMALLINT) ON COMMIT
PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."idxs" ("id" INTEGER, "table_id" INTEGER,
"type" INTEGER, "name" VARCHAR(1024)) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."keys" ("id" INTEGER, "table_id" INTEGER,
"type" INTEGER, "name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER) ON
COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."objects" ("id" INTEGER, "name"
VARCHAR(1024), "nr" INTEGER, "sub" INTEGER) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."triggers" ("id" INTEGER, "name"
VARCHAR(1024), "table_id" INTEGER, "time" SMALLINT, "orientation" SMALLINT,
"event" SMALLINT, "old_name" VARCHAR(1024), "new_name" VARCHAR(1024),
"condition" VARCHAR(2048), "statement" VARCHAR(2048)) ON COMMIT PRESERVE ROWS;
create view logging.compinfo as select * from logging.compinfo();
SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM
"tmp"."_columns" AS t) AS columns;
create view sys.dependencies_vw as select d.id, i1.obj_type, i1.name,
d.depend_id as used_by_id, i2.obj_type as used_by_obj_type, i2.name as
used_by_name, d.depend_type, dt.dependency_type_name from sys.dependencies d
join sys.ids i1 on d.id = i1.id join sys.ids i2 on d.depend_id = i2.id join
sys.dependency_types dt on d.depend_type = dt.dependency_type_id order by id,
depend_id;
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
@@ -371,8 +371,6 @@
\dSf sys."str_to_date"
\dSf sys."str_to_time"
\dSf sys."str_to_timestamp"
-\dSf sys."strimp_create"
-\dSf sys."strimp_filter"
\dSf sys."suspend_log_flushing"
\dSf sys."text"
\dSf sys."time_to_str"
@@ -923,8 +921,6 @@ SYSTEM PROCEDURE sys.storagemodel
SYSTEM FUNCTION sys.str_to_date
SYSTEM FUNCTION sys.str_to_time
SYSTEM FUNCTION sys.str_to_timestamp
-SYSTEM PROCEDURE sys.strimp_create
-SYSTEM FILTER FUNCTION sys.strimp_filter
SYSTEM FUNCTION sys.strings
SYSTEM FUNCTION sys.substr
SYSTEM FUNCTION sys.substring
@@ -1013,12 +1009,12 @@ CREATE TABLE "sys"."triggers" ("id" INTE
CREATE TABLE "sys"."types" ("id" INTEGER, "systemname" VARCHAR(256), "sqlname"
VARCHAR(1024), "digits" INTEGER, "scale" INTEGER, "radix" INTEGER, "eclass"
INTEGER, "schema_id" INTEGER);
CREATE TABLE "sys"."user_role" ("login_id" INTEGER, "role_id" INTEGER);
CREATE TABLE "sys"."value_partitions" ("table_id" INTEGER, "partition_id"
INTEGER, "value" VARCHAR(2048));
-CREATE TABLE "tmp"."_columns" ("id" INTEGER, "name" VARCHAR(1024), "type"
VARCHAR(1024), "type_digits" INTEGER, "type_scale" INTEGER, "table_id" INTEGER,
"default" VARCHAR(2048), "null" BOOLEAN, "number" INTEGER, "storage"
VARCHAR(2048));
-CREATE TABLE "tmp"."_tables" ("id" INTEGER, "name" VARCHAR(1024), "schema_id"
INTEGER, "query" VARCHAR(1048576), "type" SMALLINT, "system" BOOLEAN,
"commit_action" SMALLINT, "access" SMALLINT);
-CREATE TABLE "tmp"."idxs" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER,
"name" VARCHAR(1024));
-CREATE TABLE "tmp"."keys" ("id" INTEGER, "table_id" INTEGER, "type" INTEGER,
"name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER);
-CREATE TABLE "tmp"."objects" ("id" INTEGER, "name" VARCHAR(1024), "nr"
INTEGER, "sub" INTEGER);
-CREATE TABLE "tmp"."triggers" ("id" INTEGER, "name" VARCHAR(1024), "table_id"
INTEGER, "time" SMALLINT, "orientation" SMALLINT, "event" SMALLINT, "old_name"
VARCHAR(1024), "new_name" VARCHAR(1024), "condition" VARCHAR(2048), "statement"
VARCHAR(2048));
+CREATE GLOBAL TEMPORARY TABLE "tmp"."_columns" ("id" INTEGER, "name"
VARCHAR(1024), "type" VARCHAR(1024), "type_digits" INTEGER, "type_scale"
INTEGER, "table_id" INTEGER, "default" VARCHAR(2048), "null" BOOLEAN, "number"
INTEGER, "storage" VARCHAR(2048)) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."_tables" ("id" INTEGER, "name"
VARCHAR(1024), "schema_id" INTEGER, "query" VARCHAR(1048576), "type" SMALLINT,
"system" BOOLEAN, "commit_action" SMALLINT, "access" SMALLINT) ON COMMIT
PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."idxs" ("id" INTEGER, "table_id" INTEGER,
"type" INTEGER, "name" VARCHAR(1024)) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."keys" ("id" INTEGER, "table_id" INTEGER,
"type" INTEGER, "name" VARCHAR(1024), "rkey" INTEGER, "action" INTEGER) ON
COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."objects" ("id" INTEGER, "name"
VARCHAR(1024), "nr" INTEGER, "sub" INTEGER) ON COMMIT PRESERVE ROWS;
+CREATE GLOBAL TEMPORARY TABLE "tmp"."triggers" ("id" INTEGER, "name"
VARCHAR(1024), "table_id" INTEGER, "time" SMALLINT, "orientation" SMALLINT,
"event" SMALLINT, "old_name" VARCHAR(1024), "new_name" VARCHAR(1024),
"condition" VARCHAR(2048), "statement" VARCHAR(2048)) ON COMMIT PRESERVE ROWS;
create view logging.compinfo as select * from logging.compinfo();
SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM
"tmp"."_columns" AS t) AS columns;
create view sys.dependencies_vw as select d.id, i1.obj_type, i1.name,
d.depend_id as used_by_id, i2.obj_type as used_by_obj_type, i2.name as
used_by_name, d.depend_type, dt.dependency_type_name from sys.dependencies d
join sys.ids i1 on d.id = i1.id join sys.ids i2 on d.depend_id = i2.id join
sys.dependency_types dt on d.depend_type = dt.dependency_type_id order by id,
depend_id;
@@ -1491,8 +1487,6 @@ create procedure sys.storagemodelinit()
create function str_to_date(s string, format string) returns date external
name mtime."str_to_date";
create function str_to_time(s string, format string) returns time with time
zone external name mtime."str_to_time";
create function str_to_timestamp(s string, format string) returns timestamp
with time zone external name mtime."str_to_timestamp";
-create procedure sys.strimp_create(sch string, tab string, col string)
external name sql.createstrimps;
-create filter function sys.strimp_filter(strs string, q string) external name
strimps.strimpfilter;
create procedure sys.suspend_log_flushing() external name
sql.suspend_log_flushing;
create function "text" (p inet) returns clob external name inet."text";
create function time_to_str(d time with time zone, format string) returns
string external name mtime."time_to_str";
@@ -4111,8 +4105,6 @@ select 'null in value_partitions.value',
[ "sys.functions", "sys", "str_to_date", "SYSTEM", "create
function str_to_date(s string, format string) returns date external name
mtime.\"str_to_date\";", "mtime", "MAL", "Scalar function",
false, false, false, true, "result", "date", 0, 0, "out",
"s", "clob", 0, 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.functions", "sys", "str_to_time", "SYSTEM", "create
function str_to_time(s string, format string) returns time with time zone
external name mtime.\"str_to_time\";", "mtime", "MAL", "Scalar
function", false, false, false, true, "result", "timetz",
1, 0, "out", "s", "clob", 0, 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.functions", "sys", "str_to_timestamp", "SYSTEM", "create
function str_to_timestamp(s string, format string) returns timestamp with time
zone external name mtime.\"str_to_timestamp\";", "mtime", "MAL",
"Scalar function", false, false, false, true, "result",
"timestamptz", 7, 0, "out", "s", "clob", 0, 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.functions", "sys", "strimp_create", "SYSTEM", "create
procedure sys.strimp_create(sch string, tab string, col string) external name
sql.createstrimps;", "sql", "MAL", "Procedure", true, false,
false, true, "sch", "clob", 0, 0, "in", "tab", "clob", 0,
0, "in", "col", "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", "sys", "strimp_filter", "SYSTEM", "create
filter function sys.strimp_filter(strs string, q string) external name
strimps.strimpfilter;", "strimps", "MAL", "Filter function", false,
false, false, true, "strs", "clob", 0, 0, "in", "q",
"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, NULL,
NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "strings", "SYSTEM", "strings",
"sql", "Internal C", "Scalar function", false, 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 ]
[ "sys.functions", "sys", "strings", "SYSTEM", "strings",
"sql", "Internal C", "Scalar function", false, false, false, false,
"res_0", "clob", 0, 0, "out", "arg_1", "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, NULL, NULL, NULL,
NULL, NULL ]
[ "sys.functions", "sys", "strings", "SYSTEM", "strings",
"sql", "Internal C", "Scalar function", false, false, false, false,
"res_0", "varchar", 0, 0, "out", "arg_1",
"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,
NULL, NULL, NULL, NULL, NULL ]
@@ -6193,7 +6185,6 @@ select 'null in value_partitions.value',
[ "grant on function", "sys", "str_to_date", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "str_to_time", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "str_to_timestamp", "public",
"EXECUTE", "monetdb", 0 ]
-[ "grant on function", "sys", "strimp_filter", "public",
"EXECUTE", "monetdb", 0 ]
[ "grant on function", "sys", "text", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "time_to_str", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "timestamp_to_str", "public",
"EXECUTE", "monetdb", 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
