Changeset: f9a7d058c4e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9a7d058c4e3
Added Files:
sql/test/HTM/Tests/MultipleConnections-4.SQL.py
sql/test/HTM/Tests/MultipleConnections-4.stable.err
sql/test/HTM/Tests/MultipleConnections-4.stable.out
sql/test/HTM/Tests/MultipleConnections-5.SQL.py
sql/test/HTM/Tests/MultipleConnections-5.stable.err
sql/test/HTM/Tests/MultipleConnections-5.stable.out
Modified Files:
sql/test/HTM/Tests/All
sql/test/HTM/Tests/MultipleConnections-1.SQL.py
sql/test/HTM/Tests/MultipleConnections-2.SQL.py
sql/test/HTM/Tests/MultipleConnections-3.SQL.py
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalse.SQL.py
Branch: HTM
Log Message:
Add a few more HTM test to narrow down transactional issues
diffs (truncated from 406 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
@@ -5,6 +5,8 @@ MultipleConnectionsAllWithAutocommit
MultipleConnections-1
MultipleConnections-2
MultipleConnections-3
+MultipleConnections-4
+MultipleConnections-5
MultipleConnections-cleanup
ReadsItsOwnWrites
ReadsItsOwnWrites-cleanup
diff --git a/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
--- a/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
+++ b/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
@@ -38,9 +38,12 @@ query(c2, 'SELECT * FROM htmtest')
run(c1, 'DELETE FROM htmtest WHERE id > 3')
run(c1, 'COMMIT')
+print('c1')
query(c1, 'SELECT * FROM htmtest')
+print('c2')
query(c2, 'SELECT * FROM htmtest')
c3 = connect(False)
+print('c3')
query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
--- a/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
+++ b/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
@@ -38,9 +38,12 @@ query(c2, 'SELECT * FROM htmtest')
run(c1, 'DELETE FROM htmtest WHERE id > 3')
run(c1, 'COMMIT')
+print('c1')
query(c1, 'SELECT * FROM htmtest')
+print('c2')
query(c2, 'SELECT * FROM htmtest')
c3 = connect(True)
+print('c3')
query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-3.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-3.SQL.py
--- a/sql/test/HTM/Tests/MultipleConnections-3.SQL.py
+++ b/sql/test/HTM/Tests/MultipleConnections-3.SQL.py
@@ -36,9 +36,12 @@ c2 = connect(False)
query(c2, 'SELECT * FROM htmtest')
run(c1, 'DELETE FROM htmtest WHERE id > 3')
+print('c1')
query(c1, 'SELECT * FROM htmtest')
+print('c2')
query(c2, 'SELECT * FROM htmtest')
c3 = connect(True)
+print('c3')
query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-4.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-4.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-4.SQL.py
@@ -0,0 +1,44 @@
+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(True)
+run(c1, 'INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99)')
+query(c1, 'SELECT * FROM htmtest')
+run(c1, 'DELETE FROM htmtest WHERE id > 3')
+print('c1')
+query(c1, 'SELECT * FROM htmtest')
+
+c2 = connect(False)
+print('c2')
+query(c2, 'SELECT * FROM htmtest')
+
+c3 = connect(True)
+print('c3')
+query(c3, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-4.stable.err
b/sql/test/HTM/Tests/MultipleConnections-4.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-4.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'MultipleConnections-4` in directory 'sql/test/HTM` itself:
+
+
+# 15:47:00 >
+# 15:47:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32366" "--set"
"mapi_usock=/var/tmp/mtest-57125/.s.monetdb.32366" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 15:47:00 >
+
+# 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 = 32366
+# cmdline opt mapi_usock = /var/tmp/mtest-57125/.s.monetdb.32366
+# 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
+
+# 15:47:00 >
+# 15:47:00 > "/usr/bin/python" "MultipleConnections-4.SQL.py"
"MultipleConnections-4"
+# 15:47:00 >
+
+
+# 15:47:01 >
+# 15:47:01 > "Done."
+# 15:47:01 >
+
diff --git a/sql/test/HTM/Tests/MultipleConnections-4.stable.out
b/sql/test/HTM/Tests/MultipleConnections-4.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-4.stable.out
@@ -0,0 +1,51 @@
+stdout of test 'MultipleConnections-4` in directory 'sql/test/HTM` itself:
+
+
+# 15:47:00 >
+# 15:47:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32366" "--set"
"mapi_usock=/var/tmp/mtest-57125/.s.monetdb.32366" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 15:47:00 >
+
+# 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:32366/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-57125/.s.monetdb.32366
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.9'
+# Finished reading the write-ahead log 'sql_logs/sql/log.9'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:47:00 >
+# 15:47:00 > "/usr/bin/python" "MultipleConnections-4.SQL.py"
"MultipleConnections-4"
+# 15:47:00 >
+
+INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99)
+&2 3 -1
+
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30), (43, 99), (44, 99), (45, 99)]
+DELETE FROM htmtest WHERE id > 3
+&2 3 -1
+
+c1
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+c2
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+c3
+SELECT * FROM htmtest
+[(1, 10), (2, 20), (3, 30)]
+
+# 15:47:01 >
+# 15:47:01 > "Done."
+# 15:47:01 >
+
diff --git a/sql/test/HTM/Tests/MultipleConnections-5.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-5.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-5.SQL.py
@@ -0,0 +1,58 @@
+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(True)
+run(c1, 'INSERT INTO htmtest VALUES (43, 99), (44, 99), (45, 99)')
+query(c1, 'SELECT * FROM htmtest')
+
+c2 = connect(False)
+print('c2')
+query(c2, 'SELECT * FROM htmtest')
+
+run(c1, 'DELETE FROM htmtest WHERE id > 3')
+print('c1')
+query(c1, 'SELECT * FROM htmtest')
+
+print('c2')
+query(c2, 'SELECT * FROM htmtest')
+
+print('c2')
+run(c2, 'SELECT * FROM htmtest')
+run(c2, 'COMMIT')
+
+print('c2')
+query(c2, 'SELECT * FROM htmtest')
+
+c3 = connect(True)
+print('c3')
+query(c3, 'SELECT * FROM htmtest')
+
+print('c1')
+query(c2, 'SELECT * FROM htmtest')
diff --git a/sql/test/HTM/Tests/MultipleConnections-5.stable.err
b/sql/test/HTM/Tests/MultipleConnections-5.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/HTM/Tests/MultipleConnections-5.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'MultipleConnections-5` in directory 'sql/test/HTM` itself:
+
+
+# 15:58:59 >
+# 15:58:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36076" "--set"
"mapi_usock=/var/tmp/mtest-58334/.s.monetdb.36076" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM"
"--set" "mal_listing=0"
+# 15:58:59 >
+
+# 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 = 36076
+# cmdline opt mapi_usock = /var/tmp/mtest-58334/.s.monetdb.36076
+# 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
