improve cache

Author: mikejolley

includes/class-wc-product-tables-query.php

@@ -270,14 +270,17 @@ public function prime_product_table_caches( $posts ) {
 
 			// Prime attribute values.
 			$rows  = $wpdb->get_results( '
-				SELECT `product_attribute_id`, `value`, `is_default`
+				SELECT `product_id`, `product_attribute_id`, `value`, `is_default`
 				FROM ' . $wpdb->prefix . 'wc_product_attribute_values
 				WHERE product_id IN (' . $prime_non_variations_sql . ');
 			' ); // WPCS: db call ok, cache ok, unprepared SQL OK.
 			$cache = array_fill_keys( $prime_ids, array() );
 
 			foreach ( $rows as $row ) {
-				$cache[ $row->product_attribute_id ][] = $row;
+				if ( ! isset( $cache[ $row->product_id ] ) ) {
+					$cache[ $row->product_id ] = array();
+				}
+				$cache[ $row->product_id ][ $row->product_attribute_id ][] = $row;
 			}
 
 			foreach ( $prime_ids as $id ) {

includes/data-stores/class-wc-product-data-store-custom-table.php

@@ -595,9 +595,7 @@ public function delete( &$product, $args = array() ) {
 	 * @param WC_Product $product The product object.
 	 */
 	protected function clear_caches( &$product ) {
-		foreach ( $product->get_attributes( 'edit' ) as $attribute ) {
-			wp_cache_delete( 'woocommerce_product_attribute_values_' . $attribute->get_product_attribute_id(), 'product' );
-		}
+		wp_cache_delete( 'woocommerce_product_attribute_values_' . $product->get_id(), 'product' );
 		wp_cache_delete( 'woocommerce_product_' . $product->get_id(), 'product' );
 		wp_cache_delete( 'woocommerce_product_relationships_' . $product->get_id(), 'product' );
 		wp_cache_delete( 'woocommerce_product_downloads_' . $product->get_id(), 'product' );
@@ -1348,8 +1346,10 @@ public function read_attributes( &$product ) {
 		}
 
 		if ( ! empty( $product_attributes ) ) {
-			$attributes         = array();
-			$default_attributes = array();
+			$attributes             = array();
+			$default_attributes     = array();
+			$cached_attr_value_data = wp_cache_get( 'woocommerce_product_attribute_values_' . $product->get_id(), 'product' );
+
 			foreach ( $product_attributes as $attr ) {
 				$attribute = new WC_Product_Attribute();
 				$attribute->set_attribute_id( $attr->attribute_id ); // This is the attribute taxonomy ID, or 0 for local attributes.
@@ -1359,20 +1359,17 @@ public function read_attributes( &$product ) {
 				$attribute->set_visible( $attr->is_visible );
 				$attribute->set_variation( $attr->is_variation );
 
-				$attr_value_data = wp_cache_get( 'woocommerce_product_attribute_values_' . $attr->product_attribute_id, 'product' );
-
-				if ( false === $attr_value_data ) {
-					$attr_value_data = $wpdb->get_results(
+				if ( ! isset( $cached_attr_value_data[ $attr->product_attribute_id ] ) ) {
+					$cached_attr_value_data[ $attr->product_attribute_id ] = $wpdb->get_results(
 						$wpdb->prepare(
 							"SELECT value, is_default FROM {$wpdb->prefix}wc_product_attribute_values WHERE product_attribute_id = %d",
 							$attr->product_attribute_id
 						)
 					);
-
-					wp_cache_set( 'woocommerce_product_attribute_values_' . $attr->product_attribute_id, $attr_value_data, 'product' );
 				}
 
-				$attr_values = wp_list_pluck( $attr_value_data, 'value' );
+				$attr_value_data = $cached_attr_value_data[ $attr->product_attribute_id ];
+				$attr_values     = wp_list_pluck( $attr_value_data, 'value' );
 
 				// If this is a taxonomy, we're reading numeric term IDs.
 				if ( $attr->attribute_id ) {
@@ -1389,6 +1386,9 @@ public function read_attributes( &$product ) {
 					}
 				}
 			}
+
+			wp_cache_set( 'woocommerce_product_attribute_values_' . $product->get_id(), $cached_attr_value_data, 'product' );
+
 			$product->set_attributes( $attributes );
 			$product->set_default_attributes( $default_attributes );
 		}