Changeset: 5403bd807cef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5403bd807cef
Added Files:
sql/test/HTM/Tests/MultipleConnections-1.SQL.py
sql/test/HTM/Tests/MultipleConnections-1.stable.err
sql/test/HTM/Tests/MultipleConnections-1.stable.out
sql/test/HTM/Tests/MultipleConnections-2.SQL.py
sql/test/HTM/Tests/MultipleConnections-2.stable.err
sql/test/HTM/Tests/MultipleConnections-2.stable.out
sql/test/HTM/Tests/MultipleConnections-cleanup.sql
sql/test/HTM/Tests/MultipleConnections-cleanup.stable.err
sql/test/HTM/Tests/MultipleConnections-cleanup.stable.out
Modified Files:
sql/test/HTM/Tests/All
sql/test/HTM/Tests/MultipleConnectionsAllWithAutocommit.SQL.py
Branch: HTM
Log Message:
Add new multi-connection test for regular transactions
diffs (truncated from 419 to 300 lines):
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
@@ -2,6 +2,9 @@ setup
MultipleConnections1WithAutocommitFalse
MultipleConnections1WithAutocommitFalseAndDelete
MultipleConnectionsAllWithAutocommit
+MultipleConnections-1
+MultipleConnections-2
+MultipleConnections-cleanup
ReadsItsOwnWrites
ReadsItsOwnWrites-cleanup
NonUpdatePrecommitReturns0
diff --git a/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
@@ -0,0 +1,46 @@
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+import sys, time, monetdb.sql, os
+
+
+def connect(autocommit):
+ return monetdb.sql.connect(database = os.getenv('TSTDB'),
+ hostname = 'localhost',
+ port = int(os.getenv('MAPIPORT')),
+ username = 'monetdb',
+ password = 'monetdb',
+ autocommit = autocommit)
+
+def query(conn, sql):
+ print(sql)
+ cur = conn.cursor()
+ cur.execute(sql)
+ r = cur.fetchall()
+ cur.close()
+ print(r)
+
+def run(conn, sql):
+ print(sql)
+ r = conn.execute(sql)
+ print(r)
+
+
+c1 = connect(False)
+run(c1, 'INSERT INTO htmtest VALUES (40, 99), (41, 99), (42, 99)')
+run(c1, 'COMMIT')
+query(c1, 'SELECT * FROM htmtest')
+
+c2 = connect(False)
+query(c2, 'SELECT * FROM htmtest')
+
+run(c1, 'DELETE FROM htmtest WHERE id > 3')
+run(c1, 'COMMIT')
+query(c1, 'SELECT * FROM htmtest')
+
+query(c2, 'SELECT * FROM htmtest')
+
+c3 = connect(False)
+query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-1.stable.err
b/sql/test/HTM/Tests/MultipleConnections-1.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-1.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'MultipleConnections-1` in directory 'sql/test/HTM` itself:
+
+
+# 19:08:11 >
+# 19:08:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32824" "--set"
"mapi_usock=/var/tmp/mtest-47751/.s.monetdb.32824" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 19:08:11 >
+
+# 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 = 32824
+# cmdline opt mapi_usock = /var/tmp/mtest-47751/.s.monetdb.32824
+# 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
+
+# 19:08:12 >
+# 19:08:12 > "/usr/bin/python" "MultipleConnections-1.SQL.py"
"MultipleConnections-1"
+# 19:08:12 >
+
+
+# 19:08:12 >
+# 19:08:12 > "Done."
+# 19:08:12 >
+
diff --git a/sql/test/HTM/Tests/MultipleConnections-1.stable.out
b/sql/test/HTM/Tests/MultipleConnections-1.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-1.stable.out
@@ -0,0 +1,56 @@
+stdout of test 'MultipleConnections-1` in directory 'sql/test/HTM` itself:
+
+
+# 19:08:11 >
+# 19:08:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32824" "--set"
"mapi_usock=/var/tmp/mtest-47751/.s.monetdb.32824" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 19:08:11 >
+
+# 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://MacBookAir.local:32824/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-47751/.s.monetdb.32824
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.6'
+# Finished reading the write-ahead log 'sql_logs/sql/log.6'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 19:08:12 >
+# 19:08:12 > "/usr/bin/python" "MultipleConnections-1.SQL.py"
"MultipleConnections-1"
+# 19:08:12 >
+
+INSERT INTO htmtest VALUES (40, 99), (41, 99), (42, 99)
+&2 3 -1
+
+COMMIT
+&4 f
+
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30), (40, 99), (41, 99), (42, 99)]
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30), (40, 99), (41, 99), (42, 99)]
+DELETE FROM htmtest WHERE id > 3
+&2 3 -1
+
+COMMIT
+&4 f
+
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+
+# 19:08:12 >
+# 19:08:12 > "Done."
+# 19:08:12 >
+
diff --git a/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
@@ -0,0 +1,46 @@
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+import sys, time, monetdb.sql, os
+
+
+def connect(autocommit):
+ return monetdb.sql.connect(database = os.getenv('TSTDB'),
+ hostname = 'localhost',
+ port = int(os.getenv('MAPIPORT')),
+ username = 'monetdb',
+ password = 'monetdb',
+ autocommit = autocommit)
+
+def query(conn, sql):
+ print(sql)
+ cur = conn.cursor()
+ cur.execute(sql)
+ r = cur.fetchall()
+ cur.close()
+ print(r)
+
+def run(conn, sql):
+ print(sql)
+ r = conn.execute(sql)
+ print(r)
+
+
+c1 = connect(False)
+run(c1, 'INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99)')
+run(c1, 'COMMIT')
+query(c1, 'SELECT * FROM htmtest')
+
+c2 = connect(False)
+query(c2, 'SELECT * FROM htmtest')
+
+run(c1, 'DELETE FROM htmtest WHERE id > 3')
+run(c1, 'COMMIT')
+query(c1, 'SELECT * FROM htmtest')
+
+query(c2, 'SELECT * FROM htmtest')
+
+c3 = connect(True)
+query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-2.stable.err
b/sql/test/HTM/Tests/MultipleConnections-2.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-2.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'MultipleConnections-2` in directory 'sql/test/HTM` itself:
+
+
+# 19:08:12 >
+# 19:08:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32824" "--set"
"mapi_usock=/var/tmp/mtest-47751/.s.monetdb.32824" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 19:08:12 >
+
+# 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 = 32824
+# cmdline opt mapi_usock = /var/tmp/mtest-47751/.s.monetdb.32824
+# 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
+
+# 19:08:12 >
+# 19:08:12 > "/usr/bin/python" "MultipleConnections-2.SQL.py"
"MultipleConnections-2"
+# 19:08:12 >
+
+
+# 19:08:12 >
+# 19:08:12 > "Done."
+# 19:08:12 >
+
diff --git a/sql/test/HTM/Tests/MultipleConnections-2.stable.out
b/sql/test/HTM/Tests/MultipleConnections-2.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-2.stable.out
@@ -0,0 +1,56 @@
+stdout of test 'MultipleConnections-2` in directory 'sql/test/HTM` itself:
+
+
+# 19:08:12 >
+# 19:08:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32824" "--set"
"mapi_usock=/var/tmp/mtest-47751/.s.monetdb.32824" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 19:08:12 >
+
+# 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://MacBookAir.local:32824/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-47751/.s.monetdb.32824
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.7'
+# Finished reading the write-ahead log 'sql_logs/sql/log.7'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 19:08:12 >
+# 19:08:12 > "/usr/bin/python" "MultipleConnections-2.SQL.py"
"MultipleConnections-2"
+# 19:08:12 >
+
+INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99)
+&2 3 -1
+
+COMMIT
+&4 f
+
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30), (43, 99), (44, 99), (45, 99)]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
