Changeset: a99d76a8c14e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a99d76a8c14e
Added Files:
sql/test/HTM/Tests/PersistBeforePrecommit-1.sql
sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.err
sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.out
sql/test/HTM/Tests/PersistBeforePrecommit-2.sql
sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.err
sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.out
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.sql
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.err
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.out
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.sql
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.stable.err
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.stable.out
Modified Files:
sql/server/sql_mvc.c
sql/test/HTM/Tests/All
sql/test/HTM/Tests/RollbackAfterPrecommit-1.stable.err
sql/test/HTM/Tests/RollbackAfterPrecommit-1.stable.out
sql/test/HTM/Tests/RollbackAfterPrecommit-2.stable.out
sql/test/HTM/Tests/RollbackBeforePrecommit-1.stable.err
sql/test/HTM/Tests/RollbackBeforePrecommit-1.stable.out
Branch: HTM
Log Message:
Fix calling persist before precommit or after rollback
Add and fix test releted to these changes
diffs (truncated from 591 to 300 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -362,8 +362,10 @@ int
mvc_persistcommit(mvc *m, int chain, const char *name, lng id) {
int result = SQL_OK;//, wait = 0;
sql_trans *tr = m->session->tr;
- // set CPaaS HTM id
- tr->htm_id = id;
+ if (tr->htm_id != id) {
+ (void)sql_error(m, 010, "40000!PERSISTCOMMIT: transaction is
aborted because pre-commit transaction id missmatch. Transaction was either not
pre-commited or aborted.");
+ return -1;
+ }
store_lock();
if ((result = sql_trans_persistcommit(tr)) != SQL_OK) {
@@ -390,6 +392,8 @@ mvc_rollback(mvc *m, int chain, const ch
assert(m->session->active); /* only abort an active transaction */
store_lock();
+ // Reset pre-commit id
+ tr->htm_id = 0;
if (m->qc)
qc_clean(m->qc);
if (name && name[0] != '\0') {
diff --git a/sql/test/HTM/Tests/All b/sql/test/HTM/Tests/All
--- a/sql/test/HTM/Tests/All
+++ b/sql/test/HTM/Tests/All
@@ -24,3 +24,7 @@ InsertWithCommitDeleteWith2PC-2
TwoInsetsIn1Transaction
PrecommitWithoutPersists-1
PrecommitWithoutPersists-2
+PersistBeforePrecommit-1
+PersistBeforePrecommit-2
+PersistBeforePrecommitWithRollback-1
+PersistBeforePrecommitWithRollback-2
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-1.sql
b/sql/test/HTM/Tests/PersistBeforePrecommit-1.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-1.sql
@@ -0,0 +1,7 @@
+START TRANSACTION;
+INSERT INTO htmtest VALUES (37, 99), (38, 99), (39, 99);
+SELECT * FROM htmtest;
+CALL persistcommit(9);
+SELECT * FROM htmtest;
+CALL precommit(9);
+SELECT * FROM htmtest;
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.err
b/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.err
@@ -0,0 +1,48 @@
+stderr of test 'PersistBeforePrecommit-1` in directory 'sql/test/HTM` itself:
+
+
+# 11:21:35 >
+# 11:21:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35393" "--set"
"mapi_usock=/var/tmp/mtest-9501/.s.monetdb.35393" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 11:21:35 >
+
+# builtin opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35393
+# cmdline opt mapi_usock = /var/tmp/mtest-9501/.s.monetdb.35393
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 11:21:36 >
+# 11:21:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9501" "--port=35393"
+# 11:21:36 >
+
+MAPI = (monetdb) /var/tmp/mtest-9501/.s.monetdb.35393
+QUERY = CALL persistcommit(9);
+ERROR = !failed
+MAPI = (monetdb) /var/tmp/mtest-9501/.s.monetdb.35393
+QUERY = SELECT * FROM htmtest;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-9501/.s.monetdb.35393
+QUERY = CALL precommit(9);
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-9501/.s.monetdb.35393
+QUERY = SELECT * FROM htmtest;
+ERROR = !current transaction is aborted (please ROLLBACK)
+
+# 11:21:36 >
+# 11:21:36 > "Done."
+# 11:21:36 >
+
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.out
b/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.out
@@ -0,0 +1,48 @@
+stdout of test 'PersistBeforePrecommit-1` in directory 'sql/test/HTM` itself:
+
+
+# 11:21:35 >
+# 11:21:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35393" "--set"
"mapi_usock=/var/tmp/mtest-9501/.s.monetdb.35393" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 11:21:35 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_HTM', using 4 threads
+# Compiled for x86_64-apple-darwin14.4.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 8.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-56.cwi.nl:35393/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9501/.s.monetdb.35393
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.17'
+# Finished reading the write-ahead log 'sql_logs/sql/log.17'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 11:21:36 >
+# 11:21:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9501" "--port=35393"
+# 11:21:36 >
+
+#START TRANSACTION;
+#INSERT INTO htmtest VALUES (37, 99), (38, 99), (39, 99);
+[ 3 ]
+#SELECT * FROM htmtest;
+% sys.htmtest, sys.htmtest # table_name
+% id, val # name
+% int, int # type
+% 2, 2 # length
+[ 1, 10 ]
+[ 2, 20 ]
+[ 3, 88 ]
+[ 37, 99 ]
+[ 38, 99 ]
+[ 39, 99 ]
+
+# 11:21:36 >
+# 11:21:36 > "Done."
+# 11:21:36 >
+
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-2.sql
b/sql/test/HTM/Tests/PersistBeforePrecommit-2.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-2.sql
@@ -0,0 +1,2 @@
+SELECT * FROM htmtest;
+DELETE FROM htmtest WHERE id > 3;
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.err
b/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'PersistBeforePrecommit-2` in directory 'sql/test/HTM` itself:
+
+
+# 11:21:36 >
+# 11:21:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35393" "--set"
"mapi_usock=/var/tmp/mtest-9501/.s.monetdb.35393" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 11:21:36 >
+
+# builtin opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35393
+# cmdline opt mapi_usock = /var/tmp/mtest-9501/.s.monetdb.35393
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 11:21:36 >
+# 11:21:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9501" "--port=35393"
+# 11:21:36 >
+
+
+# 11:21:36 >
+# 11:21:36 > "Done."
+# 11:21:36 >
+
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.out
b/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'PersistBeforePrecommit-2` in directory 'sql/test/HTM` itself:
+
+
+# 11:21:36 >
+# 11:21:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35393" "--set"
"mapi_usock=/var/tmp/mtest-9501/.s.monetdb.35393" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 11:21:36 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_HTM', using 4 threads
+# Compiled for x86_64-apple-darwin14.4.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 8.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-56.cwi.nl:35393/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9501/.s.monetdb.35393
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.17'
+# Finished reading the write-ahead log 'sql_logs/sql/log.17'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 11:21:36 >
+# 11:21:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9501" "--port=35393"
+# 11:21:36 >
+
+#SELECT * FROM htmtest;
+% sys.htmtest, sys.htmtest # table_name
+% id, val # name
+% int, int # type
+% 1, 2 # length
+[ 1, 10 ]
+[ 2, 20 ]
+[ 3, 88 ]
+#DELETE FROM htmtest WHERE id > 3;
+[ 0 ]
+
+# 11:21:36 >
+# 11:21:36 > "Done."
+# 11:21:36 >
+
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.sql
b/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+INSERT INTO htmtest VALUES (40, 99), (41, 99), (42, 99);
+SELECT * FROM htmtest;
+CALL persistcommit(10);
+ROLLBACK;
+
+START TRANSACTION;
+SELECT * FROM htmtest;
+INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99);
+SELECT * FROM htmtest;
+CALL precommit(10);
+CALL persistcommit(10);
+SELECT * FROM htmtest;
diff --git a/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.err
b/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'PersistBeforePrecommitWithRollback-1` in directory
'sql/test/HTM` itself:
+
+
+# 11:28:52 >
+# 11:28:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35336" "--set"
"mapi_usock=/var/tmp/mtest-10209/.s.monetdb.35336" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 11:28:52 >
+
+# builtin opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35336
+# cmdline opt mapi_usock = /var/tmp/mtest-10209/.s.monetdb.35336
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
