hello-stephen commented on PR #65882:
URL: https://github.com/apache/doris/pull/65882#issuecomment-5067367513

   [conflict-resolved-4336f7ec]
   
   Rebased this backport onto current `branch-4.1` 
(`192c2dc04873599c75b0c4e125d4b8f5a640b201`) and force-updated the PR head to 
`4336f7ecbf052f01885ff0f748f38274c58290ba`.
   
   Conflict resolution kept both valid branch developments:
   - retained the current branch snapshot/scan-semantics code and tests;
   - retained the system-table projection implementation and its tests;
   - kept the branch refactored name-mapping path and added only the `TypeUtil` 
import required by the backport.
   
   Validation:
   - Git conflict markers: none
   - `git diff --check`: passed
   - FE Maven checkstyle: 0 violations
   - target Groovy syntax compile: passed
   - suite discover/load: `test_iceberg_system_table_projection`, tags 
`p0,external,iceberg`
   - local targeted Maven compilation was blocked before `fe-core` by the local 
macOS JDK/toolchain error `NoSuchFieldError: JCTree$JCImport.qualid`; this is 
not a source assertion, so the fresh community buildall is required.


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

Reply via email to