Changeset 164

Timestamp:

04/18/2006 06:10:06 AM (6 years ago)

Author:

cirrus

Message:

Optimization: Added 3 key index on the links table.
Optimization: Changed the db_data function in the table class, to avoid a duplicate query.
Thanks to Winner.

Location:

trunk

Files:

• globals/classes/table.php (modified) (2 diffs)
• install/schema.sql (modified) (1 diff)

trunk/globals/classes/table.php

@@ -32 +32 @@
                 global $db, $vars;
                 if ($limit == '' && $limit !== FALSE) {
-                        $cnt = $db->cnt($select, $from, $where, $group_by);
+                        if ($this->info['CURRENT_PAGE'] == '' && $_SERVER['REQUEST_METHOD'] == 'GET') $this->info['CURRENT_PAGE'] = get($this->info['TABLE_NAME']."_showpage");
+                        if ($this->info['CURRENT_PAGE'] == '') $this->info['CURRENT_PAGE'] = 1;
+                        $page = $this->info['CURRENT_PAGE'];
+                        $limit = (($page-1)*$vars['constructor']['max_rows']).', '.$vars['constructor']['max_rows'];
+                        $want_pages = true;
+                        }
+                $data = $db->get("SQL_CALC_FOUND_ROWS ".$select, $from, $where, $group_by, $order_by, $limit);
+                if (isset($want_pages)) {
+                        $cnt = $db->query_data("SELECT FOUND_ROWS()");
+                        $cnt = $cnt[0]['FOUND_ROWS()'];
                         if ($vars['constructor']['max_rows'] != '' && $cnt > $vars['constructor']['max_rows']) {
                                 $this->info['TOTAL_PAGES'] = ceil($cnt / $vars['constructor']['max_rows']);
-                                
-                                if ($this->info['CURRENT_PAGE'] == '' && $_SERVER['REQUEST_METHOD'] == 'GET') $this->info['CURRENT_PAGE'] = get($this->info['TABLE_NAME']."_showpage");
-                                if ($this->info['CURRENT_PAGE'] == '') $this->info['CURRENT_PAGE'] = 1;
-                                
-                                $page = $this->info['CURRENT_PAGE'];
-                                $limit = (($page-1)*$vars['constructor']['max_rows']).', '.$vars['constructor']['max_rows'];
-
                                 for ($i=1;$i<=$this->info['TOTAL_PAGES'];$i++) {
                                         $this->info['PAGES'][$i] = makelink(array($this->info['TABLE_NAME']."_showpage" => $i), TRUE);
@@ -47 +49 @@
                         }
                 }
-                $data = $db->get($select, $from, $where, $group_by, $order_by, $limit);
                 if (isset($data[0])) {
                         $isset = TRUE;

trunk/install/schema.sql

@@ -107 +107 @@
   `info` text,
   PRIMARY KEY  (`id`),
-  KEY `node_id` (`node_id`),
-  KEY `peer_node_id` (`peer_node_id`),
+  KEY `node_id` (`node_id`,`type`,`status`),
+  KEY `peer_node_id` (`peer_node_id`,`type`,`status`),
   KEY `type` (`type`),
   KEY `status` (`status`),
-  KEY `peer_ap_id` (`peer_ap_id`)
+  KEY `peer_ap_id` (`peer_ap_id`,`type`,`status`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;