From: Reini U. <ru...@us...> - 2004-12-09 22:24:57
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24094 Modified Files: main.php WikiDB.php Log Message: optimize on _DEBUG_SQL only. but now again on every 50th request, not just save. Index: main.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v retrieving revision 1.194 retrieving revision 1.195 diff -u -2 -b -p -d -r1.194 -r1.195 --- main.php 30 Nov 2004 17:46:49 -0000 1.194 +++ main.php 9 Dec 2004 22:24:44 -0000 1.195 @@ -32,6 +32,4 @@ class WikiRequest extends Request { function WikiRequest () { $this->_dbi = WikiDB::open($GLOBALS['DBParams']); // first mysql request costs [958ms]! [670ms] is mysql_connect() - //if ((DEBUG & _DEBUG_TRACE) or (time() % 50 == 0)) - // $this->_dbi->_backend->optimize(); if (in_array('File', $this->_dbi->getAuthParam('USER_AUTH_ORDER'))) { // force our local copy, until the pear version is fixed. @@ -66,4 +64,9 @@ $this->version = phpwiki_version(); $this->setArg('action', $this->_deduceAction()); + if ((DEBUG & _DEBUG_SQL) or (time() % 50 == 0)) { + if ($this->_dbi->_backend->optimize()) + trigger_error(_("Optimizing database"), E_USER_NOTICE); + } + // Restore auth state. This doesn't check for proper authorization! if (ENABLE_USER_NEW) { @@ -1178,4 +1181,7 @@ if (!defined('PHPWIKI_NOMAIN') or !PHPWI // $Log$ +// Revision 1.195 2004/12/09 22:24:44 rurban +// optimize on _DEBUG_SQL only. but now again on every 50th request, not just save. +// // Revision 1.194 2004/11/30 17:46:49 rurban // added ModeratedPage POST action hook (part 2/3) Index: WikiDB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v retrieving revision 1.113 retrieving revision 1.114 diff -u -2 -b -p -d -r1.113 -r1.114 --- WikiDB.php 6 Dec 2004 19:49:55 -0000 1.113 +++ WikiDB.php 9 Dec 2004 22:24:44 -0000 1.114 @@ -903,5 +903,5 @@ class WikiDB_Page // We're doing this here rather than in createRevision because // postgres can't optimize while locked. - if (DEBUG or (time() % 50 == 0)) { + if ((DEBUG & _DEBUG_SQL) or (time() % 5 == 0)) { if ($backend->optimize()) trigger_error(_("Optimizing database"), E_USER_NOTICE); @@ -1984,5 +1984,8 @@ class WikiDB_cache $this->_backend->update_pagedata($pagename, $newdata); - if (USECACHE and !empty($this->_pagedata_cache[$pagename]) and is_array($this->_pagedata_cache[$pagename])) { + if (USECACHE + and !empty($this->_pagedata_cache[$pagename]) + and is_array($this->_pagedata_cache[$pagename])) + { $cachedata = &$this->_pagedata_cache[$pagename]; foreach($newdata as $key => $val) @@ -2126,4 +2129,7 @@ function _sql_debuglog_shutdown_function // $Log$ +// Revision 1.114 2004/12/09 22:24:44 rurban +// optimize on _DEBUG_SQL only. but now again on every 50th request, not just save. +// // Revision 1.113 2004/12/06 19:49:55 rurban // enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now. |