DanielLeens commented on PR #12284:
URL: https://github.com/apache/seatunnel/pull/12284#issuecomment-6538591410

   Merged `dev` (`3ac2d1cec6a`) into this branch with a plain merge commit (no 
rebase, no force push). New head: `bc0703539ed` (previous head `8894b7a22c`). 
Only formatting was run locally (module-scoped `spotless:apply`); `git diff 
origin/dev --name-status` lists only this PR's own 28 files and no deletions.
   
   Conflicts and resolution:
   - `docs/zh/transforms/sql.md`: kept both changelog lines (DDL event support 
from this PR, then struct query from `dev`), same order as the English doc.
   - `SQLTransform.java`: import-only conflict, kept both `java.util.Locale` 
(from `dev`) and `java.util.Set` (this PR).
   - `ZetaSQLEngine.java`: kept both fields side by side, this PR's 
`referencedInputColumns` and `dev`'s `directProjectionIndexes` (fast path for 
plain column projections). `init()` re-runs `parseSQL()` and then collects 
referenced columns, so each isolated engine used for schema-change translation 
recomputes the fast-path indexes for its own input row type.
   - `docs/en/transforms/sql.md` merged without conflict.
   
   Compile and tests are left to the fork CI run per the validation policy 
(queued at the time of writing, no result claimed): 
https://github.com/DanielLeens/seatunnel/actions/runs/41164781897
   


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

Reply via email to