From daa96d471242aac1b4f73269d822aaa003f619d5 Mon Sep 17 00:00:00 2001 From: morningman Date: Thu, 20 Feb 2025 19:14:13 +0800 Subject: [PATCH 1/3] branch-3.0: [fix](paimon) avoid get paimon table when replay --- .../apache/doris/datasource/paimon/PaimonExternalTable.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java index 20e2a606d88576..d234a4e081ea25 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java @@ -61,12 +61,11 @@ public class PaimonExternalTable extends ExternalTable implements MvccTable { private static final Logger LOG = LogManager.getLogger(PaimonExternalTable.class); - private final Table paimonTable; + private Table paimonTable; public PaimonExternalTable(long id, String name, String remoteName, PaimonExternalCatalog catalog, PaimonExternalDatabase db) { super(id, name, remoteName, catalog, db, TableType.PAIMON_EXTERNAL_TABLE); - this.paimonTable = catalog.getPaimonTable(dbName, name); } public String getPaimonCatalogType() { @@ -76,11 +75,13 @@ public String getPaimonCatalogType() { protected synchronized void makeSureInitialized() { super.makeSureInitialized(); if (!objectCreated) { + this.paimonTable = ((PaimonExternalCatalog) catalog).getPaimonTable(dbName, name); objectCreated = true; } } public Table getPaimonTable(Optional snapshot) { + makeSureInitialized(); return paimonTable.copy( Collections.singletonMap(CoreOptions.SCAN_VERSION.key(), String.valueOf(getOrFetchSnapshotCacheValue(snapshot).getSnapshot().getSnapshotId()))); From 65e6204c9464781fbb92b5a6600bed21df8a7cb9 Mon Sep 17 00:00:00 2001 From: morningman Date: Thu, 20 Feb 2025 19:53:28 +0800 Subject: [PATCH 2/3] 3.0.4-rc02 --- gensrc/script/gen_build_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh index 2f008423010126..58f2aa762a37a5 100755 --- a/gensrc/script/gen_build_version.sh +++ b/gensrc/script/gen_build_version.sh @@ -32,7 +32,7 @@ build_version_major=3 build_version_minor=0 build_version_patch=4 build_version_hotfix=0 -build_version_rc_version="rc01" +build_version_rc_version="rc02" build_version="${build_version_prefix}-${build_version_major}.${build_version_minor}.${build_version_patch}" if [[ ${build_version_hotfix} -gt 0 ]]; then From da52b309518c3a98d628150813b3c66ae73cbf42 Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Fri, 21 Feb 2025 15:21:20 +0800 Subject: [PATCH 3/3] Update gen_build_version.sh --- gensrc/script/gen_build_version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh index 58f2aa762a37a5..233e2d21430031 100755 --- a/gensrc/script/gen_build_version.sh +++ b/gensrc/script/gen_build_version.sh @@ -30,9 +30,9 @@ set -eo pipefail build_version_prefix="doris" build_version_major=3 build_version_minor=0 -build_version_patch=4 +build_version_patch=5 build_version_hotfix=0 -build_version_rc_version="rc02" +build_version_rc_version="rc01" build_version="${build_version_prefix}-${build_version_major}.${build_version_minor}.${build_version_patch}" if [[ ${build_version_hotfix} -gt 0 ]]; then