This is an automated email from the ASF dual-hosted git repository.

jooger pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 8e0c592198 IGNITE-15624: Calcite. get rid of tests required support of 
different connections in logical tests. (#4028)
8e0c592198 is described below

commit 8e0c5921986f41d9301eee13f1d69187fa7ec572
Author: Max Zhuravkov <[email protected]>
AuthorDate: Tue Jul 9 13:56:16 2024 +0300

    IGNITE-15624: Calcite. get rid of tests required support of different 
connections in logical tests. (#4028)
---
 .../sql/update/test_big_string_update.test         |  47 +++
 .../sql/update/test_big_string_update.test_ignore  |  96 -------
 .../sql/update/test_null_update.test               |  40 +++
 .../sql/update/test_null_update.test_ignore        | 194 -------------
 .../update/test_repeated_string_update.test_ignore |  62 ----
 .../sql/update/test_string_update.test_ignore      |  66 -----
 .../test_string_update_many_strings.test_ignore    | 128 ---------
 .../sql/update/test_string_update_null.test_ignore |  40 ---
 .../update/test_string_update_rollback.test_ignore | 118 --------
 .../test_string_update_rollback_null.test_ignore   |  89 ------
 .../sql/update/test_update.test_ignore             |  80 ------
 .../test_update_delete_same_tuple.test_ignore      |  44 ---
 .../sql/update/test_update_from.test_ignore        | 160 -----------
 .../update/test_update_many_updaters.test_ignore   | 316 ---------------------
 .../test_update_many_updaters_nulls.test_ignore    | 119 --------
 .../sql/update/test_update_mix.test_ignore         |  75 -----
 .../sql/update/test_update_same_value.test_ignore  | 180 ------------
 17 files changed, 87 insertions(+), 1767 deletions(-)

diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test 
b/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test
new file mode 100644
index 0000000000..ada1533ec9
--- /dev/null
+++ 
b/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test
@@ -0,0 +1,47 @@
+# name: test/sql/update/test_big_string_update.test
+# description: Test update of big string
+# group: [update]
+
+# create a table
+statement ok
+CREATE TABLE test (a VARCHAR);
+
+statement ok
+INSERT INTO test VALUES ('abcdefghijklmnopqrstuvwxyz')
+
+# increase the size of the string until it is bigger than a block
+# 26 -> 260
+# concat the string 10x and insert it
+statement ok
+INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
+
+# delete the old value
+statement ok
+DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
+
+# 260 -> 2600
+# concat the string 10x and insert it
+statement ok
+INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
+
+# delete the old value
+statement ok
+DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
+
+# 2600 -> 26000
+# concat the string 10x and insert it
+statement ok
+INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
+
+# delete the old value
+statement ok
+DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
+
+# 26000 -> 780000
+statement error:  Value too long for type: VARCHAR(65536)
+INSERT INTO test SELECT a||a||a FROM test
+
+query T
+SELECT length(a) FROM test
+----
+26000
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test_ignore
deleted file mode 100644
index e423a8c125..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_big_string_update.test_ignore
+++ /dev/null
@@ -1,96 +0,0 @@
-# name: test/sql/update/test_big_string_update.test
-# description: Test update of big string
-# group: [update]
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('abcdefghijklmnopqrstuvwxyz')
-
-# increase the size of the string until it is bigger than a block
-# 26 -> 260
-# concat the string 10x and insert it
-statement ok con1
-INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
-
-# delete the old value
-statement ok con1
-DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
-
-# 260 -> 2600
-# concat the string 10x and insert it
-statement ok con1
-INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
-
-# delete the old value
-statement ok con1
-DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
-
-# 2600 -> 26000
-# concat the string 10x and insert it
-statement ok con1
-INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
-
-# delete the old value
-statement ok con1
-DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
-
-# 26000 -> 260000
-# concat the string 10x and insert it
-statement ok con1
-INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
-
-# delete the old value
-statement ok con1
-DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
-
-# 260000 -> 2600000
-# concat the string 10x and insert it
-statement ok con1
-INSERT INTO test SELECT a||a||a||a||a||a||a||a||a||a FROM test
-
-# delete the old value
-statement ok con1
-DELETE FROM test WHERE length(a) = (SELECT MIN(length(a)) FROM test)
-
-# verify that the string length is correct
-query I con1
-SELECT LENGTH(a) FROM test
-----
-2600000
-
-# now update the big string in a separate transaction
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a='a'
-
-# verify the lengths
-query I con1
-SELECT LENGTH(a) FROM test
-----
-1
-
-query I con2
-SELECT LENGTH(a) FROM test
-----
-2600000
-
-# now commit
-statement ok con1
-COMMIT
-
-# the big string is gone now
-query I con1
-SELECT LENGTH(a) FROM test
-----
-1
-
-query I con2
-SELECT LENGTH(a) FROM test
-----
-1
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test 
b/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test
new file mode 100644
index 0000000000..5372b7f8e3
--- /dev/null
+++ b/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test
@@ -0,0 +1,40 @@
+# name: test/sql/update/test_null_update.test
+# description: Test standard update behavior with NULLs
+# group: [update]
+
+# create a table
+statement ok
+CREATE TABLE test (a INTEGER);
+
+statement ok
+INSERT INTO test VALUES (1), (2), (3), (NULL)
+
+query I
+SELECT * FROM test ORDER BY a
+----
+1
+2
+3
+NULL
+
+statement ok
+UPDATE test SET a=NULL WHERE a=2
+
+query I
+SELECT * FROM test ORDER BY a
+----
+1
+3
+NULL
+NULL
+
+statement ok
+UPDATE test SET a=4 WHERE a IS NULL
+
+query I
+SELECT * FROM test ORDER BY a
+----
+1
+3
+4
+4
\ No newline at end of file
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test_ignore
deleted file mode 100644
index 94b63ddec6..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_null_update.test_ignore
+++ /dev/null
@@ -1,194 +0,0 @@
-# name: test/sql/update/test_null_update.test
-# description: Test standard update behavior with NULLs
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3), (NULL)
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-1
-2
-3
-
-# test updating from a non-null value to a null value
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=NULL WHERE a=2
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-1
-2
-3
-
-# commit
-statement ok con1
-COMMIT
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-# now test a rollback
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=NULL WHERE a=3
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-NULL
-1
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-statement ok con1
-ROLLBACK
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-# test updating from a null value to a non-null value
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=10 WHERE a IS NULL
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-3
-10
-10
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-# now rollback
-statement ok con1
-ROLLBACK
-
-# values are back to original values
-query I con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-# perform the same update, but this time commit
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=10 WHERE a IS NULL
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-3
-10
-10
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-1
-3
-
-statement ok con1
-COMMIT
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-3
-10
-10
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-1
-3
-10
-10
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_repeated_string_update.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_repeated_string_update.test_ignore
deleted file mode 100644
index d65b04bd84..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_repeated_string_update.test_ignore
+++ /dev/null
@@ -1,62 +0,0 @@
-# name: test/sql/update/test_repeated_string_update.test
-# description: Test repeated update of string in same segment
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('hello'), ('world')
-
-statement ok con2
-BEGIN TRANSACTION;
-
-# scan the table
-query T con1
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-# test a number of repeated updates
-statement ok con1
-UPDATE test SET a='test' WHERE a='hello';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-statement ok con1
-UPDATE test SET a='test2' WHERE a='world';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-test2
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-statement ok con2
-COMMIT;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-test2
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_string_update.test_ignore
deleted file mode 100644
index bbbaffd8cc..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update.test_ignore
+++ /dev/null
@@ -1,66 +0,0 @@
-# name: test/sql/update/test_string_update.test
-# description: Test update of string columns
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('hello'), ('world')
-
-statement ok con2
-BEGIN TRANSACTION;
-
-# scan the table
-query T con1
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-# test a delete from the table
-statement ok con1
-DELETE FROM test WHERE a='hello';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-# now test an update of the table
-statement ok con1
-UPDATE test SET a='hello';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-hello
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-statement ok con2
-COMMIT;
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_many_strings.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_string_update_many_strings.test_ignore
deleted file mode 100644
index 01f06d4370..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_many_strings.test_ignore
+++ /dev/null
@@ -1,128 +0,0 @@
-# name: test/sql/update/test_string_update_many_strings.test
-# description: Test string updates with many strings
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('a'), ('b'), ('c'), (NULL)
-
-# insert the same strings many times
-# 16 -> 64
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 64 -> 256
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 256 -> 1024
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 1024 -> 4096
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 4096 -> 16384
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 16384 -> 65536
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 65536 -> 262144
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# 262144 -> 1048576
-statement ok con1
-INSERT INTO test SELECT * FROM test
-
-# verify that the distinct values are correct
-query T con1
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-a
-b
-c
-
-query T con2
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-a
-b
-c
-
-# test update of string column in another transaction
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a='aa' WHERE a='a';
-
-# verify that the values were updated
-query T con1
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-aa
-b
-c
-
-query T con2
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-a
-b
-c
-
-# now roll it back
-statement ok con1
-ROLLBACK;
-
-# the values should be back to normal
-query T con1
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-a
-b
-c
-
-query T con2
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-a
-b
-c
-
-# this time do the same but commit it
-statement ok con1
-UPDATE test SET a='aa' WHERE a='a';
-
-# now both connections have the updated value
-query T con1
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-aa
-b
-c
-
-query T con2
-SELECT DISTINCT a FROM test ORDER BY a
-----
-NULL
-aa
-b
-c
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_null.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_string_update_null.test_ignore
deleted file mode 100644
index a7dbd96de9..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_null.test_ignore
+++ /dev/null
@@ -1,40 +0,0 @@
-# name: test/sql/update/test_string_update_null.test
-# description: Test update of string columns with NULLs
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('hello'), ('world')
-
-statement ok con2
-BEGIN TRANSACTION;
-
-# update a string to NULL
-statement ok con1
-UPDATE test SET a=NULL where a='world';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-hello
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-statement ok con2
-COMMIT;
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-hello
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback.test_ignore
deleted file mode 100644
index 3b125b7297..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback.test_ignore
+++ /dev/null
@@ -1,118 +0,0 @@
-# name: test/sql/update/test_string_update_rollback.test
-# description: Test rollback of string update
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('hello'), ('world')
-
-statement ok con1
-BEGIN TRANSACTION;
-
-# perform an update within the transaction
-statement ok con1
-UPDATE test SET a='test' WHERE a='hello';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-# now rollback the update
-statement ok con1
-ROLLBACK;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-hello
-world
-
-# rollback of a value that is updated twice
-statement ok con1
-UPDATE test SET a='test' WHERE a='hello';
-
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a='test2' WHERE a='test';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test2
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-statement ok con1
-ROLLBACK;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-# test rollback of string update in different part
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a='test2' WHERE a='world';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-test2
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-statement ok con1
-ROLLBACK;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback_null.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback_null.test_ignore
deleted file mode 100644
index f960e8d3ac..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_string_update_rollback_null.test_ignore
+++ /dev/null
@@ -1,89 +0,0 @@
-# name: test/sql/update/test_string_update_rollback_null.test
-# description: Test rollback of string update with NULL
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a VARCHAR);
-
-statement ok con1
-INSERT INTO test VALUES ('test'), ('world')
-
-# test rollback of value -> NULL update
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a=NULL WHERE a='world';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-test
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-statement ok con1
-ROLLBACK;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-# test rollback of NULL -> value update
-statement ok con1
-UPDATE test SET a=NULL WHERE a='world';
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-test
-
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a='world' WHERE a IS NULL;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-test
-world
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-test
-
-statement ok con1
-ROLLBACK;
-
-query T con1
-SELECT * FROM test ORDER BY a
-----
-NULL
-test
-
-query T con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-test
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update.test_ignore 
b/modules/sql-engine/src/integrationTest/sql/update/test_update.test_ignore
deleted file mode 100644
index 761b8adae3..0000000000
--- a/modules/sql-engine/src/integrationTest/sql/update/test_update.test_ignore
+++ /dev/null
@@ -1,80 +0,0 @@
-# name: test/sql/update/test_update.test
-# description: Test standard update behavior
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (3)
-
-query I con1
-SELECT * FROM test
-----
-3
-
-# test simple update
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=1
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test
-----
-1
-
-query I con2
-SELECT * FROM test
-----
-3
-
-# commit
-statement ok con1
-COMMIT
-
-query I con1
-SELECT * FROM test
-----
-1
-
-query I con2
-SELECT * FROM test
-----
-1
-
-# now test a rollback
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=4
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test
-----
-4
-
-query I con2
-SELECT * FROM test
-----
-1
-
-statement ok con1
-ROLLBACK
-
-query I con1
-SELECT * FROM test
-----
-1
-
-query I con2
-SELECT * FROM test
-----
-1
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_delete_same_tuple.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_delete_same_tuple.test_ignore
deleted file mode 100644
index feaeddd822..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_delete_same_tuple.test_ignore
+++ /dev/null
@@ -1,44 +0,0 @@
-# name: test/sql/update/test_update_delete_same_tuple.test
-# description: Test update and delete of the same tuple
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# on a normal table, we can update and delete the same tuple concurrently 
without a conflict
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3);
-
-statement ok con1
-BEGIN TRANSACTION;
-
-statement ok con2
-BEGIN TRANSACTION;
-
-statement ok con1
-UPDATE test SET a=a+1;
-
-statement ok con2
-DELETE FROM test
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-2
-3
-4
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-
-statement ok con1
-COMMIT;
-
-statement ok con2
-COMMIT;
-
-statement ok con1
-DROP TABLE test;
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_from.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_from.test_ignore
deleted file mode 100644
index 87b6f1ec5b..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_from.test_ignore
+++ /dev/null
@@ -1,160 +0,0 @@
-# name: test/sql/update/test_update_from.test
-# description: Test updates that use a from clause
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# create a table
-statement ok
-CREATE TABLE test (a INTEGER);
-
-statement ok
-INSERT INTO test VALUES (3)
-
-statement ok
-CREATE  TABLE src (a INTEGER);
-
-statement ok
-INSERT INTO src VALUES (2)
-
-query I
-SELECT * FROM test
-----
-3
-
-query I
-SELECT * FROM src
-----
-2
-
-# test simple update
-statement ok
-UPDATE test SET a=test.a+s.a FROM src s
-
-query I
-SELECT * FROM test
-----
-5
-
-# test self join via alias
-statement ok
-UPDATE test SET a=test.a+t.a FROM test t
-
-query I
-SELECT * FROM test
-----
-10
-
-# test multiple tables
-statement ok
-UPDATE test SET a=t.a+s.a FROM test t, src s
-
-query I
-SELECT * FROM test
-----
-12
-
-# test subquery
-statement ok
-UPDATE test SET a=s.q FROM (SELECT a+1 as q FROM src) s
-
-query I
-SELECT * FROM test
-----
-3
-
-# test view
-statement ok
-CREATE VIEW vt AS (SELECT 17 as v)
-
-statement ok
-UPDATE test SET a=v FROM vt
-
-query I
-SELECT * FROM test
-----
-17
-
-# with a where clause on the from table
-statement ok
-UPDATE test SET a=s.a FROM src s WHERE s.a = 2
-
-query I
-SELECT * FROM test
-----
-2
-
-# with a where clause that involves both tables
-statement ok
-UPDATE test t SET a=1 FROM src s WHERE s.a = t.a
-
-query I
-SELECT * FROM test
-----
-1
-
-# with a where clause that evaluates to false
-statement ok
-UPDATE test t SET a=9 FROM src s WHERE s.a=t.a
-
-query I
-SELECT * FROM test
-----
-1
-
-# test with multiple updates per row (which is undefined),
-# but in this case the last value in the table will win
-# FIXME:
-mode skip
-
-statement ok
-INSERT INTO src VALUES (7)
-
-statement ok
-UPDATE test SET a=s.a FROM src s
-
-query I
-SELECT * FROM test
-----
-7
-
-mode unskip
-
-# test described in issue 1035
-
-statement ok
-CREATE TABLE terms(docid INTEGER, term INTEGER);
-
-statement ok
-CREATE TABLE docs(id INTEGER, len INTEGER);
-
-statement ok
-insert into docs values (1, 0), (2, 0);
-
-statement ok
-insert into terms values (1, 1);
-
-statement ok
-insert into terms values (2, 1);
-
-statement ok
-insert into terms values (2, 2);
-
-statement ok
-insert into terms values (2, 3);
-
-statement ok
-UPDATE docs
-SET len = sq.len
-FROM (
-    SELECT docid AS id, count(term) AS len
-    FROM terms
-    GROUP BY docid
-    ORDER BY docid
-) AS sq
-WHERE docs.id = sq.id;
-
-query II
-select * from docs;
-----
-1      1
-2      3
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters.test_ignore
deleted file mode 100644
index 801ed5b99c..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters.test_ignore
+++ /dev/null
@@ -1,316 +0,0 @@
-# name: test/sql/update/test_update_many_updaters.test
-# description: Test update behavior with multiple updaters
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-# this test contains four query connections (con1, con2, con3, con4)
-# and one updating connection (updater)
-# first create a table, filled with 3 values (1), (2), (3)
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3)
-
-# now we start updating specific values and reading different versions
-# con1 sees the initial state
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=4 WHERE a=1
-
-statement ok con2
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=5 WHERE a=2
-
-statement ok con3
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=6 WHERE a=3
-
-statement ok con4
-BEGIN TRANSACTION
-
-# now read the different states
-# con sees {1, 2, 3}
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# con2 sees {2, 3, 4}
-query I con2
-SELECT * FROM test ORDER BY a
-----
-2
-3
-4
-
-# con3 sees {3, 4, 5}
-query I con3
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# con4 sees {4, 5, 6}
-query I con4
-SELECT * FROM test ORDER BY a
-----
-4
-5
-6
-
-# now verify that we get conflicts when we update values that have been 
updated AFTER we started
-statement error con1
-UPDATE test SET a=99 WHERE a=1
-
-statement error con2
-UPDATE test SET a=99 WHERE a=2
-
-statement error con3
-UPDATE test SET a=99 WHERE a=3
-
-# revert to previous state
-statement ok updater
-UPDATE test SET a=a-3
-
-# rollback all connections
-statement ok con1
-ROLLBACK
-
-statement ok con2
-ROLLBACK
-
-statement ok con3
-ROLLBACK
-
-statement ok con4
-ROLLBACK
-
-# we repeat the previous process of updates
-
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=4 WHERE a=1
-
-statement ok con2
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=5 WHERE a=2
-
-statement ok con3
-BEGIN TRANSACTION
-
-statement ok updater
-UPDATE test SET a=6 WHERE a=3
-
-statement ok con4
-BEGIN TRANSACTION
-
-# now read the different states
-# con sees {1, 2, 3}
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# con2 sees {2, 3, 4}
-query I con2
-SELECT * FROM test ORDER BY a
-----
-2
-3
-4
-
-# con3 sees {3, 4, 5}
-query I con3
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# con4 sees {4, 5, 6}
-query I con4
-SELECT * FROM test ORDER BY a
-----
-4
-5
-6
-
-# we now verify that we CAN update values that were committed BEFORE we started
-statement ok con2
-UPDATE test SET a=7 WHERE a=4
-
-statement ok con3
-UPDATE test SET a=8 WHERE a=5
-
-statement ok con4
-UPDATE test SET a=9 WHERE a=6
-
-# now read the different states again
-# con sees {1, 2, 3} still
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# con2 sees {2, 3, 7}
-query I con2
-SELECT * FROM test ORDER BY a
-----
-2
-3
-7
-
-# con3 sees {3, 4, 8}
-query I con3
-SELECT * FROM test ORDER BY a
-----
-3
-4
-8
-
-# con4 sees {4, 5, 9}
-query I con4
-SELECT * FROM test ORDER BY a
-----
-4
-5
-9
-
-# updater still sees {4, 5, 6}
-query I updater
-SELECT * FROM test ORDER BY a
-----
-4
-5
-6
-
-# now we commit in phases
-# first we commit con4
-statement ok con4
-COMMIT
-
-# con, con2, con3 still see the same data, con4 sees the currently committed 
data
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-2
-3
-7
-
-query I con3
-SELECT * FROM test ORDER BY a
-----
-3
-4
-8
-
-query I con4
-SELECT * FROM test ORDER BY a
-----
-4
-5
-9
-
-# then we commit con2
-statement ok con2
-COMMIT
-
-# con, con3 still see the same data, con2 and con4 see the committed data
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-5
-7
-9
-
-query I con3
-SELECT * FROM test ORDER BY a
-----
-3
-4
-8
-
-query I con4
-SELECT * FROM test ORDER BY a
-----
-5
-7
-9
-
-# then we commit con3
-statement ok con3
-COMMIT
-
-# con still sees the same data, but the rest all see the committed data
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
-query I con3
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
-query I con4
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
-# now we commit con1, this should trigger a cleanup
-statement ok con1
-COMMIT
-
-# now con1 also sees the committed data
-query I con1
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters_nulls.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters_nulls.test_ignore
deleted file mode 100644
index 2e347b8b70..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_many_updaters_nulls.test_ignore
+++ /dev/null
@@ -1,119 +0,0 @@
-# name: test/sql/update/test_update_many_updaters_nulls.test
-# description: Test update behavior with multiple updaters and NULL values
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-statement ok con1
-PRAGMA enable_verification
-
-statement ok con2
-PRAGMA enable_verification
-
-statement ok con3
-PRAGMA enable_verification
-
-statement ok con4
-PRAGMA enable_verification
-
-statement ok con5
-PRAGMA enable_verification
-
-# this test contains five query connections (con1, con2, con3, con4, con5)
-# and one updating connection (updater)
-# create a table, filled with 3 values (1), (2), (3)
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3)
-
-# now we start updating specific values and reading different versions
-statement ok con1
-BEGIN TRANSACTION
-
-query I updater
-UPDATE test SET a=NULL WHERE a=1
-----
-1
-
-statement ok con2
-BEGIN TRANSACTION
-
-query I updater
-UPDATE test SET a=NULL WHERE a=2
-----
-1
-
-statement ok con3
-BEGIN TRANSACTION
-
-query I updater
-UPDATE test SET a=NULL WHERE a=3
-----
-1
-
-statement ok con4
-BEGIN TRANSACTION
-
-query I updater
-UPDATE test SET a=99 WHERE a IS NULL
-----
-3
-
-statement ok con5
-BEGIN TRANSACTION
-
-# now read the different states
-# con sees {1, 2, 3}
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# con2 sees {NULL, 2, 3}
-query I con2
-SELECT * FROM test ORDER BY a
-----
-NULL
-2
-3
-
-# con3 sees {NULL, NULL, 3}
-query I con3
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-3
-
-# con4 sees {NULL, NULL, NULL}
-query I con4
-SELECT * FROM test ORDER BY a
-----
-NULL
-NULL
-NULL
-
-# con5 sees {99, 99, 99}
-query I con5
-SELECT * FROM test ORDER BY a
-----
-99
-99
-99
-
-# now verify that we get conflicts when we update values that have been 
updated AFTER we started
-statement error con1
-UPDATE test SET a=99 WHERE a=1
-
-statement error con2
-UPDATE test SET a=99 WHERE a=2
-
-statement error con3
-UPDATE test SET a=99 WHERE a=3
-
-statement error con4
-UPDATE test SET a=99 WHERE a IS NULL
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_mix.test_ignore 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_mix.test_ignore
deleted file mode 100644
index 872e5a7de9..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_mix.test_ignore
+++ /dev/null
@@ -1,75 +0,0 @@
-# name: test/sql/update/test_update_mix.test
-# description: Test mix of updates inserts and deletes
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3);
-
-query R con1
-SELECT SUM(a) FROM test
-----
-6.000000
-
-statement ok con1
-BEGIN TRANSACTION
-
-# append from con2
-statement ok con2
-INSERT INTO test VALUES (4), (5), (6);
-
-query R con1
-SELECT SUM(a) FROM test
-----
-6.000000
-
-query R con2
-SELECT SUM(a) FROM test
-----
-21.000000
-
-# delete from con2
-statement ok con2
-DELETE FROM test WHERE a < 4
-
-query R con1
-SELECT SUM(a) FROM test
-----
-6.000000
-
-query R con2
-SELECT SUM(a) FROM test
-----
-15.000000
-
-# update from con2
-statement ok con2
-UPDATE test SET a=a-3
-
-query R con1
-SELECT SUM(a) FROM test
-----
-6.000000
-
-query R con2
-SELECT SUM(a) FROM test
-----
-6.000000
-
-# now commit
-statement ok con1
-COMMIT
-
-query R con1
-SELECT SUM(a) FROM test
-----
-6.000000
-
-query R con2
-SELECT SUM(a) FROM test
-----
-6.000000
-
diff --git 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_same_value.test_ignore
 
