Skip to content

Improve performance of wp_navigation lookup. #36891

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
spacedmonkey merged 3 commits into from
Nov 30, 2021
Merged

Improve performance of wp_navigation lookup. #36891

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e87b6c5
Use WP_Query
spacedmonkey Nov 25, 2021
e142755
Only published posts.
spacedmonkey Nov 26, 2021
5f70726
Fix lint error
spacedmonkey Nov 29, 2021
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
24 changes: 15 additions & 9 deletions packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,23 @@ function block_core_navigation_get_first_non_empty_navigation() {
// see:
// - https://github.com/WordPress/wordpress-develop/blob/ba943e113d3b31b121f77a2d30aebe14b047c69d/src/wp-includes/nav-menu.php#L613-L619.
// - https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters.
$navigation_posts = get_posts(
array(
'post_type' => 'wp_navigation',
'order' => 'ASC',
'orderby' => 'name',
'posts_per_page' => 1, // only the first post.
's' => '<!-- wp:', // look for block indicators to ensure we only include non-empty Navigations.
)
$parsed_args = array(
'post_type' => 'wp_navigation',
'no_found_rows' => true,
'order' => 'ASC',
'orderby' => 'name',
'post_status' => 'publish',
'posts_per_page' => 20, // Try the first 20 posts.
Copy link
Contributor

@adamziel adamziel Nov 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to filter by post_content != ''. Is there a need to fetch more than 1? Do we ever expect to see a non-empty wp_navigation post that has no blocks in it? CC @getdave @noisysocks

Copy link
Contributor

@getdave getdave Nov 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't expect it but I guess it could happen...

Copy link
Contributor

@getdave getdave Nov 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somewhat mitigated by https://github.com/WordPress/gutenberg/pull/36891/files#diff-90cb5b64c95087ded3c7bb160e38189c8499b0f14f61beb884c887452449fa12R159

);
return count( $navigation_posts ) ? $navigation_posts[0] : null;

$navigation_posts = new WP_Query( $parsed_args );
foreach ( $navigation_posts->posts as $navigation_post ) {
if ( has_blocks( $navigation_post ) ) {
return $navigation_post;
}
}

return null;
}

/**
Expand Down