Changeset: c39c1495a064 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c39c1495a064
Added Files:
sql/test/mapi/Tests/python2_dec38.SQL.bat
sql/test/mapi/Tests/python2_dec38.SQL.sh
sql/test/mapi/Tests/python2_dec38.stable.err
sql/test/mapi/Tests/python2_dec38.stable.out
sql/test/mapi/Tests/python2_int128.SQL.bat
sql/test/mapi/Tests/python2_int128.SQL.sh
sql/test/mapi/Tests/python2_int128.stable.err
sql/test/mapi/Tests/python2_int128.stable.out
sql/test/mapi/Tests/python3_dec38.SQL.bat
sql/test/mapi/Tests/python3_dec38.SQL.sh
sql/test/mapi/Tests/python3_dec38.stable.err
sql/test/mapi/Tests/python3_dec38.stable.out
sql/test/mapi/Tests/python3_int128.SQL.bat
sql/test/mapi/Tests/python3_int128.SQL.sh
sql/test/mapi/Tests/python3_int128.stable.err
sql/test/mapi/Tests/python3_int128.stable.out
sql/test/mapi/Tests/python_dec38.py
sql/test/mapi/Tests/python_int128.py
Modified Files:
sql/test/mapi/Tests/All
Branch: int128
Log Message:
added simplistic python tests for 128-bit integers and 38-digit decimals
diffs (truncated from 576 to 300 lines):
diff --git a/sql/test/mapi/Tests/All b/sql/test/mapi/Tests/All
--- a/sql/test/mapi/Tests/All
+++ b/sql/test/mapi/Tests/All
@@ -17,6 +17,10 @@ HAVE_HGE?mal_int128
HAVE_HGE?sql_int128
HAVE_PHP&HAVE_HGE?php_int128
HAVE_PERL&HAVE_HGE?perl_int128
+HAVE_PYTHON2&HAVE_HGE?python2_int128
+HAVE_PYTHON3&HAVE_HGE?python3_int128
HAVE_HGE?sql_dec38
HAVE_PHP&HAVE_HGE?php_dec38
HAVE_PERL&HAVE_HGE?perl_dec38
+HAVE_PYTHON2&HAVE_HGE?python2_dec38
+HAVE_PYTHON3&HAVE_HGE?python3_dec38
diff --git a/sql/test/mapi/Tests/python2_dec38.SQL.bat
b/sql/test/mapi/Tests/python2_dec38.SQL.bat
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_dec38.SQL.bat
@@ -0,0 +1,13 @@
+@echo off
+
+rem must be aligned with the installation directory chosen in
+rem clients/python/test/Makefile.ag
+set testpath=%TSTSRCDIR%
+rem ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+rem Python that runs Mtest (currently always Python 2)
+set PYTHONPATH=%testpath%;%PYTHON2PATH%
+
+prompt # $t $g
+echo on
+
+%PYTHON2% "%testpath%/python_dec38.py %MAPIPORT% %TSTDB% %MAPIHOST%"
diff --git a/sql/test/mapi/Tests/python2_dec38.SQL.sh
b/sql/test/mapi/Tests/python2_dec38.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_dec38.SQL.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# must be aligned with the installation directory chosen in
+# clients/python/test/Makefile.ag
+testpath="$TSTSRCDIR"
+# ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+# Python that runs Mtest (currently always Python 2)
+PYTHONPATH=$testpath:${PYTHON2PATH}
+export PYTHONPATH
+
+Mlog -x "${PYTHON2} $testpath/python_dec38.py $MAPIPORT $TSTDB $MAPIHOST"
diff --git a/sql/test/mapi/Tests/python2_dec38.stable.err
b/sql/test/mapi/Tests/python2_dec38.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_dec38.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'python2_dec38` in directory 'sql/test/mapi` itself:
+
+
+# 18:07:09 >
+# 18:07:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31922" "--set"
"mapi_usock=/var/tmp/mtest-28749/.s.monetdb.31922" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/dec38/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
+# 18:07:09 >
+
+# builtin opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/dec38/prefix/--disable-debug_--enable-assert_--enable-optimize/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 = 31922
+# cmdline opt mapi_usock = /var/tmp/mtest-28749/.s.monetdb.31922
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/dec38/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 18:07:10 >
+# 18:07:10 > "./python2_dec38.SQL.sh" "python2_dec38"
+# 18:07:10 >
+
+
+# 18:07:10 >
+# 18:07:10 > "Done."
+# 18:07:10 >
+
diff --git a/sql/test/mapi/Tests/python2_dec38.stable.out
b/sql/test/mapi/Tests/python2_dec38.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_dec38.stable.out
@@ -0,0 +1,41 @@
+stdout of test 'python2_dec38` in directory 'sql/test/mapi` itself:
+
+
+# 18:07:09 >
+# 18:07:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31922" "--set"
"mapi_usock=/var/tmp/mtest-28749/.s.monetdb.31922" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/dec38/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
+# 18:07:09 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mapi', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:31922/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28749/.s.monetdb.31922
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:23:27 >
+# 18:23:27 > "./python2_dec38.SQL.sh" "python2_dec38"
+# 18:23:27 >
+
+
+# 18:23:27 >
+# 18:23:27 > /usr/bin/python2
/net/rome.ins.cwi.nl/export/scratch2/manegold/.rig./scratch0/Monet/HG/int128/source/MonetDB/sql/test/mapi/Tests/python_dec38.py
35903 mTests_sql_test_mapi /var/tmp/mtest-10465
+# 18:23:27 >
+
+[(Decimal('12345678901234567899876543210987654321'),
Decimal('1234567890123456789.9876543210987654321'),
Decimal('0.12345678901234567899876543210987654321'))]
+(Decimal('12345678901234567899876543210987654321'),
Decimal('1234567890123456789.9876543210987654321'),
Decimal('0.12345678901234567899876543210987654321'))
+12345678901234567899876543210987654321
+1234567890123456789.9876543210987654321
+0.12345678901234567899876543210987654321
+
+# 18:23:27 >
+# 18:23:27 > "Done."
+# 18:23:27 >
+
diff --git a/sql/test/mapi/Tests/python2_int128.SQL.bat
b/sql/test/mapi/Tests/python2_int128.SQL.bat
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_int128.SQL.bat
@@ -0,0 +1,13 @@
+@echo off
+
+rem must be aligned with the installation directory chosen in
+rem clients/python/test/Makefile.ag
+set testpath=%TSTSRCDIR%
+rem ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+rem Python that runs Mtest (currently always Python 2)
+set PYTHONPATH=%testpath%;%PYTHON2PATH%
+
+prompt # $t $g
+echo on
+
+%PYTHON2% "%testpath%/python_int128.py %MAPIPORT% %TSTDB% %MAPIHOST%"
diff --git a/sql/test/mapi/Tests/python2_int128.SQL.sh
b/sql/test/mapi/Tests/python2_int128.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_int128.SQL.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# must be aligned with the installation directory chosen in
+# clients/python/test/Makefile.ag
+testpath="$TSTSRCDIR"
+# ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+# Python that runs Mtest (currently always Python 2)
+PYTHONPATH=$testpath:${PYTHON2PATH}
+export PYTHONPATH
+
+Mlog -x "${PYTHON2} $testpath/python_int128.py $MAPIPORT $TSTDB $MAPIHOST"
diff --git a/sql/test/mapi/Tests/python2_int128.stable.err
b/sql/test/mapi/Tests/python2_int128.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_int128.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'python2_int128` in directory 'sql/test/mapi` itself:
+
+
+# 18:07:09 >
+# 18:07:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31922" "--set"
"mapi_usock=/var/tmp/mtest-28749/.s.monetdb.31922" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/int128/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
+# 18:07:09 >
+
+# builtin opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/int128/prefix/--disable-debug_--enable-assert_--enable-optimize/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 = 31922
+# cmdline opt mapi_usock = /var/tmp/mtest-28749/.s.monetdb.31922
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/int128/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi
+# cmdline opt mal_listing = 0
+# cmdline opt gdk_debug = 536870922
+
+# 18:07:10 >
+# 18:07:10 > "./python2_int128.SQL.sh" "python2_int128"
+# 18:07:10 >
+
+
+# 18:07:10 >
+# 18:07:10 > "Done."
+# 18:07:10 >
+
diff --git a/sql/test/mapi/Tests/python2_int128.stable.out
b/sql/test/mapi/Tests/python2_int128.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mapi/Tests/python2_int128.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'python2_int128` in directory 'sql/test/mapi` itself:
+
+
+# 18:07:09 >
+# 18:07:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31922" "--set"
"mapi_usock=/var/tmp/mtest-28749/.s.monetdb.31922" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/int128/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
+# 18:07:09 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mapi', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:31922/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28749/.s.monetdb.31922
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:07:10 >
+# 18:07:10 > "./python2_int128.SQL.sh" "python2_int128"
+# 18:07:10 >
+
+
+# 18:17:58 >
+# 18:17:58 > /usr/bin/python2
/net/rome.ins.cwi.nl/export/scratch2/manegold/.rig./scratch0/Monet/HG/int128/source/MonetDB/sql/test/mapi/Tests/python_int128.py
31201 mTests_sql_test_mapi /var/tmp/mtest-6230
+# 18:17:58 >
+
+[(123456789098765432101234567890987654321L,)]
+(123456789098765432101234567890987654321L,)
+123456789098765432101234567890987654321
+
+# 18:17:58 >
+# 18:17:58 > "Done."
+# 18:17:58 >
+
diff --git a/sql/test/mapi/Tests/python3_dec38.SQL.bat
b/sql/test/mapi/Tests/python3_dec38.SQL.bat
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python3_dec38.SQL.bat
@@ -0,0 +1,13 @@
+@echo off
+
+rem must be aligned with the installation directory chosen in
+rem clients/python/test/Makefile.ag
+set testpath=%TSTSRCDIR%
+rem ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+rem Python that runs Mtest (currently always Python 3)
+set PYTHONPATH=%testpath%;%PYTHON3PATH%
+
+prompt # $t $g
+echo on
+
+%PYTHON3% "%testpath%/python_dec38.py %MAPIPORT% %TSTDB% %MAPIHOST%"
diff --git a/sql/test/mapi/Tests/python3_dec38.SQL.sh
b/sql/test/mapi/Tests/python3_dec38.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/test/mapi/Tests/python3_dec38.SQL.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# must be aligned with the installation directory chosen in
+# clients/python/test/Makefile.ag
+testpath="$TSTSRCDIR"
+# ignore PYTHONPATH from Mtest, it is hardcoded to the dirs for the
+# Python that runs Mtest (currently always Python 3)
+PYTHONPATH=$testpath:${PYTHON3PATH}
+export PYTHONPATH
+
+Mlog -x "${PYTHON3} $testpath/python_dec38.py $MAPIPORT $TSTDB $MAPIHOST"
diff --git a/sql/test/mapi/Tests/python3_dec38.stable.err
b/sql/test/mapi/Tests/python3_dec38.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mapi/Tests/python3_dec38.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'python3_dec38` in directory 'sql/test/mapi` itself:
+
+
+# 18:07:10 >
+# 18:07:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31922" "--set"
"mapi_usock=/var/tmp/mtest-28749/.s.monetdb.31922" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/dec38/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_mapi"
"--set" "mal_listing=0"
+# 18:07:10 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
