chore(2meet-data-optimizer-hivepress-addon): 0.5.1 repackage (no functional change)

Version bump for a re-release packaged alongside the WP-MVB v8 hub (dev39)
acceptance; code is identical to the previous release.

2meet-data-optimizer-hivepress-addon.php

@@ -3,7 +3,7 @@
  * Plugin Name:       2meet Data Optimizer — Hivepress AddOn
  * Plugin URI:        https://2meet.io/2meet-data-optimizer/hivepress
  * Description:       HivePress + 12 擴充整合：13 adapter (core/reviews/bookings/messages/memberships/requests/favorites/statistics/tags/seo/social-links/blocks/marketplace) + 7 HPCT interceptor + 5 query interceptor + admin tab + CLI namespace
- * Version:           0.2.0
+ * Version:           0.5.1
  * Requires at least: 6.0
  * Tested up to:      6.9.4
  * Requires PHP:      8.1
@@ -24,7 +24,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-define( 'TMDO_HIVEPRESS_VERSION', '0.2.0' );
+define( 'TMDO_HIVEPRESS_VERSION', '0.5.1' );
 define( 'TMDO_HIVEPRESS_PATH', plugin_dir_path( __FILE__ ) );
 define( 'TMDO_HIVEPRESS_URL', plugin_dir_url( __FILE__ ) );
 define( 'TMDO_HIVEPRESS_FILE', __FILE__ );

CHANGELOG.md

