Changeset 424

Timestamp:

07/15/09 07:25:24 (11 years ago)

Author:

kovell

Message:

Fixes: killlists with both involved corps and alliances work. Memory use reduced.

Location:

dev/common/includes

Files:

• class.db.mysqli.php (modified) (6 diffs)
• class.db_memcache.php (modified) (1 diff)
• class.killlist.php (modified) (3 diffs)
• globals.php (modified) (1 diff)

dev/common/includes/class.db.mysqli.php

@@ -87 +87 @@
         $t1 = strtok(microtime(), ' ') + strtok('');
 
+                if(isset($this->resid_)) $this->resid_->free();
+
         $this->resid_ = mysqli_query($this->dbconn_->id(),$sql);
 
@@ -196 +198 @@
         // this is the minimum runtime a query has to run to be
         // eligible for caching in seconds
-        $this->_minruntime = 0.05;
+        $this->_minruntime = 0.1;
 
         // maximum size of a cached result set (512kB)
@@ -424 +426 @@
         // we got no or no valid cache so open the connection and run the query
         $this->dbconn_ = new DBConnection_mysqli();
-
-        $t1 = strtok(microtime(), ' ') + strtok('');
+                if(isset($this->resid_)) $this->resid_->free();
+
+                $t1 = strtok(microtime(), ' ') + strtok('');
 
         $this->resid_ = mysqli_query($this->dbconn_->id(), $sql);
@@ -458 +461 @@
         {
             $this->genCache();
+                        // We will use the cached version now so free the mysqli resource.
+                        if($this->_cached)
+                        {
+                                $this->resid_->free();
+                                unset($this->resid_);
+                        }
         }
 
@@ -607 +616 @@
         $this->_minruntime = 0.1;
 
-        // maximum size of a cached result set (1MB)
-        $this->_maxcachesize = 1048576;
+        // maximum size of a cached result set (512kB)
+        $this->_maxcachesize = 524288;
         $this->d = true;
     }
@@ -737 +746 @@
         // we got no or no valid cache so open the connection and run the query
         $this->dbconn_ = new DBConnection_mysqli;
+                if(isset($this->resid_)) $this->resid_->free();
 
         $t1 = strtok(microtime(), ' ') + strtok('');

dev/common/includes/class.db_memcache.php

@@ -15 +15 @@
         $this->_minruntime = 0.1;
 
-        // maximum size of a cached result set (1MB)
-        $this->_maxcachesize = 1048576;
+        // maximum size of a cached result set (512kB)
+        $this->_maxcachesize = 524288;
         $this->d = true;
     }

dev/common/includes/class.killlist.php

@@ -44 +44 @@
          *
          */
-        $timeindex='kll_timestamp';
         if (!$this->qry_->executed_)
         {
@@ -151 +150 @@
                                         $this->sql_ .= $invop." ind.ind_crp_id IN (".
                                                 implode(',', $this->inv_crp_)." ) ";
+                                        $invop = "OR";
                                 }
                                 if($this->inv_all_ )
@@ -158 +158 @@
                                 }
                                 $this->sql_ .= ") ) ";
-/* Faster on <50k mails, much slower on >500k
-                                $this->sql_ .= " INNER JOIN ";
-                                if($this->inv_plt_ && !($this->inv_crp_ || $this->inv_all_))
-                                {
-                                        $this->sql_ .= " kb3_inv_detail ind ".
-                  "ON (kll.kll_id = ind.ind_kll_id AND ind.ind_plt_id IN (".
-                  implode(',', $this->inv_plt_)." ) ) ";
-                                }
-                                else
-                                {
-                                        $unionop = " ( ";
-                                        if($this->inv_plt_)
-                                        {
-                                                $indsqlp .= $unionop." SELECT DISTINCT ind_kll_id ".
-                                                        "FROM kb3_inv_detail ".
-                                                        "WHERE ind_plt_id IN (".implode(',', $this->inv_plt_)." ) ";
-                                                $unionop = " UNION ";
-                                        }
-                                        if($this->inv_crp_)
-                                        {
-                                                $this->sql_ .= $unionop." SELECT DISTINCT ind_kll_id ".
-                                                        "FROM kb3_inv_detail WHERE ind_crp_id IN (".
-                                                        implode(',', $this->inv_crp_)." ) ";
-                                                $unionop = " UNION ";
-                                        }
-                                        if($this->inv_all_) $this->sql_ .= $unionop." SELECT DISTINCT ind_kll_id FROM kb3_inv_detail WHERE ind_all_id IN (".
-                                          implode(',', $this->inv_all_).") ";
-                                        $this->sql_ .= ") ind ON (kll.kll_id = ind.ind_kll_id) ";
-                                }
-*/
             }
             // The first argument after WHERE affects sql optimisation so check

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '423';
+        $svn_rev = '424';
 }
 define('SVN_REV', $svn_rev);