Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12470/runtime/xrpc/admin
Modified Files:
admin.xq
Log Message:
propagated changes of Thursday Aug 13 2009 - Friday Aug 14 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/13 - stmane: runtime/xrpc/admin/admin.xq,1.11.10.1
Since Fabian's checkin on 2009/07/01 (on the CVS HEAD before the Aug2009 branch
was made),
sql_logdir & xquery_logdir are hard-wired inside the kernel,
and any attempts to change them via the .conf files or command line arguments
are ignored.
Hence, we can also remove the respective command line options and
enviroment variables to not "pretend" those values could be changed.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: admin.xq
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.xq,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- admin.xq 31 Oct 2008 15:26:44 -0000 1.11
+++ admin.xq 14 Aug 2009 12:50:12 -0000 1.12
@@ -89,7 +89,7 @@
{ pf:mil('var ret; var err := CATCH({ lock_set(pf_short); ret := bat(str,str);
var tot := 0LL; colname_runt...@batloop() tot :+= sum([batsize]($t));
ret.insert("xquery_index_curMB", str(tot/1048576LL)); tot :=
doc_timestamp.select(timestamp_nil,timestamp_nil).reverse();
ret.insert("xquery_cache_curdocs", str(count(tot))); tot :=
tot.join(doc_collection).tunique().reverse().join(collection_size).sum(); if
(isnil(tot)) tot := 0LL; ret.insert("xquery_cache_curMB", str(tot/1048576LL));
ret.insert("xquery_log_curMB", str((logger_changes(pf_logger) -
logger_base)/131072)); ret.insert("gdk_vm_cursize", str(vm_cursize()));
ret.insert("gdk_mem_cursize", str(mem_cursize())); }); lock_unset(pf_short); if
(not(isnil(err))) ERROR(err); return ret;') };
declare function admin:db-env()
-{ pf:mil('var dels := new(void, str,
20).append("exec_prefix").append("prefix").append("gdk_debug").append("gdk_embedded").append("gdk_vm_minsize").append("mapi_debug").append("mapi_noheaders").append("monet_daemon").append("monet_mod_path").append("monet_pid").append("monet_prompt").append("monet_welcome").append("sql_debug").append("sql_logdir").reverse();
return
monet_environment.kdiff(dels).access(BAT_WRITE).insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
+{ pf:mil('var dels := new(void, str,
20).append("exec_prefix").append("prefix").append("gdk_debug").append("gdk_embedded").append("gdk_vm_minsize").append("mapi_debug").append("mapi_noheaders").append("monet_daemon").append("monet_mod_path").append("monet_pid").append("monet_prompt").append("monet_welcome").append("sql_debug").reverse();
return
monet_environment.kdiff(dels).access(BAT_WRITE).insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
(: =================== HTTP =================== :)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
