升级paimon 1.2.0

Author: macdoor

fe/fe-core/src/main/java/com/starrocks/connector/paimon/PaimonMetadata.java

@@ -49,6 +49,7 @@
 import com.starrocks.sql.optimizer.statistics.Statistics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.paimon.Snapshot;
 import org.apache.paimon.catalog.CachingCatalog;
 import org.apache.paimon.catalog.Catalog;
 import org.apache.paimon.catalog.Identifier;
@@ -276,10 +277,11 @@ public boolean tableExists(ConnectContext context, String dbName, String tableNa
     public List<RemoteFileInfo> getRemoteFiles(Table table, GetRemoteFilesParams params) {
         RemoteFileInfo remoteFileInfo = new RemoteFileInfo();
         PaimonTable paimonTable = (PaimonTable) table;
+        Optional<Snapshot> latestSnapshotOptional = paimonTable.getNativeTable().latestSnapshot();
         long latestSnapshotId = -1L;
         try {
-            if (paimonTable.getNativeTable().latestSnapshotId().isPresent()) {
-                latestSnapshotId = paimonTable.getNativeTable().latestSnapshotId().getAsLong();
+            if (latestSnapshotOptional.isPresent()) {
+                latestSnapshotId = latestSnapshotOptional.get().id();
             }
         } catch (Exception e) {
             // System table does not have snapshotId, ignore it.
@@ -300,7 +302,7 @@ public List<RemoteFileInfo> getRemoteFiles(Table table, GetRemoteFilesParams par
             }
             InnerTableScan scan = (InnerTableScan) readBuilder.newScan();
             PaimonMetricRegistry paimonMetricRegistry = new PaimonMetricRegistry();
-            List<Split> splits = scan.withMetricsRegistry(paimonMetricRegistry).plan().splits();
+            List<Split> splits = scan.withMetricRegistry(paimonMetricRegistry).plan().splits();
             traceScanMetrics(paimonMetricRegistry, splits, table.getCatalogTableName(), predicates);
 
             PaimonSplitsInfo paimonSplitsInfo = new PaimonSplitsInfo(predicates, splits);

fe/fe-core/src/main/java/com/starrocks/connector/paimon/PaimonMetricRegistry.java

@@ -21,11 +21,11 @@
 
 import java.util.Map;
 
-public class PaimonMetricRegistry extends MetricRegistry {
+public class PaimonMetricRegistry implements MetricRegistry {
     private MetricGroup metricGroup;
 
     @Override
-    protected MetricGroup createMetricGroup(String groupName, Map<String, String> variables) {
+    public MetricGroup createMetricGroup(String groupName, Map<String, String> variables) {
         MetricGroup metricGroup = new MetricGroupImpl(groupName, variables);
         this.metricGroup = metricGroup;
         return metricGroup;

fe/fe-core/src/test/java/com/starrocks/connector/paimon/PaimonMetadataTest.java

@@ -56,6 +56,7 @@
 import mockit.MockUp;
 import mockit.Mocked;
 import org.apache.paimon.CoreOptions;
+import org.apache.paimon.Snapshot;
 import org.apache.paimon.catalog.Catalog;
 import org.apache.paimon.catalog.CatalogContext;
 import org.apache.paimon.catalog.CatalogFactory;
@@ -241,7 +242,8 @@ public void testGetSystemTable(@Mocked ManifestsTable paimonSystemTable,
             {
                 paimonNativeCatalog.getTable((Identifier) any);
                 result = paimonSystemTable;
-                paimonSystemTable.latestSnapshotId();
+                Optional<Snapshot> latestSnapshotOptional = paimonSystemTable.latestSnapshot();
+                latestSnapshotOptional.get().id();
                 result = new Exception("Readonly Table tbl1$manifests does not support currentSnapshot.");
                 paimonSystemTable.newReadBuilder();
                 result = readBuilder;
@@ -267,9 +269,9 @@ public void testListPartitionNames(@Mocked FileStoreTable mockPaimonTable)
                 ));
         Identifier tblIdentifier = new Identifier("db1", "tbl1");
         org.apache.paimon.partition.Partition partition1 = new Partition(Map.of("year", "2020", "month", "1"),
-                100L, 1L, 1L, 1741327322000L);
+                100L, 1L, 1L, 1741327322000L, false);
         org.apache.paimon.partition.Partition partition2 = new Partition(Map.of("year", "2020", "month", "2"),
-                100L, 1L, 1L, 1741327322000L);
+                100L, 1L, 1L, 1741327322000L, false);
 
         new Expectations() {
             {

fe/pom.xml

@@ -68,7 +68,7 @@ under the License.
         <dnsjava.version>3.6.3</dnsjava.version>
         <nimbusds.version>9.37.2</nimbusds.version>
         <protobuf-java.version>3.25.5</protobuf-java.version>
-        <paimon.version>1.0.1</paimon.version>
+        <paimon.version>1.2.0</paimon.version>
         <delta-kernel.version>4.0.0rc1</delta-kernel.version>
         <iceberg.version>1.9.0</iceberg.version>
         <staros.version>3.5-rc3</staros.version>