On Sun, Oct 12, 2008 at 03:58:23PM +0200, Niels Nes wrote:
On Sun, Oct 12, 2008 at 01:19:43PM +0200, Stefan Manegold wrote:
On Sun, Oct 12, 2008 at 10:24:45AM +0000, Niels Nes wrote:
Update of /cvsroot/monetdb/MonetDB/src/gdk In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23370/src/gdk
Modified Files: gdk_logger.mx Log Message: default log directories moved to ${gdk_dbfarm} Logger now extends the logdir with ${dbname}/$log_name where $log_name == sql or xquery (passed by the call to logger_create) (so now everything is again under the dbfarm base directory by default but can still be set to anything else using the logdir variables)
Niels,
(mainly to be able to anticipate how your changes will affect testing, and whether I need to do any changes in Mtest.py, TestTools, and/or */RunMtest*) in case we do use/set sql_logdir and/or xquery_logdir, what wil be the resulting path for the log? ${*_logdir} or ${*_logdir}/${dbname}/${log_name}
Whatever is used for gdk_dbfarm/dbname/sql Same for xquery but then instead of sql xquery.
?
in other words, is the default for sql_logdir & xquery_logdir now ${gdk_dbfarm} or ${gdk_dbfarm}/${dbname}/${log_name}
Well gdk_dbfarm usualy puts dbname/bat under it. This same structure is used for logs now, ie dbfarm/'dbname'/'logname'
?
I fixed the monetdb_options.py such that Mtest should work without more changes.
Ok, will see tomorrow morning.
`make check` resp. RunMtest.{sh,bat} calls Mtest.py with overruled locations for dbfarm, sql_logdir, & xquery_logdir (with your changes setting only dbfarm might be enough and could help to clean up / simplify TestTools and Mtest.py) and some code in TestTools assumes that logs are in $sql_logdir & $xquery_logdir, not in say $sql_logdir/$dbname/sql or $xquery_logdir/$dbname/xquery --- but I'll sort that out sometime next week ...
Stefan
Niels
Thanks!
Stefan
Needed to patch mo_substitute (now rewrites all ${varname} and for windows also all %varname%), same for monet_options.py
U gdk_logger.mx Index: gdk_logger.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_logger.mx,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- gdk_logger.mx 10 Oct 2008 08:50:31 -0000 1.26 +++ gdk_logger.mx 12 Oct 2008 10:24:43 -0000 1.27 @@ -1037,7 +1037,7 @@
lg->tid = 0;
- snprintf(filename, BUFSIZ, "%s%c%s%c", logdir, DIR_SEP, dbname, DIR_SEP);
- snprintf(filename, BUFSIZ, "%s%c%s%c%s%c", logdir, DIR_SEP, dbname, DIR_SEP, fn, DIR_SEP); lg->fn = GDKstrdup(fn); lg->dir = GDKstrdup(filename); lg->phandler = phandler;
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
--
Niels Nes, Centre for Mathematics and Computer Science (CWI) Kruislaan 413, 1098 SJ Amsterdam, The Netherlands room C0.02, phone ++31 20 592-4098, fax ++31 20 592-4312 url: http://www.cwi.nl/~niels e-mail: Niels.Nes@cwi.nl
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers