Changeset: d4cbc98909a5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4cbc98909a5
Removed Files:
monetdb5/extras/mal_optimizer_template/Tests/All
monetdb5/extras/mal_optimizer_template/Tests/SingleServer
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
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:
Removed opt_sql_append test. It was constantly being reapproved and not worth
to have around
diffs (truncated from 431 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/All
b/monetdb5/extras/mal_optimizer_template/Tests/All
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/All
+++ /dev/null
@@ -1,1 +0,0 @@
-opt_sql_append
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/SingleServer
b/monetdb5/extras/mal_optimizer_template/Tests/SingleServer
deleted file mode 100644
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.SQL.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-import platform
-
-if platform.system() == 'Windows':
- suffix = '.Windows'
-else:
- suffix = ''
-
-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.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-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;
-
-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));
-
-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';
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
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ /dev/null
@@ -1,17 +0,0 @@
-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"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-20069/.s.monetdb.34504
-QUERY = explain copy into ttt from E'a:\\tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "a:\\tmp/xyz"
-CODE = 42000
-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"
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = explain copy into ttt from 'Z:/tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "Z:/tmp/xyz"
-CODE = 42000
-
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
deleted file mode 100644
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++ /dev/null
@@ -1,8 +0,0 @@
-MAPI = monetdb@LAB03:37903
-QUERY = explain copy into ttt from '/tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
-CODE = 42000
-MAPI = monetdb@LAB03:37903
-QUERY = explain copy into ttt from '/tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
-CODE = 42000
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
deleted file mode 100644
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ /dev/null
@@ -1,119 +0,0 @@
-#create table ttt (a int, b int, c int);
-#select optimizer;
-% .%2 # table_name
-% %2 # name
-% varchar # type
-% 15 # length
-[ "sequential_pipe" ]
-#select def from optimizers() where name = optimizer;
-% .%1 # table_name
-% def # name
-% clob # type
-% 626 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();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();"
]
-#explain copy into ttt from '/tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 274 # length
-function user.main():void;
- querylog.define("explain copy into ttt from \\'/tmp/xyz\\';":str,
"sequential_pipe":str, 22:int);
- X_4:int := sql.mvc();
- (X_27:bat[:int], X_28:bat[:int], X_29:bat[:int]) :=
sql.copy_from(0x7fe144159410:ptr, "|":str, "\n":str, nil:str, "null":str,
"/tmp/xyz":str, -1:lng, 0:lng, 0:int, nil:str, 0:int, 1:int);
- X_30:lng := aggr.count(X_27:bat[:int]);
- X_31:lng := sql.claim(X_4:int, "sys":str, "ttt":str, X_30:lng);
- (X_87:int, X_86:ptr, X_91:ptr, X_94:ptr) := sql.append_prep(X_4:int,
"sys":str, "ttt":str,
"averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee":str,
"b":str, "c":str);
- X_89:ptr := sql.append_exec(X_86:ptr, X_31:lng, X_27:bat[:int]);
- X_92:ptr := sql.append_exec(X_91:ptr, X_31:lng, X_28:bat[:int]);
- X_95:ptr := sql.append_exec(X_94:ptr, X_31:lng, X_29:bat[:int]);
- X_41:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
- sql.affectedRows(X_41:int, X_30:lng);
-end user.main;
-#inline actions= 0 time=0 usec
-#remap actions= 0 time=1 usec
-#costmodel actions= 1 time=1 usec
-#coercion actions= 0 time=1 usec
-#aliases actions=11 time=4 usec
-#evaluate actions= 0 time=3 usec
-#emptybind actions= 0 time=0 usec
-#pushselect actions= 0 time=6 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=3 usec
-#commonTerms actions= 0 time=1 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=2 usec
-#reorder actions= 1 time=7 usec
-#matpack actions= 0 time=0 usec
-#multiplex actions= 0 time=1 usec
-#profiler actions= 1 time=1 usec
-#candidates actions= 1 time=0 usec
-#deadcode actions= 0 time=2 usec
-#postfix actions= 0 time=1 usec
-#wlc actions= 0 time=0 usec
-#garbagecollector actions= 1 time=13 usec
-#total actions=27 time=96 usec
-#start transaction;
-#create local temp table "opt_pipe_name" ("opt_pipe_name" string);
-#insert into "opt_pipe_name" values ((select optimizer));
-[ 1 ]
-#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;
-% .%2 # table_name
-% %2 # name
-% varchar # type
-% 6 # length
-[ "user_0" ]
-#select def from optimizers() where name = optimizer;
-% .%1 # table_name
-% def # name
-% clob # type
-% 649 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();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.sql_append();optimizer.garbageCollector();"
]
-#rollback;
-#explain copy into ttt from '/tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 274 # length
-function user.main():void;
- querylog.define("explain copy into ttt from \\'/tmp/xyz\\';":str,
"user_0":str, 22:int);
- X_4:int := sql.mvc();
- (X_27:bat[:int], X_28:bat[:int], X_29:bat[:int]) :=
sql.copy_from(0x7fe144159410:ptr, "|":str, "\n":str, nil:str, "null":str,
"/tmp/xyz":str, -1:lng, 0:lng, 0:int, nil:str, 0:int, 1:int);
- X_30:lng := aggr.count(X_27:bat[:int]);
- X_31:lng := sql.claim(X_4:int, "sys":str, "ttt":str, X_30:lng);
- (X_88:int, X_87:ptr, X_92:ptr, X_95:ptr) := sql.append_prep(X_4:int,
"sys":str, "ttt":str,
"averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee":str,
"b":str, "c":str);
- X_90:ptr := sql.append_exec(X_87:ptr, X_31:lng, X_27:bat[:int]);
- X_93:ptr := sql.append_exec(X_92:ptr, X_31:lng, X_28:bat[:int]);
- X_96:ptr := sql.append_exec(X_95:ptr, X_31:lng, X_29:bat[:int]);
- X_41:int := sql.append_finish(X_88:int, X_90:ptr, X_93:ptr, X_96:ptr);
- sql.affectedRows(X_41:int, X_30:lng);
-end user.main;
-#inline actions= 0 time=0 usec
-#remap actions= 0 time=0 usec
-#costmodel actions= 1 time=0 usec
-#coercion actions=11 time=2 usec
-#aliases actions=11 time=3 usec
-#evaluate actions= 0 time=1 usec
-#emptybind actions= 0 time=0 usec
-#pushselect actions= 0 time=4 usec
-#aliases actions= 0 time=1 usec
-#mergetable actions= 0 time=11 usec
-#deadcode actions= 0 time=2 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=2 usec
-#commonTerms actions= 0 time=1 usec
-#projectionpath actions= 0 time=1 usec
-#deadcode actions= 0 time=2 usec
-#reorder actions= 1 time=6 usec
-#matpack actions= 0 time=0 usec
-#multiplex actions= 0 time=1 usec
-#profiler actions= 1 time=0 usec
-#candidates actions= 1 time=0 usec
-#deadcode actions= 0 time=2 usec
-#postfix actions= 0 time=1 usec
-#wlc actions= 0 time=1 usec
-#optimizer.sql_append actions= 0 time=2 usec
-#garbagecollector actions= 1 time=13 usec
-#total actions=28 time=93 usec
-#drop table ttt;
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
deleted file mode 100755
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ /dev/null
@@ -1,207 +0,0 @@
-#set optimizer = 'sequential_pipe'; -- to get predictable errors
-#create table ttt (a int, b int, c int);
-#select optimizer;
-% .%2 # table_name
-% %2 # name
-% varchar # type
-% 15 # length
-[ "sequential_pipe" ]
-#select def from optimizers() where name = optimizer;
-% .%1 # table_name
-% def # name
-% clob # type
-% 626 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();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();"
]
-#explain copy into ttt from E'\\tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 274 # length
-function user.main():void;
- querylog.define("explain copy into ttt from E\\'\\\\\\\\tmp/xyz\\';":str,
"sequential_pipe":str, 22:int);
- X_4:int := sql.mvc();
- (X_27:bat[:int], X_28:bat[:int], X_29:bat[:int]) :=
sql.copy_from(0x0000025E741F1730:ptr, "|":str, "\n":str, nil:str, "null":str,
"\\tmp/xyz":str, -1:lng, 0:lng, 0:int, nil:str, 0:int, 1:int);
- X_30:lng := aggr.count(X_27:bat[:int]);
- X_31:lng := sql.claim(X_4:int, "sys":str, "ttt":str, X_30:lng);
- (X_87:int, X_86:ptr, X_91:ptr, X_94:ptr) := sql.append_prep(X_4:int,
"sys":str, "ttt":str,
"averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee":str,
"b":str, "c":str);
- X_89:ptr := sql.append_exec(X_86:ptr, X_31:lng, X_27:bat[:int]);
- X_92:ptr := sql.append_exec(X_91:ptr, X_31:lng, X_28:bat[:int]);
- X_95:ptr := sql.append_exec(X_94:ptr, X_31:lng, X_29:bat[:int]);
- X_41:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
- sql.affectedRows(X_41:int, X_30:lng)
-end user.main;
-#inline actions= 0 time=0 usec
-#remap actions= 0 time=0 usec
-#costmodel actions= 1 time=0 usec
-#coercion actions=12 time=0 usec
-#aliases actions=12 time=0 usec
-#evaluate actions= 0 time=0 usec
-#emptybind actions= 0 time=0 usec
-#pushselect actions= 0 time=0 usec
-#aliases actions= 0 time=0 usec
-#mergetable actions= 0 time=0 usec
-#deadcode actions= 0 time=0 usec
-#aliases actions= 0 time=0 usec
-#constants actions= 0 time=0 usec
-#commonTerms actions= 0 time=0 usec
-#projectionpath actions= 0 time=0 usec
-#deadcode actions= 0 time=0 usec
-#reorder actions= 1 time=0 usec
-#matpack actions= 0 time=0 usec
-#multiplex actions= 0 time=0 usec
-#profiler actions= 1 time=0 usec
-#candidates actions= 1 time=0 usec
-#deadcode actions= 0 time=0 usec
-#postfix actions= 0 time=0 usec
-#wlc actions= 0 time=0 usec
-#garbagecollector actions= 1 time=0 usec
-#total actions=27 time=0 usec
-#explain copy into ttt from E'a:\\tmp/xyz';
-% .explain # table_name
-% mal # name
-% clob # type
-% 274 # length
-function user.main():void;
- querylog.define("explain copy into ttt from
E\\'a:\\\\\\\\tmp/xyz\\';":str, "sequential_pipe":str, 22:int);
- X_4:int := sql.mvc();
- (X_27:bat[:int], X_28:bat[:int], X_29:bat[:int]) :=
sql.copy_from(0x0000025E741F1730:ptr, "|":str, "\n":str, nil:str, "null":str,
"a:\\tmp/xyz":str, -1:lng, 0:lng, 0:int, nil:str, 0:int, 1:int);
- X_30:lng := aggr.count(X_27:bat[:int]);
- X_31:lng := sql.claim(X_4:int, "sys":str, "ttt":str, X_30:lng);
- (X_87:int, X_86:ptr, X_91:ptr, X_94:ptr) := sql.append_prep(X_4:int,
"sys":str, "ttt":str,
"averylongcolumnnametomakeitlargeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee":str,
"b":str, "c":str);
- X_89:ptr := sql.append_exec(X_86:ptr, X_31:lng, X_27:bat[:int]);
- X_92:ptr := sql.append_exec(X_91:ptr, X_31:lng, X_28:bat[:int]);
- X_95:ptr := sql.append_exec(X_94:ptr, X_31:lng, X_29:bat[:int]);
- X_41:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
- sql.affectedRows(X_41:int, X_30:lng);
-end user.main;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
