Changeset: a1aa0e73a5f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1aa0e73a5f9
Added Files:
sql/test/bincopy/Tests/All
sql/test/bincopy/Tests/bincopy_broken_strings_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.out
sql/test/bincopy/Tests/bincopy_broken_strings_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.out
sql/test/bincopy/Tests/bincopy_ints_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_ints_on_client.stable.err
sql/test/bincopy/Tests/bincopy_ints_on_client.stable.out
sql/test/bincopy/Tests/bincopy_ints_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_ints_on_server.stable.err
sql/test/bincopy/Tests/bincopy_ints_on_server.stable.out
sql/test/bincopy/Tests/bincopy_large_strings_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_large_strings_on_client.stable.err
sql/test/bincopy/Tests/bincopy_large_strings_on_client.stable.out
sql/test/bincopy/Tests/bincopy_large_strings_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.err
sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.out
sql/test/bincopy/Tests/bincopy_more_ints_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_more_ints_on_client.stable.err
sql/test/bincopy/Tests/bincopy_more_ints_on_client.stable.out
sql/test/bincopy/Tests/bincopy_more_ints_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_more_ints_on_server.stable.err
sql/test/bincopy/Tests/bincopy_more_ints_on_server.stable.out
sql/test/bincopy/Tests/bincopy_null_ints_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_null_ints_on_client.stable.err
sql/test/bincopy/Tests/bincopy_null_ints_on_client.stable.out
sql/test/bincopy/Tests/bincopy_null_ints_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_null_ints_on_server.stable.err
sql/test/bincopy/Tests/bincopy_null_ints_on_server.stable.out
sql/test/bincopy/Tests/bincopy_strings_on_client.SQL.py
sql/test/bincopy/Tests/bincopy_strings_on_client.stable.err
sql/test/bincopy/Tests/bincopy_strings_on_client.stable.out
sql/test/bincopy/Tests/bincopy_strings_on_server.SQL.py
sql/test/bincopy/Tests/bincopy_strings_on_server.stable.err
sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
sql/test/bincopy/Tests/bincopy_support.py
Removed Files:
sql/test/Tests/bincopy_broken_strings_on_client.SQL.py
sql/test/Tests/bincopy_broken_strings_on_client.stable.err
sql/test/Tests/bincopy_broken_strings_on_client.stable.out
sql/test/Tests/bincopy_broken_strings_on_server.SQL.py
sql/test/Tests/bincopy_broken_strings_on_server.stable.err
sql/test/Tests/bincopy_broken_strings_on_server.stable.out
sql/test/Tests/bincopy_ints_on_client.SQL.py
sql/test/Tests/bincopy_ints_on_client.stable.err
sql/test/Tests/bincopy_ints_on_client.stable.out
sql/test/Tests/bincopy_ints_on_server.SQL.py
sql/test/Tests/bincopy_ints_on_server.stable.err
sql/test/Tests/bincopy_ints_on_server.stable.out
sql/test/Tests/bincopy_large_strings_on_client.SQL.py
sql/test/Tests/bincopy_large_strings_on_client.stable.err
sql/test/Tests/bincopy_large_strings_on_client.stable.out
sql/test/Tests/bincopy_large_strings_on_server.SQL.py
sql/test/Tests/bincopy_large_strings_on_server.stable.err
sql/test/Tests/bincopy_large_strings_on_server.stable.out
sql/test/Tests/bincopy_more_ints_on_client.SQL.py
sql/test/Tests/bincopy_more_ints_on_client.stable.err
sql/test/Tests/bincopy_more_ints_on_client.stable.out
sql/test/Tests/bincopy_more_ints_on_server.SQL.py
sql/test/Tests/bincopy_more_ints_on_server.stable.err
sql/test/Tests/bincopy_more_ints_on_server.stable.out
sql/test/Tests/bincopy_null_ints_on_client.SQL.py
sql/test/Tests/bincopy_null_ints_on_client.stable.err
sql/test/Tests/bincopy_null_ints_on_client.stable.out
sql/test/Tests/bincopy_null_ints_on_server.SQL.py
sql/test/Tests/bincopy_null_ints_on_server.stable.err
sql/test/Tests/bincopy_null_ints_on_server.stable.out
sql/test/Tests/bincopy_strings_on_client.SQL.py
sql/test/Tests/bincopy_strings_on_client.stable.err
sql/test/Tests/bincopy_strings_on_client.stable.out
sql/test/Tests/bincopy_strings_on_server.SQL.py
sql/test/Tests/bincopy_strings_on_server.stable.err
sql/test/Tests/bincopy_strings_on_server.stable.out
sql/test/Tests/bincopy_support.py
Modified Files:
sql/test/Tests/All
Branch: copybinary
Log Message:
Move bincopy tests to their own directory
diffs (truncated from 624 to 300 lines):
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -128,16 +128,3 @@ HAVE_PYMONETDB&HAVE_LIBBZ2?hot_snapshot_
HAVE_PYMONETDB&HAVE_LIBLZMA?hot_snapshot_xz
HAVE_PYTHON_LZ4&HAVE_PYMONETDB&HAVE_LIBLZ4?hot_snapshot_lz4
!HAVE_PYTHON_LZ4&HAVE_PYMONETDB&HAVE_LIBLZ4?hot_snapshot_lz4_lite
-
-bincopy_ints_on_client
-bincopy_ints_on_server
-bincopy_more_ints_on_client
-bincopy_more_ints_on_server
-bincopy_strings_on_client
-bincopy_strings_on_server
-bincopy_null_ints_on_client
-bincopy_null_ints_on_server
-bincopy_large_strings_on_client
-bincopy_large_strings_on_server
-bincopy_broken_strings_on_client
-bincopy_broken_strings_on_server
diff --git a/sql/test/Tests/bincopy_broken_strings_on_client.stable.err
b/sql/test/Tests/bincopy_broken_strings_on_client.stable.err
deleted file mode 100644
--- a/sql/test/Tests/bincopy_broken_strings_on_client.stable.err
+++ /dev/null
@@ -1,21 +0,0 @@
-stderr of test 'bincopy_broken_strings_on_client` in directory 'sql/test`
itself:
-
-
-# 16:41:40 >
-# 16:41:40 > "/usr/bin/python3.7" "bincopy_broken_strings_on_client.SQL.py"
"bincopy_broken_strings_on_client"
-# 16:41:40 >
-
-
-# 16:41:40 >
-# 16:41:40 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-554 --port=38574 --database=mTests_sql_test
-# 16:41:40 >
-
-MAPI = (monetdb) /var/tmp/mtest-554/.s.monetdb.38574
-QUERY = COPY BINARY INTO foo(id, s) FROM
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_broken_strings.bin'
ON CLIENT;
-
-CODE = BADENCODING ??????? what should be here?
-
-# 16:41:40 >
-# 16:41:40 > "Done."
-# 16:41:40 >
-
diff --git a/sql/test/Tests/bincopy_broken_strings_on_server.stable.err
b/sql/test/Tests/bincopy_broken_strings_on_server.stable.err
deleted file mode 100644
--- a/sql/test/Tests/bincopy_broken_strings_on_server.stable.err
+++ /dev/null
@@ -1,21 +0,0 @@
-stderr of test 'bincopy_broken_strings_on_server` in directory 'sql/test`
itself:
-
-
-# 16:41:40 >
-# 16:41:40 > "/usr/bin/python3.7" "bincopy_broken_strings_on_server.SQL.py"
"bincopy_broken_strings_on_server"
-# 16:41:40 >
-
-
-# 16:41:40 >
-# 16:41:40 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-554 --port=38574 --database=mTests_sql_test
-# 16:41:40 >
-
-MAPI = (monetdb) /var/tmp/mtest-554/.s.monetdb.38574
-QUERY = COPY BINARY INTO foo(id, s) FROM
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_broken_strings.bin'
ON SERVER;
-
-CODE = BADENCODING ??????? what should be here?
-
-# 16:41:40 >
-# 16:41:40 > "Done."
-# 16:41:40 >
-
diff --git a/sql/test/Tests/bincopy_large_strings_on_server.stable.out
b/sql/test/Tests/bincopy_large_strings_on_server.stable.out
deleted file mode 100644
--- a/sql/test/Tests/bincopy_large_strings_on_server.stable.out
+++ /dev/null
@@ -1,30 +0,0 @@
-stdout of test 'bincopy_large_strings_on_server` in directory 'sql/test`
itself:
-
-
-# 16:33:55 >
-# 16:33:55 > "/usr/bin/python3.7" "bincopy_large_strings_on_server.SQL.py"
"bincopy_large_strings_on_server"
-# 16:33:55 >
-
-
-# 16:33:56 >
-# 16:33:56 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-30104 --port=35185 --database=mTests_sql_test
-# 16:33:56 >
-
-#START TRANSACTION;
-#CREATE TABLE foo(id INT NOT NULL, s TEXT);
-#COPY BINARY INTO foo(id, s) FROM
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_large_strings.bin'
ON SERVER;
-[ 1000000 ]
-#SELECT COUNT(id) FROM foo
-#WHERE (id % 10000 <> 0 AND LENGTH(s) = 9)
-#OR (id % 10000 = 0 AND LENGTH(s) = 280000 + 9);
-% sys.%1 # table_name
-% %1 # name
-% bigint # type
-% 7 # length
-[ 1000000 ]
-#ROLLBACK;
-
-# 16:33:57 >
-# 16:33:57 > "Done."
-# 16:33:57 >
-
diff --git a/sql/test/Tests/bincopy_strings_on_server.stable.out
b/sql/test/Tests/bincopy_strings_on_server.stable.out
deleted file mode 100644
--- a/sql/test/Tests/bincopy_strings_on_server.stable.out
+++ /dev/null
@@ -1,28 +0,0 @@
-stdout of test 'bincopy_strings_on_server` in directory 'sql/test` itself:
-
-
-# 15:35:04 >
-# 15:35:04 > "/usr/bin/python3.7" "bincopy_strings_on_server.SQL.py"
"bincopy_strings_on_server"
-# 15:35:04 >
-
-
-# 15:35:04 >
-# 15:35:04 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-9154 --port=36987 --database=mTests_sql_test
-# 15:35:04 >
-
-#START TRANSACTION;
-#CREATE TABLE foo(id INT NOT NULL, s VARCHAR(20));
-#COPY BINARY INTO foo(id, s) FROM
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy_strings.bin' ON
SERVER;
-[ 1000000 ]
-#SELECT COUNT(id) FROM foo WHERE s = ('int' || id);
-% .%1 # table_name
-% %1 # name
-% bigint # type
-% 7 # length
-[ 1000000 ]
-#ROLLBACK;
-
-# 15:35:05 >
-# 15:35:05 > "Done."
-# 15:35:05 >
-
diff --git a/sql/test/bincopy/Tests/All b/sql/test/bincopy/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/bincopy/Tests/All
@@ -0,0 +1,13 @@
+
+bincopy_ints_on_client
+bincopy_ints_on_server
+bincopy_more_ints_on_client
+bincopy_more_ints_on_server
+bincopy_strings_on_client
+bincopy_strings_on_server
+bincopy_null_ints_on_client
+bincopy_null_ints_on_server
+bincopy_large_strings_on_client
+bincopy_large_strings_on_server
+bincopy_broken_strings_on_client
+bincopy_broken_strings_on_server
diff --git a/sql/test/Tests/bincopy_broken_strings_on_client.SQL.py
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.SQL.py
rename from sql/test/Tests/bincopy_broken_strings_on_client.SQL.py
rename to sql/test/bincopy/Tests/bincopy_broken_strings_on_client.SQL.py
diff --git a/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'bincopy_broken_strings_on_client` in directory
'sql/test/bincopy` itself:
+
+
+# 10:17:52 >
+# 10:17:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=32201" "--set"
"mapi_usock=/var/tmp/mtest-17076/.s.monetdb.32201" "--forcemito"
"--dbpath=/home/jvr/monets/copybinary/inst/var/MonetDB/mTests_sql_test_bincopy"
"--set" "embedded_c=true"
+# 10:17:52 >
+
+# builtin opt gdk_dbpath =
/home/jvr/monets/copybinary/inst/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_listenaddr = all
+# cmdline opt mapi_port = 32201
+# cmdline opt mapi_usock = /var/tmp/mtest-17076/.s.monetdb.32201
+# cmdline opt gdk_dbpath =
/home/jvr/monets/copybinary/inst/var/MonetDB/mTests_sql_test_bincopy
+# cmdline opt embedded_c = true
+#client2: createExceptionInternal: !ERROR: SQLException:sql:HY013!Could not
allocate space
+
+
+
+
+# 10:17:52 >
+# 10:17:52 > "/usr/bin/python3.7" "bincopy_broken_strings_on_client.SQL.py"
"bincopy_broken_strings_on_client"
+# 10:17:52 >
+
+
+# 10:17:52 >
+# 10:17:52 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-17076 --port=32201 --database=mTests_sql_test_bincopy
+# 10:17:52 >
+
+
+
+# 10:17:52 >
+# 10:17:52 > "Done."
+# 10:17:52 >
+
diff --git a/sql/test/Tests/bincopy_broken_strings_on_client.stable.out
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.out
rename from sql/test/Tests/bincopy_broken_strings_on_client.stable.out
rename to sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.out
--- a/sql/test/Tests/bincopy_broken_strings_on_client.stable.out
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_client.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'bincopy_broken_strings_on_client` in directory 'sql/test`
itself:
+stdout of test 'bincopy_broken_strings_on_client` in directory
'sql/test/bincopy` itself:
# 16:41:59 >
diff --git a/sql/test/Tests/bincopy_broken_strings_on_server.SQL.py
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.SQL.py
rename from sql/test/Tests/bincopy_broken_strings_on_server.SQL.py
rename to sql/test/bincopy/Tests/bincopy_broken_strings_on_server.SQL.py
diff --git a/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'bincopy_broken_strings_on_server` in directory
'sql/test/bincopy` itself:
+
+
+# 10:17:52 >
+# 10:17:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=32201" "--set"
"mapi_usock=/var/tmp/mtest-17076/.s.monetdb.32201" "--forcemito"
"--dbpath=/home/jvr/monets/copybinary/inst/var/MonetDB/mTests_sql_test_bincopy"
"--set" "embedded_c=true"
+# 10:17:52 >
+
+# builtin opt gdk_dbpath =
/home/jvr/monets/copybinary/inst/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_listenaddr = all
+# cmdline opt mapi_port = 32201
+# cmdline opt mapi_usock = /var/tmp/mtest-17076/.s.monetdb.32201
+# cmdline opt gdk_dbpath =
/home/jvr/monets/copybinary/inst/var/MonetDB/mTests_sql_test_bincopy
+# cmdline opt embedded_c = true
+#client2: BATattach: !ERROR: input is not UTF-8
+#client2: createExceptionInternal: !ERROR: SQLException:sql:42000!Failed to
attach file
/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy/bincopy_broken_strings.bin
+
+# 10:17:52 >
+# 10:17:52 > "/usr/bin/python3.7" "bincopy_broken_strings_on_server.SQL.py"
"bincopy_broken_strings_on_server"
+# 10:17:52 >
+
+
+# 10:17:52 >
+# 10:17:52 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-17076 --port=32201 --database=mTests_sql_test_bincopy
+# 10:17:52 >
+
+MAPI = (monetdb) /var/tmp/mtest-17076/.s.monetdb.32201
+QUERY = COPY BINARY INTO foo(id, s) FROM
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy/bincopy_broken_strings.bin'
ON SERVER;
+
+CODE = 42000
+
+# 10:17:53 >
+# 10:17:53 > "Done."
+# 10:17:53 >
+
diff --git a/sql/test/Tests/bincopy_broken_strings_on_server.stable.out
b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.out
rename from sql/test/Tests/bincopy_broken_strings_on_server.stable.out
rename to sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.out
--- a/sql/test/Tests/bincopy_broken_strings_on_server.stable.out
+++ b/sql/test/bincopy/Tests/bincopy_broken_strings_on_server.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'bincopy_broken_strings_on_server` in directory 'sql/test`
itself:
+stdout of test 'bincopy_broken_strings_on_server` in directory
'sql/test/bincopy` itself:
# 16:41:40 >
diff --git a/sql/test/Tests/bincopy_ints_on_client.SQL.py
b/sql/test/bincopy/Tests/bincopy_ints_on_client.SQL.py
rename from sql/test/Tests/bincopy_ints_on_client.SQL.py
rename to sql/test/bincopy/Tests/bincopy_ints_on_client.SQL.py
diff --git a/sql/test/Tests/bincopy_ints_on_client.stable.err
b/sql/test/bincopy/Tests/bincopy_ints_on_client.stable.err
rename from sql/test/Tests/bincopy_ints_on_client.stable.err
rename to sql/test/bincopy/Tests/bincopy_ints_on_client.stable.err
--- a/sql/test/Tests/bincopy_ints_on_client.stable.err
+++ b/sql/test/bincopy/Tests/bincopy_ints_on_client.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'bincopy_ints_on_client` in directory 'sql/test` itself:
+stderr of test 'bincopy_ints_on_client` in directory 'sql/test/bincopy` itself:
# 14:42:27 >
diff --git a/sql/test/Tests/bincopy_ints_on_client.stable.out
b/sql/test/bincopy/Tests/bincopy_ints_on_client.stable.out
rename from sql/test/Tests/bincopy_ints_on_client.stable.out
rename to sql/test/bincopy/Tests/bincopy_ints_on_client.stable.out
--- a/sql/test/Tests/bincopy_ints_on_client.stable.out
+++ b/sql/test/bincopy/Tests/bincopy_ints_on_client.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'bincopy_ints_on_client` in directory 'sql/test` itself:
+stdout of test 'bincopy_ints_on_client` in directory 'sql/test/bincopy` itself:
# 14:42:27 >
diff --git a/sql/test/Tests/bincopy_ints_on_server.SQL.py
b/sql/test/bincopy/Tests/bincopy_ints_on_server.SQL.py
rename from sql/test/Tests/bincopy_ints_on_server.SQL.py
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
