opendev/gerrit
Code Issues Proposed changes

DataSourceProvider: Rename local variable to avoid hiding field

Browse Source 
Change-Id: Idb2d50ce17ad4778e8f0e7d0ef5d6fc381bdaf12
This commit is contained in:
Hector Oswaldo Caballero
2018-08-05 10:08:28 -04:00
parent 61c3679442
commit 84f216aaca
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
View File

@@ -118,20 +118,20 @@ public class DataSourceProvider implements Provider<DataSource>, LifecycleListen
} }
if (usePool) { if (usePool) {
final BasicDataSource ds = new BasicDataSource(); final BasicDataSource lds = new BasicDataSource();
ds.setDriverClassName(driver); lds.setDriverClassName(driver);
ds.setUrl(url); lds.setUrl(url);
if (username != null && !username.isEmpty()) { if (username != null && !username.isEmpty()) {
ds.setUsername(username); lds.setUsername(username);
} }
if (password != null && !password.isEmpty()) { if (password != null && !password.isEmpty()) {
ds.setPassword(password); lds.setPassword(password);
} }
int poolLimit = threadSettingsConfig.getDatabasePoolLimit(); int poolLimit = threadSettingsConfig.getDatabasePoolLimit();
ds.setMaxActive(poolLimit); lds.setMaxActive(poolLimit);
ds.setMinIdle(cfg.getInt(DATABASE_KEY, "poolminidle", 4)); lds.setMinIdle(cfg.getInt(DATABASE_KEY, "poolminidle", 4));
ds.setMaxIdle(cfg.getInt(DATABASE_KEY, "poolmaxidle", Math.min(poolLimit, 16))); lds.setMaxIdle(cfg.getInt(DATABASE_KEY, "poolmaxidle", Math.min(poolLimit, 16)));
ds.setMaxWait( lds.setMaxWait(
ConfigUtil.getTimeUnit( ConfigUtil.getTimeUnit(
cfg, cfg,
DATABASE_KEY, DATABASE_KEY,
@@ -139,16 +139,16 @@ public class DataSourceProvider implements Provider<DataSource>, LifecycleListen
"poolmaxwait", "poolmaxwait",
MILLISECONDS.convert(30, SECONDS), MILLISECONDS.convert(30, SECONDS),
MILLISECONDS)); MILLISECONDS));
ds.setInitialSize(ds.getMinIdle()); lds.setInitialSize(lds.getMinIdle());
long evictIdleTimeMs = 1000L * 60; long evictIdleTimeMs = 1000L * 60;
ds.setMinEvictableIdleTimeMillis(evictIdleTimeMs); lds.setMinEvictableIdleTimeMillis(evictIdleTimeMs);
ds.setTimeBetweenEvictionRunsMillis(evictIdleTimeMs / 2); lds.setTimeBetweenEvictionRunsMillis(evictIdleTimeMs / 2);
ds.setTestOnBorrow(true); lds.setTestOnBorrow(true);
ds.setTestOnReturn(true); lds.setTestOnReturn(true);
ds.setValidationQuery(dst.getValidationQuery()); lds.setValidationQuery(dst.getValidationQuery());
ds.setValidationQueryTimeout(5); lds.setValidationQueryTimeout(5);
exportPoolMetrics(ds); exportPoolMetrics(lds);
return intercept(interceptor, ds); return intercept(interceptor, lds);
} }
// Don't use the connection pool. // Don't use the connection pool.
// //