@@ -11,6 +11,122 @@ Versioning follows [Semantic Versioning](https://semver.org/).
 
 ---
 
+## [0.5.1] — 2026-10-02 — 重新打包
+
+### Changed
+- 重新打包（無功能變更）：與 WP-MVB v8 樞紐站（dev39）一同驗收後發版；程式碼與前一版相同。
+
+---
+
+## [0.5.0] — 2026-09-28
+
+Released with 2meet-data-optimizer 1.4.0 (hardening 2.4).
+
+### Changed
+
+- `hp_listing_core` declares `(hp_price, post_id)`, `(hp_rating, post_id)` and
+  `(hp_hourly_rate, post_id)` indexes for the listing sorts HivePress offers:
+  with core 1.4.0 reading the ID tie-break from the flat `post_id`, a sort walks
+  the index and stops at the page instead of sorting every match (dev36, 1.3M
+  listings: price sort 14 s native → 0.37 s routed, hourly rate 11.5 s → 0.35 s,
+  rating 43 s → 0.51 s). Core 1.3.0 ignores indexes ending with `post_id`, so
+  nothing changes there. The pinned schema hash is unchanged. (PR-119)
+- Transient entries in a persistent object cache live a day (`MAX_CACHE_TTL`,
+  HivePress's own default) instead of a week; a timeout still outlives its value
+  by a minute. At a week dev36 kept 4.7M entries (1 GB) in the shared Redis and
+  pushed other sites' keys out. Entries already cached keep their week. (PR-120)
+
+---
+
+## [0.4.0] — 2026-09-27
+
+Released with 2meet-data-optimizer 1.3.0 (hardening 2.3).
+
+### Changed
+
+- `hp_listing_core` declares indexes on `hp_hourly_rate` and `hp_rating_count`
+  (HivePress filters and sorts on both). They are declared through the group's
+  `indexes`, not `searchable`, so the pinned schema hash is unchanged and the
+  table is not rebuilt; core 1.3.0 adds them in place from WP-CLI / WP-Cron.
+  dev36 (902k listings): two indexes in about 4.7 s; routed `rating_count IN`
+  2.1 s → 0.36 s, `rating_count !=` 2.1 s → 0.76 s, hourly rate + price sort
+  2.1 s → 0.65 s. (PR-090)
+- With a persistent object cache, transient entries now expire: a value after
+  a week (`MAX_CACHE_TTL`; HivePress writes it before its timeout, and a miss
+  only makes it rebuild), its timeout a minute after the later of that and its
+  own time — HivePress reads a missing timeout as "never expires", so the
+  timeout must go last. Entries of deleted posts no longer pile up. (PR-099,
+  PR-115)
+
+### Added
+
+- Opt-in flattening of a site's own listing attributes: the
+  `tmdo_hp_listing_attribute_fields` filter (`'hp_warranty' => 'integer'`)
+  registers them in an `hp_listing_attrs` group — a new table, each column
+  indexed at creation — leaving `hp_listing_core` unchanged. Types: text,
+  textarea, integer, decimal, boolean, date, datetime, timestamp, enum. The
+  group is registered once themes load, so the filter may live in a theme;
+  core 1.3.0 keeps it native until a drift fix has filled it. (PR-109, PR-115)
+
+### Upgrading
+
+- Deploy with core 1.3.0: on an older core the AddOn declares no index at all
+  (core 1.2.0 would run the ALTER inside a web request). (PR-090b)
+- Redis: entries written by 0.3.0 have no TTL (dev36 had 3.0 M). Give them one
+  with non-blocking commands — never `wp cache flush-group`, which the Redis
+  Object Cache drop-in runs as one server-side script and which blocked Redis
+  on a large group. `NX` leaves entries written by 0.4.0 alone:
+
+  ```
+  redis-cli --scan --pattern '<WP_CACHE_KEY_SALT>wp:tmdo_hp_transient:*' \
+    | awk '{printf "EXPIRE %s 604800 NX\r\n", $0}' | redis-cli --pipe
+  redis-cli --scan --pattern '<WP_CACHE_KEY_SALT>wp:tmdo_hp_transient:_transient_timeout_*' \
+    | awk '{printf "EXPIRE %s 608400 GT\r\n", $0}' | redis-cli --pipe
+  ```
+
+  The second pass makes timeouts outlive their values. dev36: 3,013,352 keys
+  in 45 s and 1,867,569 timeouts in 32 s, 0 errors, Redis latency max 2 ms. The pattern
+  follows the drop-in's key layout (`<salt><blog prefix>:<group>:<key>`);
+  check it with `redis-cli --scan --pattern '<salt>*tmdo_hp_transient*' | head`
+  first. redis-cli 7 has no `--count` with `--scan`.
+
+---
+
+## [0.3.0] — 2026-09-27
+
+Released with 2meet-data-optimizer 1.2.0 (hardening 2.2).
+
+### Changed
+
+- With a persistent object cache (`wp_using_ext_object_cache()`), the
+  transient filter keeps HivePress's per-post transient pairs in the
+  `tmdo_hp_transient` cache group instead of `wp_options`, where they piled
+  up (1.15 M pairs on dev36). The cache is then the only store: rows written
+  before are neither read nor deleted (HivePress rebuilds those caches once),
+  because a `get_option()` miss adds the name to WordPress's `notoptions` for
+  good and a hit keeps the old row in the `options` cache group with no expiry.
+  Without an object cache nothing changes. After upgrading, remove the rows
+  left behind with core's `wp tmdo cleanup-hp-transients --options --confirm`.
+
+### Fixed
+
+- The detected / bound status cells of the HivePress admin table go through
+  `esc_html()` (2.1 audit); output unchanged.
+
+### Docs
+
+- `docs/REGISTERED-KEYS.md`: the six registered keys HivePress never writes
+  as meta, because its models alias them to core columns (listing
+  `hp_vendor` → `post_parent`, `hp_status` → `post_status`; request
+  `hp_status`, `hp_user`; vendor `hp_user`; review `hp_rating` →
+  `comment_karma`). The schema stays; their flat columns are always NULL.
+- `docs/HIVEPRESS-COVERAGE.md`: dev36 inventory of the meta each HivePress
+  post type holds, where the extensions keep their data and the query shapes
+  the front end produces. Attribute auto-registration is not needed now:
+  every meta key HivePress queries is registered.
+
+---
+
 ## [0.2.0] — 2026-09-26
 
 Released with 2meet-data-optimizer 1.1.0 (hardening 2.1, search-index mode).

README.md

@@ -43,6 +43,9 @@ reviews / messages / memberships / requests / listing-meta
 
 ---
 
+Registered keys HivePress keeps in core columns instead of meta (`hp_vendor`, `hp_status`, …): see [docs/REGISTERED-KEYS.md](docs/REGISTERED-KEYS.md).
+What the HivePress extensions write and how they query it (dev36 inventory, D04 decision): see [docs/HIVEPRESS-COVERAGE.md](docs/HIVEPRESS-COVERAGE.md).
+
 ## Requirements
 
 - WordPress ≥ 6.0

admin/class-tmdo-admin-hivepress.php

@@ -85,9 +85,9 @@ if ( ! class_exists( 'TMDO_Admin_HivePress' ) ) {
 						<tr>
 							<td><code><?php echo esc_html( $slug ); ?></code></td>
 							<td><?php echo esc_html( $name ); ?></td>
-							<td><?php echo $is_detected ? '✅' : '⚪'; ?></td>
+							<td><?php echo esc_html( $is_detected ? '✅' : '⚪' ); ?></td>
 							<td><?php echo esc_html( $detected[ $slug ] ?? '—' ); ?></td>
-							<td><?php echo $is_bound ? '✅' : '—'; ?></td>
+							<td><?php echo esc_html( $is_bound ? '✅' : '—' ); ?></td>
 							<td><?php echo null === $score ? '—' : esc_html( (string) $score ); ?></td>
 						</tr>
 					<?php endforeach; ?>

docs/HIVEPRESS-COVERAGE.md

@@ -0,0 +1,61 @@
+# HivePress coverage: what the extensions write and how HivePress queries it
+
+Read-only inventory on **dev36** (2026-09-27): HivePress 1.7 with blocks, bookings,
+favorites, marketplace, memberships, messages, requests, reviews, seo, social-links and
+tags; 101,175 listings, 1,499 vendors, 709 requests. The data is seeded, so features the
+seed never used show no rows — noted per line. Account pages (favorites, messages,
+memberships) were not crawled (login).
+
+## Meta keys written (rows, `hp_*`)
+
+| Post type | Key | Rows | Registered group | Queried? |
+|---|---|---|---|---|
+| hp_listing | `hp_hourly_rate` | 101,157 | `hp_listing_core` | yes — filter BETWEEN, sort |
+| hp_listing | `hp_price` | 100,437 | `hp_listing_core` | yes — filter BETWEEN, sort |
+| hp_listing | `hp_rating`, `hp_rating_count` | 53,299 | `hp_listing_core` | `hp_rating` sort |
+| hp_listing | `hp_verified` | 31,985 | `hp_listing_core` | no |
+| hp_listing | `hp_featured` | 5,131 | `hp_listing_core` | yes — featured block (`= CHAR`, `meta_key` + `rand`) |
+| hp_listing | `hp_warranty` | 100,401 | — | no (seed data: values are not warranty term ids; see below) |
+| hp_vendor | `hp_rating`, `hp_hourly_rate`, `hp_rating_count`, `hp_verified` | 761–1,499 | `hp_vendor_core` | `hp_hourly_rate` filter, `hp_rating` sort |
+| hp_vendor | `hp_availability` | 4 | — | no |
+| hp_request | `hp_budget` | 709 | `hp_request_core` | yes — filter BETWEEN, `meta_value_num` sort |
+| hp_request | `hp_due_date` | 709 | — | no |
+| hp_booking | `hp_start_time`, `hp_end_time` | 1 | `hp_booking_core` | no (1 booking) |
+| `*_attribute` | `hp_edit_field_*`, `hp_filterable`, … | 3 each | — | attribute settings, read by ID |
+
+User meta and comment meta: no `hp_*` rows. Term meta: `hp_sort_order` 170, `hp_icon`
+153 (`hp_taxonomy`).
+
+## Where the extensions keep their data
+
+- **Reviews** — `hp_review` comments (5,324); rating in `comment_karma` (see
+  [REGISTERED-KEYS.md](REGISTERED-KEYS.md)).
+- **Requests / offers** — `hp_request` posts; offers are `hp_offer` comments (48), no meta.
+- **Messages** — `hp_message` comments (0 on dev36).
+- **Favorites** — 4 user meta rows (no `hp_` prefix); nothing to flatten.
+- **Bookings** — `hp_booking` posts (1); **memberships** — no plans on dev36.
+- **Tags / categories / select attributes** — taxonomies (`hp_listing_tags` 2,160,
+  `hp_listing_category` 101,175, `hp_listing_warranty` 720 relationships). A select
+  filter (`warranty=28`) becomes `tax_query hp_listing_warranty IN`, never a meta query.
+- **SEO, social links** — no rows on dev36.
+
+## Query shapes seen (front-end crawl, 18 URLs)
+
+- Search filters on number attributes: `hp_price` / `hp_hourly_rate` / `hp_budget`
+  `BETWEEN DECIMAL` — routed.
+- Sort: the named shape `(NOT EXISTS OR EXISTS)` on `hp_price`, `hp_hourly_rate`,
+  `hp_rating` with `orderby=<name>__order` — routed, flat-first since core 1.2.0;
+  requests sort by `meta_key=hp_budget` + `meta_value_num` (a secondary query here) —
+  a shape the router handles.
+- Featured block: `meta_key=hp_featured` + `orderby=rand`, and `hp_featured = CHAR`.
+- Every front-end search carries WooCommerce's `product_visibility NOT IN` tax query.
+- `HivePress\Components\Attribute::set_search_query` runs its own `get_posts()` inside
+  `pre_get_posts` (suppress_filters): not routable (~100 ms on dev36).
+
+## D04 (auto-register HivePress attributes): not now
+
+Every meta key HivePress queries on dev36 is already registered; select attributes are
+taxonomies; the unregistered keys that are written (`hp_due_date`, `hp_availability`,
+`hp_warranty`) are never queried. Auto-registration would only pay off on a site whose
+admin adds **filterable or sortable number / date attributes** — revisit then (a doctor
+check listing such attributes without a registered key would flag it).

docs/REGISTERED-KEYS.md

@@ -0,0 +1,38 @@
+# Registered keys HivePress never writes
+
+Some keys the AddOn registers in its flat groups are **aliases of core columns** in the
+HivePress models: HivePress reads and writes the column, never a meta row. Their flat
+columns therefore stay `NULL`, and a meta query on them finds nothing — natively and
+routed alike.
+
+| Entity / group | Key | HivePress model field | Stored in |
+|---|---|---|---|
+| post / `hp_listing_core` | `hp_vendor` | Listing `vendor` | `wp_posts.post_parent` |
+| post / `hp_listing_core` | `hp_status` | Listing `status` | `wp_posts.post_status` |
+| post / `hp_request_core` | `hp_status` | Request `status` | `wp_posts.post_status` |
+| post / `hp_request_core` | `hp_user` | Request `user` | `wp_posts.post_author` |
+| post / `hp_vendor_core` | `hp_user` | Vendor `user` | `wp_posts.post_author` |
+| comment / `hp_review` | `hp_rating` | Review `rating` (hivepress-reviews) | `wp_comments.comment_karma` |
+
+Sources: `'_alias' => …` in `hivepress/includes/models/class-listing.php`,
+`class-vendor.php`, `hivepress-requests/includes/models/class-request.php` and
+`hivepress-reviews/includes/models/class-review.php`.
+
+## Checked on dev36 (2026-09-27, 101,175 listings)
+
+- Native meta rows: `hp_vendor` 0, `hp_status` 0, `hp_user` 0, comment `hp_rating` 0.
+- Instead: 101,175 / 101,175 listings have `post_parent > 0`; listing statuses are
+  `publish` 91,804 / `draft` 9,371; 5,244 of 5,324 `hp_review` comments carry
+  `comment_karma`.
+
+## What this means
+
+- Filters and sorts HivePress builds on these fields use the core columns, never
+  `meta_query`, so the router has nothing to route for them.
+- Drift checks report nothing for them: native and flat are both empty.
+- **No schema change** (plan decision D03, 2.2): the columns cost only NULLs, and
+  dropping them would need a flat-table migration on every site.
+
+Not in this list: `hp_expired_time` and `hp_featured_time` are real meta fields of the
+Listing model (no alias); they are empty on dev36 only because its seeded listings
+never expire or get featured.

includes/class-tmdo-hivepress-entity-groups.php

@@ -76,6 +76,7 @@ final class TMDO_HivePress_Entity_Groups {
 		self::register_hp_request_core_group();
 		self::register_hp_vendor_core_group();
 		self::register_hp_user_group();
+		self::register_hp_listing_attributes_group();
 	}
 
 	// ── Group definitions ────────────────────────────────────────────────────
@@ -257,9 +258,66 @@ final class TMDO_HivePress_Entity_Groups {
 					'label' => 'Hourly rate',
 				),
 			),
-			array( 'post_types' => array( 'hp_listing' ) )
+			array(
+				'post_types' => array( 'hp_listing' ),
+				// Filtered and sorted on by HivePress search. Declared as indexes
+				// (added in place) rather than `searchable`, which would change
+				// the schema hash and rebuild a table that may hold aeav_only data.
+				// Only with core 1.3.0+ (ddl_allowed()): older cores run the ALTER
+				// inside whatever request comes first, a visitor's included.
+				'indexes'    => method_exists( 'TMDO_Schema_Manager', 'ddl_allowed' ) ? array(
+					'hourly_rate'    => array( 'hp_hourly_rate' ),
+					'rating_count'   => array( 'hp_rating_count' ),
+					// HivePress sorts: the value then the ID tie-break, which core 1.4.0
+					// reads in order (flat-first) instead of sorting every match.
+					'price_id'       => array( 'hp_price', 'post_id' ),
+					'rating_id'      => array( 'hp_rating', 'post_id' ),
+					'hourly_rate_id' => array( 'hp_hourly_rate', 'post_id' ),
+				) : array(),
+			)
 		);
 	}
+	/**
+	 * A site's own HivePress listing attributes (created under Listings →
+	 * Attributes, e.g. a "Warranty" number → hp_warranty), opt-in through the
+	 * `tmdo_hp_listing_attribute_fields` filter: `array( 'hp_warranty' => 'integer' )`.
+	 *
+	 * They get a group of their own — a new table, each column indexed at
+	 * creation — so hp_listing_core and its pinned definition stay unchanged.
+	 * Keys another group already manages, keys without the hp_ prefix and
+	 * types that cannot take a plain index (json, binary) are ignored. Core
+	 * fills the new table from native meta (drift fix) before using it.
+	 *
+	 * Registered once themes are loaded (the init:1 run): a filter added in a
+	 * theme is seen, and the group gets one definition per request.
+	 *
+	 * @return void
+	 */
+	private static function register_hp_listing_attributes_group(): void {
+		if ( ! did_action( 'after_setup_theme' ) ) {
+			return;
+		}
+		$fields = array();
+		foreach ( (array) apply_filters( 'tmdo_hp_listing_attribute_fields', array() ) as $key => $type ) {
+			$key   = (string) $key;
+			$owner = TMDO_Entity_Registry::get_field( 'post', $key, 'hp_listing' );
+			if ( 1 !== preg_match( '/^hp_[a-z0-9_]+$/', $key )
+				|| ! in_array( $type, array( 'text', 'textarea', 'integer', 'decimal', 'boolean', 'date', 'datetime', 'timestamp', 'enum' ), true )
+				|| ( null !== $owner && 'hp_listing_attrs' !== $owner['group'] ) ) {
+				continue;
+			}
+			$fields[] = array(
+				'key'        => $key,
+				'type'       => $type,
+				'searchable' => true,
+				'label'      => 'Site listing attribute',
+			);
+		}
+		if ( $fields ) {
+			TMDO_Entity_Registry::register_group( 'post', 'hp_listing_attrs', $fields, array( 'post_types' => array( 'hp_listing' ) ) );
+		}
+	}
+
 	/**
 	 * HivePress request core meta keys (post_type=hp_request).
 	 *

includes/class-tmdo-hivepress-transient-filter.php

@@ -77,6 +77,12 @@ final class TMDO_Hivepress_Transient_Filter {
 	/** Namespace prefix for translated wp_options entries. */
 	public const TRANSLATED_NAMESPACE = 'wpdo_hp_pm_';
 
+	/** Object cache group used instead of wp_options when a persistent cache is present. */
+	public const CACHE_GROUP = 'tmdo_hp_transient';
+
+	/** Longest an object-cache entry lives: a day, HivePress's own default (2.4 PR-120). */
+	public const MAX_CACHE_TTL = DAY_IN_SECONDS;
+
 	/**
 	 * Register the four metadata filters on `init`. Idempotent — safe to call
 	 * multiple times.
@@ -164,7 +170,16 @@ final class TMDO_Hivepress_Transient_Filter {
 		// HivePress cache layer reads the timeout *first*, then decides whether
 		// to read the value. We must preserve raw stored values until HivePress
 		// itself orders deletion.
+		if ( wp_using_ext_object_cache() ) {
+			// The object cache is the only store. Rows left in wp_options from
+			// before are not read (`wp tmdo cleanup-hp-transients --options`
+			// removes them): a get_option() miss would add the name to
+			// `notoptions` for good, as later writes never reach wp_options.
+			$value = wp_cache_get( $option_name, self::CACHE_GROUP );
+			$value = false === $value ? null : $value;
+		} else {
 			$value = get_option( $option_name, null );
+		}
 
 		if ( null === $value ) {
 			// Cache miss in our store → fall through to normal postmeta path
@@ -239,16 +254,27 @@ final class TMDO_Hivepress_Transient_Filter {
 		$translated  = self::translate_key( (int) $object_id, (string) $meta_key );
 		$option_name = ( $is_timeout ? '_transient_timeout_' : '_transient_' ) . $translated;
 
+		if ( wp_using_ext_object_cache() ) {
+			wp_cache_delete( $option_name, self::CACHE_GROUP );
+			return true;
+		}
 		delete_option( $option_name );
 		return true;
 	}
 
 	/**
-	 * Internal: persist value or timeout to wp_options.
+	 * Internal: persist value or timeout to the object cache when a persistent
+	 * one is in use (Redis: a TTL cache belongs there, not in wp_options), else
+	 * to wp_options.
 	 *
-	 * Both halves of the transient pair are written with `autoload=no` (they
-	 * are read on-demand only — never via wp_load_alloptions() — so eagerly
-	 * loading them on every page would defeat the point of the move).
+	 * In wp_options both halves of the transient pair are written with
+	 * `autoload=no` (they are read on-demand only — never via
+	 * wp_load_alloptions() — so eagerly loading them on every page would defeat
+	 * the point of the move). In the object cache the value, written before its
+	 * timeout, expires after MAX_CACHE_TTL (a miss only makes HivePress rebuild
+	 * it) and the timeout a minute after the later of that and its own time,
+	 * so HivePress always sees it expire first; entries of deleted posts do
+	 * not pile up (2.3 PR-099).
 	 *
 	 * @param int    $post_id    Post ID.
 	 * @param string $meta_key   Original `_transient_*` meta_key.
@@ -260,6 +286,13 @@ final class TMDO_Hivepress_Transient_Filter {
 		$translated  = self::translate_key( $post_id, $meta_key );
 		$option_name = ( $is_timeout ? '_transient_timeout_' : '_transient_' ) . $translated;
 
+		if ( wp_using_ext_object_cache() ) {
+			// A timeout outlives its value: HivePress takes a missing timeout for
+			// "never expires" and would keep serving the value.
+			$ttl = $is_timeout ? max( self::MAX_CACHE_TTL, (int) $meta_value - time() ) + MINUTE_IN_SECONDS : self::MAX_CACHE_TTL;
+			wp_cache_set( $option_name, $meta_value, self::CACHE_GROUP, $ttl );
+			return;
+		}
 		update_option( $option_name, $meta_value, false );
 	}
 

tests/bootstrap.php

@@ -24,6 +24,12 @@ if ( ! file_exists( $tmdo_core_bootstrap ) ) {
 }
 require_once $tmdo_core_bootstrap;
 
+if ( ! function_exists( 'did_action' ) ) {
+	function did_action( string $hook ): int {
+		return (int) ( $GLOBALS['_wp_did_action'][ $hook ] ?? 0 );
+	}
+}
+
 define( 'TMDO_HIVEPRESS_PATH', dirname( __DIR__ ) . '/' );
 define( 'TMDO_HIVEPRESS_URL', 'http://localhost/wp-content/plugins/2meet-data-optimizer-hivepress-addon/' );
 define( 'TMDO_HIVEPRESS_FILE', dirname( __DIR__ ) . '/2meet-data-optimizer-hivepress-addon.php' );

tests/integration/HivepressTransientFilterTest.php

@@ -44,8 +44,10 @@ class HivepressTransientFilterTest extends TestCase {
 		global $wpdb;
 		$wpdb->query( 'TRUNCATE TABLE `' . self::POSTMETA . '`' );
 
-		// Reset wp_options state for filter tests
+		// Reset wp_options / object cache state for filter tests
 		$GLOBALS['_wp_options']                 = array();
+		$GLOBALS['_wp_cache']                   = array();
+		$GLOBALS['_wp_using_ext_object_cache'] = false;
 
 		// Default the toggle to enabled
 		update_option( WPDO_Hivepress_Transient_Filter::OPT_ENABLED, '1' );
@@ -195,6 +197,74 @@ class HivepressTransientFilterTest extends TestCase {
 		$this->assertSame( array( array( 'serialized', 'data' ) ), $value );
 	}
 
+	// ── External object cache (2.2 PR-081) ──────────────────────────────────
+
+	public function test_with_an_object_cache_writes_skip_wp_options(): void {
+		$GLOBALS['_wp_using_ext_object_cache'] = true;
+		$key        = '_transient_hp_models/cat/v1';
+		$translated = WPDO_Hivepress_Transient_Filter::translate_key( 100, $key );
+
+		$this->assertTrue( WPDO_Hivepress_Transient_Filter::on_update( null, 100, $key, 'val', '' ) );
+		WPDO_Hivepress_Transient_Filter::on_update( null, 100, '_transient_timeout_hp_models/cat/v1', '99999999', '' );
+
+		$this->assertFalse( get_option( '_transient_' . $translated ), 'no wp_options row' );
+		$this->assertFalse( get_option( '_transient_timeout_' . $translated ), 'no wp_options row' );
+		$this->assertSame( array( 'val' ), WPDO_Hivepress_Transient_Filter::on_read( null, 100, $key, true ) );
+		$this->assertSame( array( '99999999' ), WPDO_Hivepress_Transient_Filter::on_read( null, 100, '_transient_timeout_hp_models/cat/v1', true ) );
+	}
+
+	/**
+	 * Entries expire in the object cache too (2.3 PR-099): the value (written
+	 * first, before its timeout is known) after a day, the timeout after the
+	 * later of that and its own time, plus a minute. Orphans of deleted posts
+	 * no longer pile up.
+	 */
+	public function test_with_an_object_cache_entries_get_a_ttl(): void {
+		// A day, HivePress's own default: at a week, 1.3M listings kept 4.7M
+		// entries (1 GB) in a shared Redis and pushed other sites' keys out (2.4 PR-120).
+		$this->assertSame( 86400, WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL );
+		$GLOBALS['_wp_using_ext_object_cache'] = true;
+		$key        = '_transient_hp_models/cat/v1';
+		$translated = WPDO_Hivepress_Transient_Filter::translate_key( 100, $key );
+
+		WPDO_Hivepress_Transient_Filter::on_update( null, 100, $key, 'val', '' );
+		WPDO_Hivepress_Transient_Filter::on_update( null, 100, '_transient_timeout_hp_models/cat/v1', (string) ( time() + 3600 ), '' );
+		WPDO_Hivepress_Transient_Filter::on_update( null, 101, '_transient_timeout_hp_models/cat/v1', (string) ( time() - 5 ), '' );
+
+		$ttl = $GLOBALS['_wp_cache_ttl'][ WPDO_Hivepress_Transient_Filter::CACHE_GROUP ];
+		$this->assertSame( WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL, $ttl[ '_transient_' . $translated ] );
+		// A timeout must outlive its value: HivePress takes a missing timeout for
+		// "never expires" and would serve the stale value (review F5).
+		$this->assertSame( WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL + 60, $ttl[ '_transient_timeout_' . $translated ] );
+		$this->assertSame( WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL + 60, $ttl[ '_transient_timeout_' . WPDO_Hivepress_Transient_Filter::translate_key( 101, $key ) ], 'already expired' );
+		WPDO_Hivepress_Transient_Filter::on_update( null, 102, '_transient_timeout_hp_models/cat/v1', (string) ( time() + 2 * WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL ), '' );
+		$this->assertEqualsWithDelta( 2 * WPDO_Hivepress_Transient_Filter::MAX_CACHE_TTL + 60, $GLOBALS['_wp_cache_ttl'][ WPDO_Hivepress_Transient_Filter::CACHE_GROUP ][ '_transient_timeout_' . WPDO_Hivepress_Transient_Filter::translate_key( 102, $key ) ], 2 );
+	}
+
+	public function test_with_an_object_cache_a_value_left_in_wp_options_is_not_read(): void {
+		// A miss must not fall back to get_option(): the option is absent after
+		// cleanup and WordPress would add its name to `notoptions` for good.
+		$key        = '_transient_hp_models/cat/v1';
+		$translated = WPDO_Hivepress_Transient_Filter::translate_key( 100, $key );
+		update_option( '_transient_' . $translated, 'from-before' );
+		$GLOBALS['_wp_using_ext_object_cache'] = true;
+
+		$this->assertNull( WPDO_Hivepress_Transient_Filter::on_read( null, 100, $key, true ) );
+	}
+
+	public function test_with_an_object_cache_delete_leaves_wp_options_alone(): void {
+		$key        = '_transient_hp_models/cat/v1';
+		$translated = WPDO_Hivepress_Transient_Filter::translate_key( 100, $key );
+		update_option( '_transient_' . $translated, 'from-before' );
+		$GLOBALS['_wp_using_ext_object_cache'] = true;
+		WPDO_Hivepress_Transient_Filter::on_update( null, 100, $key, 'val', '' );
+
+		WPDO_Hivepress_Transient_Filter::on_delete( null, 100, $key, '', false );
+
+		$this->assertNull( WPDO_Hivepress_Transient_Filter::on_read( null, 100, $key, true ) );
+		$this->assertSame( 'from-before', get_option( '_transient_' . $translated ), 'left for cleanup-hp-transients --options' );
+	}
+
 	// ── count/purge legacy ──────────────────────────────────────────────────
 
 	public function test_count_legacy_postmeta_rows_returns_zero_when_clean(): void {

tests/integration/bootstrap.php

@@ -21,8 +21,23 @@ if ( ! file_exists( $tmdo_core_bootstrap ) ) {
 		. dirname( __DIR__, 3 ) . '/2meet-data-optimizer'
 	);
 }
+// Defined before the core bootstrap (which only adds it when missing) so tests can read the TTL.
+if ( ! function_exists( 'wp_cache_set' ) ) {
+	function wp_cache_set( $key, $value, $group = '', $ttl = 0 ): bool {
+		$GLOBALS['_wp_cache'][ $group ][ $key ]     = $value;
+		$GLOBALS['_wp_cache_ttl'][ $group ][ $key ] = (int) $ttl;
+		return true;
+	}
+}
 require_once $tmdo_core_bootstrap;
 
+// External object cache switch for the transient filter tests (Redis on real sites).
+if ( ! function_exists( 'wp_using_ext_object_cache' ) ) {
+	function wp_using_ext_object_cache( $using = null ): bool { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
+		return ! empty( $GLOBALS['_wp_using_ext_object_cache'] );
+	}
+}
+
 define( 'TMDO_HIVEPRESS_PATH', dirname( __DIR__, 2 ) . '/' );
 define( 'TMDO_HIVEPRESS_URL', 'http://localhost/wp-content/plugins/2meet-data-optimizer-hivepress-addon/' );
 define( 'TMDO_HIVEPRESS_FILE', TMDO_HIVEPRESS_PATH . '2meet-data-optimizer-hivepress-addon.php' );

tests/unit/HivePressEntityGroupsTest.php

