Changeset: 7ab831e65f9d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ab831e65f9d
Modified Files:
monetdb5/modules/mal/sysmon.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/26_sysmon.sql
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: linear-hashing
Log Message:
Removed redundant tinyint, smallint and int versions of sys.pause, sys.resume
and sys.stop procedures. We only need the bigint version. This fixes the
upgrade as well
diffs (229 lines):
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -135,20 +135,14 @@ SYSMONpause(Client cntxt, MalBlkPtr mb,
(void) mb;
(void) stk;
(void) pci;
-
+
switch( getArgType(mb,pci,1)){
case TYPE_bte: tag = *getArgReference_bte(stk,pci,1); break;
case TYPE_sht: tag = *getArgReference_sht(stk,pci,1); break;
case TYPE_int: tag = *getArgReference_int(stk,pci,1); break;
case TYPE_lng: tag = *getArgReference_lng(stk,pci,1); break;
-#ifdef HAVE_HGE
- case TYPE_hge:
- /* Does this happen?
- * If so, what do we have TODO ? */
- throw(MAL, "SYSMONpause", SQLSTATE(42000) "type hge not
handled, yet");
-#endif
default:
- throw(MAL, "SYSMONpause", SQLSTATE(42000) "Pause requires
integer");
+ throw(MAL, "SYSMONpause", SQLSTATE(42000) "SYSMONpause requires
a 64-bit integer");
}
if (tag < 1)
throw(MAL, "SYSMONpause", SQLSTATE(42000) "Tag must be
positive");
@@ -171,20 +165,14 @@ SYSMONresume(Client cntxt, MalBlkPtr mb,
(void) mb;
(void) stk;
(void) pci;
-
+
switch( getArgType(mb,pci,1)){
case TYPE_bte: tag = *getArgReference_bte(stk,pci,1); break;
case TYPE_sht: tag = *getArgReference_sht(stk,pci,1); break;
case TYPE_int: tag = *getArgReference_int(stk,pci,1); break;
case TYPE_lng: tag = *getArgReference_lng(stk,pci,1); break;
-#ifdef HAVE_HGE
- case TYPE_hge:
- /* Does this happen?
- * If so, what do we have TODO ? */
- throw(MAL, "SYSMONresume", SQLSTATE(42000) "type hge not
handled, yet");
-#endif
default:
- throw(MAL, "SYSMONresume", SQLSTATE(42000) "Resume requires
integer");
+ throw(MAL, "SYSMONresume", SQLSTATE(42000) "SYSMONresume
requires a 64-bit integer");
}
if (tag < 1)
throw(MAL, "SYSMONresume", SQLSTATE(42000) "Tag must be
positive");
@@ -207,20 +195,14 @@ SYSMONstop(Client cntxt, MalBlkPtr mb, M
(void) mb;
(void) stk;
(void) pci;
-
+
switch( getArgType(mb,pci,1)){
case TYPE_bte: tag = *getArgReference_bte(stk,pci,1); break;
case TYPE_sht: tag = *getArgReference_sht(stk,pci,1); break;
case TYPE_int: tag = *getArgReference_int(stk,pci,1); break;
case TYPE_lng: tag = *getArgReference_lng(stk,pci,1); break;
-#ifdef HAVE_HGE
- case TYPE_hge:
- /* Does this happen?
- * If so, what do we have TODO ? */
- throw(MAL, "SYSMONstop", SQLSTATE(42000) "type hge not handled,
yet");
-#endif
default:
- throw(MAL, "SYSMONstop", SQLSTATE(42000) "Stop requires
integer");
+ throw(MAL, "SYSMONstop", SQLSTATE(42000) "SYSMONstop requires a
64-bit integer");
}
if (tag < 1)
throw(MAL, "SYSMONstop", SQLSTATE(42000) "Tag must be
positive");
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
@@ -2553,44 +2553,12 @@ sql_update_linear_hashing(Client c, mvc
"create view sys.queue as select * from sys.queue();\n"
"grant select on sys.queue to public;\n"
- "create procedure sys.pause(tag tinyint)\n"
- " external name sql.sysmon_pause;\n"
- "grant execute on procedure sys.pause(tinyint) to
public;\n"
- "create procedure sys.resume(tag tinyint)\n"
- " external name sql.sysmon_resume;\n"
- "grant execute on procedure sys.resume(tinyint) to
public;\n"
- "create procedure sys.stop(tag tinyint)\n"
- "external name sql.sysmon_stop;\n"
- "grant execute on procedure sys.stop(tinyint) to
public;\n"
+ "drop procedure sys.pause(int);\n"
+ "drop procedure sys.resume(int);\n"
+ "drop procedure sys.stop(int);\n"
- "create procedure sys.pause(tag smallint)\n"
- " external name sql.sysmon_pause;\n"
- "grant execute on procedure sys.pause(smallint) to
public;\n"
- "create procedure sys.resume(tag smallint)\n"
- " external name sql.sysmon_resume;\n"
- "grant execute on procedure sys.resume(smallint) to
public;\n"
- "create procedure sys.stop(tag smallint)\n"
- " external name sql.sysmon_stop;\n"
- "grant execute on procedure sys.stop(smallint) to
public;\n"
-
- "create procedure sys.pause(tag int)\n"
- " external name sql.sysmon_pause;\n"
- "grant execute on procedure sys.pause(int) to public;\n"
- "create procedure sys.resume(tag int)\n"
- " external name sql.sysmon_resume;\n"
- "grant execute on procedure sys.resume(int) to
public;\n"
- "create procedure sys.stop(tag int)\n"
- " external name sql.sysmon_stop;\n"
- "grant execute on procedure sys.stop(int) to public;\n"
-
- "create procedure sys.pause(tag bigint)\n"
- " external name sql.sysmon_pause;\n"
"grant execute on procedure sys.pause(bigint) to
public;\n"
- "create procedure sys.resume(tag bigint)\n"
- " external name sql.sysmon_resume;\n"
"grant execute on procedure sys.resume(bigint) to
public;\n"
- "create procedure sys.stop(tag bigint)\n"
- " external name sql.sysmon_stop;\n"
"grant execute on procedure sys.stop(bigint) to
public;\n");
pos += snprintf(buf + pos, bufsize - pos,
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
@@ -26,36 +26,6 @@ create view sys.queue as select * from s
grant select on sys.queue to public;
-- operations to manipulate the state of havoc queries
-create procedure sys.pause(tag tinyint)
-external name sql.sysmon_pause;
-grant execute on procedure sys.pause(tinyint) to public;
-create procedure sys.resume(tag tinyint)
-external name sql.sysmon_resume;
-grant execute on procedure sys.resume(tinyint) to public;
-create procedure sys.stop(tag tinyint)
-external name sql.sysmon_stop;
-grant execute on procedure sys.stop(tinyint) to public;
-
-create procedure sys.pause(tag smallint)
-external name sql.sysmon_pause;
-grant execute on procedure sys.pause(smallint) to public;
-create procedure sys.resume(tag smallint)
-external name sql.sysmon_resume;
-grant execute on procedure sys.resume(smallint) to public;
-create procedure sys.stop(tag smallint)
-external name sql.sysmon_stop;
-grant execute on procedure sys.stop(smallint) to public;
-
-create procedure sys.pause(tag int)
-external name sql.sysmon_pause;
-grant execute on procedure sys.pause(int) to public;
-create procedure sys.resume(tag int)
-external name sql.sysmon_resume;
-grant execute on procedure sys.resume(int) to public;
-create procedure sys.stop(tag int)
-external name sql.sysmon_stop;
-grant execute on procedure sys.stop(int) to public;
-
create procedure sys.pause(tag bigint)
external name sql.sysmon_pause;
grant execute on procedure sys.pause(bigint) to public;
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -1445,9 +1445,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "patindex", 0, "int", "patindex" ]
[ "sys", "patindex", 1, "clob", "" ]
[ "sys", "patindex", 2, "clob", "" ]
-[ "sys", "pause", 0, "tinyint", "create procedure
sys.pause(tag tinyint)\nexternal name sql.sysmon_pause;" ]
-[ "sys", "pause", 0, "smallint", "create procedure
sys.pause(tag smallint)\nexternal name sql.sysmon_pause;" ]
-[ "sys", "pause", 0, "int", "create procedure sys.pause(tag
int)\nexternal name sql.sysmon_pause;" ]
[ "sys", "pause", 0, "bigint", "create procedure
sys.pause(tag bigint)\nexternal name sql.sysmon_pause;" ]
[ "sys", "percent_rank", 0, "double", "percent_rank" ]
[ "sys", "percent_rank", 1, "any", "" ]
@@ -1639,9 +1636,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "restart", 1, "varchar", "" ]
[ "sys", "restart", 2, "varchar", "" ]
[ "sys", "restart", 3, "bigint", "" ]
-[ "sys", "resume", 0, "tinyint", "create procedure
sys.resume(tag tinyint)\nexternal name sql.sysmon_resume;" ]
-[ "sys", "resume", 0, "smallint", "create procedure
sys.resume(tag smallint)\nexternal name sql.sysmon_resume;" ]
-[ "sys", "resume", 0, "int", "create procedure
sys.resume(tag int)\nexternal name sql.sysmon_resume;" ]
[ "sys", "resume", 0, "bigint", "create procedure
sys.resume(tag bigint)\nexternal name sql.sysmon_resume;" ]
[ "sys", "reuse", 0, "clob", "create procedure reuse(sys
string, tab string)\n external name sql.reuse;" ]
[ "sys", "reuse", 1, "clob", "" ]
@@ -4442,9 +4436,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "stddev_samp", 1, "sec_interval", "" ]
[ "sys", "stddev_samp", 0, "double", "create aggregate
stddev_samp(val interval month) returns double\n external name
\"aggr\".\"stdev\";" ]
[ "sys", "stddev_samp", 1, "month_interval", "" ]
-[ "sys", "stop", 0, "tinyint", "create procedure sys.stop(tag
tinyint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "stop", 0, "smallint", "create procedure sys.stop(tag
smallint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stopsession", 0, "int", "create procedure
sys.stopsession(\"sessionid\" int)\n external name clients.stopsession;" ]
[ "sys", "storage", 0, "varchar", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" varchar(1024),\n \"table\"
varchar(1024),\n \"column\" varchar(1024), \n \"type\" varchar(1024),\n
\"mode\" varchar(15),\n location varchar(1024),\n \"count\" bigint,\n typewidth
int,\n columnsize bigint,\n heapsize bigint,\n hashes bigint,\n phash
boolean,\n \"imprints\" bigint,\n sorted boolean,\n revsorted boolean,\n
\"unique\" boolean,\n orderidx bigint\n)\nexternal name sql.\"storage\";" ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -1539,9 +1539,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "patindex", 0, "int", "patindex" ]
[ "sys", "patindex", 1, "clob", "" ]
[ "sys", "patindex", 2, "clob", "" ]
-[ "sys", "pause", 0, "tinyint", "create procedure
sys.pause(tag tinyint)\nexternal name sql.sysmon_pause;" ]
-[ "sys", "pause", 0, "smallint", "create procedure
sys.pause(tag smallint)\nexternal name sql.sysmon_pause;" ]
-[ "sys", "pause", 0, "int", "create procedure sys.pause(tag
int)\nexternal name sql.sysmon_pause;" ]
[ "sys", "pause", 0, "bigint", "create procedure
sys.pause(tag bigint)\nexternal name sql.sysmon_pause;" ]
[ "sys", "percent_rank", 0, "double", "percent_rank" ]
[ "sys", "percent_rank", 1, "any", "" ]
@@ -1743,9 +1740,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "restart", 1, "varchar", "" ]
[ "sys", "restart", 2, "varchar", "" ]
[ "sys", "restart", 3, "bigint", "" ]
-[ "sys", "resume", 0, "tinyint", "create procedure
sys.resume(tag tinyint)\nexternal name sql.sysmon_resume;" ]
-[ "sys", "resume", 0, "smallint", "create procedure
sys.resume(tag smallint)\nexternal name sql.sysmon_resume;" ]
-[ "sys", "resume", 0, "int", "create procedure
sys.resume(tag int)\nexternal name sql.sysmon_resume;" ]
[ "sys", "resume", 0, "bigint", "create procedure
sys.resume(tag bigint)\nexternal name sql.sysmon_resume;" ]
[ "sys", "reuse", 0, "clob", "create procedure reuse(sys
string, tab string)\n external name sql.reuse;" ]
[ "sys", "reuse", 1, "clob", "" ]
@@ -5029,9 +5023,6 @@ stdout of test 'systemfunctions` in dire
[ "sys", "stddev_samp", 1, "month_interval", "" ]
[ "sys", "stddev_samp", 0, "double", "create aggregate
stddev_samp(val hugeint) returns double\n external name \"aggr\".\"stdev\";" ]
[ "sys", "stddev_samp", 1, "hugeint", "" ]
-[ "sys", "stop", 0, "tinyint", "create procedure sys.stop(tag
tinyint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "stop", 0, "smallint", "create procedure sys.stop(tag
smallint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stopsession", 0, "int", "create procedure
sys.stopsession(\"sessionid\" int)\n external name clients.stopsession;" ]
[ "sys", "storage", 0, "varchar", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" varchar(1024),\n \"table\"
varchar(1024),\n \"column\" varchar(1024), \n \"type\" varchar(1024),\n
\"mode\" varchar(15),\n location varchar(1024),\n \"count\" bigint,\n typewidth
int,\n columnsize bigint,\n heapsize bigint,\n hashes bigint,\n phash
boolean,\n \"imprints\" bigint,\n sorted boolean,\n revsorted boolean,\n
\"unique\" boolean,\n orderidx bigint\n)\nexternal name sql.\"storage\";" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
