Skip to content
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.

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

feat: Pre-populate version.content cache when getting version object #446

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

fsbraun
Copy link
Member

@fsbraun fsbraun commented Jan 27, 2025

Description

The checks framework triggers database hits when accessing a version.content object. This PR adds the content object to the version's field cache to avoid these unnecessary database hits.

The failing test against django-cms@develop-4 fails due to an import order issue for the core's cms.toolbar.toolbar.CMSToolbar. This prevents the core to use versioning's prefetching and is fixed by django-cms/django-cms#8120

Related resources

Checklist

  • I have opened this pull request against master
  • I have added or modified the tests when changing logic
  • I have followed the conventional commits guidelines to add meaningful information into the changelog
  • I have read the contribution guidelines and I have joined #workgroup-pr-review on
    Slack to find a “pr review buddy” who is going to review my pull request.

Summary by Sourcery

Enhancements:

  • Improve performance by reducing database hits when accessing version content.

Copy link

sourcery-ai bot commented Jan 27, 2025

Reviewer's Guide by Sourcery

This pull request pre-populates the version's field cache with the content object when retrieving a version, avoiding database hits when accessing the version's content.

Sequence diagram for optimized version content retrieval

sequenceDiagram
    participant Client
    participant Version
    participant Database

    Client->>Version: get_for_content(content_object)
    Version->>Database: Query version by content_object.pk
    Database-->>Version: Return version
    Note over Version: Cache content_object in version._state.fields_cache
    Note over Version: Cache version in content_object._version_cache
    Version-->>Client: Return version with cached content
Loading

Class diagram showing Version model caching changes

classDiagram
    class Version {
        -_state: ModelState
        +get_for_content(content_object)
        +convert_to_proxy()
        +content: ContentObject
    }

    class ModelState {
        -fields_cache: dict
    }

    class ContentObject {
        -_version_cache: Version
    }

    Version *-- ModelState
    Version -- ContentObject

    note for Version "Added caching of content object
in fields_cache to avoid DB hits"
Loading

File-Level Changes

Change Details Files
Pre-populate the version's field cache with the content object.
  • Added version._state.fields_cache['content'] = content_object to the get_for_content method.
djangocms_versioning/models.py
Preserve the field cache when converting a version to a proxy.
  • Store the field cache before deep copying the version object.
  • Restore the field cache after deep copying the version object.
djangocms_versioning/models.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @fsbraun - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

codecov bot commented Jan 27, 2025

Codecov Report

Attention: Patch coverage is 91.66667% with 2 lines in your changes missing coverage. Please review.

Project coverage is 89.77%. Comparing base (f68190c) to head (0417e3a).

Files with missing lines Patch % Lines
djangocms_versioning/cms_config.py 75.00% 0 Missing and 1 partial ⚠️
djangocms_versioning/cms_toolbars.py 91.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #446      +/-   ##
==========================================
- Coverage   90.63%   89.77%   -0.87%     
==========================================
  Files          72       72              
  Lines        2702     2718      +16     
  Branches      314      318       +4     
==========================================
- Hits         2449     2440       -9     
- Misses        179      201      +22     
- Partials       74       77       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fsbraun fsbraun requested a review from a team January 27, 2025 17:11
@@ -432,10 +433,30 @@
)


class VersioningBasicToolbar(BasicToolbar):
def add_language_menu(self):

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error as implicit returns always return None.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants