Changeset: 5481c2bd313f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5481c2bd313f
Added Files:
sql/test/HTM/Tests/PrecommitWithoutPersists-1.sql
sql/test/HTM/Tests/PrecommitWithoutPersists-1.stable.err
sql/test/HTM/Tests/PrecommitWithoutPersists-1.stable.out
sql/test/HTM/Tests/PrecommitWithoutPersists-2.sql
sql/test/HTM/Tests/PrecommitWithoutPersists-2.stable.err
sql/test/HTM/Tests/PrecommitWithoutPersists-2.stable.out
Removed 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-3.SQL.py
sql/test/HTM/Tests/MultipleConnections-3.stable.err
sql/test/HTM/Tests/MultipleConnections-3.stable.out
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
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalse.SQL.py
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalse.stable.err
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalse.stable.out
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalseAndDelete.SQL.py
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalseAndDelete.stable.err
sql/test/HTM/Tests/MultipleConnections1WithAutocommitFalseAndDelete.stable.out
Modified Files:
sql/test/HTM/Tests/All
Branch: HTM
Log Message:
Remove usless (for this branch) multiple connections tets
Add precommit with persists on store restart tests
diffs (truncated from 1328 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
@@ -1,12 +1,5 @@
setup
-MultipleConnections1WithAutocommitFalse
-MultipleConnections1WithAutocommitFalseAndDelete
MultipleConnectionsAllWithAutocommit
-MultipleConnections-1
-MultipleConnections-2
-MultipleConnections-3
-MultipleConnections-4
-MultipleConnections-5
MultipleConnections-cleanup
ReadsItsOwnWrites
ReadsItsOwnWrites-cleanup
@@ -29,3 +22,5 @@ InsertWith2PCDeleteWithCommit-2
InsertWithCommitDeleteWith2PC-1
InsertWithCommitDeleteWith2PC-2
TwoInsetsIn1Transaction
+PrecommitWithoutPersists-1
+PrecommitWithoutPersists-2
diff --git a/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
b/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-1.SQL.py
+++ /dev/null
@@ -1,49 +0,0 @@
-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')
-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-1.stable.err
b/sql/test/HTM/Tests/MultipleConnections-1.stable.err
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-1.stable.err
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-1.stable.out
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-
-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)]
-
-# 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
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-2.SQL.py
+++ /dev/null
@@ -1,49 +0,0 @@
-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')
-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-2.stable.err
b/sql/test/HTM/Tests/MultipleConnections-2.stable.err
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-2.stable.err
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
--- a/sql/test/HTM/Tests/MultipleConnections-2.stable.out
+++ /dev/null
@@ -1,59 +0,0 @@
-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'
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
