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

Fix source query caching #3516

Merged
merged 1 commit into from Dec 12, 2023
Merged

Fix source query caching #3516

merged 1 commit into from Dec 12, 2023

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Dec 12, 2023

Fixes

Follow up fix of change in #3300

Description

@dhruvkb has flagged that the condition for the sources stats aggregation ES query caching is incorrect and is always True. This means that we always query ES instead of using the cached value.
This PR removes the incorrect or sources to use cache when the sources list are empty in cache.

Testing Instructions

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Signed-off-by: Olga Bulat <obulat@gmail.com>
@obulat obulat added 🟥 priority: critical Must be addressed ASAP 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🧱 stack: api Related to the Django API labels Dec 12, 2023
@obulat obulat self-assigned this Dec 12, 2023
@obulat obulat requested a review from a team as a code owner December 12, 2023 03:57
Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

LGTM as is, but this looks like a good candidate for a unit test, considering we missed it in review before 🙂

Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

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

LGTM, but reiterating @sarayourfriend's request for a test. Not as highly required (because #3505 adds some) but good to have.

Additionally, this line https://github.com/WordPress/openverse/pull/3516/files#diff-8429482fb10e7f976ad2295c754632b960e3edc0dae9edfa29504cbabf24d967L598 yields a weird response where I believe a blank array would be more appropriate.

- buckets = [{"key": "none_found", "doc_count": 0}]
+ buckets = []

@obulat
Copy link
Contributor Author

obulat commented Dec 12, 2023

Additionally, this line https://github.com/WordPress/openverse/pull/3516/files#diff-8429482fb10e7f976ad2295c754632b960e3edc0dae9edfa29504cbabf24d967L598 yields a weird response where I believe a blank array would be more appropriate.

If we use a blank array, the next line in that file would raise an error.

@obulat obulat merged commit 7e87b67 into main Dec 12, 2023
68 checks passed
@obulat obulat deleted the fix/sources_cache branch December 12, 2023 14:58
@dhruvkb
Copy link
Member

dhruvkb commented Dec 12, 2023

If we use a blank array, the next line in that file would raise an error.

It doesn't.
image

Nevermind, it's merged now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟥 priority: critical Must be addressed ASAP 🧱 stack: api Related to the Django API
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants