golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce DB queries by half during MU signup, props donncha, see #12140 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-05 17:59:24 +00:00
parent a7e2f2533b
commit 908a280df4
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
wp-includes/functions.php
View File

@ -335,7 +335,9 @@ function get_option( $setting, $default = false ) {
return $default; return $default;
} }
$alloptions = wp_load_alloptions(); if ( ! defined( 'WP_INSTALLING' ) ) {
$alloptions = wp_load_alloptions();
}
if ( isset( $alloptions[$setting] ) ) { if ( isset( $alloptions[$setting] ) ) {
$value = $alloptions[$setting]; $value = $alloptions[$setting];
@ -495,12 +497,14 @@ function update_option( $option_name, $newvalue ) {
$newvalue = maybe_serialize( $newvalue ); $newvalue = maybe_serialize( $newvalue );
do_action( 'update_option', $option_name, $oldvalue, $newvalue ); do_action( 'update_option', $option_name, $oldvalue, $newvalue );
$alloptions = wp_load_alloptions(); if ( ! defined( 'WP_INSTALLING' ) ) {
if ( isset( $alloptions[$option_name] ) ) { $alloptions = wp_load_alloptions();
$alloptions[$option_name] = $newvalue; if ( isset( $alloptions[$option_name] ) ) {
wp_cache_set( 'alloptions', $alloptions, 'options' ); $alloptions[$option_name] = $newvalue;
} else { wp_cache_set( 'alloptions', $alloptions, 'options' );
wp_cache_set( $option_name, $newvalue, 'options' ); } else {
wp_cache_set( $option_name, $newvalue, 'options' );
}
} }
$wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) ); $wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) );
@ -560,12 +564,14 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
$value = maybe_serialize( $value ); $value = maybe_serialize( $value );
$autoload = ( 'no' === $autoload ) ? 'no' : 'yes'; $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
do_action( 'add_option', $name, $value ); do_action( 'add_option', $name, $value );
if ( 'yes' == $autoload ) { if ( ! defined( 'WP_INSTALLING' ) ) {
$alloptions = wp_load_alloptions(); if ( 'yes' == $autoload ) {
$alloptions[$name] = $value; $alloptions = wp_load_alloptions();
wp_cache_set( 'alloptions', $alloptions, 'options' ); $alloptions[$name] = $value;
} else { wp_cache_set( 'alloptions', $alloptions, 'options' );
wp_cache_set( $name, $value, 'options' ); } else {
wp_cache_set( $name, $value, 'options' );
}
} }
// This option exists now // This option exists now
@ -606,14 +612,16 @@ function delete_option( $name ) {
do_action( 'delete_option', $name ); do_action( 'delete_option', $name );
// expected_slashed ($name) // expected_slashed ($name)
$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" ); $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
if ( 'yes' == $option->autoload ) { if ( ! defined( 'WP_INSTALLING' ) ) {
$alloptions = wp_load_alloptions(); if ( 'yes' == $option->autoload ) {
if ( isset( $alloptions[$name] ) ) { $alloptions = wp_load_alloptions();
unset( $alloptions[$name] ); if ( isset( $alloptions[$name] ) ) {
wp_cache_set( 'alloptions', $alloptions, 'options' ); unset( $alloptions[$name] );
wp_cache_set( 'alloptions', $alloptions, 'options' );
}
} else {
wp_cache_delete( $name, 'options' );
} }
} else {
wp_cache_delete( $name, 'options' );
} }
do_action( 'deleted_option', $name ); do_action( 'deleted_option', $name );
return true; return true;
@ -665,15 +673,17 @@ function get_transient($transient) {
if ( $_wp_using_ext_object_cache ) { if ( $_wp_using_ext_object_cache ) {
$value = wp_cache_get($transient, 'transient'); $value = wp_cache_get($transient, 'transient');
} else { } else {
$transient_option = '_transient_' . esc_sql($transient); if ( ! defined( 'WP_INSTALLING' ) ) {
// If option is not in alloptions, it is not autoloaded and thus has a timeout $transient_option = '_transient_' . esc_sql($transient);
$alloptions = wp_load_alloptions(); // If option is not in alloptions, it is not autoloaded and thus has a timeout
if ( !isset( $alloptions[$transient_option] ) ) { $alloptions = wp_load_alloptions();
$transient_timeout = '_transient_timeout_' . esc_sql($transient); if ( !isset( $alloptions[$transient_option] ) ) {
if ( get_option($transient_timeout) < time() ) { $transient_timeout = '_transient_timeout_' . esc_sql($transient);
delete_option($transient_option); if ( get_option($transient_timeout) < time() ) {
delete_option($transient_timeout); delete_option($transient_option);
return false; delete_option($transient_timeout);
return false;
}
} }
} }
@ -1742,7 +1752,9 @@ function is_blog_installed() {
return true; return true;
$suppress = $wpdb->suppress_errors(); $suppress = $wpdb->suppress_errors();
$alloptions = wp_load_alloptions(); if ( ! defined( 'WP_INSTALLING' ) ) {
$alloptions = wp_load_alloptions();
}
// If siteurl is not set to autoload, check it specifically // If siteurl is not set to autoload, check it specifically
if ( !isset( $alloptions['siteurl'] ) ) if ( !isset( $alloptions['siteurl'] ) )
$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" ); $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );