Changeset: f35de8963808 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f35de8963808
Added Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
Removed Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.test
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:
Check OS before matching outputs
diffs (truncated from 373 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
copy from monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
copy to monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
@@ -1,27 +1,15 @@
-set optimizer = 'sequential_pipe'; -- to get predictable errors
-
-create table ttt
(averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
int, b int, c int);
-select optimizer;
-select def from optimizers() where name = optimizer;
+from MonetDBtesting.sqltest import SQLTestCase
+import platform
-explain copy into ttt from '/tmp/xyz';
-explain copy into ttt from E'\\tmp/xyz';
-explain copy into ttt from E'a:\\tmp/xyz';
-
-start transaction;
-create local temp table "opt_pipe_name" ("opt_pipe_name" string);
-insert into "opt_pipe_name" values ((select optimizer));
+if platform.system() == 'Windows':
+ suffix = '.Windows'
+else:
+ suffix = ''
-set optimizer = substring((select def from optimizers() where name = (select
opt_pipe_name from "opt_pipe_name")),0,
- length((select def from optimizers() where name = (select
opt_pipe_name from "opt_pipe_name")))-length('optimizer.garbageCollector();'))
|| 'optimizer.sql_append();optimizer.garbageCollector();';
-select optimizer;
-
-select def from optimizers() where name = optimizer;
-rollback;
-
-explain copy into ttt from '/tmp/xyz';
-explain copy into ttt from E'\\tmp/xyz';
-explain copy into ttt from 'Z:/tmp/xyz';
-drop table ttt;
-
-set optimizer = 'default_pipe';
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('opt_sql_append.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+ .assertMatchStableOut(fout='opt_sql_append.stable.out%s' %
(suffix))\
+ .assertMatchStableError(ferr='opt_sql_append.stable.err%s' %
(suffix))
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -1,35 +1,3 @@
-stderr of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
-
-
-# 22:58:57 >
-# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
-# 22:58:57 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/monetdb5/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# 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 gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36275
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_extras_mal_optimizer_template
-# cmdline opt mal_listing = 0
-
-# 22:58:57 >
-# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
-# 22:58:57 >
-
MAPI = (monetdb) /var/tmp/mtest-20069/.s.monetdb.34504
QUERY = explain copy into ttt from E'\\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: "\\tmp/xyz"
@@ -47,7 +15,3 @@ QUERY = explain copy into ttt from 'Z:/t
ERROR = !COPY INTO: filename must have absolute path: "Z:/tmp/xyz"
CODE = 42000
-# 22:58:58 >
-# 22:58:58 > "Done."
-# 22:58:58 >
-
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -1,35 +1,3 @@
-stderr of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
-
-
-# 22:58:57 >
-# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
-# 22:58:57 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/monetdb5/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# 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 gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36275
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_extras_mal_optimizer_template
-# cmdline opt mal_listing = 0
-
-# 22:58:57 >
-# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
-# 22:58:57 >
-
MAPI = monetdb@LAB03:37903
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
@@ -38,8 +6,3 @@ MAPI = monetdb@LAB03:37903
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
CODE = 42000
-
-# 22:58:58 >
-# 22:58:58 > "Done."
-# 22:58:58 >
-
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -1,47 +1,3 @@
-stdout of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
-
-
-# 22:58:57 >
-# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
-# 22:58:57 >
-
-# MonetDB 5 server v11.8.0
-# This is an unreleased version
-# Serving database 'mTests_extras_mal_optimizer_template', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.630 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://rome.ins.cwi.nl:36275/
-# MonetDB/GIS module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_history.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
-
-
-# 16:06:52 >
-# 16:06:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25090" "--port=39713"
-# 16:06:52 >
-
#create table ttt (a int, b int, c int);
#select optimizer;
% .%2 # table_name
@@ -158,8 +114,3 @@ end user.main;
#garbagecollector actions= 1 time=69 usec
#total actions=28 time=638 usec
#drop table ttt;
-
-# 22:58:58 >
-# 22:58:58 > "Done."
-# 22:58:58 >
-
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -1,57 +1,3 @@
-stdout of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
-
-
-# 22:58:57 >
-# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
-# 22:58:57 >
-
-# MonetDB 5 server v11.8.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_extras_mal_optimizer_template', using 4
threads
-# Compiled for x86_64-pc-winnt/64bit
-# Found 11.991 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://lab03:33047/
-# MonetDB/GIS module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 60_wlcr.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 99_system.sql
-
-
-# 16:06:52 >
-# 16:06:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25090" "--port=39713"
-# 16:06:52 >
-
#set optimizer = 'sequential_pipe'; -- to get predictable errors
#create table ttt (a int, b int, c int);
#select optimizer;
@@ -247,8 +193,3 @@ end user.main;
#garbagecollector actions= 1 time=59 usec
#total actions=25 time=186 usec
#drop table ttt;
-
-# 22:58:58 >
-# 22:58:58 > "Done."
-# 22:58:58 >
-
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.test
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.test
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.test
+++ /dev/null
@@ -1,97 +0,0 @@
-statement ok
-set optimizer = 'sequential_pipe'
-
-statement ok
-create table ttt
(averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
int, b int, c int)
-
-query T rowsort
-select optimizer
-----
-sequential_pipe
-
-query T rowsort
-select def from optimizers() where name = optimizer
-----
-optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector();
-
-query T python .explain.function_histogram
-explain copy into ttt from '/tmp/xyz'
-----
-user.main
-1
-querylog.define
-1
-sql.mvc
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
