Changeset: 3c5afd28aebb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c5afd28aebb
Added Files:
sql/test/prepare/Tests/sample.15.SQL.py
sql/test/prepare/Tests/sample.15.sql
sql/test/prepare/Tests/sample.15.stable.err
sql/test/prepare/Tests/sample.15.stable.out
Removed Files:
sql/test/sample/Tests/sample.15.sql
sql/test/sample/Tests/sample.15.stable.err
sql/test/sample/Tests/sample.15.stable.out
Modified Files:
sql/test/prepare/Tests/All
sql/test/sample/Tests/All
Branch: mtest
Log Message:
moved sample.15 to prepare folder
diffs (262 lines):
diff --git a/sql/test/prepare/Tests/All b/sql/test/prepare/Tests/All
--- a/sql/test/prepare/Tests/All
+++ b/sql/test/prepare/Tests/All
@@ -10,4 +10,5 @@ prepared-statement-with-udf.Bug-6650
prepared-merge-statement.Bug-6706
prepare-types.Bug-6724
prepared-select-with-error-causes-hang.Bug-6761
+sample.15
diff --git a/sql/test/prepare/Tests/sample.15.SQL.py
b/sql/test/prepare/Tests/sample.15.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/sample.15.SQL.py
@@ -0,0 +1,10 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('sample.15.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+ .assertMatchStableOut(fout='sample.15.stable.out')\
+ .assertMatchStableError(ferr='sample.15.stable.err')
+
diff --git a/sql/test/prepare/Tests/sample.15.sql
b/sql/test/prepare/Tests/sample.15.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/sample.15.sql
@@ -0,0 +1,6 @@
+select * from GENERATE_SERIES(1,41) sample 1.25; --should give error
+select * from GENERATE_SERIES(1,41) seed 1; --error, seed without sample
+
+prepare select * from GENERATE_SERIES(1,41) sample ?;
+prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
+prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
diff --git a/sql/test/prepare/Tests/sample.15.stable.err
b/sql/test/prepare/Tests/sample.15.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/sample.15.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'sample.15` in directory 'sql/test/sample` itself:
+
+
+# 10:58:47 >
+# 10:58:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33041" "--set"
"mapi_usock=/var/tmp/mtest-27873/.s.monetdb.33041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample"
"--set" "embedded_c=true"
+# 10:58:47 >
+
+# builtin opt gdk_dbpath =
/home/aris/Installations/default-env/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 = 33041
+# cmdline opt mapi_usock = /var/tmp/mtest-27873/.s.monetdb.33041
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 10:58:47 >
+# 10:58:47 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27873" "--port=33041"
+# 10:58:47 >
+
+MAPI = (monetdb) /var/tmp/mtest-27873/.s.monetdb.33041
+QUERY = select * from GENERATE_SERIES(1,41) sample 1.25; --should
give error
+ERROR = !Illegal argument p should be between 0 and 1.0
+MAPI = (monetdb) /var/tmp/mtest-225090/.s.monetdb.36040
+QUERY = select * from GENERATE_SERIES(1,41) seed 1; --error, seed without
sample
+ERROR = !SEED: cannot have SEED without SAMPLE
+CODE = 42000
+
+
+# 10:58:47 >
+# 10:58:47 > "Done."
+# 10:58:47 >
+
diff --git a/sql/test/prepare/Tests/sample.15.stable.out
b/sql/test/prepare/Tests/sample.15.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/prepare/Tests/sample.15.stable.out
@@ -0,0 +1,51 @@
+stdout of test 'sample.15` in directory 'sql/test/sample` itself:
+
+
+# 10:58:47 >
+# 10:58:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33041" "--set"
"mapi_usock=/var/tmp/mtest-27873/.s.monetdb.33041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample"
"--set" "embedded_c=true"
+# 10:58:47 >
+
+# MonetDB 5 server v11.32.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_sample', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.558 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://aris-MonetDB:33041/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27873/.s.monetdb.33041
+# MonetDB/SQL module loaded
+
+
+#prepare select * from GENERATE_SERIES(1,41) sample ?;
+#prepare select * from GENERATE_SERIES(1,41) sample ?;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 7, 2, 1, 0, 2, 5 # length
+[ "tinyint", 8, 0, "", "%3", "value" ]
+[ "bigint", 64, 0, NULL, NULL, NULL ]
+#prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
+#prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 7, 2, 1, 0, 2, 5 # length
+[ "tinyint", 8, 0, "", "%3", "value" ]
+[ "int", 32, 0, NULL, NULL, NULL ]
+#prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
+#prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 7, 2, 1, 0, 2, 5 # length
+[ "tinyint", 8, 0, "", "%3", "value" ]
+[ "bigint", 64, 0, NULL, NULL, NULL ]
+[ "int", 32, 0, NULL, NULL, NULL ]
+
+
+# 10:58:47 >
+# 10:58:47 > "Done."
+# 10:58:47 >
+
diff --git a/sql/test/sample/Tests/All b/sql/test/sample/Tests/All
--- a/sql/test/sample/Tests/All
+++ b/sql/test/sample/Tests/All
@@ -12,4 +12,3 @@ sample.11
sample.12
sample.13
sample.14
-sample.15
diff --git a/sql/test/sample/Tests/sample.15.sql
b/sql/test/sample/Tests/sample.15.sql
deleted file mode 100644
--- a/sql/test/sample/Tests/sample.15.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-select * from GENERATE_SERIES(1,41) sample 1.25; --should give error
-select * from GENERATE_SERIES(1,41) seed 1; --error, seed without sample
-
-prepare select * from GENERATE_SERIES(1,41) sample ?;
-prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
-prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
diff --git a/sql/test/sample/Tests/sample.15.stable.err
b/sql/test/sample/Tests/sample.15.stable.err
deleted file mode 100644
--- a/sql/test/sample/Tests/sample.15.stable.err
+++ /dev/null
@@ -1,43 +0,0 @@
-stderr of test 'sample.15` in directory 'sql/test/sample` itself:
-
-
-# 10:58:47 >
-# 10:58:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33041" "--set"
"mapi_usock=/var/tmp/mtest-27873/.s.monetdb.33041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample"
"--set" "embedded_c=true"
-# 10:58:47 >
-
-# builtin opt gdk_dbpath =
/home/aris/Installations/default-env/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 = 33041
-# cmdline opt mapi_usock = /var/tmp/mtest-27873/.s.monetdb.33041
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample
-# cmdline opt embedded_c = true
-# cmdline opt gdk_debug = 553648138
-
-# 10:58:47 >
-# 10:58:47 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27873" "--port=33041"
-# 10:58:47 >
-
-MAPI = (monetdb) /var/tmp/mtest-27873/.s.monetdb.33041
-QUERY = select * from GENERATE_SERIES(1,41) sample 1.25; --should
give error
-ERROR = !Illegal argument p should be between 0 and 1.0
-MAPI = (monetdb) /var/tmp/mtest-225090/.s.monetdb.36040
-QUERY = select * from GENERATE_SERIES(1,41) seed 1; --error, seed without
sample
-ERROR = !SEED: cannot have SEED without SAMPLE
-CODE = 42000
-
-
-# 10:58:47 >
-# 10:58:47 > "Done."
-# 10:58:47 >
-
diff --git a/sql/test/sample/Tests/sample.15.stable.out
b/sql/test/sample/Tests/sample.15.stable.out
deleted file mode 100644
--- a/sql/test/sample/Tests/sample.15.stable.out
+++ /dev/null
@@ -1,51 +0,0 @@
-stdout of test 'sample.15` in directory 'sql/test/sample` itself:
-
-
-# 10:58:47 >
-# 10:58:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33041" "--set"
"mapi_usock=/var/tmp/mtest-27873/.s.monetdb.33041" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_sample"
"--set" "embedded_c=true"
-# 10:58:47 >
-
-# MonetDB 5 server v11.32.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_sample', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.558 GiB available main-memory.
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://aris-MonetDB:33041/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27873/.s.monetdb.33041
-# MonetDB/SQL module loaded
-
-
-#prepare select * from GENERATE_SERIES(1,41) sample ?;
-#prepare select * from GENERATE_SERIES(1,41) sample ?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 7, 2, 1, 0, 2, 5 # length
-[ "tinyint", 8, 0, "", "%3", "value" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
-#prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
-#prepare select * from GENERATE_SERIES(1,41) sample 0.2 seed ?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 7, 2, 1, 0, 2, 5 # length
-[ "tinyint", 8, 0, "", "%3", "value" ]
-[ "int", 32, 0, NULL, NULL, NULL ]
-#prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
-#prepare select * from GENERATE_SERIES(1,41) sample ? seed ?;
-% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
-% type, digits, scale, schema, table, column # name
-% varchar, int, int, str, str, str # type
-% 7, 2, 1, 0, 2, 5 # length
-[ "tinyint", 8, 0, "", "%3", "value" ]
-[ "bigint", 64, 0, NULL, NULL, NULL ]
-[ "int", 32, 0, NULL, NULL, NULL ]
-
-
-# 10:58:47 >
-# 10:58:47 > "Done."
-# 10:58:47 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
