Skip to content

fix data branch edge cases#25471

Draft
gouhongshen wants to merge 1 commit into
matrixorigin:mainfrom
gouhongshen:bvt-data-branch-edge-coverage
Draft

fix data branch edge cases#25471
gouhongshen wants to merge 1 commit into
matrixorigin:mainfrom
gouhongshen:bvt-data-branch-edge-coverage

Conversation

@gouhongshen

@gouhongshen gouhongshen commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

What type of PR is this?

  • API-change
  • BUG
  • Improvement
  • Documentation
  • Feature
  • Test and CI
  • Code Refactoring

Which issue(s) this PR fixes:

issue #24924

What this PR does / why we need it:

This PR adds and fixes BVT coverage for data branch edge cases from #24924, then fixes the underlying failures found by those cases.

Root causes covered include unsafe clone SQL rewriting for string literals and quoted identifiers, unescaped internal SQL literals for apostrophe identifiers, missing data branch diff/merge/PICK support for decimal256/year/geometry/enum and other edge types, partitioned table change collection panics, unstable PICK validation errors, and explicit transaction rejection for DATA BRANCH DIFF/MERGE.

The changes also update branch_matrix_coverage and branch_unhappy_path expected results after manually checking that the generated results match the intended semantics. The invalid DATA BRANCH PICK src INTO dst grammar extension was removed; incomplete PICK syntax remains rejected by the parser.

Validation:

  • make build
  • git diff --check
  • no @bvt:issue / @skip tags in the three acceptance BVT files below
  • mo-tester branch_matrix_coverage: 99/99 passed, ignored:0
  • mo-tester branch_unhappy_path: 63/63 passed, ignored:0
  • mo-tester branch_edge_cases: 109/109 passed, ignored:0
  • targeted Go tests for frontend, databranchutils, container/types, parser tree/mysql, sql/plan, sql/compile, objectio/mergeutil, and disttae

@mergify mergify Bot added kind/bug Something isn't working kind/test-ci labels Jul 6, 2026
@matrix-meow matrix-meow added the size/XXL Denotes a PR that changes 2000+ lines label Jul 6, 2026
@gouhongshen gouhongshen force-pushed the bvt-data-branch-edge-coverage branch from a9ad0cb to cbce287 Compare July 6, 2026 06:50
@gouhongshen gouhongshen force-pushed the bvt-data-branch-edge-coverage branch from d60abf9 to 235d65c Compare July 6, 2026 06:51
@matrix-meow matrix-meow added size/L Denotes a PR that changes [500,999] lines and removed size/XXL Denotes a PR that changes 2000+ lines labels Jul 6, 2026
@gouhongshen gouhongshen force-pushed the bvt-data-branch-edge-coverage branch from dfa5b12 to 63021a8 Compare July 6, 2026 06:55
@gouhongshen gouhongshen force-pushed the bvt-data-branch-edge-coverage branch from 63021a8 to d32c632 Compare July 6, 2026 07:02
@gouhongshen gouhongshen changed the title [codex] fix data branch edge cases fix data branch edge cases Jul 6, 2026
@gouhongshen gouhongshen force-pushed the bvt-data-branch-edge-coverage branch from d32c632 to 94a1b8a Compare July 6, 2026 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Something isn't working kind/test-ci size/L Denotes a PR that changes [500,999] lines

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants