feat(2meet-data-optimizer): route meta orderby including the HivePress sort clause
- Sort shape (relation OR of NOT EXISTS + EXISTS on one key, named in orderby): drop it from meta_query, LEFT JOIN the flat table and order by its column, ties by ID - Named routed clause as the sole orderby, and meta_key + meta_value_num (meta_value on string columns) with IS NOT NULL; stay native when the column would not order like CAST(meta_value AS type), orderby has several keys, or meta_value filters - Verify: tests/live/run.php router (11/11); fe.sh price__asc / hourly_rate__desc / rating__desc ids == native - PR: PR-062
This commit is contained in:
@@ -60,6 +60,9 @@ class TMDO_Post_Query_Router {
|
||||
/** Query var holding the status / date copy route, when one applies. */
|
||||
private const COPY_VAR = 'wpdo_post_copy_route';
|
||||
|
||||
/** Query var holding the flat column a routed meta orderby sorts on. */
|
||||
private const SORT_VAR = 'wpdo_post_sort';
|
||||
|
||||
/** Query var holding the COUNT for found_posts_query. */
|
||||
private const COUNT_VAR = 'wpdo_post_count_sql';
|
||||
|
||||
@@ -118,18 +121,41 @@ class TMDO_Post_Query_Router {
|
||||
$pt = (string) reset( $post_types );
|
||||
|
||||
$raw_meta_query = (array) $query->get( 'meta_query' );
|
||||
if ( empty( $raw_meta_query ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
// All or nothing: routed clauses are ANDed into the WHERE, so the
|
||||
// query is routed only when every registered clause can be, and
|
||||
// the remaining (unregistered) clauses are ANDed too.
|
||||
$relation = strtoupper( (string) ( $raw_meta_query['relation'] ?? 'AND' ) );
|
||||
$orderby = $query->get( 'orderby' );
|
||||
$named = is_array( $orderby ) ? array_keys( $orderby ) : preg_split( '/[\s,]+/', (string) $orderby );
|
||||
$named = is_array( $orderby ) ? array_keys( $orderby ) : preg_split( '/[\s,]+/', trim( (string) $orderby ) );
|
||||
$sort_name = 1 === count( $named ) ? (string) reset( $named ) : '';
|
||||
$direction = 'ASC' === strtoupper( (string) ( is_array( $orderby ) ? reset( $orderby ) : $query->get( 'order' ) ) ) ? 'ASC' : 'DESC';
|
||||
$routed = array(); // Keyed by post_type.
|
||||
$remaining = array();
|
||||
$sort = array();
|
||||
|
||||
// meta_key + orderby meta_value(_num): native INNER JOINs the key
|
||||
// (EXISTS) and orders by meta_value+0 (NUMERIC) or meta_value.
|
||||
$meta_key = $query->get( 'meta_key' );
|
||||
$take_key = is_string( $meta_key ) && in_array( $sort_name, array( 'meta_value', 'meta_value_num' ), true )
|
||||
&& null !== self::field_for( array( 'key' => $meta_key ), $pt );
|
||||
if ( $take_key ) {
|
||||
$field = self::field_for( array( 'key' => $meta_key ), $pt );
|
||||
$type = 'meta_value_num' === $sort_name ? 'NUMERIC' : (string) $query->get( 'meta_type' );
|
||||
$route = self::route_clause(
|
||||
array(
|
||||
'key' => $meta_key,
|
||||
'compare' => 'EXISTS',
|
||||
'type' => $type,
|
||||
),
|
||||
$field
|
||||
);
|
||||
if ( ! $route || ! self::sortable( $route, $field ) || '' !== $query->get( 'meta_value' ) || '' !== $query->get( 'meta_compare' ) ) {
|
||||
return;
|
||||
}
|
||||
$routed[ $pt ][] = $route;
|
||||
$sort = self::sort_for( $pt, $route, $direction );
|
||||
}
|
||||
|
||||
foreach ( $raw_meta_query as $k => $clause ) {
|
||||
if ( 'relation' === $k || ! is_array( $clause ) ) {
|
||||
@@ -137,6 +163,17 @@ class TMDO_Post_Query_Router {
|
||||
continue;
|
||||
}
|
||||
if ( ! isset( $clause['key'] ) ) {
|
||||
// Sort shape: matches every post, only orders by the key.
|
||||
$name = 'AND' === $relation ? self::sort_shape( $clause ) : '';
|
||||
$field = '' !== $name && $name === $sort_name ? self::field_for( $clause[ $name ], $pt ) : null;
|
||||
if ( $field ) {
|
||||
$route = self::route_clause( array( 'compare' => 'EXISTS' ) + $clause[ $name ], $field );
|
||||
if ( ! $route || ! self::sortable( $route, $field ) ) {
|
||||
return;
|
||||
}
|
||||
$sort = self::sort_for( $pt, $route, $direction );
|
||||
continue;
|
||||
}
|
||||
if ( self::has_registered_key( $clause, $pt ) ) {
|
||||
return; // Nested group.
|
||||
}
|
||||
@@ -149,17 +186,30 @@ class TMDO_Post_Query_Router {
|
||||
$remaining[ $k ] = $clause;
|
||||
continue;
|
||||
}
|
||||
// Unroutable, under OR, or named by orderby (the name would be lost).
|
||||
$route = self::route_clause( $clause, $field );
|
||||
if ( ! $route || 'AND' !== $relation || ( is_string( $k ) && in_array( $k, $named, true ) ) ) {
|
||||
if ( ! $route || 'AND' !== $relation ) {
|
||||
return;
|
||||
}
|
||||
// Named by orderby: only as the sole ordering, on a column that
|
||||
// orders like native (otherwise the name would be lost).
|
||||
if ( is_string( $k ) && in_array( $k, $named, true ) ) {
|
||||
if ( $k !== $sort_name || ! self::sortable( $route, $field ) ) {
|
||||
return;
|
||||
}
|
||||
$sort = self::sort_for( $pt, $route, $direction );
|
||||
}
|
||||
$routed[ $pt ][] = $route;
|
||||
}
|
||||
|
||||
if ( empty( $routed ) ) {
|
||||
if ( empty( $routed ) && empty( $sort ) ) {
|
||||
return;
|
||||
}
|
||||
if ( $take_key ) {
|
||||
$query->set( 'meta_key', '' );
|
||||
}
|
||||
if ( $sort ) {
|
||||
$query->set( self::SORT_VAR, $sort );
|
||||
}
|
||||
|
||||
// Preserve relation if surviving clauses still have it.
|
||||
if ( isset( $raw_meta_query['relation'] ) && ! isset( $remaining['relation'] ) ) {
|
||||
@@ -185,27 +235,32 @@ class TMDO_Post_Query_Router {
|
||||
public function posts_join( ?string $join, \WP_Query $query ): string {
|
||||
$join = (string) ( $join ?? '' );
|
||||
$routed = $query->get( self::QUERY_VAR );
|
||||
if ( empty( $routed ) || ! is_array( $routed ) ) {
|
||||
return $join;
|
||||
$sort = $query->get( self::SORT_VAR );
|
||||
$pairs = array(); // Pairs of post type and group.
|
||||
foreach ( is_array( $routed ) ? $routed : array() as $post_type => $clauses ) {
|
||||
foreach ( array_column( $clauses, 'group' ) as $group ) {
|
||||
$pairs[] = array( $post_type, $group );
|
||||
}
|
||||
}
|
||||
if ( ! empty( $sort ) ) {
|
||||
$pairs[] = array( $sort['post_type'], $sort['group'] );
|
||||
}
|
||||
|
||||
global $wpdb;
|
||||
|
||||
foreach ( $routed as $post_type => $clauses ) {
|
||||
foreach ( array_unique( array_column( $clauses, 'group' ) ) as $group ) {
|
||||
$table = $wpdb->prefix . 'wpdo_post_' . sanitize_key( $group );
|
||||
$alias = self::table_alias( $post_type, $group );
|
||||
foreach ( $pairs as list( $post_type, $group ) ) {
|
||||
$table = $wpdb->prefix . 'wpdo_post_' . sanitize_key( $group );
|
||||
$alias = self::table_alias( $post_type, $group );
|
||||
|
||||
// Don't double-join.
|
||||
if ( false !== strpos( $join, "`{$alias}`" ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// The copy route only applies to single-group searches.
|
||||
$type = self::copy_route_for( $query, $post_type ) ? 'INNER' : 'LEFT';
|
||||
$join .= " {$type} JOIN `{$table}` AS `{$alias}` "
|
||||
. "ON (`{$wpdb->posts}`.`ID` = `{$alias}`.`post_id`)";
|
||||
// Don't double-join.
|
||||
if ( false !== strpos( $join, "`{$alias}`" ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// The copy route only applies to single-group searches.
|
||||
$type = self::copy_route_for( $query, $post_type ) ? 'INNER' : 'LEFT';
|
||||
$join .= " {$type} JOIN `{$table}` AS `{$alias}` "
|
||||
. "ON (`{$wpdb->posts}`.`ID` = `{$alias}`.`post_id`)";
|
||||
}
|
||||
|
||||
return $join;
|
||||
@@ -248,7 +303,8 @@ class TMDO_Post_Query_Router {
|
||||
}
|
||||
|
||||
/**
|
||||
* Order by the flat table's post_date copy when the copy route applies.
|
||||
* Order by the routed meta orderby column (ties by ID), or by the flat
|
||||
* table's post_date copy when the copy route applies.
|
||||
*
|
||||
* @param string|null $orderby Current ORDER BY SQL.
|
||||
* @param \WP_Query $query Current WP_Query.
|
||||
@@ -256,7 +312,13 @@ class TMDO_Post_Query_Router {
|
||||
*/
|
||||
public function posts_orderby( ?string $orderby, \WP_Query $query ): string {
|
||||
$orderby = (string) ( $orderby ?? '' );
|
||||
$copy = $query->get( self::COPY_VAR );
|
||||
$sort = $query->get( self::SORT_VAR );
|
||||
if ( ! empty( $sort ) ) {
|
||||
global $wpdb;
|
||||
return '`' . self::table_alias( $sort['post_type'], $sort['group'] ) . '`.`' . esc_sql( $sort['column'] ) . '` '
|
||||
. $sort['order'] . ", `{$wpdb->posts}`.`ID` DESC";
|
||||
}
|
||||
$copy = $query->get( self::COPY_VAR );
|
||||
if ( empty( $copy ) ) {
|
||||
return $orderby;
|
||||
}
|
||||
@@ -272,7 +334,8 @@ class TMDO_Post_Query_Router {
|
||||
*/
|
||||
public function posts_request( ?string $request, \WP_Query $query ): string {
|
||||
$request = (string) ( $request ?? '' );
|
||||
if ( empty( $query->get( self::QUERY_VAR ) ) || false === strpos( $request, 'SQL_CALC_FOUND_ROWS' ) ) {
|
||||
$routed = ! empty( $query->get( self::QUERY_VAR ) ) || ! empty( $query->get( self::SORT_VAR ) );
|
||||
if ( ! $routed || false === strpos( $request, 'SQL_CALC_FOUND_ROWS' ) ) {
|
||||
return $request;
|
||||
}
|
||||
$request = preg_replace( '/\bSQL_CALC_FOUND_ROWS\s+/', '', $request, 1 );
|
||||
@@ -454,7 +517,7 @@ class TMDO_Post_Query_Router {
|
||||
return null;
|
||||
}
|
||||
|
||||
$numeric_type = 1 === preg_match( '/^(NUMERIC|SIGNED|UNSIGNED|DECIMAL)(\(\d+(,\s?\d+)?\))?$/', $type );
|
||||
$numeric_type = self::is_numeric_type( $type );
|
||||
if ( in_array( $compare, array( 'EXISTS', 'NOT EXISTS' ), true ) ) {
|
||||
$ok = in_array( $kind, array( 'text', 'textarea', 'enum', 'integer', 'decimal', 'boolean' ), true );
|
||||
} elseif ( in_array( $kind, array( 'text', 'textarea', 'enum' ), true ) ) {
|
||||
@@ -479,6 +542,80 @@ class TMDO_Post_Query_Router {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a meta query type casts to a number (NUMERIC, SIGNED, DECIMAL(p,s) …).
|
||||
*
|
||||
* @param string $type Upper-cased clause type.
|
||||
* @return bool
|
||||
*/
|
||||
private static function is_numeric_type( string $type ): bool {
|
||||
return 1 === preg_match( '/^(NUMERIC|SIGNED|UNSIGNED|DECIMAL)(\(\d+(,\s?\d+)?\))?$/', $type );
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether ordering by the flat column matches native ordering by
|
||||
* CAST(meta_value AS type): numbers by a numeric type, strings by CHAR.
|
||||
*
|
||||
* @param array{type:string} $route Routed clause.
|
||||
* @param array<string, mixed> $field Registered field.
|
||||
* @return bool
|
||||
*/
|
||||
private static function sortable( array $route, array $field ): bool {
|
||||
$kind = $field['type'] ?? 'text';
|
||||
if ( in_array( $kind, array( 'integer', 'decimal', 'boolean' ), true ) ) {
|
||||
return self::is_numeric_type( $route['type'] );
|
||||
}
|
||||
return in_array( $kind, array( 'text', 'textarea', 'enum' ), true ) && 'CHAR' === $route['type'];
|
||||
}
|
||||
|
||||
/**
|
||||
* The ordering a routed meta orderby resolves to.
|
||||
*
|
||||
* @param string $post_type Post type slug.
|
||||
* @param array{group:string, column:string} $route Routed clause.
|
||||
* @param string $direction ASC or DESC.
|
||||
* @return array{post_type:string, group:string, column:string, order:string}
|
||||
*/
|
||||
private static function sort_for( string $post_type, array $route, string $direction ): array {
|
||||
return array(
|
||||
'post_type' => $post_type,
|
||||
'group' => $route['group'],
|
||||
'column' => $route['column'],
|
||||
'order' => $direction,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The clause name of a "sort by a key, keep posts without it" group —
|
||||
* relation OR of exactly NOT EXISTS and EXISTS on one key and type, one
|
||||
* of them named (HivePress search sorting) — or '' for any other group.
|
||||
*
|
||||
* @param array<int|string, mixed> $group Nested meta query group.
|
||||
* @return string
|
||||
*/
|
||||
private static function sort_shape( array $group ): string {
|
||||
if ( 'OR' !== strtoupper( (string) ( $group['relation'] ?? '' ) ) ) {
|
||||
return '';
|
||||
}
|
||||
unset( $group['relation'] );
|
||||
if ( 2 !== count( $group ) ) {
|
||||
return '';
|
||||
}
|
||||
$name = '';
|
||||
$compares = array();
|
||||
foreach ( $group as $k => $clause ) {
|
||||
if ( ! is_array( $clause ) || ! is_string( $clause['key'] ?? null ) ) {
|
||||
return '';
|
||||
}
|
||||
$compares[] = strtoupper( (string) ( $clause['compare'] ?? '=' ) );
|
||||
$name = is_string( $k ) ? $k : $name;
|
||||
}
|
||||
list( $a, $b ) = array_values( $group );
|
||||
sort( $compares );
|
||||
$same = $a['key'] === $b['key'] && strtoupper( (string) ( $a['type'] ?? '' ) ) === strtoupper( (string) ( $b['type'] ?? '' ) );
|
||||
return array( 'EXISTS', 'NOT EXISTS' ) === $compares && $same ? $name : '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a deterministic JOIN alias for a (post_type, group) pair.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user