[fix](paimon) adapt FE for paimon 1.3.1 and iceberg 1.10.1#60876
[fix](paimon) adapt FE for paimon 1.3.1 and iceberg 1.10.1#60876xylaaaaa wants to merge 4 commits intoapache:masterfrom
Conversation
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
There was a problem hiding this comment.
Pull request overview
This PR updates Doris FE’s Paimon/Iceberg integration to match upstream dependency/API changes (Paimon 1.3.1 + Iceberg 1.10.1), including adapting the FE-side metrics registry wiring.
Changes:
- Bump FE-managed dependency versions for Iceberg and Paimon.
- Update Paimon scan code to use the renamed metrics-registration API.
- Refactor
PaimonMetricRegistryto match Paimon’s updatedMetricRegistrytype (now an interface).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
fe/pom.xml |
Updates Iceberg/Paimon versions and changes the hive-catalog-shade version property. |
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java |
Adjusts Paimon scan metrics registration call to the new API name. |
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/profile/PaimonMetricRegistry.java |
Updates registry implementation to implement Paimon’s MetricRegistry interface and exposes the required method. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| <properties> | ||
| <doris.hive.catalog.shade.version>3.1.0</doris.hive.catalog.shade.version> | ||
| <doris.hive.catalog.shade.version>3.1.0-PAIMON_JUNWEI_SNAPSHOT</doris.hive.catalog.shade.version> | ||
| <!-- iceberg 1.9.1 depends avro on 1.12 --> |
There was a problem hiding this comment.
This comment references Iceberg 1.9.1, but iceberg.version is now 1.10.1. Please update the comment to avoid confusion (or make it version-agnostic, e.g., ‘Iceberg depends on Avro 1.12.x’ if that’s the intended constraint).
| <!-- iceberg 1.9.1 depends avro on 1.12 --> | |
| <!-- Iceberg depends on Avro 1.12.x --> |
fe/pom.xml
Outdated
| </modules> | ||
| <properties> | ||
| <doris.hive.catalog.shade.version>3.1.0</doris.hive.catalog.shade.version> | ||
| <doris.hive.catalog.shade.version>3.1.0-PAIMON_JUNWEI_SNAPSHOT</doris.hive.catalog.shade.version> |
There was a problem hiding this comment.
The doris.hive.catalog.shade.version is set to a developer-specific snapshot (3.1.0-PAIMON_JUNWEI_SNAPSHOT). Unless this artifact/version is published to the configured Maven repositories, this will make the FE build non-reproducible and likely fail for other developers/CI. Please switch to a released/shared version (or add the proper repository and use a team-standard version naming).
| <doris.hive.catalog.shade.version>3.1.0-PAIMON_JUNWEI_SNAPSHOT</doris.hive.catalog.shade.version> | |
| <doris.hive.catalog.shade.version>3.1.0</doris.hive.catalog.shade.version> |
|
run buildall |
TPC-H: Total hot run time: 28582 ms |
TPC-DS: Total hot run time: 183329 ms |
|
run buildall |
Summary
doris.hive.catalog.shade.versionto3.1.0-PAIMON_JUNWEI_SNAPSHOTiceberg.versionto1.10.1paimon.versionto1.3.1MetricRegistryis now an interface (useimplements)withMetricsRegistryrenamed towithMetricRegistryVerification
cd fe && /mnt/disk2/yunyou/chenjunwei/doris_tools/apache-maven-3.9.9/bin/mvn -DskipTests -pl fe-core -am compile