From 8f08e5f887cba4b9aab8145c7c9a99a15131041f Mon Sep 17 00:00:00 2001 From: "shuming.li" Date: Wed, 23 Oct 2024 10:16:49 +0800 Subject: [PATCH 1/2] fix cherry pick conflicts Signed-off-by: shuming.li --- .../src/main/java/com/starrocks/catalog/TabletStatMgr.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java b/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java index 129bcf0c64abc..7652f859ba727 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java @@ -116,6 +116,7 @@ protected void runAfterCatalogReady() { } // NOTE: calculate the row first with read lock, then update the stats with write lock + locker.lockTableWithIntensiveDbLock(db, table, LockType.READ); Map, Long> indexRowCountMap = Maps.newHashMap(); try { OlapTable olapTable = (OlapTable) table; From 11e999a75e79e27b7b49c4aa6796d6f5b2f5a2bf Mon Sep 17 00:00:00 2001 From: "shuming.li" Date: Wed, 23 Oct 2024 10:32:02 +0800 Subject: [PATCH 2/2] fix cherry pick conflicts Signed-off-by: shuming.li --- .../src/main/java/com/starrocks/catalog/TabletStatMgr.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java b/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java index 7652f859ba727..f93304170eec4 100644 --- a/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java +++ b/fe/fe-core/src/main/java/com/starrocks/catalog/TabletStatMgr.java @@ -116,7 +116,7 @@ protected void runAfterCatalogReady() { } // NOTE: calculate the row first with read lock, then update the stats with write lock - locker.lockTableWithIntensiveDbLock(db, table, LockType.READ); + locker.lockTableWithIntensiveDbLock(db, table.getId(), LockType.READ); Map, Long> indexRowCountMap = Maps.newHashMap(); try { OlapTable olapTable = (OlapTable) table;