Changeset: b0b6670c42a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b0b6670c42a0
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.SQL.py
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-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: analyze-fix
Log Message:
Fix test for new statistics + approve upgrades.
diffs (truncated from 4873 to 300 lines):
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -6142,4 +6142,104 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlc') and name in ('clock', 'tick');
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlr') and name in ('clock', 'tick');
drop view sys.systemfunctions;
+drop table sys.statistics;
+drop procedure sys.analyze(int,bigint);
+drop procedure sys.analyze(int,bigint,string);
+drop procedure sys.analyze(int,bigint,string,string);
+drop procedure sys.analyze(int,bigint,string,string,string);
+create procedure sys."analyze"()
+external name sql."analyze";
+grant execute on procedure sys."analyze"() to public;
+create procedure sys."analyze"("sname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024)) to public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024),varchar(1024)) to
public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024),
"cname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure
sys."analyze"(varchar(1024),varchar(1024),varchar(1024)) to public;
+create function sys."statistics"()
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"() to public;
+create view sys."statistics" as
+select * from sys."statistics"()
+-- exclude system tables
+where ("schema", "table") in (
+ SELECT sch."name", tbl."name"
+ FROM sys."tables" AS tbl JOIN sys."schemas" AS sch ON tbl.schema_id =
sch.id
+ WHERE tbl."system" = FALSE)
+order by "schema", "table", "column";
+grant select on sys."statistics" to public;
+create function sys."statistics"("sname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"(varchar(1024)) to public;
+create function sys."statistics"("sname" varchar(1024), "tname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"(varchar(1024),varchar(1024)) to
public;
+create function sys."statistics"("sname" varchar(1024), "tname" varchar(1024),
"cname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function
sys."statistics"(varchar(1024),varchar(1024),varchar(1024)) to public;
+update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'statistics';
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -6142,4 +6142,104 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlc') and name in ('clock', 'tick');
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlr') and name in ('clock', 'tick');
drop view sys.systemfunctions;
+drop table sys.statistics;
+drop procedure sys.analyze(int,bigint);
+drop procedure sys.analyze(int,bigint,string);
+drop procedure sys.analyze(int,bigint,string,string);
+drop procedure sys.analyze(int,bigint,string,string,string);
+create procedure sys."analyze"()
+external name sql."analyze";
+grant execute on procedure sys."analyze"() to public;
+create procedure sys."analyze"("sname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024)) to public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024),varchar(1024)) to
public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024),
"cname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure
sys."analyze"(varchar(1024),varchar(1024),varchar(1024)) to public;
+create function sys."statistics"()
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"() to public;
+create view sys."statistics" as
+select * from sys."statistics"()
+-- exclude system tables
+where ("schema", "table") in (
+ SELECT sch."name", tbl."name"
+ FROM sys."tables" AS tbl JOIN sys."schemas" AS sch ON tbl.schema_id =
sch.id
+ WHERE tbl."system" = FALSE)
+order by "schema", "table", "column";
+grant select on sys."statistics" to public;
+create function sys."statistics"("sname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"(varchar(1024)) to public;
+create function sys."statistics"("sname" varchar(1024), "tname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"(varchar(1024),varchar(1024)) to
public;
+create function sys."statistics"("sname" varchar(1024), "tname" varchar(1024),
"cname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function
sys."statistics"(varchar(1024),varchar(1024),varchar(1024)) to public;
+update sys._tables set system = true where system <> true and schema_id = 2000
and name = 'statistics';
+update sys.functions set system = true where system <> true and schema_id =
2000 and name in ('analyze','statistics');
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -5547,4 +5547,104 @@ update sys.functions set system = true w
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlc') and name in ('clock', 'tick');
update sys.functions set system = true where system <> true and schema_id =
(select id from sys.schemas where name = 'wlr') and name in ('clock', 'tick');
drop view sys.systemfunctions;
+drop table sys.statistics;
+drop procedure sys.analyze(int,bigint);
+drop procedure sys.analyze(int,bigint,string);
+drop procedure sys.analyze(int,bigint,string,string);
+drop procedure sys.analyze(int,bigint,string,string,string);
+create procedure sys."analyze"()
+external name sql."analyze";
+grant execute on procedure sys."analyze"() to public;
+create procedure sys."analyze"("sname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024)) to public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure sys."analyze"(varchar(1024),varchar(1024)) to
public;
+create procedure sys."analyze"("sname" varchar(1024), "tname" varchar(1024),
"cname" varchar(1024))
+external name sql."analyze";
+grant execute on procedure
sys."analyze"(varchar(1024),varchar(1024),varchar(1024)) to public;
+create function sys."statistics"()
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"() to public;
+create view sys."statistics" as
+select * from sys."statistics"()
+-- exclude system tables
+where ("schema", "table") in (
+ SELECT sch."name", tbl."name"
+ FROM sys."tables" AS tbl JOIN sys."schemas" AS sch ON tbl.schema_id =
sch.id
+ WHERE tbl."system" = FALSE)
+order by "schema", "table", "column";
+grant select on sys."statistics" to public;
+create function sys."statistics"("sname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
+)
+external name sql."statistics";
+grant execute on function sys."statistics"(varchar(1024)) to public;
+create function sys."statistics"("sname" varchar(1024), "tname" varchar(1024))
+returns table (
+ "column_id" integer,
+ "schema" varchar(1024),
+ "table" varchar(1024),
+ "column" varchar(1024),
+ "type" varchar(1024),
+ "width" integer,
+ "count" bigint,
+ "unique" boolean,
+ "nils" boolean,
+ "minval" string,
+ "maxval" string,
+ "sorted" boolean,
+ "revsorted" boolean
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
