From de9e22bcd5ca0ee8ed46d54d449c77027d8ca01b Mon Sep 17 00:00:00 2001
From: morningman <yunyou@selectdb.com>
Date: Fri, 6 Jun 2025 10:33:19 +0800
Subject: [PATCH 1/2] branch-3.0: 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 a8561a6ff8860b..d946a2412ef2eb 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
@@ -157,6 +157,7 @@ protected Map<String, String> processCompatibleProperties(Map<String, String> pr
     }
 
     public String getDatabaseTypeName() {
+        makeSureInitialized();
         return jdbcClient.getDbType();
     }
 
@@ -257,6 +258,7 @@ public void gsonPostProcess() throws IOException {
 
     @Override
     public List<String> listDatabaseNames() {
+        makeSureInitialized();
         return jdbcClient.getDatabaseNameList();
     }
 

From e8ce553db865fc27cde9bcda1c330d9a94a90d0c Mon Sep 17 00:00:00 2001
From: morningman <yunyou@selectdb.com>
Date: Thu, 19 Jun 2025 15:24:35 +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 d946a2412ef2eb..5094207490ce5e 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
@@ -258,7 +258,6 @@ public void gsonPostProcess() throws IOException {
 
     @Override
     public List<String> listDatabaseNames() {
-        makeSureInitialized();
         return jdbcClient.getDatabaseNameList();
     }