xylaaaaa commented on issue #69884: URL: https://github.com/apache/doris/issues/69884#issuecomment-6570063262
CI investigation for PR #69904, head `f0a229f7b9`: - [COMPILE 1088348](http://43.132.222.7:8111/viewLog.html?buildId=1088348), [FE UT 1088337](http://43.132.222.7:8111/viewLog.html?buildId=1088337), [Cloud UT 1088339](http://43.132.222.7:8111/viewLog.html?buildId=1088339), and [BE UT 1088338](http://43.132.222.7:8111/viewLog.html?buildId=1088338) all stop at the same Git merge conflict. Compilation and tests have not started in these builds. - All four conflict in `file_scan_operator.cpp`, `file_scanner_v2.cpp`, `PluginDrivenScanNode.java`, and `PlanNodes.thrift` when merging with master `5af2df3231`. No Cloud-specific test failure was reported. - Integration is in progress: retain master's unified V2 scanner and SplitProducer lifecycle, migrate Delta to the current `ConnectorScanRequest` streaming API, and update dispatch/lifecycle tests. Delta's optional Thrift field 16 remains free across master and maintained release branches. - Local FE/BE rebuilds and focused tests are running; CI is not yet passing. Evidence and the local tasklist are updated under `docs/delta-m1-preflight/ci-2026-11-02/`. The four remaining M1 acceptance gates remain open. This comment will be updated with the fix commit and validation results. -- 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]
