Changeset: 70e3fb8ab3ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70e3fb8ab3ca
Removed Files:
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Dec2016
Log Message:
Approve upgrade tests after release.
diffs (truncated from 3698 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
@@ -24,216 +24,14 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-create procedure sys.createorderindex(sys string, tab string, col string)
-external name sql.createorderindex;
-create procedure sys.droporderindex(sys string, tab string, col string)
-external name sql.droporderindex;
-drop function sys.zorder_decode_y;
-drop function sys.zorder_decode_x;
-drop function sys.zorder_encode;
-drop view sys.tablestoragemodel;
-drop view sys.storagemodel;
-drop function sys.storagemodel();
-drop procedure sys.storagemodelinit();
-drop function sys."storage"(string, string, string);
-drop function sys."storage"(string, string);
-drop function sys."storage"(string);
-drop view sys."storage";
-drop function sys."storage"();
-alter table sys.storagemodelinput add column "revsorted" boolean;
-alter table sys.storagemodelinput add column "unique" boolean;
-alter table sys.storagemodelinput add column "orderidx" bigint;
-create function sys."storage"()
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create view sys."storage" as select * from sys."storage"();
-create function sys."storage"( sname string)
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create function sys."storage"( sname string, tname string)
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create function sys."storage"( sname string, tname string, cname string)
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create procedure sys.storagemodelinit()
-begin
- delete from sys.storagemodelinput;
- insert into sys.storagemodelinput
- select X."schema", X."table", X."column", X."type", X.typewidth, X.count, 0,
X.typewidth, false, X.sorted, X.revsorted, X."unique", X.orderidx from
sys."storage"() X;
- update sys.storagemodelinput
- set reference = true
- where concat(concat("schema","table"), "column") in (
- SELECT concat( concat("fkschema"."name", "fktable"."name"),
"fkkeycol"."name" )
- FROM "sys"."keys" AS "fkkey",
- "sys"."objects" AS "fkkeycol",
- "sys"."tables" AS "fktable",
- "sys"."schemas" AS "fkschema"
- WHERE "fktable"."id" = "fkkey"."table_id"
- AND "fkkey"."id" = "fkkeycol"."id"
- AND "fkschema"."id" = "fktable"."schema_id"
- AND "fkkey"."rkey" > -1);
- update sys.storagemodelinput
- set "distinct" = "count"
- where "type" = 'varchar' or "type"='clob';
-end;
-create function sys.storagemodel()
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "count" bigint,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint)
-begin
- return select I."schema", I."table", I."column", I."type", I."count",
- columnsize(I."type", I.count, I."distinct"),
- heapsize(I."type", I."distinct", I."atomwidth"),
- hashsize(I."reference", I."count"),
- imprintsize(I."count",I."type"),
- I.sorted, I.revsorted, I."unique", I.orderidx
- from sys.storagemodelinput I;
-end;
-create view sys.storagemodel as select * from sys.storagemodel();
-create view sys.tablestoragemodel
-as select "schema","table",max(count) as "count",
- sum(columnsize) as columnsize,
- sum(heapsize) as heapsize,
- sum(hashes) as hashes,
- sum("imprints") as "imprints",
- sum(case when sorted = false then 8 * count else 0 end) as auxiliary
-from sys.storagemodel() group by "schema","table";
-update sys._tables set system = true where name in ('storage', 'storagemodel',
'tablestoragemodel') and schema_id = (select id from sys.schemas where name =
'sys');
-alter table sys.statistics add column "revsorted" boolean;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('storage', 'storagemodel') and f.type = 5 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 ('createorderindex', 'droporderindex', 'storagemodelinit')
and f.type = 2 and f.schema_id = s.id and s.name = 'sys');
-delete from systemfunctions where function_id not in (select id from
functions);
-set schema "sys";
-Running database upgrade commands:
-set schema "sys";
-drop view sys.querylog_history;
-drop view sys.querylog_calls;
-drop function sys.querylog_calls();
-create function sys.querylog_calls()
-returns table(
- id oid,
- "start" timestamp,
- "stop" timestamp,
- arguments string,
- tuples bigint,
- run bigint,
- ship bigint,
- cpu int,
- io int
-)
-external name sql.querylog_calls;
-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.io
-from sys.querylog_catalog() qd, sys.querylog_calls() ql
-where qd.id = ql.id and qd.owner = user;
-update _tables set system = true where name in ('querylog_calls',
'querylog_history') and schema_id = (select id from schemas where name = 'sys');
-drop aggregate sys.stddev_pop(wrd);
-drop aggregate sys.stddev_samp(wrd);
-drop aggregate sys.var_pop(wrd);
-drop aggregate sys.var_samp(wrd);
-drop aggregate sys.median(wrd);
-drop aggregate sys.quantile(wrd, double);
-drop aggregate sys.corr(wrd, wrd);
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('querylog_calls') and f.type = 5 and f.schema_id = s.id and
s.name = 'sys');
-delete from systemfunctions where function_id not in (select id from
functions);
-set schema "sys";
-
-
-# 11:37:26 >
-# 11:37:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13462" "--port=32800"
-# 11:37:26 >
+# 15:26:18 >
+# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21187" "--port=38946"
+# 15:26:18 >
#select 1;
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
% tinyint # type
% 1 # length
[ 1 ]
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
@@ -24,216 +24,14 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-create procedure sys.createorderindex(sys string, tab string, col string)
-external name sql.createorderindex;
-create procedure sys.droporderindex(sys string, tab string, col string)
-external name sql.droporderindex;
-drop function sys.zorder_decode_y;
-drop function sys.zorder_decode_x;
-drop function sys.zorder_encode;
-drop view sys.tablestoragemodel;
-drop view sys.storagemodel;
-drop function sys.storagemodel();
-drop procedure sys.storagemodelinit();
-drop function sys."storage"(string, string, string);
-drop function sys."storage"(string, string);
-drop function sys."storage"(string);
-drop view sys."storage";
-drop function sys."storage"();
-alter table sys.storagemodelinput add column "revsorted" boolean;
-alter table sys.storagemodelinput add column "unique" boolean;
-alter table sys.storagemodelinput add column "orderidx" bigint;
-create function sys."storage"()
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create view sys."storage" as select * from sys."storage"();
-create function sys."storage"( sname string)
-returns table (
- "schema" string,
- "table" string,
- "column" string,
- "type" string,
- "mode" string,
- location string,
- "count" bigint,
- typewidth int,
- columnsize bigint,
- heapsize bigint,
- hashes bigint,
- phash boolean,
- "imprints" bigint,
- sorted boolean,
- revsorted boolean,
- "unique" boolean,
- orderidx bigint
-)
-external name sql."storage";
-create function sys."storage"( sname string, tname string)
-returns table (
- "schema" string,
- "table" string,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
