Changeset: f71dc3d80ab9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f71dc3d80ab9
Modified Files:
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_strings_on_server.stable.err
sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
Branch: copybinary
Log Message:
Apparently some tests were approved while failing
and now magically started working??
diffs (86 lines):
diff --git a/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.err
b/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.err
--- a/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.err
+++ b/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.err
@@ -29,18 +29,8 @@ stderr of test 'bincopy_large_strings_on
# 10:17:51 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-17076 --port=32201 --database=mTests_sql_test_bincopy
# 10:17:51 >
-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_large_strings.bin'
ON SERVER;
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-17076/.s.monetdb.32201
-QUERY = SELECT COUNT(id) FROM foo
- WHERE (id % 10000 <> 0 AND LENGTH(s) = 9)
- OR (id % 10000 = 0 AND LENGTH(s) = 280000 + 9);
+# 11:02:21 >
+# 11:02:21 > "Done."
+# 11:02:21 >
-CODE = 25005
-
-# 10:17:52 >
-# 10:17:52 > "Done."
-# 10:17:52 >
-
diff --git a/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.out
b/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.out
--- a/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.out
+++ b/sql/test/bincopy/Tests/bincopy_large_strings_on_server.stable.out
@@ -12,6 +12,16 @@ stdout of test 'bincopy_large_strings_on
#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/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy/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 >
diff --git a/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.err
b/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.err
--- a/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.err
+++ b/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.err
@@ -29,16 +29,8 @@ stderr of test 'bincopy_strings_on_serve
# 10:17:46 > mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-17076 --port=32201 --database=mTests_sql_test_bincopy
# 10:17:46 >
-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_strings.bin'
ON SERVER;
-
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-17076/.s.monetdb.32201
-QUERY = SELECT COUNT(id) FROM foo WHERE s = ('int' || id);
-CODE = 25005
+# 11:00:28 >
+# 11:00:28 > "Done."
+# 11:00:28 >
-# 10:17:46 >
-# 10:17:46 > "Done."
-# 10:17:46 >
-
diff --git a/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
b/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
--- a/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
+++ b/sql/test/bincopy/Tests/bincopy_strings_on_server.stable.out
@@ -12,6 +12,14 @@ stdout of test 'bincopy_strings_on_serve
#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/bincopy_ints.bin',
R'/home/jvr/monets/copybinary/inst/mTests/sql/test/bincopy/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 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
