Changeset 845

Show
Ignore:
Timestamp:
06/07/07 03:50:25 (1 year ago)
Author:
mdawaffe
Message:

get rid of some unused keys. add better ones re #570

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/bb-admin/upgrade-functions.php

    r792 r845  
    1515        $bb_upgrade += bb_upgrade_180(); // Delete users for real 
    1616        $bb_upgrade += bb_upgrade_190(); // Move topic_resolved to topicmeta 
     17        $bb_upgrade += bb_upgrade_200(); // Indices 
    1718        require_once( BBPATH . 'bb-admin/upgrade-schema.php'); 
    1819        bb_make_db_current(); 
    19         $bb_upgrade += bb_upgrade_200(); // Make forum and topic slugs 
     20        $bb_upgrade += bb_upgrade_1000(); // Make forum and topic slugs 
    2021        bb_update_db_version(); 
    2122        return $bb_upgrade; 
     
    335336 
    336337function bb_upgrade_200() { 
     338        if ( ( $dbv = bb_get_option_from_db( 'bb_db_version' ) ) && $dbv >= 845 ) 
     339                return 0; 
     340 
     341        global $bbdb; 
     342 
     343        $bbdb->hide_errors(); 
     344        $bbdb->query( "DROP INDEX tag_id_index ON $bbdb->tagged" ); 
     345        $bbdb->query( "DROP INDEX user_id ON $bbdb->topicmeta" ); 
     346        $bbdb->query( "DROP INDEX forum_id ON $bbdb->topics" ); 
     347        $bbdb->query( "DROP INDEX topic_time ON $bbdb->topics" ); 
     348        $bbdb->query( "DROP INDEX topic_start_time ON $bbdb->topics" ); 
     349        $bbdb->query( "DROP INDEX tag_id_index ON $bbdb->tagged" ); 
     350        $bbdb->query( "DROP INDEX topic_id ON $bbdb->posts" ); 
     351        $bbdb->query( "DROP INDEX poster_id ON $bbdb->posts" ); 
     352        $bbdb->show_errors(); 
     353 
     354        bb_update_option( 'bb_db_version', 845 ); 
     355 
     356        echo "Done removing old indices.<br />"; 
     357        return 1; 
     358 
     359} 
     360 
     361function bb_upgrade_1000() { 
    337362        if ( ( $dbv = bb_get_option_from_db( 'bb_db_version' ) ) && $dbv >= 788 ) 
    338363                return 0; 
  • trunk/bb-admin/upgrade-schema.php

    r788 r845  
    2424  post_position bigint(20) NOT NULL default '0', 
    2525  PRIMARY KEY  (post_id), 
    26   KEY topic_id (topic_id), 
    27   KEY poster_id (poster_id), 
     26  KEY topic_time (topic_id,post_time), 
     27  KEY poster_time (poster_id,post_time), 
    2828  KEY post_time (post_time), 
    2929  FULLTEXT KEY post_text (post_text) 
     
    4747  tag_count bigint(20) NOT NULL default '0', 
    4848  PRIMARY KEY  (topic_id), 
    49   KEY forum_id (forum_id), 
    50   KEY topic_time (topic_time), 
    51   KEY topic_start_time (topic_start_time) 
     49  KEY forum_time (forum_id,topic_time), 
     50  KEY user_start_time (topic_poster,topic_start_time) 
    5251); 
    5352CREATE TABLE $bbdb->topicmeta ( 
     
    5756  meta_value longtext, 
    5857  PRIMARY KEY  (meta_id), 
    59   KEY user_id (topic_id), 
     58  KEY topic_id (topic_id), 
    6059  KEY meta_key (meta_key) 
    6160); 
     
    8786  raw_tag varchar(50) NOT NULL default '', 
    8887  tag_count bigint(20) unsigned NOT NULL default '0', 
    89   PRIMARY KEY  (tag_id) 
     88  PRIMARY KEY  (tag_id), 
     89  KEY name (tag) 
    9090); 
    9191CREATE TABLE $bbdb->tagged ( 
     
    9595  tagged_on datetime NOT NULL default '0000-00-00 00:00:00', 
    9696  PRIMARY KEY  (tag_id,user_id,topic_id), 
    97   KEY tag_id_index (tag_id), 
    9897  KEY user_id_index (user_id), 
    9998  KEY topic_id_index (topic_id) 
  • trunk/bb-includes/functions.php

    r844 r845  
    11891189                break; 
    11901190        case 'bb_db_version' : 
    1191                 return '788'; // Don't filter 
     1191                return '845'; // Don't filter 
    11921192                break; 
    11931193        case 'html_type' :