Changeset: 4ae868d3f1e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ae868d3f1e7
Modified Files:
MonetDB5/src/optimizer/Tests/All
MonetDB5/src/optimizer/Tests/cycloon00.mal
MonetDB5/src/optimizer/Tests/cycloon00.stable.err
MonetDB5/src/optimizer/Tests/cycloon00.stable.out
Branch: default
Log Message:
Remove cycloon test.
It is located in the wrong place and it is not testing anything.
All the tests for related with data cyclotron will be done at datacyclotron
module.
diffs (196 lines):
diff -r fdea8523f81f -r 4ae868d3f1e7 MonetDB5/src/optimizer/Tests/All
--- a/MonetDB5/src/optimizer/Tests/All Sat Oct 09 15:36:11 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/All Mon Oct 11 14:37:10 2010 +0200
@@ -42,7 +42,6 @@
mapreduce00
-cycloon00
#mat00
#mat01
#mat02
diff -r fdea8523f81f -r 4ae868d3f1e7 MonetDB5/src/optimizer/Tests/cycloon00.mal
--- a/MonetDB5/src/optimizer/Tests/cycloon00.mal Sat Oct 09 15:36:11
2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-function sql.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
- return bat.new(:any_1,:any_2);
-end bind;
-
-function sql.exportResult(x:any_1, y:bat[:any_3,:any_2]);
- io.print(1);
-end exportResult;
-
-function sql.rsColumn(x:any_1, s:str,t:str,k:str,i:int, kk:int,
z:bat[:any_3,:any_4]);
- io.print(1);
-end rsColumn;
-
-function sql.resultSet(i:int, j:int, k:bat[:any_1,:any_2]):bat[:oid,:oid];
- return bat.new(:oid,:oid);
-end resultSet;
-
-function tst();
- x1:bat[:oid,:int] := sql.bind("sys","tab","id",0);
- x6:bat[:oid,:int] := sql.bind("sys","col","t_id",0);
- x9:= bat.reverse(x6);
- x10:= algebra.join(x1,x9);
- x13:= algebra.markT(x10,0...@0);
- x14:= bat.reverse(x13);
- x15:= algebra.join(x14,x1);
- x16:= sql.resultSet(1,1,x15);
- sql.rsColumn(x16,"sys.c","t_id","int",32,0,x15);
- x22 := io.stdout();
- sql.exportResult(x22,x16);
-end tst;
-optimizer.datacyclotron("user","tst");
-mdb.list("user","tst");
-
diff -r fdea8523f81f -r 4ae868d3f1e7
MonetDB5/src/optimizer/Tests/cycloon00.stable.err
--- a/MonetDB5/src/optimizer/Tests/cycloon00.stable.err Sat Oct 09 15:36:11
2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-stderr of test 'cycloon00` in directory 'src/optimizer` itself:
-
-
-# 23:40:58 >
-# 23:40:58 > mserver5 "--config=/ufs/mk/monet5Head//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5Head//Linux/lib/MonetDB5:/ufs/mk/monet5Head//Linux/lib/MonetDB5/lib:/ufs/mk/monet5Head//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5Head//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5Head//Linux/var/MonetDB5/sql_logs" --set
mapi_open=true --set xrpc_open=true --set mapi_port=31497 --set xrpc_port=47208
--set xrpc_docroot=/ufs/mk/monet5Head/package/MonetDB5 --set monet_prompt=
--trace --dbname=mTests_src_optimizer cycloon00.mal
-# 23:40:58 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.29.0
-# builtin opt monet_pid = 4043
-# builtin opt prefix = /ufs/mk/monet5Head//Linux
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_mmap_minsize = 137438953472
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/mk/monet5Head//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/monet5Head//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config = /ufs/mk/monet5Head//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/monet5Head//Linux/lib/MonetDB5:/ufs/mk/monet5Head//Linux/lib/MonetDB5/lib:/ufs/mk/monet5Head//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/monet5Head//Linux/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir = /ufs/mk/monet5Head//Linux/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 31497
-# cmdline opt xrpc_port = 47208
-# cmdline opt xrpc_docroot = /ufs/mk/monet5Head/package/MonetDB5
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_optimizer
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5Head//Linux/etc/monetdb5.conf)
-
-# 23:40:58 >
-# 23:40:58 > Done.
-# 23:40:58 >
-
diff -r fdea8523f81f -r 4ae868d3f1e7
MonetDB5/src/optimizer/Tests/cycloon00.stable.out
--- a/MonetDB5/src/optimizer/Tests/cycloon00.stable.out Sat Oct 09 15:36:11
2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-stdout of test 'cycloon00` in directory 'src/optimizer` itself:
-
-
-# 23:40:58 >
-# 23:40:58 > mserver5 "--config=/ufs/mk/monet5Head//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5Head//Linux/lib/MonetDB5:/ufs/mk/monet5Head//Linux/lib/MonetDB5/lib:/ufs/mk/monet5Head//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5Head//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5Head//Linux/var/MonetDB5/sql_logs" --set
mapi_open=true --set xrpc_open=true --set mapi_port=31497 --set xrpc_port=47208
--set xrpc_docroot=/ufs/mk/monet5Head/package/MonetDB5 --set monet_prompt=
--trace --dbname=mTests_src_optimizer cycloon00.mal
-# 23:40:58 >
-
-# MonetDB server v5.11.0, based on kernel v1.29.0
-# Serving database 'mTests_src_optimizer', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:31497/
-function sql.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
- return _5 := bat.new(:any_1,:any_2);
-end bind;
-function sql.exportResult(x:any_1,y:bat[:any_3,:any_2]):void;
- io.print(1);
-end exportResult;
-function
sql.rsColumn(x:any_1,s:str,t:str,k:str,i:int,kk:int,z:bat[:any_3,:any_4]):void;
- io.print(1);
-end rsColumn;
-function sql.resultSet(i:int,j:int,k:bat[:any_1,:any_2]):bat[:oid,:oid];
- return _4 := bat.new(:oid,:oid);
-end resultSet;
-function user.tst():void;
- x1:bat[:oid,:int] := sql.bind("sys","tab","id",0);
- x6:bat[:oid,:int] := sql.bind("sys","col","t_id",0);
- x9 := bat.reverse(x6);
- x10 := algebra.join(x1,x9);
- x13 := algebra.markT(x10,0...@0);
- x14 := bat.reverse(x13);
- x15 := algebra.join(x14,x1);
- x16 := sql.resultSet(1,1,x15);
- sql.rsColumn(x16,"sys.c","t_id","int",32,0,x15);
- x22 := io.stdout();
- sql.exportResult(x22,x16);
-end tst;
-function user.main():void;
- mdb.list("user","tst");
-end main;
-function user.tst():void;
- x1:bat[:oid,:int] := sql.bind("sys","tab","id",0);
- x6:bat[:oid,:int] := sql.bind("sys","col","t_id",0);
- x9 := bat.reverse(x6);
- x10 := algebra.join(x1,x9);
- x13 := algebra.markT(x10,0...@0);
- x14 := bat.reverse(x13);
- x15 := algebra.join(x14,x1);
- x16 := sql.resultSet(1,1,x15);
- sql.rsColumn(x16,"sys.c","t_id","int",32,0,x15);
- x22 := io.stdout();
- sql.exportResult(x22,x16);
-end tst;
-
-# 23:40:58 >
-# 23:40:58 > Done.
-# 23:40:58 >
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
