Flush delete operations to avoid conflicting queries #311

DropSnorz · 2025-04-27T15:05:04Z

Related to #306

coderabbitai · 2025-04-27T15:05:11Z

Walkthrough

The changes update several DAO interfaces to extend JpaRepository instead of CrudRepository, enhancing repository capabilities across multiple modules. Method annotations with @Modifying are refined by enabling automatic flushing and clearing of the persistence context. Additionally, explicit calls to flush() are inserted in various task classes after bulk deletion operations to ensure the persistence context is synchronized with the database before new entities are created. Some redundant public modifiers are removed from interface method declarations. No new features or changes to business logic are introduced.

Changes

File(s)	Change Summary
`.../auth/dao/UserAccountDAO.java`	Enhanced `@Modifying` annotation on `deleteInvalidAccounts()` to include `clearAutomatically=true, flushAutomatically=true`.
`.../core/dao/FileStatDAO.java` `.../core/dao/PluginDAO.java` `.../core/dao/PluginFootprintDAO.java` `.../core/dao/SymlinkDAO.java` `.../explore/dao/RemotePackageDAO.java` `.../explore/dao/RemoteSourceDAO.java`	Changed base interface from `CrudRepository` to `JpaRepository` for all listed DAOs, updating imports accordingly. For `FileStatDAO`, also enhanced `@Modifying` annotation on `deleteByPath()`. For `SymlinkDAO` and `RemoteSourceDAO`, removed redundant `public` modifiers from interface method declarations.
`.../core/tasks/FileSyncTask.java`	Added `fileStatDAO.flush()` after file statistics deletion in `extractFolderSize` method.
`.../core/tasks/PluginSyncTask.java`	Added explicit `flush()` calls on `pluginDAO` and `symlinkDAO` after deletions and before new entity creation.
`.../explore/tasks/SourceSyncTask.java`	Added `remotePackageDAO.flush()` after `deleteAll()` in `start()` method.

Sequence Diagram(s)

sequenceDiagram
    participant Task as Sync Task (FileSyncTask/PluginSyncTask/SourceSyncTask)
    participant DAO as DAO (e.g., FileStatDAO, PluginDAO, SymlinkDAO, RemotePackageDAO)
    participant DB as Database

    Task->>DAO: deleteAll() or deleteByPath()
    Task->>DAO: flush()
    DAO->>DB: Synchronize persistence context
    Task->>DAO: (re)create new entities / perform queries

sequenceDiagram
    participant Service as Service Layer
    participant DAO as DAO with @Modifying
    participant DB as Database

    Service->>DAO: Call method with @Modifying(clearAutomatically=true, flushAutomatically=true)
    DAO->>DB: Flush persistence context before query
    DAO->>DB: Execute modifying query
    DAO->>DB: Clear persistence context after query
    Service->>DAO: Continue with subsequent operations

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0a9c1f2 and d27b3f8.

📒 Files selected for processing (10)

owlplug-client/src/main/java/com/owlplug/auth/dao/UserAccountDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/dao/FileStatDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/dao/PluginDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/dao/PluginFootprintDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/dao/SymlinkDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/tasks/FileSyncTask.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/core/tasks/PluginSyncTask.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/explore/dao/RemoteSourceDAO.java (1 hunks)
owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (1)

GitHub Check: Codacy Static Code Analysis

🔇 Additional comments (14)

owlplug-client/src/main/java/com/owlplug/auth/dao/UserAccountDAO.java (1)

30-30: Improved persistence context management with enhanced @Modifying annotation.

Adding clearAutomatically=true and flushAutomatically=true to the @Modifying annotation is a good practice. This ensures that:

The persistence context is flushed before executing the delete query (preventing stale data issues)

The persistence context is cleared after execution (removing deleted entities from memory)

These changes align with the PR's objective of avoiding conflicting queries and maintaining database consistency.

owlplug-client/src/main/java/com/owlplug/core/dao/PluginFootprintDAO.java (1)

22-24: Good improvement: Upgrading from CrudRepository to JpaRepository

This change enhances the repository's capabilities by switching from CrudRepository to JpaRepository, giving access to additional JPA-specific methods like flush(), saveAndFlush(), and better transaction control. This aligns perfectly with the PR objective of flushing delete operations to avoid conflicting queries.

The upgrade maintains backward compatibility while providing more tools to manage the persistence context, which will help prevent potential database state inconsistencies during operations.

owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java (1)

28-28: Enhanced repository capabilities with JpaRepository

