From 7927c979b42945c709daeaaed766725d616d8001 Mon Sep 17 00:00:00 2001
From: morningman <yunyou@selectdb.com>
Date: Fri, 6 Jun 2025 10:37:24 +0800
Subject: [PATCH 1/2] branch-2.1: make sure init the jdbc client before using
 it

---
 .../org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
index b562a0329fb3dc..289b4bec9374db 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
@@ -156,6 +156,7 @@ protected Map<String, String> processCompatibleProperties(Map<String, String> pr
     }
 
     public String getDatabaseTypeName() {
+        makeSureInitialized();
         return jdbcClient.getDbType();
     }
 
@@ -256,6 +257,7 @@ public void gsonPostProcess() throws IOException {
 
     @Override
     public List<String> listDatabaseNames() {
+        makeSureInitialized();
         return jdbcClient.getDatabaseNameList();
     }
 

From 8d3064af461d33869c0fa7ddf99a8eceac229133 Mon Sep 17 00:00:00 2001
From: "Mingyu Chen (Rayner)" <yunyou@selectdb.com>
Date: Thu, 19 Jun 2025 15:44:16 +0800
Subject: [PATCH 2/2] 1

---
 .../org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
index 289b4bec9374db..bbe43ce1feef70 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
@@ -257,7 +257,6 @@ public void gsonPostProcess() throws IOException {
 
     @Override
     public List<String> listDatabaseNames() {
-        makeSureInitialized();
         return jdbcClient.getDatabaseNameList();
     }