branch-4.1: [fix](paimon) adapt FE for paimon 1.3.1 and iceberg 1.10.1 #60876#61391
Open
xylaaaaa wants to merge 1 commit intoapache:branch-4.1from
Open
branch-4.1: [fix](paimon) adapt FE for paimon 1.3.1 and iceberg 1.10.1 #60876#61391xylaaaaa wants to merge 1 commit intoapache:branch-4.1from
xylaaaaa wants to merge 1 commit intoapache:branch-4.1from
Conversation
) - bump `doris.hive.catalog.shade.version` to `3.1.0-PAIMON_JUNWEI_SNAPSHOT` - bump `iceberg.version` to `1.10.1` - bump `paimon.version` to `1.3.1` - adapt paimon metrics API changes in FE: - `MetricRegistry` is now an interface (use `implements`) - `withMetricsRegistry` renamed to `withMetricRegistry` - `cd fe && /mnt/disk2/yunyou/chenjunwei/doris_tools/apache-maven-3.9.9/bin/mvn -DskipTests -pl fe-core -am compile` - build result: SUCCESS --------- Co-authored-by: Calvin Kirs <kirs@apache.org>
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
There was a problem hiding this comment.
Pull request overview
Cherry-picks upstream FE adaptations needed to build/work with newer Paimon (1.3.1) and Iceberg (1.10.1) on branch-4.1, primarily via dependency bumps and small API updates.
Changes:
- Bump FE dependency versions (Iceberg 1.10.1, Paimon 1.3.1, plus related versions).
- Adapt FE Paimon metrics hookup to the updated Paimon scan API (
withMetricRegistry,MetricRegistryas interface). - Update unit tests for new library APIs and add a new Paimon scan test (currently problematic on this branch).
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
fe/pom.xml |
Updates dependency versions for Iceberg/Paimon/maxcompute and related properties. |
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java |
Adjusts to Paimon scan metrics API rename (withMetricRegistry). |
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/profile/PaimonMetricRegistry.java |
Updates implementation to match MetricRegistry becoming an interface. |
fe/fe-core/src/test/java/org/apache/doris/datasource/paimon/source/PaimonScanNodeTest.java |
Updates DataFileMeta construction for Paimon 1.3.1 and adds a new system-table JNI forcing test (does not compile as-is). |
fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergUtilsTest.java |
Updates manifest-file test scaffolding to avoid GenericManifestFile usage under newer Iceberg. |
💡 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.1</doris.hive.catalog.shade.version> | ||
| <!-- iceberg 1.9.1 depends avro on 1.12 --> |
| @Test | ||
| public void testPaimonDataSystemTableForceJniEvenWhenNativeSupported() throws UserException { | ||
| TupleDescriptor desc = new TupleDescriptor(new TupleId(3)); | ||
| PaimonScanNode paimonScanNode = new PaimonScanNode(new PlanNodeId(1), desc, false, sv); |
Comment on lines
+416
to
+420
| PaimonSource source = Mockito.mock(PaimonSource.class); | ||
| PaimonSysExternalTable binlogTable = Mockito.mock(PaimonSysExternalTable.class); | ||
| Mockito.when(binlogTable.getSysTableType()).thenReturn("binlog"); | ||
| Mockito.when(source.getExternalTable()).thenReturn(binlogTable); | ||
| spyPaimonScanNode.setSource(source); |
Comment on lines
+438
to
+439
| Assert.assertTrue(spyPaimonScanNode.shouldForceJniForSystemTable()); | ||
| List<org.apache.doris.spi.Split> splits = spyPaimonScanNode.getSplits(1); |
Comment on lines
+413
to
+415
| Mockito.doReturn(Collections.singletonList(dataSplit)).when(spyPaimonScanNode).getPaimonSplitFromAPI(); | ||
| mockNativeReader(spyPaimonScanNode); | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Conflict Resolution
fe/pom.xml: accepted PR versions (iceberg 1.10.1, maxcompute 0.53.2-public)PaimonScanNodeTest.java: accepted new test methodtestPaimonDataSystemTableForceJniEvenWhenNativeSupported