Optimized database requests when removing resources #8192
Conversation
|
Important Review skippedAuto incremental reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the WalkthroughThe updates primarily enhance the deletion process of related resources in the CVAT project, task, job, and segment models. New methods for cascading deletions and optimized annotation removals were added, ensuring efficient resource management. Additionally, changes in the database migration file modify foreign key relationships for better integrity and consistency. Changes
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (4)
- cvat/apps/dataset_manager/task.py (1 hunks)
- cvat/apps/engine/migrations/0082_alter_labeledimageattributeval_image_and_more.py (1 hunks)
- cvat/apps/engine/models.py (8 hunks)
- cvat/apps/engine/views.py (1 hunks)
Additional comments not posted (18)
cvat/apps/engine/migrations/0082_alter_labeledimageattributeval_image_and_more.py (6)
14-23: Field alteration forlabeledimageattributeval.imageis correct.The
imagefield now usesDO_NOTHINGon delete, which is appropriate for preventing cascading deletions.
24-33: Field alteration forlabeledshape.parentis correct.The
parentfield now usesDO_NOTHINGon delete and allows null values, which is appropriate for maintaining the hierarchical structure without cascading deletions.
34-43: Field alteration forlabeledshapeattributeval.shapeis correct.The
shapefield now usesDO_NOTHINGon delete, which is appropriate for preventing cascading deletions.
44-53: Field alteration forlabeledtrack.parentis correct.The
parentfield now usesDO_NOTHINGon delete and allows null values, which is appropriate for maintaining the hierarchical structure without cascading deletions.
54-63: Field alteration forlabeledtrackattributeval.trackis correct.The
trackfield now usesDO_NOTHINGon delete, which is appropriate for preventing cascading deletions.
64-73: Field alteration fortrackedshapeattributeval.shapeis correct.The
shapefield now usesDO_NOTHINGon delete, which is appropriate for preventing cascading deletions.cvat/apps/dataset_manager/task.py (1)
445-445: Optimized deletion process in_deletemethod is correct.The
_deletemethod now uses thedelete_related_resourcesmethod ofdb_job, which consolidates the deletion process for related resources.cvat/apps/engine/models.py (10)
347-347: Modification inProject.get_labelsmethod is correct.The method now returns all label sets, which is appropriate for the project's requirements.
366-373:Project.delete_related_resourcesmethod optimizes deletion process.The method efficiently deletes labels and attributes, preventing redundant deletions.
376-378: Modification inProject.deletemethod is correct.The method now calls
delete_related_resourcesbefore deletion, ensuring efficient resource management.
444-444: Modification inTask.get_labelsmethod is correct.The method now returns all label sets, which is appropriate for the task's requirements.
483-493:Task.delete_related_annotationsmethod optimizes deletion process.The method efficiently deletes related annotations, preventing redundant deletions.
494-503:Task.delete_related_resourcesmethod optimizes deletion process.The method efficiently deletes labels and attributes, preventing redundant deletions.
506-508: Modification inTask.deletemethod is correct.The method now calls
delete_related_resourcesbefore deletion, ensuring efficient resource management.
786-795:Job.delete_related_annotationsmethod optimizes deletion process.The method efficiently deletes related annotations, preventing redundant deletions.
796-798:Job.delete_related_resourcesmethod optimizes deletion process.The method efficiently deletes labels and attributes, preventing redundant deletions.
801-803: Modification inJob.deletemethod is correct.The method now calls
delete_related_resourcesbefore deletion, ensuring efficient resource management.cvat/apps/engine/views.py (1)
1749-1753: Ensure the transaction block covers all necessary operations.The transaction block ensures atomicity, but make sure all related operations are included within the block to maintain data integrity.
cvat/apps/engine/views.py
Outdated
| segment = instance.segment | ||
| super().perform_destroy(instance) | ||
| if segment: | ||
| segment.delete() |
There was a problem hiding this comment.
Optimize segment deletion logic.
The segment deletion logic can be optimized by checking the existence of the segment before entering the transaction block to avoid unnecessary transactions.
- with transaction.atomic():
- segment = instance.segment
- super().perform_destroy(instance)
- if segment:
- segment.delete()
+ segment = instance.segment
+ if segment:
+ with transaction.atomic():
+ super().perform_destroy(instance)
+ segment.delete()
+ else:
+ super().perform_destroy(instance)Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| segment = instance.segment | |
| super().perform_destroy(instance) | |
| if segment: | |
| segment.delete() | |
| segment = instance.segment | |
| if segment: | |
| with transaction.atomic(): | |
| super().perform_destroy(instance) | |
| segment.delete() | |
| else: | |
| super().perform_destroy(instance) |
bsekachev
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #8192 +/- ##
==========================================
Coverage ? 83.32%
==========================================
Files ? 388
Lines ? 41396
Branches ? 3856
==========================================
Hits ? 34493
Misses ? 6903
Partials ? 0
|
|
@Marishka17 @zhiltsov-max Any more comments? |
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
|
Motivation and context
How has this been tested?
Checklist
developbranch(cvat-canvas,
cvat-core,
cvat-data and
cvat-ui)
License
Feel free to contact the maintainers if that's a concern.
Summary by CodeRabbit
Bug Fixes
Performance Improvements
General Improvements