Changeset: c8c1e21898e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8c1e21898e2
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/26_sysmon.sql
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
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: Apr2019
Log Message:
Allow any user to use sys.queue.
It only gives information about their own queries.
diffs (truncated from 326 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
@@ -1536,6 +1536,11 @@ sql_update_apr2019(Client c, mvc *sql)
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
+ /* 26_sysmon.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "grant execute on function sys.queue to public;\n"
+ "grant select on sys.queue to public;\n");
+
/* 51_sys_schema_extensions.sql */
pos += snprintf(buf + pos, bufsize - pos,
"ALTER TABLE sys.keywords SET READ WRITE;\n"
diff --git a/sql/scripts/26_sysmon.sql b/sql/scripts/26_sysmon.sql
--- a/sql/scripts/26_sysmon.sql
+++ b/sql/scripts/26_sysmon.sql
@@ -19,8 +19,10 @@ returns table(
query string
)
external name sql.sysmon_queue;
+grant execute on function sys.queue to public;
create view sys.queue as select * from sys.queue();
+grant select on sys.queue to public;
-- operations to manipulate the state of havoc queries
create procedure sys.pause(tag int)
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -5905,6 +5905,8 @@ commit;
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -5905,6 +5905,8 @@ commit;
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -5905,6 +5905,8 @@ commit;
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
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
@@ -4528,6 +4528,7 @@ drop function pcre_replace(string, strin
[ "pg", "public", "SELECT", "monetdb", 0 ]
[ "privilege_codes", "public", "SELECT", "monetdb", 0
]
[ "privileges", "public", "SELECT", NULL, 0 ]
+[ "queue", "public", "SELECT", "monetdb", 0 ]
[ "range_partitions", "public", "SELECT", NULL, 0 ]
[ "rg", "public", "SELECT", "monetdb", 0 ]
[ "roles", "public", "SELECT", "monetdb", 0 ]
@@ -4656,6 +4657,7 @@ drop function pcre_replace(string, strin
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
+[ "queue", "public", "EXECUTE", "monetdb", 0 ]
[ "radians", "public", "EXECUTE", "monetdb", 0 ]
[ "rejects", "public", "EXECUTE", "monetdb", 0 ]
[ "reverse_qual", "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
@@ -4528,6 +4528,7 @@ drop function pcre_replace(string, strin
[ "pg", "public", "SELECT", "monetdb", 0 ]
[ "privilege_codes", "public", "SELECT", "monetdb", 0
]
[ "privileges", "public", "SELECT", NULL, 0 ]
+[ "queue", "public", "SELECT", "monetdb", 0 ]
[ "range_partitions", "public", "SELECT", NULL, 0 ]
[ "rg", "public", "SELECT", "monetdb", 0 ]
[ "roles", "public", "SELECT", "monetdb", 0 ]
@@ -4656,6 +4657,7 @@ drop function pcre_replace(string, strin
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
+[ "queue", "public", "EXECUTE", "monetdb", 0 ]
[ "radians", "public", "EXECUTE", "monetdb", 0 ]
[ "rejects", "public", "EXECUTE", "monetdb", 0 ]
[ "reverse_qual", "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
@@ -4745,6 +4745,7 @@ drop function pcre_replace(string, strin
[ "pg", "public", "SELECT", "monetdb", 0 ]
[ "privilege_codes", "public", "SELECT", "monetdb", 0
]
[ "privileges", "public", "SELECT", NULL, 0 ]
+[ "queue", "public", "SELECT", "monetdb", 0 ]
[ "range_partitions", "public", "SELECT", NULL, 0 ]
[ "rg", "public", "SELECT", "monetdb", 0 ]
[ "roles", "public", "SELECT", "monetdb", 0 ]
@@ -4877,6 +4878,7 @@ drop function pcre_replace(string, strin
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
[ "quantile", "public", "EXECUTE", "monetdb", 0 ]
+[ "queue", "public", "EXECUTE", "monetdb", 0 ]
[ "radians", "public", "EXECUTE", "monetdb", 0 ]
[ "rejects", "public", "EXECUTE", "monetdb", 0 ]
[ "reverse_qual", "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
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -17,6 +17,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -17,6 +17,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5904,6 +5904,8 @@ commit;
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
INSERT INTO sys.keywords VALUES ('WINDOW');
DROP VIEW sys.var_values;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -18,6 +18,8 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema sys;
+grant execute on function sys.queue to public;
+grant select on sys.queue to public;
ALTER TABLE sys.keywords SET READ WRITE;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
