From 62c4451c9718972347e8529fd71fcd9a3e37f45e Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Mon, 1 Jul 2024 12:22:20 +0800 Subject: [PATCH] [branch-2.1][improvement](jdbc catalog) Modify the maximum number of connections in the connection pool to 30 by default (#37023) pick (#36720) In many cases, we found that users would use JDBC Catalog to perform a large number of queries, which resulted in the maximum of 10 connections being insufficient, so I adjusted it to 30, which covered most needs. --- .../main/java/org/apache/doris/jdbc/JdbcDataSourceConfig.java | 2 +- .../src/main/java/org/apache/doris/catalog/JdbcResource.java | 2 +- .../test/java/org/apache/doris/catalog/JdbcResourceTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 5fdbc211ab..a99377add2 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 @@ -31,7 +31,7 @@ public class JdbcDataSourceConfig { private TJdbcOperation op; private TOdbcTableType tableType; private int connectionPoolMinSize = 1; - private int connectionPoolMaxSize = 10; + private int connectionPoolMaxSize = 30; private int connectionPoolMaxWaitTime = 5000; private int connectionPoolMaxLifeTime = 1800000; private boolean connectionPoolKeepAlive = false; 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 c411c6d114..e8498d0a2d 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 @@ -139,7 +139,7 @@ public class JdbcResource extends Resource { OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(INCLUDE_DATABASE_LIST, ""); OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(EXCLUDE_DATABASE_LIST, ""); OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_MIN_SIZE, "1"); - OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_MAX_SIZE, "10"); + OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_MAX_SIZE, "30"); OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_MAX_LIFE_TIME, "1800000"); OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_MAX_WAIT_TIME, "5000"); OPTIONAL_PROPERTIES_DEFAULT_VALUE.put(CONNECTION_POOL_KEEP_ALIVE, "false"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/JdbcResourceTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/JdbcResourceTest.java index 8e004d4b23..81c2157686 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/JdbcResourceTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/JdbcResourceTest.java @@ -87,7 +87,7 @@ public class JdbcResourceTest { // Verify the default properties were applied during the replay Map properties = jdbcResource.getCopiedProperties(); Assert.assertEquals("1", properties.get("connection_pool_min_size")); - Assert.assertEquals("10", properties.get("connection_pool_max_size")); + Assert.assertEquals("30", properties.get("connection_pool_max_size")); Assert.assertEquals("1800000", properties.get("connection_pool_max_life_time")); Assert.assertEquals("5000", properties.get("connection_pool_max_wait_time")); Assert.assertEquals("false", properties.get("connection_pool_keep_alive")); @@ -110,7 +110,7 @@ public class JdbcResourceTest { // Verify the default properties were applied during the replay Map properties = replayedResource.getCopiedProperties(); Assert.assertEquals("1", properties.get("connection_pool_min_size")); - Assert.assertEquals("10", properties.get("connection_pool_max_size")); + Assert.assertEquals("30", properties.get("connection_pool_max_size")); Assert.assertEquals("1800000", properties.get("connection_pool_max_life_time")); Assert.assertEquals("5000", properties.get("connection_pool_max_wait_time")); Assert.assertEquals("false", properties.get("connection_pool_keep_alive"));