Changeset: a23aa4e899a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a23aa4e899a0
Added Files:
sql/test/pg_regress/Tests/int8.SQL.py
Removed Files:
sql/test/pg_regress/Tests/int8.test
Modified Files:
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.err.int128
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/int8.stable.out.int128
Branch: default
Log Message:
This test has different outputs between int128 vs no-int128
diffs (truncated from 374 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/int8.SQL.py
b/sql/test/pg_regress/Tests/int8.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/int8.SQL.py
@@ -0,0 +1,20 @@
+from MonetDBtesting.sqltest import SQLTestCase
+import pymonetdb, os
+
+conn1 = pymonetdb.connect(database=os.getenv("TSTDB"),
port=int(os.getenv("MAPIPORT")), autocommit=True)
+cur1 = conn1.cursor()
+try:
+ cur1.execute('select cast(1 as hugeint)')
+ suffix = '.int128'
+except pymonetdb.DatabaseError as e:
+ suffix = ''
+cur1.close()
+conn1.close()
+
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('int8.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+ .assertMatchStableOut(fout='int8.stable.out%s' % (suffix))\
+ .assertMatchStableError(ferr='int8.stable.err%s' % (suffix))
diff --git a/sql/test/pg_regress/Tests/int8.stable.err
b/sql/test/pg_regress/Tests/int8.stable.err
--- a/sql/test/pg_regress/Tests/int8.stable.err
+++ b/sql/test/pg_regress/Tests/int8.stable.err
@@ -1,34 +1,3 @@
-stderr of test 'int8` in directory 'sql/test/pg_regress` itself:
-
-
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
-
-# builtin opt gdk_dbpath = /ufs/dinther/INSTALL/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 = 38959
-# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 536870922
-
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
-
MAPI = (monetdb) /var/tmp/mtest-19737/.s.monetdb.30205
QUERY = INSERT INTO INT8_TBL(q1) VALUES (' ');
ERROR = !conversion of string ' ' to type lng failed.
@@ -133,8 +102,3 @@ MAPI = (monetdb) /var/tmp/mtest-3604/.s
QUERY = SELECT '' AS to_char_17, to_char(q2, '999999SG9999999999') FROM
INT8_TBL;
ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
CODE = 42000
-
-# 17:11:19 >
-# 17:11:19 > "Done."
-# 17:11:19 >
-
diff --git a/sql/test/pg_regress/Tests/int8.stable.err.int128
b/sql/test/pg_regress/Tests/int8.stable.err.int128
--- a/sql/test/pg_regress/Tests/int8.stable.err.int128
+++ b/sql/test/pg_regress/Tests/int8.stable.err.int128
@@ -1,34 +1,3 @@
-stderr of test 'int8` in directory 'sql/test/pg_regress` itself:
-
-
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
-
-# builtin opt gdk_dbpath = /ufs/dinther/INSTALL/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 = 38959
-# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 536870922
-
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
-
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = INSERT INTO INT8_TBL(q1) VALUES (' ');
ERROR = !conversion of string ' ' to type lng failed.
@@ -129,8 +98,3 @@ MAPI = (monetdb) /var/tmp/mtest-30274/.
QUERY = SELECT '' AS to_char_17, to_char(q2, '999999SG9999999999') FROM
INT8_TBL;
ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
CODE = 42000
-
-# 17:11:19 >
-# 17:11:19 > "Done."
-# 17:11:19 >
-
diff --git a/sql/test/pg_regress/Tests/int8.stable.out
b/sql/test/pg_regress/Tests/int8.stable.out
--- a/sql/test/pg_regress/Tests/int8.stable.out
+++ b/sql/test/pg_regress/Tests/int8.stable.out
@@ -1,32 +1,3 @@
-stdout of test 'int8` in directory 'sql/test/pg_regress` itself:
-
-
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
-
-# MonetDB 5 server v11.18.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_pg_regress', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.356 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://uwakai.da.cwi.nl:38959/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
-
-#--
-#-- bigint
-#-- Test bigint 64-bit integers.
-#--
#CREATE TABLE INT8_TBL(q1 bigint, q2 bigint);
#INSERT INTO INT8_TBL VALUES(' 123 ',' 456');
[ 1 ]
@@ -149,8 +120,3 @@ stdout of test 'int8` in directory 'sql/
[ "", 9135780246913578 ]
[ "", 9135780246913578 ]
[ "", 9135780246913578 ]
-
-# 16:17:25 >
-# 16:17:25 > "Done."
-# 16:17:25 >
-
diff --git a/sql/test/pg_regress/Tests/int8.stable.out.int128
b/sql/test/pg_regress/Tests/int8.stable.out.int128
--- a/sql/test/pg_regress/Tests/int8.stable.out.int128
+++ b/sql/test/pg_regress/Tests/int8.stable.out.int128
@@ -1,32 +1,3 @@
-stdout of test 'int8` in directory 'sql/test/pg_regress` itself:
-
-
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
-
-# MonetDB 5 server v11.18.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_pg_regress', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.356 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://uwakai.da.cwi.nl:38959/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
-
-#--
-#-- bigint
-#-- Test bigint 64-bit integers.
-#--
#CREATE TABLE INT8_TBL(q1 bigint, q2 bigint);
#INSERT INTO INT8_TBL VALUES(' 123 ',' 456');
[ 1 ]
@@ -158,8 +129,3 @@ stdout of test 'int8` in directory 'sql/
[ "", 9135780246913578 ]
[ "", 9135780246913578 ]
[ "", 9135780246913578 ]
-
-# 16:17:25 >
-# 16:17:25 > "Done."
-# 16:17:25 >
-
diff --git a/sql/test/pg_regress/Tests/int8.test
b/sql/test/pg_regress/Tests/int8.test
deleted file mode 100644
--- a/sql/test/pg_regress/Tests/int8.test
+++ /dev/null
@@ -1,160 +0,0 @@
-statement ok
-set optimizer = 'sequential_pipe'
-
-statement ok
-CREATE TABLE INT8_TBL(q1 bigint, q2 bigint)
-
-statement ok
-INSERT INTO INT8_TBL VALUES(' 123 ',' 456')
-
-statement ok
-INSERT INTO INT8_TBL VALUES('123 ','4567890123456789')
-
-statement ok
-INSERT INTO INT8_TBL VALUES('4567890123456789','123')
-
-statement ok
-INSERT INTO INT8_TBL VALUES('4567890123456789','4567890123456789')
-
-statement ok
-INSERT INTO INT8_TBL VALUES('4567890123456789','-4567890123456789')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES (' ')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES ('xxx')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES ('3908203590239580293850293850329485')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES ('-1204982019841029840928340329840934')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES ('- 123')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES (' 345 5')
-
-statement error
-INSERT INTO INT8_TBL(q1) VALUES ('')
-
-query II rowsort
-SELECT * FROM INT8_TBL
-----
-10 values hashing to 7716ae904bc0eeef679da3b67515d7f8
-
-query TII rowsort
-SELECT '' AS five, q1 AS plus, -q1 AS minus FROM INT8_TBL
-----
-15 values hashing to 4c5317e03578c95b1f4ad3f9ca4e4e23
-
-query TIII rowsort
-SELECT '' AS five, q1, q2, q1 + q2 AS plus FROM INT8_TBL
-----
-20 values hashing to cc8e38acdf0fc4a7eb1801853c70e2a0
-
-query TIII rowsort
-SELECT '' AS five, q1, q2, q1 - q2 AS minus FROM INT8_TBL
-----
-20 values hashing to 3ac3223bb2174ca9879ea5bbe3d9f7e7
-
-query TIII rowsort
-SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <>
4567890123456789 ORDER BY q1, q2
-----
-12 values hashing to 37619b22cc66b1d9bfe29c9d3b51a9b2
-
-query TIII rowsort
-SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL
- WHERE q1 < 1000 or (q2 > 0 and q2 < 1000)
-----
-12 values hashing to 1dceb67d1ea29b86bb56472f2bedc00d
-
-query TIII rowsort
-SELECT '' AS five, q1, q2, q1 / q2 AS divide FROM INT8_TBL
-----
-20 values hashing to d830c8594eeda24d415b7224ac5858ff
-
-query TIR rowsort
-SELECT '' AS five, q1, cast(q1 as double) FROM INT8_TBL
-----
-15 values hashing to 5d4167824d4d88a231a1d6463ac7c3cd
-
-query TIR rowsort
-SELECT '' AS five, q2, cast(q2 as double) FROM INT8_TBL
-----
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
