From f856d06f25441e2e0287f0a138a04082f759a676 Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Fri, 29 Mar 2024 11:26:26 +0800
Subject: [PATCH] [opt](iceberg) no need to check the name format of iceberg's
 database #32977 (#32979)

bp #32977

Also fix some gson serde issue like:
```
XXX declares multiple JSON fields named runnable.
```
---
 .../apache/doris/datasource/InternalCatalog.java   |  2 +-
 .../datasource/iceberg/IcebergExternalCatalog.java | 14 +-------------
 .../doris/external/elasticsearch/EsRepository.java |  4 ++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index 3a7b1a55a11b99..538d34ca2921c0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -210,7 +210,7 @@ public class InternalCatalog implements CatalogIf<Database> {
     @Getter
     private transient EsRepository esRepository = new EsRepository();
     @Getter
-    private IcebergTableCreationRecordMgr icebergTableCreationRecordMgr = new IcebergTableCreationRecordMgr();
+    private transient IcebergTableCreationRecordMgr icebergTableCreationRecordMgr = new IcebergTableCreationRecordMgr();
 
     public InternalCatalog() {
         // create internal databases
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
index c8ff468ab29d2b..5ab22cf361a2e2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
@@ -18,9 +18,6 @@
 package org.apache.doris.datasource.iceberg;
 
 import org.apache.doris.catalog.Env;
-import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.FeNameFormat;
-import org.apache.doris.common.util.Util;
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.InitCatalogLog;
 import org.apache.doris.datasource.SessionContext;
@@ -75,16 +72,7 @@ public String getIcebergCatalogType() {
 
     protected List<String> listDatabaseNames() {
         return nsCatalog.listNamespaces().stream()
-            .map(e -> {
-                String dbName = e.toString();
-                try {
-                    FeNameFormat.checkDbName(dbName);
-                } catch (AnalysisException ex) {
-                    Util.logAndThrowRuntimeException(LOG,
-                            String.format("Not a supported namespace name format: %s", dbName), ex);
-                }
-                return dbName;
-            })
+            .map(e -> e.toString())
             .collect(Collectors.toList());
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java
index aa591cfe6afaa9..7f7af1fe527432 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java
@@ -42,9 +42,9 @@ public class EsRepository extends MasterDaemon {
 
     private static final Logger LOG = LogManager.getLogger(EsRepository.class);
 
-    private Map<Long, EsTable> esTables;
+    private transient Map<Long, EsTable> esTables;
 
-    private Map<Long, EsRestClient> esClients;
+    private transient Map<Long, EsRestClient> esClients;
 
     public EsRepository() {
         super("es repository", Config.es_state_sync_interval_second * 1000);