b/modules/sql-engine/src/integrationTest/sql/update/test_update_same_value.test_ignore
deleted file mode 100644
index 0c22e47f24..0000000000
--- 
a/modules/sql-engine/src/integrationTest/sql/update/test_update_same_value.test_ignore
+++ /dev/null
@@ -1,180 +0,0 @@
-# name: test/sql/update/test_update_same_value.test
-# description: Update the same value multiple times in one transaction
-# group: [update]
-# Ignore https://issues.apache.org/jira/browse/IGNITE-15624
-
-statement ok
-PRAGMA enable_verification
-
-# create a table
-statement ok con1
-CREATE TABLE test (a INTEGER);
-
-statement ok con1
-INSERT INTO test VALUES (1), (2), (3)
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# update entire table
-statement ok con1
-BEGIN TRANSACTION
-
-statement ok con1
-UPDATE test SET a=a+1
-
-# not seen yet by con2, only by con1
-query I con1
-SELECT * FROM test
-----
-2
-3
-4
-
-query I con2
-SELECT * FROM test
-----
-1
-2
-3
-
-# update the entire table again
-statement ok con1
-UPDATE test SET a=a+1
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-1
-2
-3
-
-# now commit
-statement ok con1
-COMMIT
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# now perform updates one by one
-statement ok con1
-BEGIN TRANSACTION
-
-query I con1
-SELECT * FROM test
-----
-3
-4
-5
-
-query I con1
-SELECT * FROM test WHERE a=5
-----
-5
-
-# 5 => 9
-statement ok con1
-UPDATE test SET a=9 WHERE a=5
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-3
-4
-9
-
-# test concurrent update in con2, it should fail now
-statement error con2
-UPDATE test SET a=a+1
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# 3 => 7
-statement ok con1
-UPDATE test SET a=7 WHERE a=3
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-4
-7
-9
-
-# test concurrent update in con2, it should fail now
-statement error con2
-UPDATE test SET a=a+1
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# 4 => 8
-statement ok con1
-UPDATE test SET a=8 WHERE a=4
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
-# test concurrent update in con2, it should fail now
-statement error con2
-UPDATE test SET a=a+1
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-3
-4
-5
-
-# commit
-statement ok con1
-COMMIT
-
-query I con1
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-
-query I con2
-SELECT * FROM test ORDER BY a
-----
-7
-8
-9
-


Reply via email to