Skip to content

fix: Fix page and block lock bug #238

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jun 5, 2025
Merged

fix: Fix page and block lock bug #238

merged 4 commits into from
Jun 5, 2025

Conversation

lu-yg
Copy link
Collaborator

@lu-yg lu-yg commented Jun 5, 2025 •
edited by coderabbitai bot
Loading

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

Background and solution

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

  • Bug Fixes

    • Improved handling of the occupier field in canvas lock operations to prevent potential null pointer issues.
    • Updated logic for updating the occupier field in pages and blocks to ensure correct assignment and data consistency.

  • Chores

    • Modified database indexes for better performance and query efficiency on the block group table.
    • Simplified conditions for updating the occupier field in database operations.

@coderabbitai coderabbitai
Copy link

coderabbitai bot commented Jun 5, 2025 •
edited
Loading

Walkthrough

This update modifies database indexing for the t_block_group table in both H2 and MySQL schemas, adjusting the columns included in a unique index. It also refines the logic in CanvasServiceImpl for handling occupier assignments and simplifies SQL update conditions for the occupier_by field in both block and page mappers.

Changes

Files/Paths Change Summary
app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql,
app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql		 Dropped and recreated the u_idx_block_group index on t_block_group with updated column set.
base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java Refined occupier assignment logic and null checks in lockCanvas method.
base/src/main/resources/mappers/BlockMapper.xml,
base/src/main/resources/mappers/PageMapper.xml		 Simplified SQL update condition for occupier_by field, removing explicit null checks.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant CanvasServiceImpl
    participant DB (Page/BlockMapper)
    User->>CanvasServiceImpl: lockCanvas(id, state, type)
    CanvasServiceImpl->>DB: Update occupier_by if not empty string
    DB-->>CanvasServiceImpl: Update result
    CanvasServiceImpl-->>User: Return updated CanvasDto with occupier info
Loading

Poem

In the warren of code, a hop and a bound,
Indexes shuffled, new columns are found.
Occupiers checked with a gentle twitch,
No more nulls to make us itch!
Mapper fields pruned with a whisker’s delight—
The database garden is tidy tonight.
🐇✨

✨ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 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.

coderabbitai[bot]
coderabbitai bot reviewed Jun 5, 2025
View reviewed changes
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between bd08afd and ec15e80.

📒 Files selected for processing (5)
  • app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql (1 hunks)
  • app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql (1 hunks)
  • base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java (3 hunks)
  • base/src/main/resources/mappers/BlockMapper.xml (1 hunks)
  • base/src/main/resources/mappers/PageMapper.xml (1 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java (1)
base/src/main/java/com/tinyengine/it/common/enums/Enums.java (1)
  • Enums (20-911)
🔇 Additional comments (7)
app/src/main/resources/sql/h2/update_tables_ddl_v1.0.0_2025_0527.sql (1)

1-2: Verify the index strategy aligns with query patterns.

The composite index on tenant_id, platform_id, name, app_id suggests optimization for multi-tenant scenarios. Ensure this column order matches your most common query patterns for optimal performance.

app/src/main/resources/sql/mysql/update_tables_ddl_v1.0.0_2025_0527.sql (1)

1-2: Good consistency with H2 schema.

The MySQL schema change matches the H2 version, maintaining cross-platform compatibility.

base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java (5)

17-17: Good addition for enum-based state handling.

Adding the Enums import enables type-safe state comparisons.

48-48: Improve occupier initialization clarity.

Explicitly initializing occupier to null improves code readability.

56-57: Excellent refactoring for conditional logic.

The value and occupierValue variables make the conditional assignment logic much clearer and eliminate code duplication.

60-62: Essential null safety improvement.

Adding the null check prevents NullPointerException when accessing nested occupier properties.

67-67: Verify mapper compatibility with null values.

The service logic correctly sets value to null for release operations and uses occupierValue consistently. However, this depends on the mappers correctly handling null values to clear the occupier_by field.

The mapper changes in BlockMapper.xml and PageMapper.xml currently prevent null values from being included in UPDATE statements, which will break the unlock functionality. Ensure the mapper fixes are applied before deploying this service change.

Also applies to: 70-70, 80-80, 83-83, 88-88

@hexqi hexqi merged commit b28105d into opentiny:develop Jun 5, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coderabbitai coderabbitai[bot] coderabbitai[bot] left review comments

@hexqi hexqi hexqi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lu-yg @hexqi