(doris) 01/01: Revert "[improvement](jdbc catalog) Add catalog property to enable jdbc conne…"

[zykkk]

This is an automated email from the ASF dual-hosted git repository.

zykkk pushed a commit to branch revert-41992-enable_connection_pool
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 26c2c722beb6713bbe476276f683504ab676f499
Author: zy-kkk <zhongy...@gmail.com>
AuthorDate: Thu Oct 31 10:59:06 2024 +0800

    Revert "[improvement](jdbc catalog) Add catalog property to enable jdbc 
conne…"
    
    This reverts commit 5ede16abe01d7bd9ef3a4d85bc481c83025aeb71.
---
 be/src/runtime/descriptors.cpp                     |  10 +-
 be/src/runtime/descriptors.h                       |   2 -
 be/src/vec/exec/scan/new_jdbc_scanner.cpp          |   1 -
 be/src/vec/exec/vjdbc_connector.cpp                |   1 -
 be/src/vec/exec/vjdbc_connector.h                  |   1 -
 be/src/vec/sink/writer/vjdbc_table_writer.cpp      |   1 -
 .../org/apache/doris/jdbc/BaseJdbcExecutor.java    | 110 +++++++++-----------
 .../apache/doris/jdbc/JdbcDataSourceConfig.java    |  10 --
 .../org/apache/doris/catalog/JdbcResource.java     |   5 +-
 .../java/org/apache/doris/catalog/JdbcTable.java   |   8 --
 .../doris/datasource/jdbc/JdbcExternalCatalog.java |  32 +-----
 .../doris/datasource/jdbc/client/JdbcClient.java   |  64 ++----------
 .../datasource/jdbc/client/JdbcClientConfig.java   |  13 ---
 gensrc/thrift/Descriptors.thrift                   |   1 -
 gensrc/thrift/Types.thrift                         |   1 -
 .../test_clickhouse_jdbc_catalog_pool_test.out     | Bin 8815 -> 0 bytes
 .../test_mysql_jdbc_catalog_pool_test.out          |  85 ----------------
 .../test_oracle_jdbc_catalog_pool_test.out         | 109 --------------------
 .../test_pg_jdbc_catalog_pool_test.out             |  69 -------------
 .../test_sqlserver_jdbc_catalog_pool_test.out      |  81 ---------------
 .../test_clickhouse_jdbc_catalog_pool_test.groovy  |  71 -------------
 .../test_mysql_jdbc_catalog_pool_test.groovy       |  73 --------------
 .../test_oracle_jdbc_catalog_pool_test.groovy      | 111 ---------------------
 .../test_pg_jdbc_catalog_pool_test.groovy          |  71 -------------
 .../test_sqlserver_jdbc_catalog_pool_test.groovy   |  70 -------------
 .../suites/manager/test_manager_interface_3.groovy |   8 +-
 26 files changed, 61 insertions(+), 947 deletions(-)

diff --git a/be/src/runtime/descriptors.cpp b/be/src/runtime/descriptors.cpp
index cc6f9050ac3..bea11feb916 100644
--- a/be/src/runtime/descriptors.cpp
+++ b/be/src/runtime/descriptors.cpp
@@ -286,8 +286,7 @@ JdbcTableDescriptor::JdbcTableDescriptor(const 
TTableDescriptor& tdesc)
           _connection_pool_max_size(tdesc.jdbcTable.connection_pool_max_size),
           
_connection_pool_max_wait_time(tdesc.jdbcTable.connection_pool_max_wait_time),
           
_connection_pool_max_life_time(tdesc.jdbcTable.connection_pool_max_life_time),
-          
_connection_pool_keep_alive(tdesc.jdbcTable.connection_pool_keep_alive),
-          _enable_connection_pool(tdesc.jdbcTable.enable_connection_pool) {}
+          
_connection_pool_keep_alive(tdesc.jdbcTable.connection_pool_keep_alive) {}
 
 std::string JdbcTableDescriptor::debug_string() const {
     fmt::memory_buffer buf;
@@ -295,14 +294,13 @@ std::string JdbcTableDescriptor::debug_string() const {
             buf,
             "JDBCTable({} ,_jdbc_catalog_id = {}, _jdbc_resource_name={} 
,_jdbc_driver_url={} "
             ",_jdbc_driver_class={} ,_jdbc_driver_checksum={} ,_jdbc_url={} "
-            ",_jdbc_table_name={} ,_jdbc_user={} ,_jdbc_passwd={} "
-            ",_enable_connection_pool={},_connection_pool_min_size={} "
+            ",_jdbc_table_name={} ,_jdbc_user={} ,_jdbc_passwd={} 
,_connection_pool_min_size={} "
             ",_connection_pool_max_size={} ,_connection_pool_max_wait_time={} "
             ",_connection_pool_max_life_time={} 
,_connection_pool_keep_alive={})",
             TableDescriptor::debug_string(), _jdbc_catalog_id, 
_jdbc_resource_name,
             _jdbc_driver_url, _jdbc_driver_class, _jdbc_driver_checksum, 
_jdbc_url,
-            _jdbc_table_name, _jdbc_user, _jdbc_passwd, 
_enable_connection_pool,
-            _connection_pool_min_size, _connection_pool_max_size, 
_connection_pool_max_wait_time,
+            _jdbc_table_name, _jdbc_user, _jdbc_passwd, 
_connection_pool_min_size,
+            _connection_pool_max_size, _connection_pool_max_wait_time,
             _connection_pool_max_life_time, _connection_pool_keep_alive);
     return fmt::to_string(buf);
 }
diff --git a/be/src/runtime/descriptors.h b/be/src/runtime/descriptors.h
index b5797b0d016..b807c567543 100644
--- a/be/src/runtime/descriptors.h
+++ b/be/src/runtime/descriptors.h
@@ -319,7 +319,6 @@ public:
     int32_t connection_pool_max_wait_time() const { return 
_connection_pool_max_wait_time; }
     int32_t connection_pool_max_life_time() const { return 
_connection_pool_max_life_time; }
     bool connection_pool_keep_alive() const { return 
_connection_pool_keep_alive; }
-    bool enable_connection_pool() const { return _enable_connection_pool; }
 
 private:
     int64_t _jdbc_catalog_id;
@@ -336,7 +335,6 @@ private:
     int32_t _connection_pool_max_wait_time;
     int32_t _connection_pool_max_life_time;
     bool _connection_pool_keep_alive;
