Skip to content

Stats: Use Transient API to Improve Cache Performance #13147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeherve merged 1 commit into from
Jul 30, 2019
Merged

Stats: Use Transient API to Improve Cache Performance #13147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions class.jetpack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ class_exists( 'Jetpack_Sitemap_Manager' )
do_action( 'jetpack_sitemaps_purge_data' );
}

// Delete old stats cache
delete_option( 'jetpack_restapi_stats_cache' );

delete_transient( self::$plugin_upgrade_lock_key );
}

Expand Down
50 changes: 21 additions & 29 deletions modules/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,48 +1644,40 @@ function stats_get_from_restapi( $args = array(), $resource = '' ) {
$args = wp_parse_args( $args, array() );
$cache_key = md5( implode( '|', array( $endpoint, $api_version, serialize( $args ) ) ) );

// Get cache.
$stats_cache = Jetpack_Options::get_option( 'restapi_stats_cache', array() );
if ( ! is_array( $stats_cache ) ) {
$stats_cache = array();
}
$transient_name = "jetpack_restapi_stats_cache_{$cache_key}";

$stats_cache = get_transient( $transient_name );

// Return or expire this key.
if ( isset( $stats_cache[ $cache_key ] ) ) {
$time = key( $stats_cache[ $cache_key ] );
if ( time() - $time < ( 5 * MINUTE_IN_SECONDS ) ) {
$cached_stats = $stats_cache[ $cache_key ][ $time ];
if ( is_wp_error( $cached_stats ) ) {
return $cached_stats;
}
$cached_stats = (object) array_merge( array( 'cached_at' => $time ), (array) $cached_stats );
return $cached_stats;
if ( $stats_cache ) {
$time = key( $stats_cache );
$data = $stats_cache[ $time ]; // WP_Error or string (JSON encoded object)

if ( is_wp_error( $data ) ) {
return $data;
}
unset( $stats_cache[ $cache_key ] );

return (object) array_merge( array( 'cached_at' => $time ), (array) json_decode( $data ) );
}

// Do the dirty work.
$response = Client::wpcom_json_api_request_as_blog( $endpoint, $api_version, $args );
if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
// WP_Error
$data = is_wp_error( $response ) ? $response : new WP_Error( 'stats_error' );
// WP_Error
$return = $data;
} else {
$data = json_decode( wp_remote_retrieve_body( $response ) );
// string (JSON encoded object)
$data = wp_remote_retrieve_body( $response );
// object (rare: null on JSON failure)
$return = json_decode( $data );
}

// Expire old keys.
foreach ( $stats_cache as $k => $cache ) {
if ( ! is_array( $cache ) || ( 5 * MINUTE_IN_SECONDS ) < time() - key( $cache ) ) {
unset( $stats_cache[ $k ] );
}
}
// To reduce size in storage: store with time as key, store JSON encoded data (unless error).
set_transient( $transient_name, array( time() => $data ), 5 * MINUTE_IN_SECONDS );

// Set cache.
$stats_cache[ $cache_key ] = array(
time() => $data,
);
Jetpack_Options::update_option( 'restapi_stats_cache', $stats_cache, false );

return $data;
return $return;
}

/**
Expand Down
1 change: 0 additions & 1 deletion packages/options/legacy/class.jetpack-options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public static function get_option_names( $type = 'compact' ) {
'site_icon_url', // (string) url to the full site icon
'site_icon_id', // (int) Attachment id of the site icon file
'dismissed_manage_banner', // (bool) Dismiss Jetpack manage banner allows the user to dismiss the banner permanently
'restapi_stats_cache', // (array) Stats Cache data.
'unique_connection', // (array) A flag to determine a unique connection to wordpress.com two values "connected" and "disconnected" with values for how many times each has occured
'protect_whitelist', // (array) IP Address for the Protect module to ignore
'sync_error_idc', // (bool|array) false or array containing the site's home and siteurl at time of IDC error
Expand Down