Changeset: 558dae5fd4d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=558dae5fd4d0
Added Files:
monetdb5/optimizer/Tests/inlineFunction1.mal
monetdb5/optimizer/Tests/inlineFunction1.stable.err
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction3.mal
monetdb5/optimizer/Tests/inlineFunction3.stable.err
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.mal
monetdb5/optimizer/Tests/inlineFunction4.stable.err
monetdb5/optimizer/Tests/inlineFunction4.stable.out
Modified Files:
monetdb5/optimizer/Tests/inlineFunction.mal
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction2.mal
monetdb5/optimizer/Tests/inlineFunction2.stable.out
Branch: default
Log Message:
Extended set of constant expressions
And removal of barrier blocks that become unused.
diffs (truncated from 469 to 300 lines):
diff --git a/monetdb5/optimizer/Tests/inlineFunction.mal
b/monetdb5/optimizer/Tests/inlineFunction.mal
--- a/monetdb5/optimizer/Tests/inlineFunction.mal
+++ b/monetdb5/optimizer/Tests/inlineFunction.mal
@@ -27,19 +27,6 @@ optimizer.inline("user","tst");
io.printf("#result of inline\n");
mdb.list("user","tst");
optimizer.remap("user","tst");
-optimizer.evaluate("user","tst");
optimizer.costModel("user","tst");
optimizer.coercions("user","tst");
-optimizer.emptySet("user","tst");
-optimizer.aliases("user","tst");
-optimizer.mergetable("user","tst");
-optimizer.constants("user","tst");
-optimizer.commonTerms("user","tst");
-optimizer.joinPath("user","tst");
-optimizer.deadcode("user","tst");
-optimizer.reduce("user","tst");
-optimizer.garbageCollector("user","tst");
-optimizer.dataflow("user","tst");
-io.printf("#result of all optimizers\n");
-mdb.list("user","tst");
-
+optimizer.evaluate("user","tst");
diff --git a/monetdb5/optimizer/Tests/inlineFunction.stable.out
b/monetdb5/optimizer/Tests/inlineFunction.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction.stable.out
@@ -39,19 +39,13 @@ end tst;
function user.main():void;
io.printf("#result of inline\n");
mdb.list("user","tst");
- io.printf("#result of all optimizers\n");
- mdb.list("user","tst");
end main;
#result of inline
function user.tst():void;
-barrier X_1 := true:bit;
-exit X_1;
-end tst;
-#result of all optimizers
-function user.tst():void;
-barrier X_1 := true:bit;
-exit X_1;
-end tst;
+ X_5 := true:bit;
+ X_6:int := 0:int;
+ X_9 := 100:int;
+ X_6:int := 100:int;
# 01:05:28 >
# 01:05:28 > Done.
diff --git a/monetdb5/optimizer/Tests/inlineFunction1.mal
b/monetdb5/optimizer/Tests/inlineFunction1.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction1.mal
@@ -0,0 +1,21 @@
+function my_case{inline}(Av:int):int;
+ X3 := calc.==(Av,1);
+barrier X4 := X3;
+ X6 := calc.int(100);
+exit X4;
+barrier X7 := calc.not(X3);
+ X9 := calc.==(Av,2);
+exit X7;
+ return my_case:int := 0;
+end my_case;
+
+function tst();
+ z:= my_case(1);
+end tst;
+optimizer.inline("user","tst");
+io.printf("#result of inline\n");
+mdb.list("user","tst");
+optimizer.remap("user","tst");
+optimizer.costModel("user","tst");
+optimizer.coercions("user","tst");
+optimizer.evaluate("user","tst");
diff --git a/monetdb5/optimizer/Tests/inlineFunction1.stable.err
b/monetdb5/optimizer/Tests/inlineFunction1.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction1.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'inlineFunction1` in directory 'monetdb5/optimizer` itself:
+
+
+# 05:26:58 >
+# 05:26:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30933" "--set"
"mapi_usock=/var/tmp/mtest-21677/.s.monetdb.30933" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer"
"inlineFunction1.mal"
+# 05:26:58 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# 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 mapi_open = true
+# cmdline opt mapi_port = 30933
+# cmdline opt mapi_usock = /var/tmp/mtest-21677/.s.monetdb.30933
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer
+
+# 05:26:58 >
+# 05:26:58 > "Done."
+# 05:26:58 >
+
diff --git a/monetdb5/optimizer/Tests/inlineFunction1.stable.out
b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
@@ -0,0 +1,49 @@
+stdout of test 'inlineFunction1` in directory 'monetdb5/optimizer` itself:
+
+
+# 05:26:58 >
+# 05:26:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30933" "--set"
"mapi_usock=/var/tmp/mtest-21677/.s.monetdb.30933" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer"
"inlineFunction1.mal"
+# 05:26:58 >
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:30933/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21677/.s.monetdb.30933
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
+function user.my_case{inline}(Av:int):int;
+ X3 := calc.==(Av,1);
+barrier X4 := X3;
+ X6 := calc.int(100);
+exit X4;
+barrier X7 := calc.not(X3);
+ X9 := calc.==(Av,2);
+exit X7;
+ return my_case:int := 0;
+end my_case;
+function user.tst():void;
+ z := user.my_case(1);
+end tst;
+function user.main():void;
+ io.printf("#result of inline\n");
+ mdb.list("user","tst");
+end main;
+#result of inline
+function user.tst():void;
+ X_5 := true:bit;
+ 100:int;
+ z := 0:int;
+end tst;
+
+# 05:26:58 >
+# 05:26:58 > "Done."
+# 05:26:58 >
+
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.mal
b/monetdb5/optimizer/Tests/inlineFunction2.mal
--- a/monetdb5/optimizer/Tests/inlineFunction2.mal
+++ b/monetdb5/optimizer/Tests/inlineFunction2.mal
@@ -7,8 +7,8 @@ function tst();
b:= bat.new(:oid,:int);
z:bat[:oid,:int]:= mal.multiplex("user","my",b,1);
end tst;
+optimizer.multiplex("user","tst");
optimizer.inline("user","tst");
io.printf("#result of inline\n");
mdb.list("user","tst");
-mdb.list("user","my");
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -27,17 +27,21 @@ end tst;
function user.main():void;
io.printf("#result of inline\n");
mdb.list("user","tst");
- mdb.list("user","my");
end main;
#result of inline
function user.tst():void;
b := bat.new(:oid,:int);
- z:bat[:oid,:int] := mal.multiplex("user","my",b,1);
+ X_8 := bat.reverse(b);
+ X_10 := bat.new(nil:oid,nil:int);
+barrier (X_14,X_15) := iterator.new(b);
+ X_27 := calc.+(X_15,1);
+ X_17 := X_27;
+ X_18 := algebra.fetch(X_8,X_14);
+ bat.insert(X_10,X_18,X_17);
+ redo (X_14,X_15) := iterator.next(b);
+exit (X_14,X_15);
+ z:bat[:oid,:int] := X_10;
end tst;
-function user.my{inline}(A:int,B:int):int;
- X3 := calc.+(A,B);
- return my := X3;
-end my;
# 23:12:13 >
# 23:12:13 > Done.
diff --git a/monetdb5/optimizer/Tests/inlineFunction3.mal
b/monetdb5/optimizer/Tests/inlineFunction3.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction3.mal
@@ -0,0 +1,24 @@
+function user.my_case{inline}(Av:int):int;
+ X3 := calc.==(Av,1);
+barrier X4 := X3;
+ X6 := calc.int(100);
+exit X4;
+barrier X7 := calc.not(X3);
+ X9 := calc.==(Av,2);
+ barrier X10 := X9;
+ X12 := calc.int(200:sht);
+ exit X10;
+exit X7;
+ return my_case := 1;
+end my_case;
+
+function tst();
+ z:= my_case(0);
+end tst;
+optimizer.inline("user","tst");
+io.printf("#result of inline\n");
+optimizer.remap("user","tst");
+optimizer.costModel("user","tst");
+optimizer.coercions("user","tst");
+optimizer.evaluate("user","tst");
+mdb.list("user","tst");
diff --git a/monetdb5/optimizer/Tests/inlineFunction3.stable.err
b/monetdb5/optimizer/Tests/inlineFunction3.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction3.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'inlineFunction3` in directory 'monetdb5/optimizer` itself:
+
+
+# 05:29:16 >
+# 05:29:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31620" "--set"
"mapi_usock=/var/tmp/mtest-22766/.s.monetdb.31620" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer"
"inlineFunction3.mal"
+# 05:29:16 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# 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 mapi_open = true
+# cmdline opt mapi_port = 31620
+# cmdline opt mapi_usock = /var/tmp/mtest-22766/.s.monetdb.31620
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer
+
+# 05:29:17 >
+# 05:29:17 > "Done."
+# 05:29:17 >
+
diff --git a/monetdb5/optimizer/Tests/inlineFunction3.stable.out
b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
@@ -0,0 +1,52 @@
+stdout of test 'inlineFunction3` in directory 'monetdb5/optimizer` itself:
+
+
+# 05:29:16 >
+# 05:29:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31620" "--set"
"mapi_usock=/var/tmp/mtest-22766/.s.monetdb.31620" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_optimizer"
"inlineFunction3.mal"
+# 05:29:16 >
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:31620/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22766/.s.monetdb.31620
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
+function user.my_case{inline}(Av:int):int;
+ X3 := calc.==(Av,1);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
