Changeset: 5d6f1c26f8e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d6f1c26f8e0
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/Tests/cst01.mal
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
testing/Mtest.py.in
Branch: mutation
Log Message:
Merge with default
diffs (138 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2592,6 +2592,7 @@ str getName(str nme, size_t len);
int getPC(MalBlkPtr mb, InstrPtr p);
str getPipeCatalog(int *nme, int *def, int *stat);
str getPipeDefinition(str name);
+int getProfileCounter(int idx);
stream *getProfilerStream(void);
str getRef;
str getRefName(MalBlkPtr mb, int i);
@@ -2789,6 +2790,7 @@ str mergecandRef;
aggrFun minAggr;
str minRef;
str min_no_nilRef;
+str minusRef;
str mirrorRef;
str mitosisRef;
str mkeyRef;
@@ -3079,7 +3081,6 @@ str sqlRef;
int sqlblob_fromstr(char *instr, int *l, blob **val);
int sqlblob_tostr(str *tostr, int *l, blob *p);
int sqlfunctionProp;
-str sqlplusRef;
str srvpoolRef;
int stableProp;
str startProfiling(void);
diff --git a/monetdb5/optimizer/Tests/cst01.mal
b/monetdb5/optimizer/Tests/cst01.mal
--- a/monetdb5/optimizer/Tests/cst01.mal
+++ b/monetdb5/optimizer/Tests/cst01.mal
@@ -1,11 +1,13 @@
# test constant expressions
+function tst();
X2 := calc.dbl(1);
X14 := calc.dbl(180);
X15 := calc.*(X2,X14);
X16 := mmath.pi();
X17 := calc./(X15,X16);
io.print(X17);
+end tst;
-optimizer.evaluate();
-optimizer.aliases();
-mdb.List();
+optimizer.evaluate("user","tst");
+optimizer.aliases("user","tst");
+mdb.List("user","tst");
diff --git a/monetdb5/optimizer/Tests/cst01.stable.out
b/monetdb5/optimizer/Tests/cst01.stable.out
--- a/monetdb5/optimizer/Tests/cst01.stable.out
+++ b/monetdb5/optimizer/Tests/cst01.stable.out
@@ -5,27 +5,34 @@ stdout of test 'cst01` in directory 'mon
# 21:32:15 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=33397 --set xrpc_port=44306 --set monet_prompt= --trace
--dbname=mTests_src_optimizer cst01.mal < /dev/null
# 21:32:15 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_optimizer
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
+# 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:33947/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26757/.s.monetdb.33947
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+function user.tst():void;
+ X2 := calc.dbl(1);
+ X14 := calc.dbl(180);
+ X15 := calc.*(X2,X14);
+ X16 := mmath.pi();
+ X17 := calc./(X15,X16);
+ io.print(X17);
+end tst;
function user.main():void;
# test constant expressions
- X16 := mmath.pi();
- X17 := calc./(180:dbl,X16);
- io.print(X17);
- mdb.List();
+ mdb.List("user","tst");
end main;
-[ 57.295779513082323 ]
-function user.main():void; # 0 main:void := user.main() {G}
-# test constant expressions
- X16 := mmath.pi(); # 2 X16:dbl := MATHpi()
- X17 := calc./(180:dbl,X16); # 3 X17:dbl :=
CMDvarDIVsignal(_14:dbl, X16:dbl)
- io.print(X17); # 4 _9:void := IOprint_val(X17:dbl)
- mdb.List(); # 5 _12:void := MDBlistDetail()
-end main; # 6
+function user.tst():void; # 0 tst:void := user.tst()
+ io.print(57.295779513082323:dbl); # 1 _8:void := IOprint_val(_12:dbl)
+end tst; # 2
# 21:32:15 >
# 21:32:15 > Done.
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -38,7 +38,7 @@ OPTallConstant(Client cntxt, MalBlkPtr m
for (i = 0; i < p->retc; i++)
if (isaBatType(getArgType(mb, p, i)))
return FALSE;
- return p->argc != p->retc;
+ return TRUE;
}
static int OPTsimpleflow(MalBlkPtr mb, int pc)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -40,9 +40,7 @@ import random
import time
import socket
import struct
-import select
-#import signal
-#import getpass
+import signal
import Mfilter
import fnmatch
import glob
@@ -271,7 +269,7 @@ except ImportError:
p += os.pathsep + os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = p
-import threading, signal
+import threading
randomPortRepeat = 9
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
