Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin
In directory sc8-pr-cvs16:/tmp/cvs-serv24044
Modified Files:
Tag: XQuery_0-16
admin.xq
Log Message:
Don't modify the env var monet_environment itself, make a copy instead.
This fixes the problem that each click on the buttom "View DB
Environment" in the same session causes a "gdk_mem_maxsize" to be
inserted in monet_environment. It might also not be a good idea to
delete some environment variables from monet_environment.
Index: admin.xq
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.xq,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- admin.xq 22 Feb 2007 18:37:57 -0000 1.1.2.2
+++ admin.xq 4 May 2007 11:42:24 -0000 1.1.2.3
@@ -91,7 +91,7 @@
{ pf:mil('lock_set(pf_short); var ret := bat(str,str); var tot := 0LL; [EMAIL
PROTECTED]() 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();
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); return
ret;') };
declare function admin:db-env()
-{ pf:mil('return
environment().access(BAT_WRITE).delete("exec_prefix").delete("prefix").delete("gdk_debug").delete("gdk_embedded").delete("gdk_vm_minsize").delete("mapi_debug").delete("mapi_noheaders").delete("monet_daemon").delete("monet_mod_path").delete("monet_pid").delete("monet_prompt").delete("monet_welcome").delete("sql_debug").delete("sql_logdir").insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
+{ pf:mil('return
environment().copy().delete("exec_prefix").delete("prefix").delete("gdk_debug").delete("gdk_embedded").delete("gdk_vm_minsize").delete("mapi_debug").delete("mapi_noheaders").delete("monet_daemon").delete("monet_mod_path").delete("monet_pid").delete("monet_prompt").delete("monet_welcome").delete("sql_debug").delete("sql_logdir").insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
declare function admin:db-flush()
{ pf:mil('{ lock_set(pf_short); if (count(colname_runtime) > 0)
_runtime_flush(); lock_unset(pf_short); delete_all_docs(true); return "cache
flushed";}') };
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
