Changeset: 123a16577bd8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=123a16577bd8
Modified Files:
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: Jan2014
Log Message:
Approve upgrade from latest release.
diffs (truncated from 353 to 300 lines):
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
@@ -20,173 +20,9 @@ stdout of test 'upgrade` in directory 's
Ready.
-Running database upgrade commands:
-set schema "sys";
-drop procedure sys.resetHistory;
-drop procedure sys.keepCall;
-drop procedure sys.keepQuery;
-update sys._tables set system = false where name in
('callhistory','queryhistory','querylog') and schema_id = (select id from
sys.schemas where name = 'sys');
-drop view sys.queryLog;
-drop table sys.callHistory;
-drop table sys.queryHistory;
-create function sys.querylog_catalog()
-returns table(
- id oid,
- owner string,
- defined timestamp,
- query string,
- pipe string,
- mal int, -- size of MAL plan
- optimize bigint -- time in usec
-)
-external name sql.querylog_catalog;
-
-create function sys.querylog_calls()
-returns table(
- id oid, -- references query plan
- "start" timestamp, -- time the statement was started
- "stop" timestamp, -- time the statement was completely finished
- arguments string, -- actual call structure
- tuples wrd, -- number of tuples in the result set
- run bigint, -- time spent (in usec) until the result export
- ship bigint, -- time spent (in usec) to ship the result set
- cpu int, -- average cpu load percentage during execution
- io int, -- percentage time waiting for IO to finish
- space bigint -- total storage size of intermediates created
(in MB)
-)
-external name sql.querylog_calls;
-
-create view sys.querylog_catalog as select * from sys.querylog_catalog();
-create view sys.querylog_calls as select * from sys.querylog_calls();
-create view sys.querylog_history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from sys.querylog_catalog() qd, sys.querylog_calls() ql
-where qd.id = ql.id and qd.owner = user;
-
-update sys._tables
- set system = true
- where name in ('querylog_history', 'querylog_calls', 'querylog_catalog')
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-create procedure sys.querylog_empty()
-external name sql.querylog_empty;
-
-create procedure sys.querylog_enable()
-external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint)
-external name sql.querylog_enable_threshold;
-create procedure sys.querylog_disable()
-external name sql.querylog_disable;
-create view sys.tracelog as select * from sys.tracelog();
-drop function sys.clients;
-create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
-create view sys.sessions as select * from sys.sessions();
-create procedure sys.shutdown(delay tinyint) external name sql.shutdown;
-create procedure sys.shutdown(delay tinyint, force bool) external name
sql.shutdown;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create view sys.optimizers as select * from sys.optimizers();
-create view sys.environment as select * from sys.environment();
-create function sys.queue()
-returns table(
- qtag bigint,
- "user" string,
- started timestamp,
- estimate timestamp,
- progress int,
- status string,
- tag oid,
- query string
-)
-external name sql.sysmon_queue;
-
-create view sys.queue as select * from sys.queue();
-update sys._tables
- set system = true
- where name = 'queue'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-create procedure sys.pause(tag int)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag int)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag int)
-external name sql.sysmon_stop;
-
-create procedure sys.pause(tag bigint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag bigint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag bigint)
-external name sql.sysmon_stop;
-create aggregate quantile(val TINYINT, q DOUBLE) returns TINYINT external name
"aggr"."quantile";
-create aggregate quantile(val SMALLINT, q DOUBLE) returns SMALLINT external
name "aggr"."quantile";
-create aggregate quantile(val INTEGER, q DOUBLE) returns INTEGER external name
"aggr"."quantile";
-create aggregate quantile(val WRD, q DOUBLE) returns WRD external name
"aggr"."quantile";
-create aggregate quantile(val BIGINT, q DOUBLE) returns BIGINT external name
"aggr"."quantile";
-create aggregate quantile(val DECIMAL, q DOUBLE) returns DECIMAL external name
"aggr"."quantile";
-create aggregate quantile(val REAL, q DOUBLE) returns REAL external name
"aggr"."quantile";
-create aggregate quantile(val DOUBLE, q DOUBLE) returns DOUBLE external name
"aggr"."quantile";
-create aggregate quantile(val DATE, q DOUBLE) returns DATE external name
"aggr"."quantile";
-create aggregate quantile(val TIME, q DOUBLE) returns TIME external name
"aggr"."quantile";
-create aggregate quantile(val TIMESTAMP, q DOUBLE) returns TIMESTAMP external
name "aggr"."quantile";
-create aggregate median(val DECIMAL) returns DECIMAL external name
"aggr"."median";
-create view sys.storage as select * from sys.storage();
-create view sys.storagemodel as select * from sys.storagemodel();
-CREATE TABLE sys.statistics(
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- width integer,
- stamp timestamp,
- "sample" bigint,
- "count" bigint,
- "unique" bigint,
- "nils" bigint,
- minval string,
- maxval string,
- sorted boolean);
-
-update sys._tables
- set system = true
- where name = 'statistics'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-create procedure analyze()
-external name sql.analyze;
-
-create procedure analyze(tbl string)
-external name sql.analyze;
-
-create procedure analyze(sch string, tbl string)
-external name sql.analyze;
-
-create procedure analyze(sch string, tbl string, col string)
-external name sql.analyze;
-
-create procedure analyze("sample" bigint)
-external name sql.analyze;
-
-create procedure analyze(tbl string, "sample" bigint)
-external name sql.analyze;
-
-create procedure analyze(sch string, tbl string, "sample" bigint)
-external name sql.analyze;
-
-create procedure analyze(sch string, tbl string, col string, "sample" bigint)
-external name sql.analyze;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('querylog_calls', 'querylog_catalog', 'queue', 'sessions')
and f.type = 1 and f.schema_id = s.id and s.name = 'sys');
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('analyze', 'pause', 'querylog_disable', 'querylog_empty',
'querylog_enable', 'resume', 'setsession', 'settimeout', 'shutdown', 'stop',
'sysmon_resume') and f.type = 2 and f.schema_id = s.id and s.name = 'sys');
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('quantile', 'median') and f.type = 3 and f.schema_id = s.id
and s.name = 'sys');
-update sys._tables set system = true where name in ('environment',
'optimizers', 'queue', 'sessions', 'statistics', 'storage', 'storagemodel',
'tracelog') and schema_id = (select id from sys.schemas where name = 'sys');
-set schema "testschema";
-
-
-# 12:50:17 >
-# 12:50:17 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
-# 12:50:17 >
+# 09:28:56 >
+# 09:28:56 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
+# 09:28:56 >
#select count(*) from testschema.smallstring;
% testschema.L1 # table_name
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
@@ -16,169 +16,6 @@ stdout of test 'upgrade` in directory 's
Ready.
-Running database upgrade commands:
-set schema "sys";
-drop procedure sys.resetHistory;
-drop procedure sys.keepCall;
-drop procedure sys.keepQuery;
-update sys._tables set system = false where name in
('callhistory','queryhistory','querylog') and schema_id = (select id from
sys.schemas where name = 'sys');
-drop view sys.queryLog;
-drop table sys.callHistory;
-drop table sys.queryHistory;
-create function sys.querylog_catalog()
-returns table(
- id oid,
- owner string,
- defined timestamp,
- query string,
- pipe string,
- mal int, -- size of MAL plan
- optimize bigint -- time in usec
-)
-external name sql.querylog_catalog;
-
-create function sys.querylog_calls()
-returns table(
- id oid, -- references query plan
- "start" timestamp, -- time the statement was started
- "stop" timestamp, -- time the statement was completely finished
- arguments string, -- actual call structure
- tuples wrd, -- number of tuples in the result set
- run bigint, -- time spent (in usec) until the result export
- ship bigint, -- time spent (in usec) to ship the result set
- cpu int, -- average cpu load percentage during execution
- io int, -- percentage time waiting for IO to finish
- space bigint -- total storage size of intermediates created
(in MB)
-)
-external name sql.querylog_calls;
-
-create view sys.querylog_catalog as select * from sys.querylog_catalog();
-create view sys.querylog_calls as select * from sys.querylog_calls();
-create view sys.querylog_history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from sys.querylog_catalog() qd, sys.querylog_calls() ql
-where qd.id = ql.id and qd.owner = user;
-
-update sys._tables
- set system = true
- where name in ('querylog_history', 'querylog_calls', 'querylog_catalog')
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-create procedure sys.querylog_empty()
-external name sql.querylog_empty;
-
-create procedure sys.querylog_enable()
-external name sql.querylog_enable;
-create procedure sys.querylog_enable(threshold smallint)
-external name sql.querylog_enable_threshold;
-create procedure sys.querylog_disable()
-external name sql.querylog_disable;
-create view sys.tracelog as select * from sys.tracelog();
-drop function sys.clients;
-create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
-create view sys.sessions as select * from sys.sessions();
-create procedure sys.shutdown(delay tinyint) external name sql.shutdown;
-create procedure sys.shutdown(delay tinyint, force bool) external name
sql.shutdown;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create view sys.optimizers as select * from sys.optimizers();
-create view sys.environment as select * from sys.environment();
-create function sys.queue()
-returns table(
- qtag bigint,
- "user" string,
- started timestamp,
- estimate timestamp,
- progress int,
- status string,
- tag oid,
- query string
-)
-external name sql.sysmon_queue;
-
-create view sys.queue as select * from sys.queue();
-update sys._tables
- set system = true
- where name = 'queue'
- and schema_id = (select id from sys.schemas where name = 'sys');
-
-create procedure sys.pause(tag int)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag int)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag int)
-external name sql.sysmon_stop;
-
-create procedure sys.pause(tag bigint)
-external name sql.sysmon_pause;
-create procedure sys.resume(tag bigint)
-external name sql.sysmon_resume;
-create procedure sys.stop(tag bigint)
-external name sql.sysmon_stop;
-create aggregate quantile(val TINYINT, q DOUBLE) returns TINYINT external name
"aggr"."quantile";
-create aggregate quantile(val SMALLINT, q DOUBLE) returns SMALLINT external
name "aggr"."quantile";
-create aggregate quantile(val INTEGER, q DOUBLE) returns INTEGER external name
"aggr"."quantile";
-create aggregate quantile(val WRD, q DOUBLE) returns WRD external name
"aggr"."quantile";
-create aggregate quantile(val BIGINT, q DOUBLE) returns BIGINT external name
"aggr"."quantile";
-create aggregate quantile(val DECIMAL, q DOUBLE) returns DECIMAL external name
"aggr"."quantile";
-create aggregate quantile(val REAL, q DOUBLE) returns REAL external name
"aggr"."quantile";
-create aggregate quantile(val DOUBLE, q DOUBLE) returns DOUBLE external name
"aggr"."quantile";
-create aggregate quantile(val DATE, q DOUBLE) returns DATE external name
"aggr"."quantile";
-create aggregate quantile(val TIME, q DOUBLE) returns TIME external name
"aggr"."quantile";
-create aggregate quantile(val TIMESTAMP, q DOUBLE) returns TIMESTAMP external
name "aggr"."quantile";
-create aggregate median(val DECIMAL) returns DECIMAL external name
"aggr"."median";
-create view sys.storage as select * from sys.storage();
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