The change from CrudRepository to JpaRepository is a good upgrade. JpaRepository extends CrudRepository and provides additional functionality, including the critical flush() method that's needed to synchronize the persistence context with the database.

Also applies to: 32-32

owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java (1)

85-86: Effective database synchronization pattern

The explicit flush after deleteAll() ensures the persistence context is synchronized with the database before new entities are created, preventing potential conflicts between queries. The comment clearly explains the reasoning behind this change.

owlplug-client/src/main/java/com/owlplug/explore/dao/RemoteSourceDAO.java (2)

22-22: Enhanced repository capabilities with JpaRepository

The change from CrudRepository to JpaRepository is a good upgrade that provides additional functionality, including the ability to flush operations to the database.

Also applies to: 24-24

26-27: Clean interface definition

Removing the redundant public modifier from interface methods is a good practice, as interface methods are implicitly public. This improves code cleanliness without changing functionality.

owlplug-client/src/main/java/com/owlplug/core/tasks/FileSyncTask.java (1)

81-82: Good addition for ensuring persistence context synchronization.

Adding this explicit flush after the delete operation ensures that the persistence context is synchronized with the database before new entities are created. This prevents potential conflicts where deleted entities might still exist in the database when new ones are being created.

owlplug-client/src/main/java/com/owlplug/core/dao/FileStatDAO.java (3)

25-25: Appropriate repository upgrade.

Switching from CrudRepository to JpaRepository provides additional capabilities including explicit flush operations, which aligns with the PR objective of managing flush operations more effectively.

30-30: LGTM: Repository type updated correctly.

The interface now extends JpaRepository instead of CrudRepository, which is consistent with the import change.

37-37: Good enhancement to @Modifying annotation.

Adding clearAutomatically=true and flushAutomatically=true attributes to the @Modifying annotation ensures that:

The persistence context is automatically flushed before executing the delete query

The persistence context is cleared after execution, preventing stale data issues

This complements the explicit flush call added in FileSyncTask and addresses the core issue mentioned in the PR title about conflicting queries.

owlplug-client/src/main/java/com/owlplug/core/tasks/PluginSyncTask.java (1)

108-110: Good addition to prevent stale data issues

Adding explicit calls to flush() on both DAOs after deletion operations ensures the persistence context is properly synchronized with the database before proceeding with new entity creation. This addresses potential issues with stale or uncommitted state that could lead to conflicts during subsequent operations.

owlplug-client/src/main/java/com/owlplug/core/dao/PluginDAO.java (1)

27-31: Appropriate upgrade to JpaRepository

Changing from CrudRepository to JpaRepository is beneficial as it provides access to additional methods like flush(), saveAndFlush(), and batch operations. This change supports the explicit flush operations needed in PluginSyncTask while maintaining all existing functionality.

owlplug-client/src/main/java/com/owlplug/core/dao/SymlinkDAO.java (2)

22-25: Appropriate upgrade to JpaRepository

Changing from CrudRepository to JpaRepository provides access to additional methods like flush() and saveAndFlush(), which supports the explicit flush operations needed in PluginSyncTask.

27-27: Code cleanup: Removed redundant modifier

Good cleanup - removing the redundant public modifier since interface methods are implicitly public in Java. This makes the code more concise and follows standard Java coding conventions.

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

DropSnorz · 2025-04-27T15:05:25Z

@coderabbitai review

coderabbitai · 2025-04-27T15:05:29Z

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

fix(#306): flush delete operations to avoid conflicting queries

d27b3f8

DropSnorz self-assigned this Apr 27, 2025

DropSnorz mentioned this pull request Apr 27, 2025

Synchronization fails repeatedly on Mac #306

Closed

DropSnorz changed the base branch from master to dev April 27, 2025 17:11

DropSnorz merged commit 485b901 into dev Apr 27, 2025
3 checks passed

DropSnorz deleted the fix/persistence-conflicts branch September 27, 2025 15:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Flush delete operations to avoid conflicting queries #311

Flush delete operations to avoid conflicting queries #311

Uh oh!

DropSnorz commented Apr 27, 2025

Uh oh!

coderabbitai bot commented Apr 27, 2025 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

DropSnorz commented Apr 27, 2025

Uh oh!

coderabbitai bot commented Apr 27, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Flush delete operations to avoid conflicting queries #311

Flush delete operations to avoid conflicting queries #311

Uh oh!

Conversation

DropSnorz commented Apr 27, 2025

Uh oh!

coderabbitai bot commented Apr 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

DropSnorz commented Apr 27, 2025

Uh oh!

coderabbitai bot commented Apr 27, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

coderabbitai bot commented Apr 27, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)