dwsmith1983 commented on PR #6116: URL: https://github.com/apache/datafusion-comet/pull/6116#issuecomment-5835216012
> just wondering would #5654 cause conflicts in this PR? One small one. Both touch `error.rs`, `parquet_support.rs`, `schema_adapter.rs` and `ParquetReadSuite`, and a trial merge in either order conflicts only in one helper at the top of `schema_adapter.rs`. This PR renames `schema_has_field_ids` to `any_root_field_has_id` and documents it as root only on purpose. #5654 drops `parse_field_id` in favour of the shared `field_id` from `parquet_support.rs`. The resolution keeps this PR's name and doc with #5654's `field_id` call. Everything else merges cleanly. Whichever lands second takes that one hunk when I sync it with main. -- 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]
