Skip to content

HIVE-27345: Upgrade commons-dbcp2 to 2.9.0 #4325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2023
Merged

HIVE-27345: Upgrade commons-dbcp2 to 2.9.0 #4325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<commons-pool2.version>2.11.1</commons-pool2.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-dbcp2.version>2.7.0</commons-dbcp2.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<commons-text.version>1.10.0</commons-text.version>
<derby.version>10.14.2.0</derby.version>
<dropwizard.version>3.1.0</dropwizard.version>
Expand Down
17 changes: 9 additions & 8 deletions ...ver/src/main/java/org/apache/hadoop/hive/metastore/datasource/DbCPDataSourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.hive.metastore.datasource;

import java.sql.SQLException;
import java.time.Duration;
import java.util.Collections;
import java.util.Map;

Expand Down Expand Up @@ -84,16 +85,16 @@ public DataSource create(Configuration hdpConfig, int maxPoolSize) throws SQLExc
boolean testOnBorrow = hdpConfig.getBoolean(CONNECTION_TEST_BORROW_PROPERTY,
BaseObjectPoolConfig.DEFAULT_TEST_ON_BORROW);
long evictionTimeMillis = hdpConfig.getLong(CONNECTION_MIN_EVICT_MILLIS_PROPERTY,
BaseObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS);
BaseObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_TIME.toMillis());
boolean testWhileIdle = hdpConfig.getBoolean(CONNECTION_TEST_IDLEPROPERTY,
BaseObjectPoolConfig.DEFAULT_TEST_WHILE_IDLE);
long timeBetweenEvictionRuns = hdpConfig.getLong(CONNECTION_TIME_BETWEEN_EVICTION_RUNS_MILLIS,
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS);
BaseObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS.toMillis());
int numTestsPerEvictionRun = hdpConfig.getInt(CONNECTION_NUM_TESTS_PER_EVICTION_RUN,
BaseObjectPoolConfig.DEFAULT_NUM_TESTS_PER_EVICTION_RUN);
boolean testOnReturn = hdpConfig.getBoolean(CONNECTION_TEST_ON_RETURN, BaseObjectPoolConfig.DEFAULT_TEST_ON_RETURN);
long softMinEvictableIdleTimeMillis = hdpConfig.getLong(CONNECTION_SOFT_MIN_EVICTABLE_IDLE_TIME,
BaseObjectPoolConfig.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS);
BaseObjectPoolConfig.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME.toMillis());
boolean lifo = hdpConfig.getBoolean(CONNECTION_LIFO, BaseObjectPoolConfig.DEFAULT_LIFO);

ConnectionFactory connFactory = new DataSourceConnectionFactory(dbcpDs);
Expand All @@ -106,11 +107,11 @@ public DataSource create(Configuration hdpConfig, int maxPoolSize) throws SQLExc
objectPool.setMinIdle(connectionMinIlde);
objectPool.setTestOnBorrow(testOnBorrow);
objectPool.setTestWhileIdle(testWhileIdle);
objectPool.setMinEvictableIdleTimeMillis(evictionTimeMillis);
objectPool.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRuns);
objectPool.setMinEvictableIdleTime(Duration.ofMillis(evictionTimeMillis));
objectPool.setTimeBetweenEvictionRuns(Duration.ofMillis(timeBetweenEvictionRuns));
objectPool.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
objectPool.setTestOnReturn(testOnReturn);
objectPool.setSoftMinEvictableIdleTimeMillis(softMinEvictableIdleTimeMillis);
objectPool.setSoftMinEvictableIdleTime(Duration.ofMillis(softMinEvictableIdleTimeMillis));
objectPool.setLifo(lifo);

// Enable TxnHandler#connPoolMutex to release the idle connection if possible,
Expand All @@ -120,10 +121,10 @@ public DataSource create(Configuration hdpConfig, int maxPoolSize) throws SQLExc
if ("mutex".equalsIgnoreCase(poolName)) {
if (timeBetweenEvictionRuns < 0) {
// When timeBetweenEvictionRunsMillis non-positive, no idle object evictor thread runs
objectPool.setTimeBetweenEvictionRunsMillis(30 * 1000);
objectPool.setTimeBetweenEvictionRuns(Duration.ofMillis(30 * 1000));
}
if (softMinEvictableIdleTimeMillis < 0) {
objectPool.setSoftMinEvictableIdleTimeMillis(600 * 1000);
objectPool.setSoftMinEvictableIdleTime(Duration.ofMillis(600 * 1000));
}
}
String stmt = dbProduct.getPrepareTxnStmt();
Expand Down
2 changes: 1 addition & 1 deletion standalone-metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<apache-directory-server.version>1.5.7</apache-directory-server.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-logging.version>1.1.3</commons-logging.version>
<commons-dbcp2.version>2.7.0</commons-dbcp2.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<datasketches.version>1.1.0-incubating</datasketches.version>
<datanucleus-api-jdo.version>5.2.8</datanucleus-api-jdo.version>
<datanucleus-core.version>5.2.10</datanucleus-core.version>
Expand Down