@@ -37,9 +37,15 @@ class HivePressEntityGroupsTest extends TestCase {
 		'hp_user'         => 'hp_vendor_core',
 	);
 
+	private function post_adapter(): TMDO_Entity_Adapter_Interface {
+		$adapter = $this->createMock( TMDO_Entity_Adapter_Interface::class );
+		$adapter->method( 'get_entity_id_column' )->willReturn( 'post_id' );
+		return $adapter;
+	}
+
 	protected function setUp(): void {
 		TMDO_Entity_Registry::init();
-		TMDO_Entity_Registry::register_adapter( 'post', $this->createMock( TMDO_Entity_Adapter_Interface::class ) );
+		TMDO_Entity_Registry::register_adapter( 'post', $this->post_adapter() );
 		TMDO_Entity_Registry::register_adapter( 'user', $this->createMock( TMDO_Entity_Adapter_Interface::class ) );
 		TMDO_HivePress_Entity_Groups::register_entity_fields();
 	}
@@ -58,6 +64,86 @@ class HivePressEntityGroupsTest extends TestCase {
 		}
 	}
 
+	/**
+	 * HivePress filters and sorts listings by these; they are declared as
+	 * group indexes (added in place by core) rather than `searchable`, which
+	 * would change the pinned hash and rebuild the table.
+	 */
+	public function test_listing_columns_filtered_and_sorted_on_are_indexed(): void {
+		$this->assertSame(
+			array(
+				'hourly_rate'    => array( 'hp_hourly_rate' ),
+				'rating_count'   => array( 'hp_rating_count' ),
+				// Sorts: the value then the ID tie-break, read in order (2.4 PR-119).
+				'price_id'       => array( 'hp_price', 'post_id' ),
+				'rating_id'      => array( 'hp_rating', 'post_id' ),
+				'hourly_rate_id' => array( 'hp_hourly_rate', 'post_id' ),
+			),
+			TMDO_Entity_Registry::get_group_indexes( 'post', 'hp_listing_core' )
+		);
+	}
+
+	public function test_site_listing_attributes_are_opt_in(): void {
+		$this->assertSame( array(), TMDO_Entity_Registry::get_group_fields( 'post', 'hp_listing_attrs' ) );
+	}
+
+	/**
+	 * A site flattens its own HivePress listing attributes (e.g. a "Warranty"
+	 * number attribute → hp_warranty) in a group of their own: a new table,
+	 * indexed at creation; hp_listing_core and its pinned hash stay as they are.
+	 */
+	public function test_site_listing_attributes_get_their_own_indexed_group(): void {
+		$fields = static fn() => array(
+			'hp_warranty' => 'integer',
+			'hp_price'    => 'decimal', // Already in hp_listing_core.
+			'warranty'    => 'integer', // Not a HivePress key.
+			'hp_color'    => 'colour', // Unknown type.
+			'hp_features' => 'json', // No plain index on LONGTEXT.
+		);
+		add_filter( 'tmdo_hp_listing_attribute_fields', $fields );
+		$GLOBALS['_wp_did_action']['after_setup_theme'] = 1;
+		try {
+			TMDO_Entity_Registry::init();
+			TMDO_Entity_Registry::register_adapter( 'post', $this->post_adapter() );
+			TMDO_Entity_Registry::register_adapter( 'user', $this->createMock( TMDO_Entity_Adapter_Interface::class ) );
+			TMDO_HivePress_Entity_Groups::register_entity_fields();
+		} finally {
+			$GLOBALS['_wp_filter_callbacks']['tmdo_hp_listing_attribute_fields'] = array();
+			unset( $GLOBALS['_wp_did_action'] );
+		}
+
+		$this->assertSame( array( 'hp_warranty' ), TMDO_Entity_Registry::get_group_keys( 'post', 'hp_listing_attrs' ) );
+		$this->assertTrue( (bool) TMDO_Entity_Registry::get_group_fields( 'post', 'hp_listing_attrs' )[0]['searchable'] );
+		$this->assertSame( array( 'hp_listing' ), TMDO_Entity_Registry::get_group_post_types( 'post', 'hp_listing_attrs' ) );
+		$this->assertSame( 'hp_listing_core', TMDO_Entity_Registry::get_field( 'post', 'hp_price' )['group'] );
+		$this->test_definitions_match_persisted_schema_hashes();
+	}
+
+	/**
+	 * Registration runs twice (plugins_loaded, then init:1): the group is
+	 * registered on the run after themes load, so a theme's filter counts and
+	 * a filter that changed between runs cannot collide (review F8).
+	 */
+	public function test_site_listing_attributes_are_registered_once_themes_are_loaded(): void {
+		add_filter( 'tmdo_hp_listing_attribute_fields', static fn() => array( 'hp_warranty' => 'integer' ) );
+		try {
+			TMDO_Entity_Registry::init();
+			TMDO_Entity_Registry::register_adapter( 'post', $this->post_adapter() );
+			TMDO_Entity_Registry::register_adapter( 'user', $this->createMock( TMDO_Entity_Adapter_Interface::class ) );
+			TMDO_HivePress_Entity_Groups::register_entity_fields();
+			$this->assertSame( array(), TMDO_Entity_Registry::get_group_keys( 'post', 'hp_listing_attrs' ), 'plugins_loaded run: not yet' );
+
+			$GLOBALS['_wp_did_action']['after_setup_theme'] = 1;
+			TMDO_HivePress_Entity_Groups::register_entity_fields();
+		} finally {
+			$GLOBALS['_wp_filter_callbacks']['tmdo_hp_listing_attribute_fields'] = array();
+			unset( $GLOBALS['_wp_did_action'] );
+		}
+
+		$this->assertSame( array( 'hp_warranty' ), TMDO_Entity_Registry::get_group_keys( 'post', 'hp_listing_attrs' ) );
+		$this->assertSame( array(), TMDO_Entity_Registry::get_collisions() );
+	}
+
 	public function test_shared_keys_keep_their_current_owner(): void {
 		foreach ( self::SHARED_KEY_OWNERS as $key => $group ) {
 			$this->assertSame( $group, TMDO_Entity_Registry::get_field( 'post', $key )['group'], $key );