Changeset: d5a45306cab9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5a45306cab9
Removed Files:
monetdb5/mal/Tests/tst3000.malC
monetdb5/mal/Tests/tst3000.stable.err
monetdb5/mal/Tests/tst3000.stable.out
monetdb5/mal/Tests/tst3010.malC
monetdb5/mal/Tests/tst3010.stable.err
monetdb5/mal/Tests/tst3010.stable.out
monetdb5/mal/Tests/tst3030.malC
monetdb5/mal/Tests/tst3030.stable.err
monetdb5/mal/Tests/tst3030.stable.out
monetdb5/mal/Tests/tst3060.malC
monetdb5/mal/Tests/tst3060.stable.err
monetdb5/mal/Tests/tst3060.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/optimizer/Tests/CMexample.malC
monetdb5/optimizer/Tests/CRexample.malC
monetdb5/optimizer/Tests/CXerror1.malC
monetdb5/optimizer/Tests/CXexample.malC
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.malC
monetdb5/optimizer/Tests/DCexample2.malC
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/GCexample01.malC
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.malC
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/Mexample.malC
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/dataflow3.malC
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.malC
monetdb5/optimizer/Tests/dataflow4.stable.out
monetdb5/optimizer/Tests/dataflow5.malC
monetdb5/optimizer/Tests/dataflow5.stable.out
monetdb5/optimizer/Tests/inline00.malC
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.malC
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline02.malC
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.malC
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.malC
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline05.malC
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.malC
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.malC
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline08.malC
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline09.malC
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.malC
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline11.malC
monetdb5/optimizer/Tests/inline12.malC
monetdb5/optimizer/Tests/inline12.stable.out
monetdb5/optimizer/Tests/inlineCst.malC
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction2.malC
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineIfthen.malC
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/Tests/joinpath.malC
monetdb5/optimizer/Tests/leftjoinpath.malC
monetdb5/optimizer/Tests/manifold2.malC
monetdb5/optimizer/Tests/mat00.malC
monetdb5/optimizer/Tests/mat01.malC
monetdb5/optimizer/Tests/mitosis00.malC
monetdb5/optimizer/Tests/projectionchain.malC
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/Tests/qep00.malC
monetdb5/optimizer/Tests/qep01.malC
monetdb5/optimizer/Tests/qep02.malC
monetdb5/optimizer/Tests/remap.malC
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/reorder00.malC
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/replicator00.malC
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4010.malC
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4700.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_boolean.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_numeric_nested.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_pandas.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_returntypes.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_boolean.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_numeric.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_string.malC
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
sql/server/sql_parser.y
Branch: pythonloader
Log Message:
Merge.
diffs (truncated from 2419 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -133,16 +133,12 @@ tst281
tst292
tst285
tst300
-#tst3000
tst301
-#tst3010
tst302
tst303
-#tst3030
tst304
tst305
#tst3050
-#tst3060
tst307
tst308
tst400
diff --git a/monetdb5/mal/Tests/tst3000.malC b/monetdb5/mal/Tests/tst3000.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3000.malC
+++ /dev/null
@@ -1,7 +0,0 @@
-# testing simple property assignments
-i{constant=true}:= 1;
-j{blah=2} := "kk";
-k{blah=4,freeze=1} := "whatever";
-n{cost=12}:= bat.new(:int);
-j{blah=3} :="ll"; # second one overwrites first
-z{sorted} := bat.new(:int);
diff --git a/monetdb5/mal/Tests/tst3000.stable.err
b/monetdb5/mal/Tests/tst3000.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3000.stable.err
+++ /dev/null
@@ -1,1 +0,0 @@
-stderr of test 'tst3000` in directory 'monetdb5/mal` itself:
diff --git a/monetdb5/mal/Tests/tst3000.stable.out
b/monetdb5/mal/Tests/tst3000.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3000.stable.out
+++ /dev/null
@@ -1,46 +0,0 @@
-stdout of test 'tst3000` in directory 'monetdb5/mal` itself:
-
-
-# 08:01:13 >
-# 08:01:13 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set
sql_port=55708 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst3000.mal </dev/null
-# 08:01:13 >
-
-# Monet Database Server V4.99.19
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information.
-## testing simple property assignments
-#i{constant}:= 1;
-#j{blah} := "kk";
-#k{blah,freeze} := "whatever";
-#n{cost}:= new(:int,:int);
-##o{cost=12}:= new(int,int);
-##q:= 1:int{frozen};
-#
-##Alternative format using post-predicates
-##default interpretation for i.prop is boolean value true
-#
-## i:= 1; {i.constant:=true;}
-## j:= "kk"; {j.constant:=true;}
-## k:= "whatever"; {k.blah:=true;k.freeze:=true;}
-## n:= new(int,int);{n.cost:=12;}
-#
-function user.main():void;
-# testing simple property assignments
- i := 1;
- j := "kk";
- k := "whatever";
- n := bat.new(:oid,:int);
- j := "ll";
-# second one overwrites first
- z := bat.new(:oid,:int);
-end user.main;
-
-
-# 08:59:03 >
-# 08:59:03 > Done.
-# 08:59:03 >
-
diff --git a/monetdb5/mal/Tests/tst3010.malC b/monetdb5/mal/Tests/tst3010.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3010.malC
+++ /dev/null
@@ -1,14 +0,0 @@
-#Parsing properties and keeping them around
-function add(i:int{readonly},j:int{readonly}):int{writeable,safe};
- j:= j+i;
- return j;
-end add;
-
-function add2(i:int,j:int):int{safe};
- k:= j+i;
- return k;
-end ;
-
-i{cost=23}:= 23;
-z:= user.add(i,i); #violates properties
-kk:= user.add2(i,i);
diff --git a/monetdb5/mal/Tests/tst3010.stable.err
b/monetdb5/mal/Tests/tst3010.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3010.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst3010` in directory 'monetdb5/mal` itself:
-
-
-# 07:49:49 >
-# 07:49:49 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=34850
--set monet_prompt= --trace --dbname=mTests_src_mal tst3010.mal < /dev/null
-# 07:49:49 >
-
-
-# 07:49:49 >
-# 07:49:49 > Done.
-# 07:49:49 >
-
diff --git a/monetdb5/mal/Tests/tst3010.stable.out
b/monetdb5/mal/Tests/tst3010.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3010.stable.out
+++ /dev/null
@@ -1,37 +0,0 @@
-stdout of test 'tst3010` in directory 'monetdb5/mal` itself:
-
-
-# 07:49:49 >
-# 07:49:49 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=34850
--set monet_prompt= --trace --dbname=mTests_src_mal tst3010.mal < /dev/null
-# 07:49:49 >
-
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38399/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-function user.add{writeable, safe}(i:int{readonly},j:int{readonly}):int;
- j := calc.+(j,i);
- return add := j;
-end user.add;
-function user.add2{safe}(i:int,j:int):int;
- k := calc.+(j,i);
- return add2 := k;
-end user.add2;
-function user.main():void;
-#Parsing properties and keeping them around
- i := 23;
- z := user.add(i,i);
-#violates properties
- kk := user.add2(i,i);
-end user.main;
-
-# 07:49:49 >
-# 07:49:49 > Done.
-# 07:49:49 >
-
diff --git a/monetdb5/mal/Tests/tst3030.malC b/monetdb5/mal/Tests/tst3030.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3030.malC
+++ /dev/null
@@ -1,11 +0,0 @@
-#Parsing properties and keeping them around
-# note the use of the first parameter to obtain property set
-function newsemijoin(A:bat[:any_1],
- B:bat[:any_2]) :bat[:any_1];
- return newsemijoin:=nil;
-end newsemijoin;
-z:= bat.new(:oid{sorted=true},:int);
-w:= bat.new(:oid{sequence=true},:int);
-w:bat[:int]:= bat.new(:int);
-y:= algebra.subsort(w{sorted=true,dense=true},false,false);
-io.print(1);
diff --git a/monetdb5/mal/Tests/tst3030.stable.err
b/monetdb5/mal/Tests/tst3030.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3030.stable.err
+++ /dev/null
@@ -1,1 +0,0 @@
-stderr of test 'tst3030` in directory 'monetdb5/mal` itself:
diff --git a/monetdb5/mal/Tests/tst3030.stable.out
b/monetdb5/mal/Tests/tst3030.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3030.stable.out
+++ /dev/null
@@ -1,37 +0,0 @@
-stdout of test 'tst3030` in directory 'monetdb5/mal` itself:
-
-
-# 08:01:16 >
-# 08:01:16 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set
sql_port=55708 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst3030.mal </dev/null
-# 08:01:16 >
-
-# MonetDB 5 server v11.12.0
-# This is an unreleased version
-# Serving database 'mTests_mal', 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-2015 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:34487/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-function
user.newsemijoin(A:bat[:oid,:any_1],B:bat[:oid,:any_2]):bat[:oid,:any_1];
- return newsemijoin := nil;
-end user.newsemijoin;
-function user.main():void;
-#Parsing properties and keeping them around
-# note the use of the first parameter to obtain property set
- z := bat.new(:oid,:int);
- w:bat[:oid,:int] := bat.new(:oid,:int);
- w:bat[:oid,:int] := bat.new(:oid,:int);
- y := algebra.subsort(w,false,false);
- io.print(1);
-end user.main;
-[ 1 ]
-
-# 08:01:16 >
-# 08:01:16 > Done.
-# 08:01:16 >
-
diff --git a/monetdb5/mal/Tests/tst3060.malC b/monetdb5/mal/Tests/tst3060.malC
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3060.malC
+++ /dev/null
@@ -1,8 +0,0 @@
-# The direction for future expansion of the properties
-function tst(a:any_1{type="int,flt"}):any_1;
- io.print(a);
- return tst:=a;
-end tst;
-
-user.tst(1);
-user.tst("wrong");
diff --git a/monetdb5/mal/Tests/tst3060.stable.err
b/monetdb5/mal/Tests/tst3060.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3060.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst3060` in directory 'monetdb5/mal` itself:
-
-
-# 14:57:24 >
-# 14:57:24 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31801
--set monet_prompt= --trace --dbname=mTests_src_mal tst3060.mal < /dev/null
-# 14:57:24 >
-
-
-# 14:57:25 >
-# 14:57:25 > Done.
-# 14:57:25 >
-
diff --git a/monetdb5/mal/Tests/tst3060.stable.out
b/monetdb5/mal/Tests/tst3060.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst3060.stable.out
+++ /dev/null
@@ -1,35 +0,0 @@
-stdout of test 'tst3060` in directory 'monetdb5/mal` itself:
-
-
-# 14:57:24 >
-# 14:57:24 > 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/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31801
--set monet_prompt= --trace --dbname=mTests_src_mal tst3060.mal < /dev/null
-# 14:57:24 >
-
-# MonetDB 5 server v11.20.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 15.590 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://vienna.ins.cwi.nl:31390/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12850/.s.monetdb.31390
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-function user.tst(a:any_1{type="int,flt"}):any_1;
- io.print(a);
- return tst := a;
-end user.tst;
-function user.main():void;
-# The direction for future expansion of the properties
- user.tst(1);
- user.tst("wrong");
-end user.main;
-[ 1 ]
-[ "wrong" ]
-
-# 14:57:25 >
-# 14:57:25 > Done.
-# 14:57:25 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
