Switch reads of AnnotationModeration to Annotation.moderation_status #9481
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marcospri
commented
Apr 15, 2025
| @@ -4,12 +4,15 @@ | |||
| from h.db.mixins import Timestamps | |||
|
|
|||
|
|
|||
| class AnnotationModeration(Base, Timestamps): | |||
| class _LegacyAnnotationModeration(Base, Timestamps): | |||
There was a problem hiding this comment.
After a while we can remove the model and table.
| @@ -27,12 +30,12 @@ class AnnotationModeration(Base, Timestamps): | |||
| annotation = sa.orm.relationship( | |||
| "Annotation", | |||
| backref=sa.orm.backref( | |||
| "moderation", | |||
| "_moderation", | |||
There was a problem hiding this comment.
Renaming the model and references helps identifying current usages and not introducing new ones.
| @@ -149,7 +149,6 @@ def _eager_loaded_annotations(session): | |||
| models.Document.document_uris | |||
| ), | |||
| subqueryload(models.Annotation.document).subqueryload(models.Document.meta), | |||
| subqueryload(models.Annotation.moderation), | |||
There was a problem hiding this comment.
No need for a bunch of these, we can now derive this directly from Annotation.
| @@ -168,7 +168,6 @@ def update_annotation( | |||
| def hide(self, annotation: Annotation, user: User): | |||
| """Hides an annotation marking it it as "moderated".""" | |||
| if not annotation.is_hidden: | |||
| annotation.moderation = AnnotationModeration() | |||
There was a problem hiding this comment.
Stop writing to the old table.
| @@ -270,7 +259,7 @@ def upsert_annotation_slim(self, annotation): | |||
| # Fields of AnnotationSlim | |||
| "group_id": annotation.group.id, | |||
| "user_id": user_id, | |||
| "moderated": moderated, | |||
| "moderated": annotation.is_hidden, | |||
There was a problem hiding this comment.
AnnotationSlim doesn't need more details that the existing boolean.
seanh
approved these changes
Apr 22, 2025
marcospri
force-pushed
the
moderation-backfill
branch
from
31f7046 to
4f9688a
Compare
After: 1/ Adding the new column 2/ Concurrently writing both the old table and the new column 3/ Backfilling the new column based on AnnotationModeration we are ready ot switch the reads over the new column. This commit doesn't introduce new functionality or any behavior changes.
marcospri
force-pushed
the
moderation-reads
branch
from
83c174d to
bb129a1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After:
1/ Adding the new column
2/ Concurrently writing both the old table and the new column 3/ Backfilling the new column based on AnnotationModeration
we are ready to switch the reads over the new column.
This commit doesn't introduce new functionality or any behavior changes.
Testing