airborne12 opened a new pull request, #68636: URL: https://github.com/apache/doris/pull/68636
### What problem does this PR solve? Issue Number: None Related PR: https://github.com/apache/doris/pull/57006 Problem Summary: During schema change, an indexed column may have a shadow prefix in the working schema. `Index.getColumnUniqueIds()` previously compared that temporary name with the original index column name, so the index column ID could be omitted from the new tablet metadata. This PR separately backports the master fix to `branch-4.2` and adds a focused FE test. It does not include the SNII or gram-index backports. Source commit: `5f0a8c68ded9933b1ea7df709cdf1322bad48dea` (#57006). Backport commits: `8fde58aa539` (cherry-pick with `-x`) and `197b6e46c9b` (test). | Source PR hunk | Result on `branch-4.2` | | --- | --- | | `fe/fe-core/src/main/java/org/apache/doris/catalog/Index.java` `@@ -283,7 +283,9` | Ported: compare the original index column name with `Column.removeNamePrefix(column.getName())`, preserving case-insensitive matching. | `git range-diff` maps the source commit to `8fde58aa539`; the source code change is unchanged. The picked commit adds the `-x` provenance line, and the separate test commit has no source PR counterpart. Validation: - `./build.sh --fe`: passed; Checkstyle reported zero violations. - `./run-fe-ut.sh --run org.apache.doris.catalog.IndexTest`: 2 tests passed, including the new shadow-column case. - `test_index_ddl_fault_injection` on an isolated cloud cluster: 1 suite passed, 0 failed. The FE was built from this PR; the BE came from a local branch-4.2 SNII/gram backport build. The isolated BE had debug points enabled, as required by this existing suite. - Full PR English check against `origin/branch-4.2`: passed with no exceptions. - Full merged-tree FE Checkstyle preflight: passed. ### Release note None ### Check List (For Author) - Test - [x] Regression test - [x] Unit Test - [ ] Manual test - [ ] No need to test or manual test - Behavior changed: - [ ] No. - [x] Yes. Index column IDs are retained when schema change uses shadow column names; no protocol or on-disk format changes. - Does this need documentation? - [x] No. - [ ] Yes. ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
