Changeset: fe76dde1ac84 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe76dde1ac84
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/80_statistics.sql
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/Dump/Tests/dump-empty.stable.out
sql/test/Dump/Tests/dump.stable.out
sql/test/UserDump/Tests/create.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/rangejoin_optimize_bug.sql
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out
Branch: mutation
Log Message:
merge with default
diffs (truncated from 1286 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -75,6 +75,7 @@ mTests_sql_jdbc_tests sys objects SYSTEM
mTests_sql_jdbc_tests sys privileges SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys schemas SYSTEM TABLE null null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys sequences SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_sql_jdbc_tests sys statistics SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys storagemodelinput SYSTEM TABLE null
null null null rowid SYSTEM
mTests_sql_jdbc_tests sys systemfunctions SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys triggers SYSTEM TABLE null null
null null rowid SYSTEM
diff --git a/sql/scripts/80_statistics.sql b/sql/scripts/80_statistics.sql
--- a/sql/scripts/80_statistics.sql
+++ b/sql/scripts/80_statistics.sql
@@ -33,6 +33,11 @@ CREATE TABLE sys.statistics(
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;
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -114,19 +114,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
CREATE TABLE "sys"."allnewtriples" (
"id" INTEGER NOT NULL,
"subject" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -82,9 +82,9 @@ stderr of test 'sql_command_kills_db.SF-
# 16:15:09 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39774 -G
# 16:15:09 >
-MAPI = (monetdb) /var/tmp/mtest-2016/.s.monetdb.32311
+MAPI = (monetdb) /var/tmp/mtest-17596/.s.monetdb.37297
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (39>1)
+ERROR = !cardinality violation (40>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
--- a/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
+++ b/sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
@@ -31,19 +31,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
CREATE TABLE "sys"."table_a" (
"table_a_id" INTEGER NOT NULL,
"value_a" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
b/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
--- a/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
+++ b/sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
@@ -26,19 +26,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
CREATE TABLE "sys"."tf" (
"a" INTEGER
);
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
--- a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -131,6 +131,7 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
+[ 123 ]
# 17:14:07 >
# 17:14:07 > "Done."
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
---
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
+++
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
@@ -17,20 +17,6 @@ stdout of test 'interrupted-initializati
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
START TRANSACTION;
-SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
COMMIT;
# MonetDB 5 server v11.5.8
# This is an unreleased version
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -65,7 +65,7 @@ Ready.
[ "storagemodelinput", 2000, NULL, 0, true, 0, false, 0
]
[ "storagemodel", 2000, "create view sys.storagemodel as select * from
sys.storagemodel();", 1, true, 0, false, 0 ]
[ "tablestoragemodel", 2000, "-- A summary of the table storage requirement
is is available as a table view.\n-- The auxillary column denotes the maximum
space if all non-sorted columns\n-- would be augmented with a hash (rare
situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
-[ "statistics", 2000, NULL, 0, false, 0, false, 0
]
+[ "statistics", 2000, NULL, 0, true, 0, false, 0
]
[ "systemfunctions", 2000, NULL, 0, true, 0, false, 0
]
# 18:53:13 >
diff --git
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
--- a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
+++ b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out
@@ -30,7 +30,7 @@ Ready.
% L1 # name
% double # type
% 24 # length
-[ 2130 ]
+[ 5072 ]
# 17:14:33 >
# 17:14:33 > "Done."
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,12 +80,12 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = (monetdb) /var/tmp/mtest-2016/.s.monetdb.32311
+MAPI = (monetdb) /var/tmp/mtest-17596/.s.monetdb.37297
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
ERROR = !cardinality violation (21>1)
-MAPI = (monetdb) /var/tmp/mtest-2016/.s.monetdb.32311
+MAPI = (monetdb) /var/tmp/mtest-17596/.s.monetdb.37297
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (393>1)
+ERROR = !cardinality violation (404>1)
# 21:00:43 >
diff --git
a/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
b/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
--- a/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
+++ b/sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
@@ -27,19 +27,6 @@ Ready.
START TRANSACTION;
SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
CREATE TABLE "sys"."test_property" (
"subject" INTEGER,
"p1" INTEGER,
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
+++
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
@@ -35,7 +35,7 @@ stdout of test 'set_sql_debug_64__breaki
% name, fullname, default_schema # name
% varchar, varchar, int # type
% 9, 10, 4 # length
-[ "skyserver", "sky server", 7737 ]
+[ "skyserver", "sky server", 7782 ]
#alter user "skyserver" set schema "sys";
#drop schema sky;
#drop user skyserver;
diff --git a/sql/test/Dump/Tests/dump-empty.stable.out
b/sql/test/Dump/Tests/dump-empty.stable.out
--- a/sql/test/Dump/Tests/dump-empty.stable.out
+++ b/sql/test/Dump/Tests/dump-empty.stable.out
@@ -28,20 +28,6 @@ Ready.
#msqldump tables Wed Sep 8 10:50:27 2010
START TRANSACTION;
-SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
COMMIT;
# 10:50:28 >
diff --git a/sql/test/Dump/Tests/dump.stable.out
b/sql/test/Dump/Tests/dump.stable.out
--- a/sql/test/Dump/Tests/dump.stable.out
+++ b/sql/test/Dump/Tests/dump.stable.out
@@ -27,19 +27,6 @@ Ready.
START TRANSACTION;
CREATE SEQUENCE "sys"."test_seq" AS INTEGER;
SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
CREATE TABLE "sys"."test" (
"id" INTEGER,
"i" SMALLINT DEFAULT next value for "sys"."test_seq"
diff --git a/sql/test/UserDump/Tests/create.stable.out
b/sql/test/UserDump/Tests/create.stable.out
--- a/sql/test/UserDump/Tests/create.stable.out
+++ b/sql/test/UserDump/Tests/create.stable.out
@@ -31,20 +31,6 @@ CREATE SCHEMA "test" AUTHORIZATION "test
CREATE SCHEMA "voc" AUTHORIZATION "voc";
ALTER USER "test" SET SCHEMA "test";
ALTER USER "voc" SET SCHEMA "voc";
-SET SCHEMA "sys";
-CREATE TABLE "sys"."statistics" (
- "schema" CHARACTER LARGE OBJECT,
- "table" CHARACTER LARGE OBJECT,
- "column" CHARACTER LARGE OBJECT,
- "type" CHARACTER LARGE OBJECT,
- "stamp" TIMESTAMP,
- "count" BIGINT,
- "unique" BIGINT,
- "nils" BIGINT,
- "minval" CHARACTER LARGE OBJECT,
- "maxval" CHARACTER LARGE OBJECT,
- "sorted" BOOLEAN
-);
SET SCHEMA "voc";
CREATE TABLE "voc"."foo" (
"id" INTEGER NOT NULL,
diff --git a/sql/test/bugs/Tests/crash_order_by.stable.out
b/sql/test/bugs/Tests/crash_order_by.stable.out
--- a/sql/test/bugs/Tests/crash_order_by.stable.out
+++ b/sql/test/bugs/Tests/crash_order_by.stable.out
@@ -30,14 +30,14 @@ Ready.
% int, char # type
% 2, 1 # length
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
