mixermt commented on PR #5898:
URL: 
https://github.com/apache/datafusion-comet/pull/5898#issuecomment-6718423470

   @andygrove Conflicts resolved by merging main.
   
   **Resolution**
   - `pom.xml`: took main's removal of the `spark-3.4` profile (#7521). The 
per-profile `hadoop.version` this PR adds now covers 3.5 through 4.2.
   - `CometIcebergNativeSuite`: imports only. Kept the Parquet imports from 
#7359 and dropped `SparkException`, used only by the test this PR rewrote.
   - `CometIcebergHdfsSuite`: its Scaladoc no longer lists the 3.4 profile 
(separate commit).
   
   **Verified** on the merged tree, native library rebuilt, Spark 4.1 profile:
   
   | Suite | Passed | Scope |
   | --- | --- | --- |
   | `CometIcebergNativeSuite` | 138 | Full suite, including #7359's 
omitted-nested-field test and the DPP test #7424 updated, run against this PR's 
iceberg-rust pin. 2 canceled by existing version guards. |
   | `CometIcebergHdfsSuite` | 8 | `MiniDFSCluster` end to end: HA failover, 
encryption zone, permissions, position deletes. |
   | `CometIcebergNativeScanSuite` | 30 | NameNode declarations and the 
encryption-zone probe. |
   | `CometScanSchemeFallbackSuite` | 37 | Planner gates, including 
`icebergNative.hdfs.enabled`. |
   
   Also clean: scalastyle, spotless, `dev/ci/check-ci-config.py`, and the 
strict Spark 3.5 compile.
   


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