Changeset: f1432164ed69 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f1432164ed69
Modified Files:
sql/test/Dependencies/Tests/dependency_owner_schema_3.test
sql/test/pg_regress/Tests/alter_table.test
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
sql/test/transactions/Tests/transaction_isolation2.SQL.py
sql/test/transactions/Tests/transaction_isolation4.SQL.py
Branch: analyze-fix
Log Message:
Approving tests
diffs (173 lines):
diff --git a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
--- a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
+++ b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test
@@ -48,7 +48,7 @@ DEP_SCHEMA
query TTT rowsort
SELECT t.name, v.name, 'DEP_VIEW' from sys.tables as t, sys.tables as v,
sys.dependencies as dep where t.id = dep.id AND v.id = dep.depend_id AND
dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by t.name, v.name
----
-642 values hashing to 15ce2909c4d48e1f919105adcc09c5eb
+648 values hashing to a0dd41998f637915834fcc0f7ec4984e
query TTT rowsort
SELECT t.name, i.name, 'DEP_INDEX' from sys.tables as t, sys.idxs as i where
i.table_id = t.id and i.name not in (select name from sys.keys) and t.type in
(0, 10, 20, 30) order by t.name, i.name
@@ -126,7 +126,7 @@ DEP_FUNC
query TTT rowsort
SELECT c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v,
sys.dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND
dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by c.name, v.name
----
-2259 values hashing to 601d3047954820aa935c1cb583bed2f1
+2274 values hashing to 4f9b4426928c74b12499a7975579a842
query TTT rowsort
SELECT c.name, k.name, 'DEP_KEY' from sys.columns as c, sys.objects as kc,
sys.keys as k where kc."name" = c.name AND kc.id = k.id AND k.table_id =
c.table_id AND k.rkey = -1 order by c.name, k.name
diff --git a/sql/test/pg_regress/Tests/alter_table.test
b/sql/test/pg_regress/Tests/alter_table.test
--- a/sql/test/pg_regress/Tests/alter_table.test
+++ b/sql/test/pg_regress/Tests/alter_table.test
@@ -1198,7 +1198,7 @@ statement error
analyze atacc1("........pg.dropped.1........")
statement ok
-call analyze(0, 0, 'sys', 'atacc1')
+analyze sys.atacc1
statement error
alter table atacc1 alter a set storage plain
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
--- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
+++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
@@ -287,11 +287,11 @@ SELECT * FROM sys.sessions WHERE "userna
----
query ITITIIIITTII rowsort
-SELECT * FROM sys.statistics WHERE column_id NOT IN (SELECT id FROM
sys._columns UNION ALL SELECT id FROM tmp._columns)
+SELECT * FROM sys.statistics WHERE "column" NOT IN (SELECT id FROM
sys._columns UNION ALL SELECT id FROM tmp._columns)
----
query ITITIIIITTII rowsort
-SELECT * FROM sys.statistics WHERE type NOT IN (SELECT sqlname FROM sys.types)
+SELECT * FROM sys.statistics WHERE "type" NOT IN (SELECT sqlname FROM
sys.types)
----
query TTTTTTIIIIIIIIIII rowsort
diff --git a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
--- a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
+++ b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
@@ -422,43 +422,43 @@ query IIITIIIIII rowsort
SELECT "start", * FROM "sys"."sequences" WHERE "start" IS NULL
----
-query IITITIIIITTII rowsort
-SELECT "column_id", * FROM "sys"."statistics" WHERE "column_id" IS NULL
+query TTTTTIITTTTTT rowsort
+SELECT "schema", * FROM "sys"."statistics" WHERE "schema" IS NULL
----
-query TITITIIIITTII rowsort
+query TTTTTIITTTTTT rowsort
+SELECT "table", * FROM "sys"."statistics" WHERE "table" IS NULL
+----
+
+query TTTTTIITTTTTT rowsort
+SELECT "column", * FROM "sys"."statistics" WHERE "column" IS NULL
+----
+
+query TTTTTIITTTTTT rowsort
SELECT "type", * FROM "sys"."statistics" WHERE "type" IS NULL
----
-query IITITIIIITTII rowsort
+query ITTTTIITTTTTT rowsort
SELECT "width", * FROM "sys"."statistics" WHERE "width" IS NULL
----
-query TITITIIIITTII rowsort
-SELECT "stamp", * FROM "sys"."statistics" WHERE "stamp" IS NULL
-----
-
-query IITITIIIITTII rowsort
-SELECT "sample", * FROM "sys"."statistics" WHERE "sample" IS NULL
-----
-
-query IITITIIIITTII rowsort
+query ITTTTIITTTTTT rowsort
SELECT "count", * FROM "sys"."statistics" WHERE "count" IS NULL
----
-query IITITIIIITTII rowsort
+query TTTTTIITTTTTT rowsort
SELECT "unique", * FROM "sys"."statistics" WHERE "unique" IS NULL
----
-query IITITIIIITTII rowsort
+query TTTTTIITTTTTT rowsort
SELECT "nils", * FROM "sys"."statistics" WHERE "nils" IS NULL
----
-query IITITIIIITTII rowsort
+query TTTTTIITTTTTT rowsort
SELECT "sorted", * FROM "sys"."statistics" WHERE "sorted" IS NULL
----
-query IITITIIIITTII rowsort
+query TTTTTIITTTTTT rowsort
SELECT "revsorted", * FROM "sys"."statistics" WHERE "revsorted" IS NULL
----
diff --git a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
--- a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
+++ b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.test
@@ -166,8 +166,8 @@ query ITT rowsort
SELECT COUNT(*) AS duplicates, "username", login FROM sys.sessions GROUP BY
"username", login HAVING COUNT(*) > 1
----
-query II rowsort
-SELECT COUNT(*) AS duplicates, column_id FROM sys.statistics GROUP BY
column_id HAVING COUNT(*) > 1
+query IT rowsort
+SELECT COUNT(*) AS duplicates, "column" FROM sys.statistics GROUP BY "column"
HAVING COUNT(*) > 1
----
query II rowsort
diff --git a/sql/test/transactions/Tests/transaction_isolation2.SQL.py
b/sql/test/transactions/Tests/transaction_isolation2.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation2.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation2.SQL.py
@@ -107,16 +107,13 @@ with SQLTestCase() as mdb1:
# The current setup gives a duplicate entry in the 'comments' table,
so that cannot happen
mdb1.execute('SELECT CAST(COUNT(*) - (SELECT c FROM sys.myvar) AS
BIGINT) FROM sys.comments;').assertDataResultMatch([(1,)])
- mdb1.execute("TRUNCATE sys.myvar;")
- mdb1.execute("INSERT INTO sys.myvar VALUES ((SELECT COUNT(*) FROM
sys.statistics));").assertRowCount(1)
+ # Since Jan2022 we allow concurrent analyze statements
mdb1.execute('start transaction;').assertSucceeded()
mdb2.execute('start transaction;').assertSucceeded()
mdb1.execute('ANALYZE "sys"."integers";').assertSucceeded()
- mdb2.execute('ANALYZE
"sys"."integers";').assertFailed(err_code="42000", err_message="ANALYZE: failed
due to conflict with another transaction")
+ mdb2.execute('ANALYZE "sys"."integers";').assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
- mdb2.execute('commit;').assertFailed() # Not sure here
- # The current setup gives a duplicate entry in the 'statistics' table,
so that cannot happen
- mdb1.execute('SELECT CAST(COUNT(*) - (SELECT c FROM sys.myvar) AS
BIGINT) FROM sys.statistics;').assertDataResultMatch([(1,)])
+ mdb2.execute('commit;').assertSucceeded()
mdb1.execute('create merge table parent(a int);').assertSucceeded()
mdb1.execute('create table child1(c int);').assertSucceeded()
diff --git a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
@@ -47,12 +47,15 @@ with SQLTestCase() as mdb1:
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40000",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
+ # Since Jan2022 we allow concurrent analyze statements
+ mdb1.execute("create table mytx (i int, j int);").assertSucceeded()
+ mdb1.execute("insert into mytx values (1, 1), (2,
2)").assertSucceeded()
mdb1.execute('start transaction;').assertSucceeded()
mdb2.execute('start transaction;').assertSucceeded()
- mdb1.execute("analyze sys.myt").assertSucceeded()
- mdb2.execute('drop table myt;').assertSucceeded()
+ mdb1.execute("analyze sys.mytx").assertSucceeded()
+ mdb2.execute('drop table mytx;').assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
- mdb2.execute('commit;').assertFailed(err_code="40000",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
+ mdb2.execute('commit;').assertSucceeded()
mdb1.execute('start transaction;').assertSucceeded()
mdb2.execute('start transaction;').assertSucceeded()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