-    bool _enable_connection_pool;
 };
 
 class TupleDescriptor {
diff --git a/be/src/vec/exec/scan/new_jdbc_scanner.cpp 
b/be/src/vec/exec/scan/new_jdbc_scanner.cpp
index a23e83e2426..7eaa9ab3eab 100644
--- a/be/src/vec/exec/scan/new_jdbc_scanner.cpp
+++ b/be/src/vec/exec/scan/new_jdbc_scanner.cpp
@@ -89,7 +89,6 @@ Status NewJdbcScanner::prepare(RuntimeState* state, const 
VExprContextSPtrs& con
     _jdbc_param.connection_pool_max_life_time = 
jdbc_table->connection_pool_max_life_time();
     _jdbc_param.connection_pool_max_wait_time = 
jdbc_table->connection_pool_max_wait_time();
     _jdbc_param.connection_pool_keep_alive = 
jdbc_table->connection_pool_keep_alive();
-    _jdbc_param.enable_connection_pool = jdbc_table->enable_connection_pool();
 
     _local_state->scanner_profile()->add_info_string("JdbcDriverClass", 
_jdbc_param.driver_class);
     _local_state->scanner_profile()->add_info_string("JdbcDriverUrl", 
_jdbc_param.driver_path);
diff --git a/be/src/vec/exec/vjdbc_connector.cpp 
b/be/src/vec/exec/vjdbc_connector.cpp
index 2e819dd77c4..6c8491ef213 100644
--- a/be/src/vec/exec/vjdbc_connector.cpp
+++ b/be/src/vec/exec/vjdbc_connector.cpp
@@ -152,7 +152,6 @@ Status JdbcConnector::open(RuntimeState* state, bool read) {
         }
         ctor_params.__set_op(read ? TJdbcOperation::READ : 
TJdbcOperation::WRITE);
         ctor_params.__set_table_type(_conn_param.table_type);
-        
ctor_params.__set_enable_connection_pool(_conn_param.enable_connection_pool);
         
ctor_params.__set_connection_pool_min_size(_conn_param.connection_pool_min_size);
         
ctor_params.__set_connection_pool_max_size(_conn_param.connection_pool_max_size);
         
ctor_params.__set_connection_pool_max_wait_time(_conn_param.connection_pool_max_wait_time);
diff --git a/be/src/vec/exec/vjdbc_connector.h 
b/be/src/vec/exec/vjdbc_connector.h
index 066a95de554..954b0abfa78 100644
--- a/be/src/vec/exec/vjdbc_connector.h
+++ b/be/src/vec/exec/vjdbc_connector.h
@@ -61,7 +61,6 @@ struct JdbcConnectorParam {
     int32_t connection_pool_max_wait_time = -1;
     int32_t connection_pool_max_life_time = -1;
     bool connection_pool_keep_alive = false;
-    bool enable_connection_pool;
 
     const TupleDescriptor* tuple_desc = nullptr;
 };
diff --git a/be/src/vec/sink/writer/vjdbc_table_writer.cpp 
b/be/src/vec/sink/writer/vjdbc_table_writer.cpp
index d54768e58fe..8c24f4746ad 100644
--- a/be/src/vec/sink/writer/vjdbc_table_writer.cpp
+++ b/be/src/vec/sink/writer/vjdbc_table_writer.cpp
@@ -52,7 +52,6 @@ JdbcConnectorParam 
VJdbcTableWriter::create_connect_param(const doris::TDataSink
     jdbc_param.connection_pool_max_wait_time = 
t_jdbc_sink.jdbc_table.connection_pool_max_wait_time;
     jdbc_param.connection_pool_max_life_time = 
t_jdbc_sink.jdbc_table.connection_pool_max_life_time;
     jdbc_param.connection_pool_keep_alive = 
t_jdbc_sink.jdbc_table.connection_pool_keep_alive;
-    jdbc_param.enable_connection_pool = 
t_jdbc_sink.jdbc_table.enable_connection_pool;
 
     return jdbc_param;
 }
diff --git 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
index 61382e6c253..03e5ca1fa7c 100644
--- 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
+++ 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
@@ -41,7 +41,6 @@ import java.net.MalformedURLException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Date;
-import java.sql.Driver;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -52,7 +51,6 @@ import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.function.Function;
 
 public abstract class BaseJdbcExecutor implements JdbcExecutor {
@@ -94,8 +92,7 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
                 .setConnectionPoolMaxSize(request.connection_pool_max_size)
                 
.setConnectionPoolMaxWaitTime(request.connection_pool_max_wait_time)
                 
.setConnectionPoolMaxLifeTime(request.connection_pool_max_life_time)
-                .setConnectionPoolKeepAlive(request.connection_pool_keep_alive)
-                .setEnableConnectionPool(request.enable_connection_pool);
+                
.setConnectionPoolKeepAlive(request.connection_pool_keep_alive);
         
JdbcDataSource.getDataSource().setCleanupInterval(request.connection_pool_cache_clear_time);
         System.setProperty("com.zaxxer.hikari.useWeakReferences", "true");
         init(config, request.statement);
@@ -120,12 +117,10 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
             }
         } finally {
             closeResources(resultSet, stmt, conn);
-            if (config.isEnableConnectionPool()) {
-                if (config.getConnectionPoolMinSize() == 0 && hikariDataSource 
!= null) {
-                    hikariDataSource.close();
-                    
JdbcDataSource.getDataSource().getSourcesMap().remove(config.createCacheKey());
-                    hikariDataSource = null;
-                }
+            if (config.getConnectionPoolMinSize() == 0 && hikariDataSource != 
null) {
+                hikariDataSource.close();
+                
JdbcDataSource.getDataSource().getSourcesMap().remove(config.createCacheKey());
+                hikariDataSource = null;
             }
         }
     }
@@ -147,12 +142,10 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
     }
 
     public void cleanDataSource() {
-        if (config.isEnableConnectionPool()) {
-            if (hikariDataSource != null) {
-                hikariDataSource.close();
-                
JdbcDataSource.getDataSource().getSourcesMap().remove(config.createCacheKey());
-                hikariDataSource = null;
-            }
+        if (hikariDataSource != null) {
+            hikariDataSource.close();
+            
JdbcDataSource.getDataSource().getSourcesMap().remove(config.createCacheKey());
+            hikariDataSource = null;
         }
     }
 
@@ -294,64 +287,51 @@ public abstract class BaseJdbcExecutor implements 
JdbcExecutor {
 
     private void init(JdbcDataSourceConfig config, String sql) throws 
JdbcExecutorException {
         ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
+        String hikariDataSourceKey = config.createCacheKey();
         try {
             ClassLoader parent = getClass().getClassLoader();
             ClassLoader classLoader = 
UdfUtils.getClassLoader(config.getJdbcDriverUrl(), parent);
             Thread.currentThread().setContextClassLoader(classLoader);
-            if (config.isEnableConnectionPool()) {
-                String hikariDataSourceKey = config.createCacheKey();
-                hikariDataSource = 
JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
-                if (hikariDataSource == null) {
-                    synchronized (hikariDataSourceLock) {
-                        hikariDataSource = 
JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
-                        if (hikariDataSource == null) {
-                            long start = System.currentTimeMillis();
-                            HikariDataSource ds = new HikariDataSource();
-                            ds.setDriverClassName(config.getJdbcDriverClass());
-                            
ds.setJdbcUrl(SecurityChecker.getInstance().getSafeJdbcUrl(config.getJdbcUrl()));
-                            ds.setUsername(config.getJdbcUser());
-                            ds.setPassword(config.getJdbcPassword());
-                            
ds.setMinimumIdle(config.getConnectionPoolMinSize()); // default 1
-                            
ds.setMaximumPoolSize(config.getConnectionPoolMaxSize()); // default 10
-                            
ds.setConnectionTimeout(config.getConnectionPoolMaxWaitTime()); // default 5000
-                            
ds.setMaxLifetime(config.getConnectionPoolMaxLifeTime()); // default 30 min
-                            
ds.setIdleTimeout(config.getConnectionPoolMaxLifeTime() / 2L); // default 15 min
-                            setValidationQuery(ds);
-                            if (config.isConnectionPoolKeepAlive()) {
-                                
ds.setKeepaliveTime(config.getConnectionPoolMaxLifeTime() / 5L); // default 6 
min
-                            }
-                            hikariDataSource = ds;
-                            
JdbcDataSource.getDataSource().putSource(hikariDataSourceKey, hikariDataSource);
-                            LOG.info("JdbcClient set"
-                                    + " ConnectionPoolMinSize = " + 
config.getConnectionPoolMinSize()
-                                    + ", ConnectionPoolMaxSize = " + 
config.getConnectionPoolMaxSize()
-                                    + ", ConnectionPoolMaxWaitTime = " + 
config.getConnectionPoolMaxWaitTime()
-                                    + ", ConnectionPoolMaxLifeTime = " + 
config.getConnectionPoolMaxLifeTime()
-                                    + ", ConnectionPoolKeepAlive = " + 
config.isConnectionPoolKeepAlive());
-                            LOG.info("init datasource [" + 
(config.getJdbcUrl() + config.getJdbcUser()) + "] cost: " + (
-                                    System.currentTimeMillis() - start) + " 
ms");
+            hikariDataSource = 
JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
+            if (hikariDataSource == null) {
+                synchronized (hikariDataSourceLock) {
+                    hikariDataSource = 
JdbcDataSource.getDataSource().getSource(hikariDataSourceKey);
+                    if (hikariDataSource == null) {
+                        long start = System.currentTimeMillis();
+                        HikariDataSource ds = new HikariDataSource();
+                        ds.setDriverClassName(config.getJdbcDriverClass());
+                        
ds.setJdbcUrl(SecurityChecker.getInstance().getSafeJdbcUrl(config.getJdbcUrl()));
+                        ds.setUsername(config.getJdbcUser());
+                        ds.setPassword(config.getJdbcPassword());
+                        ds.setMinimumIdle(config.getConnectionPoolMinSize()); 
// default 1
+                        
ds.setMaximumPoolSize(config.getConnectionPoolMaxSize()); // default 10
+                        
ds.setConnectionTimeout(config.getConnectionPoolMaxWaitTime()); // default 5000
+                        
ds.setMaxLifetime(config.getConnectionPoolMaxLifeTime()); // default 30 min
+                        
ds.setIdleTimeout(config.getConnectionPoolMaxLifeTime() / 2L); // default 15 min
+                        setValidationQuery(ds);
+                        if (config.isConnectionPoolKeepAlive()) {
+                            
ds.setKeepaliveTime(config.getConnectionPoolMaxLifeTime() / 5L); // default 6 
min
                         }
+                        hikariDataSource = ds;
+                        
JdbcDataSource.getDataSource().putSource(hikariDataSourceKey, hikariDataSource);
+                        LOG.info("JdbcClient set"
+                                + " ConnectionPoolMinSize = " + 
config.getConnectionPoolMinSize()
+                                + ", ConnectionPoolMaxSize = " + 
config.getConnectionPoolMaxSize()
+                                + ", ConnectionPoolMaxWaitTime = " + 
config.getConnectionPoolMaxWaitTime()
+                                + ", ConnectionPoolMaxLifeTime = " + 
config.getConnectionPoolMaxLifeTime()
+                                + ", ConnectionPoolKeepAlive = " + 
config.isConnectionPoolKeepAlive());
+                        LOG.info("init datasource [" + (config.getJdbcUrl() + 
config.getJdbcUser()) + "] cost: " + (
+                                System.currentTimeMillis() - start) + " ms");
                     }
                 }
-                conn = hikariDataSource.getConnection();
-            } else {
-                Class<?> driverClass = 
Class.forName(config.getJdbcDriverClass(), true, classLoader);
-                Driver driverInstance = (Driver) 
driverClass.getDeclaredConstructor().newInstance();
-
-                Properties info = new Properties();
-                info.put("user", config.getJdbcUser());
-                info.put("password", config.getJdbcPassword());
-
-                conn = 
driverInstance.connect(SecurityChecker.getInstance().getSafeJdbcUrl(config.getJdbcUrl()),
 info);
-                if (conn == null) {
-                    throw new SQLException("Failed to establish a connection. 
The JDBC driver returned null. "
-                            + "Please check if the JDBC URL is correct: "
-                            + config.getJdbcUrl()
-                            + ". Ensure that the URL format and parameters are 
valid for the driver: "
-                            + driverInstance.getClass().getName());
-                }
             }
 
+            long start = System.currentTimeMillis();
+            conn = hikariDataSource.getConnection();
+            LOG.info("get connection [" + (config.getJdbcUrl() + 
config.getJdbcUser()) + "] cost: " + (
+                    System.currentTimeMillis() - start)
+                    + " ms");
+
             initializeStatement(conn, config, sql);
 
         } catch (MalformedURLException e) {
diff --git 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSourceConfig.java
 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSourceConfig.java
index 30e94ddd37f..a99377add25 100644
--- 
a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSourceConfig.java
+++ 
b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcDataSourceConfig.java
@@ -35,7 +35,6 @@ public class JdbcDataSourceConfig {
     private int connectionPoolMaxWaitTime = 5000;
     private int connectionPoolMaxLifeTime = 1800000;
     private boolean connectionPoolKeepAlive = false;
-    private boolean enableConnectionPool = false;
 
     public String createCacheKey() {
         return catalogId + jdbcUrl + jdbcUser + jdbcPassword + jdbcDriverUrl + 
jdbcDriverClass
@@ -168,13 +167,4 @@ public class JdbcDataSourceConfig {
         this.connectionPoolKeepAlive = connectionPoolKeepAlive;
         return this;
     }
-
-    public boolean isEnableConnectionPool() {
-        return enableConnectionPool;
-    }
-
-    public JdbcDataSourceConfig setEnableConnectionPool(boolean 
enableConnectionPool) {
-        this.enableConnectionPool = enableConnectionPool;
-        return this;
-    }
 }
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
index b7db351f49a..28d58b35297 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
@@ -108,7 +108,6 @@ public class JdbcResource extends Resource {
     public static final String CHECK_SUM = "checksum";
     public static final String CREATE_TIME = "create_time";
     public static final String TEST_CONNECTION = "test_connection";
-    public static final String ENABLE_CONNECTION_POOL = 
"enable_connection_pool";
 
     private static final ImmutableList<String> ALL_PROPERTIES = new 
ImmutableList.Builder<String>().add(
             JDBC_URL,
@@ -129,8 +128,7 @@ public class JdbcResource extends Resource {
             CONNECTION_POOL_MAX_WAIT_TIME,
             CONNECTION_POOL_KEEP_ALIVE,
             TEST_CONNECTION,
-            ExternalCatalog.USE_META_CACHE,
-            ENABLE_CONNECTION_POOL
+            ExternalCatalog.USE_META_CACHE
     ).build();
 
     // The default value of optional properties
@@ -151,7 +149,6 @@ public class JdbcResource extends Resource {
         OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(TEST_CONNECTION, "true");
         OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(ExternalCatalog.USE_META_CACHE,
                 String.valueOf(ExternalCatalog.DEFAULT_USE_META_CACHE));
-        OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(ENABLE_CONNECTION_POOL, "false");
     }
 
     // timeout for both connection and read. 10 seconds is long enough.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcTable.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcTable.java
index 7c3678c8ed8..6dce40a2684 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcTable.java
@@ -97,7 +97,6 @@ public class JdbcTable extends Table {
     @SerializedName("cid")
     private long catalogId = -1;
 
-    private boolean enableConnectionPool;
     private int connectionPoolMinSize;
     private int connectionPoolMaxSize;
     private int connectionPoolMaxWaitTime;
@@ -191,11 +190,6 @@ public class JdbcTable extends Table {
         return catalogId;
     }
 
-    public boolean isEnableConnectionPool() {
-        return 
Boolean.parseBoolean(getFromJdbcResourceOrDefault(JdbcResource.ENABLE_CONNECTION_POOL,
-                String.valueOf(enableConnectionPool)));
-    }
-
     public int getConnectionPoolMinSize() {
         return 
Integer.parseInt(getFromJdbcResourceOrDefault(JdbcResource.CONNECTION_POOL_MIN_SIZE,
                 String.valueOf(connectionPoolMinSize)));
@@ -244,7 +238,6 @@ public class JdbcTable extends Table {
         tJdbcTable.setJdbcDriverUrl(getDriverUrl());
         tJdbcTable.setJdbcResourceName(resourceName);
         tJdbcTable.setJdbcDriverChecksum(checkSum);
-        tJdbcTable.setEnableConnectionPool(isEnableConnectionPool());
         tJdbcTable.setConnectionPoolMinSize(getConnectionPoolMinSize());
         tJdbcTable.setConnectionPoolMaxSize(getConnectionPoolMaxSize());
         
tJdbcTable.setConnectionPoolMaxWaitTime(getConnectionPoolMaxWaitTime());
@@ -401,7 +394,6 @@ public class JdbcTable extends Table {
         driverClass = jdbcResource.getProperty(DRIVER_CLASS);
         driverUrl = jdbcResource.getProperty(DRIVER_URL);
         checkSum = jdbcResource.getProperty(CHECK_SUM);
-        enableConnectionPool = 
Boolean.parseBoolean(jdbcResource.getProperty(JdbcResource.ENABLE_CONNECTION_POOL));
         connectionPoolMinSize = 
Integer.parseInt(jdbcResource.getProperty(JdbcResource.CONNECTION_POOL_MIN_SIZE));
         connectionPoolMaxSize = 
Integer.parseInt(jdbcResource.getProperty(JdbcResource.CONNECTION_POOL_MAX_SIZE));
         connectionPoolMaxWaitTime = Integer.parseInt(
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 e7e7634cff0..fb26265d19f 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
@@ -93,8 +93,6 @@ public class JdbcExternalCatalog extends ExternalCatalog {
         
JdbcResource.checkBooleanProperty(JdbcResource.CONNECTION_POOL_KEEP_ALIVE,
                 String.valueOf(isConnectionPoolKeepAlive()));
         JdbcResource.checkBooleanProperty(JdbcResource.TEST_CONNECTION, 
String.valueOf(isTestConnection()));
-        JdbcResource.checkBooleanProperty(JdbcResource.ENABLE_CONNECTION_POOL,
-                String.valueOf(isEnableConnectionPool()));
         JdbcResource.checkDatabaseListProperties(getOnlySpecifiedDatabase(), 
getIncludeDatabaseMap(),
                 getExcludeDatabaseMap());
         JdbcResource.checkConnectionPoolProperties(getConnectionPoolMinSize(), 
getConnectionPoolMaxSize(),
@@ -114,27 +112,6 @@ public class JdbcExternalCatalog extends ExternalCatalog {
             throw new IllegalArgumentException("Jdbc catalog property 
lower_case_table_names is not supported,"
                     + " please use lower_case_meta_names instead.");
         }
-        if (catalogProperty.getOrDefault(JdbcResource.ENABLE_CONNECTION_POOL, 
"").isEmpty()) {
-            // If not setting enable_connection_pool in replay logic,
-            // set default value true to be compatible with older version.
-            catalogProperty.addProperty(JdbcResource.ENABLE_CONNECTION_POOL,
-                    isReplay ? "true" : String.valueOf(JdbcResource
-                            
.getDefaultPropertyValue(JdbcResource.ENABLE_CONNECTION_POOL)));
-        }
-    }
-
-    @Override
-    public void tryModifyCatalogProps(Map<String, String> props) {
-        // It is forbidden to modify the enable_connection_pool attribute and 
driver_url attribute of jdbc catalog
-        if (props.containsKey(JdbcResource.ENABLE_CONNECTION_POOL)) {
-            throw new IllegalArgumentException("Can not modify 
enable_connection_pool property of jdbc catalog,"
-                    + "please re-create the catalog");
-        }
-        if (props.containsKey(JdbcResource.DRIVER_URL)) {
-            throw new IllegalArgumentException("Can not modify driver_url 
property of jdbc catalog"
-                    + "please re-create the catalog");
-        }
-        super.tryModifyCatalogProps(props);
     }
 
     @Override
@@ -245,11 +222,6 @@ public class JdbcExternalCatalog extends ExternalCatalog {
                 .getDefaultPropertyValue(JdbcResource.TEST_CONNECTION)));
     }
 
-    public boolean isEnableConnectionPool() {
-        return 
Boolean.parseBoolean(catalogProperty.getOrDefault(JdbcResource.ENABLE_CONNECTION_POOL,
 JdbcResource
-                
.getDefaultPropertyValue(JdbcResource.ENABLE_CONNECTION_POOL)));
-    }
-
     @Override
     protected void initLocalObjectsImpl() {
         JdbcClientConfig jdbcClientConfig = new JdbcClientConfig()
@@ -268,8 +240,7 @@ public class JdbcExternalCatalog extends ExternalCatalog {
                 .setConnectionPoolMaxSize(getConnectionPoolMaxSize())
                 .setConnectionPoolMaxLifeTime(getConnectionPoolMaxLifeTime())
                 .setConnectionPoolMaxWaitTime(getConnectionPoolMaxWaitTime())
-                .setConnectionPoolKeepAlive(isConnectionPoolKeepAlive())
-                .setEnableConnectionPool(isEnableConnectionPool());
+                .setConnectionPoolKeepAlive(isConnectionPoolKeepAlive());
 
         jdbcClient = JdbcClient.createJdbcClient(jdbcClientConfig);
     }
@@ -349,7 +320,6 @@ public class JdbcExternalCatalog extends ExternalCatalog {
         
jdbcTable.setConnectionPoolMaxLifeTime(this.getConnectionPoolMaxLifeTime());
         
jdbcTable.setConnectionPoolMaxWaitTime(this.getConnectionPoolMaxWaitTime());
         jdbcTable.setConnectionPoolKeepAlive(this.isConnectionPoolKeepAlive());
-        jdbcTable.setEnableConnectionPool(this.isEnableConnectionPool());
     }
 
     private void testJdbcConnection() throws DdlException {
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
index e863a42c122..8c4ada01774 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
@@ -39,7 +39,6 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.Driver;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -49,7 +48,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -62,11 +60,7 @@ public abstract class JdbcClient {
     private String catalogName;
     protected String dbType;
     protected String jdbcUser;
-    protected String jdbcUrl;
-    protected String jdbcPassword;
-    protected String jdbcDriverClass;
     protected ClassLoader classLoader = null;
-    protected boolean enableConnectionPool;
     protected HikariDataSource dataSource = null;
     protected boolean isOnlySpecifiedDatabase;
     protected boolean isLowerCaseMetaNames;
@@ -109,9 +103,6 @@ public abstract class JdbcClient {
         System.setProperty("com.zaxxer.hikari.useWeakReferences", "true");
         this.catalogName = jdbcClientConfig.getCatalog();
         this.jdbcUser = jdbcClientConfig.getUser();
-        this.jdbcPassword = jdbcClientConfig.getPassword();
-        this.jdbcUrl = jdbcClientConfig.getJdbcUrl();
-        this.jdbcDriverClass = jdbcClientConfig.getDriverClass();
         this.isOnlySpecifiedDatabase = 
Boolean.parseBoolean(jdbcClientConfig.getOnlySpecifiedDatabase());
         this.isLowerCaseMetaNames = 
Boolean.parseBoolean(jdbcClientConfig.getIsLowerCaseMetaNames());
         this.metaNamesMapping = jdbcClientConfig.getMetaNamesMapping();
@@ -119,12 +110,10 @@ public abstract class JdbcClient {
                 
Optional.ofNullable(jdbcClientConfig.getIncludeDatabaseMap()).orElse(Collections.emptyMap());
         this.excludeDatabaseMap =
                 
Optional.ofNullable(jdbcClientConfig.getExcludeDatabaseMap()).orElse(Collections.emptyMap());
-        this.enableConnectionPool = jdbcClientConfig.isEnableConnectionPool();
+        String jdbcUrl = jdbcClientConfig.getJdbcUrl();
         this.dbType = parseDbType(jdbcUrl);
         initializeClassLoader(jdbcClientConfig);
-        if (enableConnectionPool) {
-            initializeDataSource(jdbcClientConfig);
-        }
+        initializeDataSource(jdbcClientConfig);
         this.jdbcLowerCaseMetaMatching = new 
JdbcIdentifierMapping(isLowerCaseMetaNames, metaNamesMapping, this);
     }
 
@@ -179,57 +168,15 @@ public abstract class JdbcClient {
     }
 
     public void closeClient() {
-        if (enableConnectionPool && dataSource != null) {
-            dataSource.close();
-        }
+        dataSource.close();
     }
 
     public Connection getConnection() throws JdbcClientException {
-        if (enableConnectionPool) {
-            return getConnectionWithPool();
-        } else {
-            return getConnectionWithoutPool();
-        }
-    }
-
-    private Connection getConnectionWithoutPool() throws JdbcClientException {
-        ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(this.classLoader);
-
-            Class<?> driverClass = Class.forName(jdbcDriverClass, true, 
this.classLoader);
-            Driver driverInstance = (Driver) 
driverClass.getDeclaredConstructor().newInstance();
-
-            Properties info = new Properties();
-            info.put("user", jdbcUser);
-            info.put("password", jdbcPassword);
-
-            Connection connection = 
driverInstance.connect(SecurityChecker.getInstance().getSafeJdbcUrl(jdbcUrl), 
info);
-
-            if (connection == null) {
-                throw new SQLException("Failed to establish a connection. The 
JDBC driver returned null. "
-                        + "Please check if the JDBC URL is correct: "
-                        + jdbcUrl
-                        + ". Ensure that the URL format and parameters are 
valid for the driver: "
-                        + driverInstance.getClass().getName());
-            }
-
-            return connection;
-        } catch (Exception e) {
-            String errorMessage = String.format("Can not connect to jdbc due 
to error: %s, Catalog name: %s",
-                    e.getMessage(), this.getCatalogName());
-            throw new JdbcClientException(errorMessage, e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(oldClassLoader);
-        }
-    }
-
-
-    private Connection getConnectionWithPool() throws JdbcClientException {
         ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
+        Connection conn;
         try {
             Thread.currentThread().setContextClassLoader(this.classLoader);
-            return dataSource.getConnection();
+            conn = dataSource.getConnection();
         } catch (Exception e) {
             String errorMessage = String.format(
                     "Catalog `%s` can not connect to jdbc due to error: %s",
@@ -238,6 +185,7 @@ public abstract class JdbcClient {
         } finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
         }
+        return conn;
     }
 
     public void close(AutoCloseable... closeables) {
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
index f3ab9953e05..85f3bd8f256 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
@@ -39,7 +39,6 @@ public class JdbcClientConfig implements Cloneable {
     private int connectionPoolMaxWaitTime;
     private int connectionPoolMaxLifeTime;
     private boolean connectionPoolKeepAlive;
-    private boolean enableConnectionPool;
 
     private Map<String, Boolean> includeDatabaseMap;
     private Map<String, Boolean> excludeDatabaseMap;
@@ -59,8 +58,6 @@ public class JdbcClientConfig implements Cloneable {
                 
JdbcResource.getDefaultPropertyValue(JdbcResource.CONNECTION_POOL_MAX_LIFE_TIME));
         this.connectionPoolKeepAlive = Boolean.parseBoolean(
                 
JdbcResource.getDefaultPropertyValue(JdbcResource.CONNECTION_POOL_KEEP_ALIVE));
-        this.enableConnectionPool = Boolean.parseBoolean(
-                
JdbcResource.getDefaultPropertyValue(JdbcResource.ENABLE_CONNECTION_POOL));
         this.includeDatabaseMap = Maps.newHashMap();
         this.excludeDatabaseMap = Maps.newHashMap();
         this.customizedProperties = Maps.newHashMap();
@@ -76,7 +73,6 @@ public class JdbcClientConfig implements Cloneable {
             cloned.connectionPoolMaxLifeTime = connectionPoolMaxLifeTime;
             cloned.connectionPoolMaxWaitTime = connectionPoolMaxWaitTime;
             cloned.connectionPoolKeepAlive = connectionPoolKeepAlive;
-            cloned.enableConnectionPool = enableConnectionPool;
             cloned.includeDatabaseMap = Maps.newHashMap(includeDatabaseMap);
             cloned.excludeDatabaseMap = Maps.newHashMap(excludeDatabaseMap);
             cloned.customizedProperties = 
Maps.newHashMap(customizedProperties);
@@ -212,15 +208,6 @@ public class JdbcClientConfig implements Cloneable {
         return this;
     }
 
-    public boolean isEnableConnectionPool() {
-        return enableConnectionPool;
-    }
-
-    public JdbcClientConfig setEnableConnectionPool(boolean 
enableConnectionPool) {
-        this.enableConnectionPool = enableConnectionPool;
-        return this;
-    }
-
     public Map<String, Boolean> getIncludeDatabaseMap() {
         return includeDatabaseMap;
     }
diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift
index 7d74c1773fe..dd6ebf2248e 100644
--- a/gensrc/thrift/Descriptors.thrift
+++ b/gensrc/thrift/Descriptors.thrift
@@ -352,7 +352,6 @@ struct TJdbcTable {
   12: optional i32 connection_pool_max_life_time
   13: optional bool connection_pool_keep_alive
   14: optional i64 catalog_id
-  15: optional bool enable_connection_pool
 }
 
 struct TMCTable {
diff --git a/gensrc/thrift/Types.thrift b/gensrc/thrift/Types.thrift
index 7fabe64e26e..235c1cb2837 100644
--- a/gensrc/thrift/Types.thrift
+++ b/gensrc/thrift/Types.thrift
@@ -454,7 +454,6 @@ struct TJdbcExecutorCtorParams {
   14: optional i32 connection_pool_cache_clear_time
   15: optional bool connection_pool_keep_alive
   16: optional i64 catalog_id
-  17: optional bool enable_connection_pool
 }
 
 struct TJavaUdfExecutorCtorParams {
diff --git 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.out
 
b/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.out
deleted file mode 100644
index 247a342cb7e..00000000000
Binary files 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.out
 and /dev/null differ
diff --git 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.out
 
b/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.out
deleted file mode 100644
index cb9ca3b5231..00000000000
--- 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.out
+++ /dev/null
@@ -1,85 +0,0 @@
--- This file is automatically generated. You should know what you did if you 
want to edit this
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types_refresh --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types_refresh --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types_refresh --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types_refresh --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types_refresh --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
--- !mysql_all_types --
-\N     302     \N      502     602     4.14159 \N      6.14159 \N      -124    
-302    2013    -402    -502    -602    \N      2012-10-26T02:08:39.345700      
2013-10-26T08:09:18     -5.14145        \N      -7.1400 row2    \N      
09:11:09.5678   text2   0xE86F6C6C6F20576F726C67        \N      \N      0x2F    
\N      0x88656C6C9F    Value3
-201    301     401     501     601     3.14159 4.1415926       5.14159 1       
-123    -301    2012    -401    -501    -601    2012-10-30      
2012-10-25T12:05:36.345700      2012-10-25T08:08:08     -4.14145        
-5.1400000001   -6.1400 row1    line1   09:09:09.5678   text1   
0x48656C6C6F20576F726C64        {"age": 30, "city": "London", "name": "Alice"}  
Option1,Option3 0x2A    0x48656C6C6F00000000000000      0x48656C6C6F    Value2
-202    302     402     502     602     4.14159 5.1415926       6.14159 0       
-124    -302    2013    -402    -502    -602    2012-11-01      
2012-10-26T02:08:39.345700      2013-10-26T08:09:18     -5.14145        
-6.1400000001   -7.1400 row2    line2   09:11:09.5678   text2   
0xE86F6C6C6F20576F726C67        {"age": 18, "city": "ChongQing", "name": 
"Gaoxin"}      Option1,Option2 0x2F    0x58676C6C6F00000000000000      
0x88656C6C9F    Value3
-203    303     403     503     603     7.14159 8.1415926       9.14159 0       
\N      -402    2017    -602    -902    -1102   2012-11-02      \N      
2013-10-27T08:11:18     -5.14145        -6.1400000000001        -7.1400 row3    
line3   09:11:09.5678   text3   0xE86F6C6C6F20576F726C67        {"age": 24, 
"city": "ChongQing", "name": "ChenQi"}      Option2 0x2F    
0x58676C6C6F00000000000000      \N      Value1
-
diff --git 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.out
 
b/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.out
deleted file mode 100644
index fe8440d8a65..00000000000
--- 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.out
+++ /dev/null
@@ -1,109 +0,0 @@
--- This file is automatically generated. You should know what you did if you 
want to edit this
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !select_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types_refresh --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
--- !query_ojdbc6_all_types --
-1      111     123     7456123.89      573     34      673.43  34.1264 60.0    
23.231  99      9999    999999999       999999999999999999      999     99999   
9999999999      9999999999999999999     1       china   beijing alice   
abcdefghrjkmnopq        123.45  12300   0.0012345       2022-01-21T05:23:01     
2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998      
2019-11-12T20:33:57.999996      2019-11-12T20:33:57.999997      223-9   12 
10:23:1.123457000
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N
-
diff --git 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.out
 
b/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.out
deleted file mode 100644
index b063d2e7919..00000000000
--- 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.out
+++ /dev/null
@@ -1,69 +0,0 @@
--- This file is automatically generated. You should know what you did if you 
want to edit this
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
--- !select_all_types_refresh --
-1      abc     def     2022-10-11      1       2       3       
2022-10-22T10:59:59     34.123  false   12.123456       10.16.10.14/32  
10.16.10.14     ff:ff:ff:ff:ff:aa       1010101010      01010   1       {"id": 
1}       (1.0,1.0)       {1.0,1.0,1.0}   [(1.0,1.0),(2.0,2.0)]   
(2.0,2.0),(1.0,1.0)     ((1.0,1.0),(2.0,2.0),(2.0,1.0)) 
((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0>
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      2       \N      \N      \N      
\N      \N      \N      \N      \N
-
diff --git 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.out
 
b/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.out
deleted file mode 100644
index 87fe3a17dd7..00000000000
--- 
a/regression-test/data/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.out
+++ /dev/null
@@ -1,81 +0,0 @@
--- This file is automatically generated. You should know what you did if you 
want to edit this
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
--- !all_type_refresh --
-1      doris   18      0       1       1       123.123 123.123 123.123 
12345678901234567890123456789012345678  12345678901234567890123456789012345678  
1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 
Make Doris Great!       Make Doris Great!       Make Doris Great!       Make 
Doris Great!       Make Doris Great!       Make Doris Great!       2023-01-17   
   16:49:05.123    2023-01-17T16:49:05     2023-01-17T16:49:05.123456      
2023-01-17T16:49        2023-01-17 16:49:05 +08:00      Make Doris Great!       
Make Doris Great!       922337203685477.5807    214748. [...]
-2      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N      
\N      \N      \N      \N      \N      \N      \N      \N      \N      \N
-
diff --git 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.groovy
 
b/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.groovy
deleted file mode 100644
index 4115b8321f7..00000000000
--- 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_clickhouse_jdbc_catalog_pool_test.groovy
+++ /dev/null
@@ -1,71 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_clickhouse_jdbc_catalog_pool_test", 
"p0,external,clickhouse,external_docker,external_docker_clickhouse") {
-    String enabled = context.config.otherConfigs.get("enableJdbcTest")
-    if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ex_db_name = "doris_test";
-        String clickhouse_port = 
context.config.otherConfigs.get("clickhouse_22_port");
-        String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
-        String s3_endpoint = getS3Endpoint()
-        String bucket = getS3BucketName()
-        String driver_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/clickhouse-jdbc-0.4.2-all.jar";
-
-        def poolOptions = [true, false]
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "true" : "false"
-            String catalog_name = "clickhouse_catalog_pool_${poolState}";
-
-            sql """ drop catalog if exists ${catalog_name} """
-            sql """ create catalog if not exists ${catalog_name} properties(
-                        "type"="jdbc",
-                        "user"="default",
-                        "password"="123456",
-                        "jdbc_url" = 
"jdbc:clickhouse://${externalEnvIp}:${clickhouse_port}/doris_test",
-                        "driver_url" = "${driver_url}",
-                        "driver_class" = 
"com.clickhouse.jdbc.ClickHouseDriver",
-                        "enable_connection_pool" = "${poolState}"
-            );"""
-
-            def tasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use ${ex_db_name} """
-                    order_qt_type  """ select * from type order by k1; """
-                }
-            }
-
-            tasks*.join()
-
-            sql """refresh catalog ${catalog_name}"""
-
-            def refreshTasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use ${ex_db_name} """
-                    order_qt_type_refresh """ select * from type order by k1; 
"""
-                }
-            }
-
-            refreshTasks*.join()
-
-            sql """ drop catalog if exists ${catalog_name} """
-        }
-    }
-}
-
diff --git 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.groovy
 
b/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.groovy
deleted file mode 100644
index 3b1150b3e8a..00000000000
--- 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_mysql_jdbc_catalog_pool_test.groovy
+++ /dev/null
@@ -1,73 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_mysql_jdbc_catalog_pool_test", 
"p0,external,mysql,external_docker,external_docker_mysql") {
-    String enabled = context.config.otherConfigs.get("enableJdbcTest")
-    String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
-    String s3_endpoint = getS3Endpoint()
-    String bucket = getS3BucketName()
-    String driver_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-j-8.3.0.jar";
-
-    if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ex_db_name = "doris_test";
-        String mysql_port = context.config.otherConfigs.get("mysql_57_port");
-
-        def poolOptions = [true, false]
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "pool_true" : "pool_false"
-            String catalog_name = "mysql_jdbc_catalog_${poolState}";
-
-            sql """ drop catalog if exists ${catalog_name} """
-            sql """ create catalog if not exists ${catalog_name} properties(
-                        "type"="jdbc",
-                        "user"="root",
-                        "password"="123456",
-                        "jdbc_url" = 
"jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false&zeroDateTimeBehavior=convertToNull",
-                        "driver_url" = "${driver_url}",
-                        "driver_class" = "com.mysql.cj.jdbc.Driver",
-                        "enable_connection_pool" = "${poolEnabled}"
-            );"""
-
-            def tasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use doris_test; """
-                    qt_mysql_all_types """ select * from all_types order by 
tinyint_u; """
-                }
-            }
-
-            tasks*.join()
-
-            sql """ refresh catalog ${catalog_name} """
-
-            def refreshTasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use doris_test; """
-                    qt_mysql_all_types_refresh """ select * from all_types 
order by tinyint_u; """
-                }
-            }
-
-            refreshTasks*.join()
-
-            sql """ drop catalog if exists ${catalog_name} """
-        }
-    }
-}
-
-
diff --git 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.groovy
 
b/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.groovy
deleted file mode 100644
index 8ec0da5c0ea..00000000000
--- 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_oracle_jdbc_catalog_pool_test.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_oracle_jdbc_catalog_pool_test", 
"p0,external,oracle,external_docker,external_docker_oracle") {
-    String enabled = context.config.otherConfigs.get("enableJdbcTest");
-    String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
-    String s3_endpoint = getS3Endpoint()
-    String bucket = getS3BucketName()
-    String driver_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/ojdbc8.jar";
-    String driver6_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/ojdbc6.jar";
-
-    if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ex_db_name = "DORIS_TEST";
-        String oracle_port = context.config.otherConfigs.get("oracle_11_port");
-        String SID = "XE";
-        String test_all_types = "TEST_ALL_TYPES";
-
-        def poolOptions = [true, false]
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "pool_true" : "pool_false"
-            String catalog_name = "oracle_catalog_${poolState}";
-
-            sql """drop catalog if exists ${catalog_name} """
-
-            sql """create catalog if not exists ${catalog_name} properties(
-                        "type"="jdbc",
-                        "user"="doris_test",
-                        "password"="123456",
-                        "jdbc_url" = 
"jdbc:oracle:thin:@${externalEnvIp}:${oracle_port}:${SID}",
-                        "driver_url" = "${driver_url}",
-                        "driver_class" = "oracle.jdbc.driver.OracleDriver",
-                        "enable_connection_pool" = "${poolEnabled}"
-            );"""
-
-            def tasks = (1..5).collect {
-                Thread.start {
-                    sql """switch ${catalog_name}"""
-                    sql """ use ${ex_db_name}"""
-                    order_qt_select_all_types """select * from 
${test_all_types}; """
-                }
-            }
-            tasks*.join()
-
-            sql """refresh catalog ${catalog_name}"""
-
-            def refreshTasks = (1..5).collect {
-                Thread.start {
-                    sql """switch ${catalog_name}"""
-                    sql """ use ${ex_db_name}"""
-                    order_qt_select_all_types_refresh """select * from 
${test_all_types}; """
-                }
-            }
-            refreshTasks*.join()
-
-            sql """drop catalog if exists ${catalog_name} """
-        }
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "pool_true" : "pool_false"
-            String catalog_name = "oracle_ojdbc6_${poolState}";
-
-            sql """drop catalog if exists ${catalog_name} """
-
-            sql """create catalog if not exists ${catalog_name} properties(
-                        "type"="jdbc",
-                        "user"="doris_test",
-                        "password"="123456",
-                        "jdbc_url" = 
"jdbc:oracle:thin:@${externalEnvIp}:${oracle_port}:${SID}",
-                        "driver_url" = "${driver6_url}",
-                        "driver_class" = "oracle.jdbc.OracleDriver",
-                        "enable_connection_pool" = "${poolEnabled}"
-            );"""
-
-
-            def tasks6 = (1..5).collect {
-                Thread.start {
-                    sql """ use ${catalog_name}.DORIS_TEST; """
-                    qt_query_ojdbc6_all_types """ select * from 
${catalog_name}.DORIS_TEST.TEST_ALL_TYPES order by 1; """
-                }
-            }
-            tasks6*.join()
-
-            sql """refresh catalog ${catalog_name};"""
-
-            def refreshTasks6 = (1..5).collect {
-                Thread.start {
-                    sql """ use ${catalog_name}.DORIS_TEST; """
-                    qt_query_ojdbc6_all_types_refresh """ select * from 
${catalog_name}.DORIS_TEST.TEST_ALL_TYPES order by 1; """
-                }
-            }
-            refreshTasks6*.join()
-
-            sql """drop catalog if exists ${catalog_name}; """
-        }
-    }
-}
diff --git 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.groovy
 
b/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.groovy
deleted file mode 100644
index 91f5c61b0ba..00000000000
--- 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_pg_jdbc_catalog_pool_test.groovy
+++ /dev/null
@@ -1,71 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_pg_jdbc_catalog_pool_test", 
"p0,external,pg,external_docker,external_docker_pg") {
-    String enabled = context.config.otherConfigs.get("enableJdbcTest")
-    String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
-    String s3_endpoint = getS3Endpoint()
-    String bucket = getS3BucketName()
-    String driver_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/postgresql-42.5.0.jar";
-
-    if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ex_schema_name = "catalog_pg_test";
-        String pg_port = context.config.otherConfigs.get("pg_14_port");
-        String test_all_types = "test_all_types";
-
-        def poolOptions = [true, false]
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "pool_true" : "pool_false"
-            String catalog_name = "pg_jdbc_catalog_${poolState}";
-
-            sql """drop catalog if exists ${catalog_name} """
-
-            sql """create catalog if not exists ${catalog_name} properties(
-                "type"="jdbc",
-                "user"="postgres",
-                "password"="123456",
-                "jdbc_url" = 
"jdbc:postgresql://${externalEnvIp}:${pg_port}/postgres?currentSchema=doris_test&useSSL=false",
-                "driver_url" = "${driver_url}",
-                "driver_class" = "org.postgresql.Driver",
-                "enable_connection_pool" = "${poolEnabled}"
-            );"""
-
-            def tasks = (1..5).collect {
-                Thread.start {
-                    sql """switch ${catalog_name}"""
-                    sql """ use ${ex_schema_name}"""
-                    order_qt_select_all_types """select * from 
${test_all_types}; """
-                }
-            }
-            tasks*.join()
-
-            sql """refresh catalog ${catalog_name}"""
-
-            def refreshTasks = (1..5).collect {
-                Thread.start {
-                    sql """switch ${catalog_name}"""
-                    sql """ use ${ex_schema_name}"""
-                    order_qt_select_all_types_refresh """select * from 
${test_all_types}; """
-                }
-            }
-            refreshTasks*.join()
-
-            sql """ drop catalog if exists ${catalog_name} """
-        }
-    }
-}
diff --git 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.groovy
 
b/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.groovy
deleted file mode 100644
index a8ebc8952fb..00000000000
--- 
a/regression-test/suites/external_table_p0/jdbc/connection_pool_test/test_sqlserver_jdbc_catalog_pool_test.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_sqlserver_jdbc_catalog_pool_test", 
"p0,external,sqlserver,external_docker,external_docker_sqlserver") {
-    String enabled = context.config.otherConfigs.get("enableJdbcTest");
-    String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
-    String s3_endpoint = getS3Endpoint()
-    String bucket = getS3BucketName()
-    String driver_url = 
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mssql-jdbc-11.2.3.jre8.jar";
-
-    if (enabled != null && enabled.equalsIgnoreCase("true")) {
-        String ex_db_name = "dbo";
-        String sqlserver_port = 
context.config.otherConfigs.get("sqlserver_2022_port");
-
-        def poolOptions = [true, false]
-
-        poolOptions.each { poolEnabled ->
-            String poolState = poolEnabled ? "pool_true" : "pool_false"
-            String catalog_name = "sqlserver_catalog_${poolState}";
-
-            sql """ drop catalog if exists ${catalog_name} """
-
-            sql """ create catalog if not exists ${catalog_name} properties(
-                        "type"="jdbc",
-                        "user"="sa",
-                        "password"="Doris123456",
-                        "jdbc_url" = 
"jdbc:sqlserver://${externalEnvIp}:${sqlserver_port};encrypt=false;databaseName=doris_test;",
-                        "driver_url" = "${driver_url}",
-                        "driver_class" = 
"com.microsoft.sqlserver.jdbc.SQLServerDriver",
-                        "enable_connection_pool" = "${poolEnabled}"
-            );"""
-
-            def tasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use ${ex_db_name} """
-                    order_qt_all_type """ select * from all_type order by id; 
"""
-                }
-            }
-            tasks*.join()
-
-            sql """refresh catalog ${catalog_name}"""
-
-            def refreshTasks = (1..5).collect {
-                Thread.start {
-                    sql """ switch ${catalog_name} """
-                    sql """ use ${ex_db_name} """
-                    order_qt_all_type_refresh """ select * from all_type order 
by id; """
-                }
-            }
-            refreshTasks*.join()
-
-            sql """ drop catalog if exists ${catalog_name} """
-        }
-    }
-}
diff --git a/regression-test/suites/manager/test_manager_interface_3.groovy 
b/regression-test/suites/manager/test_manager_interface_3.groovy
index 21b4853da9a..52e5f5f99db 100644
--- a/regression-test/suites/manager/test_manager_interface_3.groovy
+++ b/regression-test/suites/manager/test_manager_interface_3.groovy
@@ -424,7 +424,7 @@ suite('test_manager_interface_3',"p0") {
                 x ++
             }
         }
-        assertTrue(x == 21)
+        assertTrue(x == 20)
 
         connect(user=user, password="${pwd}", url=url) { 
             result = sql """ show resources """
@@ -435,7 +435,7 @@ suite('test_manager_interface_3',"p0") {
                     x ++
                 }
             }
-            assertTrue(x == 21)
+            assertTrue(x == 20)
         }
 
 
@@ -469,7 +469,7 @@ suite('test_manager_interface_3',"p0") {
         }
 
         sql """grant  USAGE_PRIV on RESOURCE  ${resource_name} TO '${user}' """
-        connect(user=user, password="${pwd}", url=url) {
+        connect(user=user, password="${pwd}", url=url) { 
             result = sql """ show resources """
             x = 0
             for(int i = 0;i<result.size();i++) {
@@ -478,7 +478,7 @@ suite('test_manager_interface_3',"p0") {
                     x ++
                 }
             }
-            assertTrue(x == 21)
+            assertTrue(x == 20)
         }
         sql """ drop RESOURCE if exists  ${resource_name} """ 
         sql """drop user if exists ${user}"""


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org