Changeset: 6ff2744a54fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ff2744a54fa
Modified Files:
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/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: linear-hashing
Log Message:
Approve upgrade.
diffs (truncated from 1501 to 300 lines):
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
@@ -5938,16 +5938,24 @@ returns table(
"memorylimit" int)
external name sql.sessions;
create view sys.sessions as select * from sys.sessions();
+grant execute on procedure sys.settimeout(bigint) to public;
+grant execute on procedure sys.settimeout(bigint,bigint) to public;
+grant execute on procedure sys.setsession(bigint) to public;
create procedure sys.setoptimizer("optimizer" string)
external name clients.setoptimizer;
+grant execute on procedure sys.setoptimizer(string) to public;
create procedure sys.setquerytimeout("query" int)
external name clients.setquerytimeout;
+grant execute on procedure sys.setquerytimeout(int) to public;
create procedure sys.setsessiontimeout("timeout" int)
external name clients.setsessiontimeout;
+grant execute on procedure sys.setsessiontimeout(int) to public;
create procedure sys.setworkerlimit("limit" int)
external name clients.setworkerlimit;
+grant execute on procedure sys.setworkerlimit(int) to public;
create procedure sys.setmemorylimit("limit" int)
external name clients.setmemorylimit;
+grant execute on procedure sys.setmemorylimit(int) to public;
create procedure sys.setoptimizer("sessionid" int, "optimizer" string)
external name clients.setoptimizer;
create procedure sys.setquerytimeout("sessionid" int, "query" int)
@@ -5994,10 +6002,24 @@ create function sys.debug(flag string) r
create function sys.debugflags()
returns table(flag string, val bool)
external name mdb."getDebugFlags";
+create procedure sys."sleep"(msecs tinyint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(tinyint) to public;
+create procedure sys."sleep"(msecs smallint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(smallint) to public;
create procedure sys."sleep"(msecs int)
external name "alarm"."sleep";
-create function sys."sleep"(msecs int) returns integer
+ grant execute on procedure sys."sleep"(int) to public;
+create function sys."sleep"(msecs tinyint) returns tinyint
external name "alarm"."sleep";
+grant execute on function sys."sleep"(tinyint) to public;
+create function sys."sleep"(msecs smallint) returns smallint
+ external name "alarm"."sleep";
+grant execute on function sys."sleep"(smallint) to public;
+create function sys."sleep"(msecs int) returns int
+ external name "alarm"."sleep";
+ grant execute on function sys."sleep"(int) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep');
drop view sys.queue;
drop function sys.queue;
@@ -6016,18 +6038,12 @@ returns table(
grant execute on function sys.queue to public;
create view sys.queue as select * from sys.queue();
grant select on sys.queue to public;
-create procedure sys.pause(tag tinyint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag tinyint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag tinyint)
-external name sql.sysmon_stop;
-create procedure sys.pause(tag smallint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag smallint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag smallint)
-external name sql.sysmon_stop;
+drop procedure sys.pause(int);
+drop procedure sys.resume(int);
+drop procedure sys.stop(int);
+grant execute on procedure sys.pause(bigint) to public;
+grant execute on procedure sys.resume(bigint) to public;
+grant execute on procedure sys.stop(bigint) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
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
@@ -5938,16 +5938,24 @@ returns table(
"memorylimit" int)
external name sql.sessions;
create view sys.sessions as select * from sys.sessions();
+grant execute on procedure sys.settimeout(bigint) to public;
+grant execute on procedure sys.settimeout(bigint,bigint) to public;
+grant execute on procedure sys.setsession(bigint) to public;
create procedure sys.setoptimizer("optimizer" string)
external name clients.setoptimizer;
+grant execute on procedure sys.setoptimizer(string) to public;
create procedure sys.setquerytimeout("query" int)
external name clients.setquerytimeout;
+grant execute on procedure sys.setquerytimeout(int) to public;
create procedure sys.setsessiontimeout("timeout" int)
external name clients.setsessiontimeout;
+grant execute on procedure sys.setsessiontimeout(int) to public;
create procedure sys.setworkerlimit("limit" int)
external name clients.setworkerlimit;
+grant execute on procedure sys.setworkerlimit(int) to public;
create procedure sys.setmemorylimit("limit" int)
external name clients.setmemorylimit;
+grant execute on procedure sys.setmemorylimit(int) to public;
create procedure sys.setoptimizer("sessionid" int, "optimizer" string)
external name clients.setoptimizer;
create procedure sys.setquerytimeout("sessionid" int, "query" int)
@@ -5994,10 +6002,24 @@ create function sys.debug(flag string) r
create function sys.debugflags()
returns table(flag string, val bool)
external name mdb."getDebugFlags";
+create procedure sys."sleep"(msecs tinyint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(tinyint) to public;
+create procedure sys."sleep"(msecs smallint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(smallint) to public;
create procedure sys."sleep"(msecs int)
external name "alarm"."sleep";
-create function sys."sleep"(msecs int) returns integer
+ grant execute on procedure sys."sleep"(int) to public;
+create function sys."sleep"(msecs tinyint) returns tinyint
external name "alarm"."sleep";
+grant execute on function sys."sleep"(tinyint) to public;
+create function sys."sleep"(msecs smallint) returns smallint
+ external name "alarm"."sleep";
+grant execute on function sys."sleep"(smallint) to public;
+create function sys."sleep"(msecs int) returns int
+ external name "alarm"."sleep";
+ grant execute on function sys."sleep"(int) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep');
drop view sys.queue;
drop function sys.queue;
@@ -6016,18 +6038,12 @@ returns table(
grant execute on function sys.queue to public;
create view sys.queue as select * from sys.queue();
grant select on sys.queue to public;
-create procedure sys.pause(tag tinyint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag tinyint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag tinyint)
-external name sql.sysmon_stop;
-create procedure sys.pause(tag smallint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag smallint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag smallint)
-external name sql.sysmon_stop;
+drop procedure sys.pause(int);
+drop procedure sys.resume(int);
+drop procedure sys.stop(int);
+grant execute on procedure sys.pause(bigint) to public;
+grant execute on procedure sys.resume(bigint) to public;
+grant execute on procedure sys.stop(bigint) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
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
@@ -5151,16 +5151,24 @@ returns table(
"memorylimit" int)
external name sql.sessions;
create view sys.sessions as select * from sys.sessions();
+grant execute on procedure sys.settimeout(bigint) to public;
+grant execute on procedure sys.settimeout(bigint,bigint) to public;
+grant execute on procedure sys.setsession(bigint) to public;
create procedure sys.setoptimizer("optimizer" string)
external name clients.setoptimizer;
+grant execute on procedure sys.setoptimizer(string) to public;
create procedure sys.setquerytimeout("query" int)
external name clients.setquerytimeout;
+grant execute on procedure sys.setquerytimeout(int) to public;
create procedure sys.setsessiontimeout("timeout" int)
external name clients.setsessiontimeout;
+grant execute on procedure sys.setsessiontimeout(int) to public;
create procedure sys.setworkerlimit("limit" int)
external name clients.setworkerlimit;
+grant execute on procedure sys.setworkerlimit(int) to public;
create procedure sys.setmemorylimit("limit" int)
external name clients.setmemorylimit;
+grant execute on procedure sys.setmemorylimit(int) to public;
create procedure sys.setoptimizer("sessionid" int, "optimizer" string)
external name clients.setoptimizer;
create procedure sys.setquerytimeout("sessionid" int, "query" int)
@@ -5207,10 +5215,24 @@ create function sys.debug(flag string) r
create function sys.debugflags()
returns table(flag string, val bool)
external name mdb."getDebugFlags";
+create procedure sys."sleep"(msecs tinyint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(tinyint) to public;
+create procedure sys."sleep"(msecs smallint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(smallint) to public;
create procedure sys."sleep"(msecs int)
external name "alarm"."sleep";
-create function sys."sleep"(msecs int) returns integer
+ grant execute on procedure sys."sleep"(int) to public;
+create function sys."sleep"(msecs tinyint) returns tinyint
external name "alarm"."sleep";
+grant execute on function sys."sleep"(tinyint) to public;
+create function sys."sleep"(msecs smallint) returns smallint
+ external name "alarm"."sleep";
+grant execute on function sys."sleep"(smallint) to public;
+create function sys."sleep"(msecs int) returns int
+ external name "alarm"."sleep";
+ grant execute on function sys."sleep"(int) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep');
drop view sys.queue;
drop function sys.queue;
@@ -5229,18 +5251,12 @@ returns table(
grant execute on function sys.queue to public;
create view sys.queue as select * from sys.queue();
grant select on sys.queue to public;
-create procedure sys.pause(tag tinyint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag tinyint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag tinyint)
-external name sql.sysmon_stop;
-create procedure sys.pause(tag smallint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag smallint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag smallint)
-external name sql.sysmon_stop;
+drop procedure sys.pause(int);
+drop procedure sys.resume(int);
+drop procedure sys.stop(int);
+grant execute on procedure sys.pause(bigint) to public;
+grant execute on procedure sys.resume(bigint) to public;
+grant execute on procedure sys.stop(bigint) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue' and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and
type = 2;
update sys._tables set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name = 'queue';
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
@@ -5151,16 +5151,24 @@ returns table(
"memorylimit" int)
external name sql.sessions;
create view sys.sessions as select * from sys.sessions();
+grant execute on procedure sys.settimeout(bigint) to public;
+grant execute on procedure sys.settimeout(bigint,bigint) to public;
+grant execute on procedure sys.setsession(bigint) to public;
create procedure sys.setoptimizer("optimizer" string)
external name clients.setoptimizer;
+grant execute on procedure sys.setoptimizer(string) to public;
create procedure sys.setquerytimeout("query" int)
external name clients.setquerytimeout;
+grant execute on procedure sys.setquerytimeout(int) to public;
create procedure sys.setsessiontimeout("timeout" int)
external name clients.setsessiontimeout;
+grant execute on procedure sys.setsessiontimeout(int) to public;
create procedure sys.setworkerlimit("limit" int)
external name clients.setworkerlimit;
+grant execute on procedure sys.setworkerlimit(int) to public;
create procedure sys.setmemorylimit("limit" int)
external name clients.setmemorylimit;
+grant execute on procedure sys.setmemorylimit(int) to public;
create procedure sys.setoptimizer("sessionid" int, "optimizer" string)
external name clients.setoptimizer;
create procedure sys.setquerytimeout("sessionid" int, "query" int)
@@ -5207,10 +5215,24 @@ create function sys.debug(flag string) r
create function sys.debugflags()
returns table(flag string, val bool)
external name mdb."getDebugFlags";
+create procedure sys."sleep"(msecs tinyint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(tinyint) to public;
+create procedure sys."sleep"(msecs smallint)
+ external name "alarm"."sleep";
+grant execute on procedure sys."sleep"(smallint) to public;
create procedure sys."sleep"(msecs int)
external name "alarm"."sleep";
-create function sys."sleep"(msecs int) returns integer
+ grant execute on procedure sys."sleep"(int) to public;
+create function sys."sleep"(msecs tinyint) returns tinyint
external name "alarm"."sleep";
+grant execute on function sys."sleep"(tinyint) to public;
+create function sys."sleep"(msecs smallint) returns smallint
+ external name "alarm"."sleep";
+grant execute on function sys."sleep"(smallint) to public;
+create function sys."sleep"(msecs int) returns int
+ external name "alarm"."sleep";
+ grant execute on function sys."sleep"(int) to public;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep');
drop view sys.queue;
drop function sys.queue;
@@ -5229,18 +5251,12 @@ returns table(
grant execute on function sys.queue to public;
create view sys.queue as select * from sys.queue();
grant select on sys.queue to public;
-create procedure sys.pause(tag tinyint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag tinyint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag tinyint)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
