Changeset: 85e320911054 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85e320911054 Modified Files: sql/backends/monet5/datacell/Tests/scenario04.stable.out sql/backends/monet5/datacell/basket.c sql/backends/monet5/datacell/datacell.c sql/backends/monet5/datacell/petrinet.c Branch: default Log Message:
A few more fixes in datacell compilation of functions seem to work 7 tests still fail. diffs (117 lines): diff --git a/sql/backends/monet5/datacell/Tests/scenario04.stable.out b/sql/backends/monet5/datacell/Tests/scenario04.stable.out --- a/sql/backends/monet5/datacell/Tests/scenario04.stable.out +++ b/sql/backends/monet5/datacell/Tests/scenario04.stable.out @@ -1,33 +1,50 @@ stdout of test 'scenario04` in directory 'sql/backends/monet5/datacell` itself: -# 16:50:39 > -# 16:50:39 > mserver5 --debug=10 --set gdk_nr_threads=0 --set "gdk_dbfarm=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/HG/Aug2011/prefix/--enable-datacell_--disable-debug_--enable-optimize_--disable-assert/var/MonetDB" --set mapi_open=true --set mapi_port=36254 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_datacell" --set mal_listing=0 ; echo ; echo Over.. -# 16:50:39 > +# 15:16:33 > +# 15:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38868" "--set" "mapi_usock=/var/tmp/mtest-23824/.s.monetdb.38868" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_backends_monet5_datacell" "--set" "mal_listing=0" +# 15:16:33 > -# MonetDB 5 server v11.5.0 +# MonetDB 5 server v11.18.0 # This is an unreleased version -# Serving database 'mTests_backends_monet5_datacell', using 4 threads +# Serving database 'mTests_sql_backends_monet5_datacell', using 8 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 7.749 GiB available main-memory. +# Found 15.591 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:36254/ +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:38868/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23824/.s.monetdb.38868 # MonetDB/GIS module loaded +# MonetDB/JAQL module loaded # MonetDB/SQL module loaded -# MonetDB/DataCell module loaded +# MonetDB/DataCell loaded Ready. +# 15:16:33 > +# 15:16:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23824" "--port=38868" +# 15:16:33 > -# 16:50:39 > -# 16:50:39 > mclient -lsql -ftest -i -e --host=rig --port=36254 -# 16:50:39 > +#set optimizer='datacell_pipe'; +#create table datacell.winin( +# id integer, +# tag timestamp, +# payload integer +#); +#create table datacell.winout( tag timestamp, mi integer, ma integer, su bigint); +#call datacell.dump(); +#baskets[ 1] datacell.winin columns 3 threshold 0 window=[0,0] time window=[0,0] beat 0 milliseconds events 0 +#baskets[ 2] datacell.winout columns 4 threshold 0 window=[0,0] time window=[0,0] beat 0 milliseconds events 0 +#receptor datacell.winin at localhost:50504 protocol=TCP mode=passive status=running delay=1000 +#emitter datacell.winout at localhost:50604 protocol=UDP mode=active status=running delay=1000 +#scheduler status running +#[0] datacell.mavg running delay 0 cycles 0 events 0 time 0 ms +#<-- datacell.winin basket[1] 0 0 +#drop table datacell.winin; +#drop table datacell.winout; -= to be checked / approved ! +# 15:16:34 > +# 15:16:34 > "Done." +# 15:16:34 > -# 16:50:40 > -# 16:50:40 > Done. -# 16:50:40 > - diff --git a/sql/backends/monet5/datacell/basket.c b/sql/backends/monet5/datacell/basket.c --- a/sql/backends/monet5/datacell/basket.c +++ b/sql/backends/monet5/datacell/basket.c @@ -174,6 +174,8 @@ BSKTregister(Client cntxt, MalBlkPtr mb, char buf[BUFSIZ], *lsch, *ltbl; str tbl; + if ( msg != MAL_SUCCEED) + return msg; BSKTelements(tbl = *(str *) getArgReference(stk, pci, 1), buf, &lsch, <bl); BSKTtolower(lsch); BSKTtolower(ltbl); @@ -342,7 +344,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal timestamp_tostr(&fptr, &i, &finish); mnstr_printf(GDKout, "#range %s - %s\n", sbuf, fbuf); - bo = BATsubselect(basket[bskt].primary[k], NULL, &start, &finish, TRUE, TRUE, FALSE); + bo = BATsubselect(baskets[bskt].primary[k], NULL, &start, &finish, TRUE, TRUE, FALSE); baskets[bskt].seen = finish; /* remove all those before cutoff time from basket */ diff --git a/sql/backends/monet5/datacell/datacell.c b/sql/backends/monet5/datacell/datacell.c --- a/sql/backends/monet5/datacell/datacell.c +++ b/sql/backends/monet5/datacell/datacell.c @@ -72,7 +72,8 @@ DCprocedureStmt(Client cntxt, MalBlkPtr be = (void *) backend_create(m, cntxt); if ( be->mvc->sa == NULL) be->mvc->sa = sa_create(); - backend_create_func(be, f); + //TODO fix result type + backend_create_func(be, f, NULL,NULL); return MAL_SUCCEED; } } diff --git a/sql/backends/monet5/datacell/petrinet.c b/sql/backends/monet5/datacell/petrinet.c --- a/sql/backends/monet5/datacell/petrinet.c +++ b/sql/backends/monet5/datacell/petrinet.c @@ -473,8 +473,7 @@ PNcontroller(void *dummy) char buf[BUFSIZ], *modnme, *fcnnme; cntxt = mal_clients; /* run as admin */ - if ( !SQLinitialized) - SQLinitEnvironment(cntxt); + SQLinitEnvironment(cntxt); /* At this point we know what is the total number of factories. * The most extremely case is when ALL factories are enable to fire * so the maximum space we could ever need is = #factories (=pnettop)*/ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
