[hive] 02/02: HIVE-21384: Upgrade to dbcp2 in JDBC storage handler (Jesus Camacho Rodriguez, reviewed by Daniel Dai)

[jc...@apache.org]

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

jcamacho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git

commit 3113f89b1f3c91f2454cd022fc3e262b75028356
Author: Jesus Camacho Rodriguez <jc...@apache.org>
AuthorDate: Mon Mar 4 15:22:26 2019 -0800

    HIVE-21384: Upgrade to dbcp2 in JDBC storage handler (Jesus Camacho Rodriguez, reviewed by Daniel Dai)
---
 jdbc-handler/pom.xml                                              | 6 +++---
 .../java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java     | 4 ++--
 .../apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java | 8 +-------
 pom.xml                                                           | 2 ++
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml
index ad421a1..8bc9bba 100644
--- a/jdbc-handler/pom.xml
+++ b/jdbc-handler/pom.xml
@@ -87,9 +87,9 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>${commons-dbcp.version}</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>${commons-dbcp2.version}</version>
     </dependency>
 
     <dependency>
diff --git a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java
index d8c5433..7fe63b4 100644
--- a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java
+++ b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java
@@ -129,8 +129,8 @@ public class JdbcStorageHandler implements HiveStorageHandler {
 
     List<Class<?>> classesToLoad = new ArrayList<>();
     classesToLoad.add(org.apache.hive.storage.jdbc.JdbcInputSplit.class);
-    classesToLoad.add(org.apache.commons.dbcp.BasicDataSourceFactory.class);
-    classesToLoad.add(org.apache.commons.pool.impl.GenericObjectPool.class);
+    classesToLoad.add(org.apache.commons.dbcp2.BasicDataSourceFactory.class);
+    classesToLoad.add(org.apache.commons.pool2.impl.GenericObjectPool.class);
     // Adding mysql jdbc driver if exists
     try {
       classesToLoad.add(Class.forName("com.mysql.jdbc.Driver"));
diff --git a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java
index 79c16df..c2e7473 100644
--- a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java
+++ b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java
@@ -15,17 +15,12 @@
 package org.apache.hive.storage.jdbc.dao;
 
 import com.google.common.base.Preconditions;
-import org.apache.commons.dbcp.BasicDataSourceFactory;
+import org.apache.commons.dbcp2.BasicDataSourceFactory;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.Constants;
 import org.apache.hadoop.hive.ql.exec.Utilities;
-import org.apache.hadoop.hive.serde.serdeConstants;
-import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.security.Credentials;
-import org.apache.hadoop.security.UserGroupInformation;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +36,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 23c4413..93a3aad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,8 @@
     <commons-lang3.version>3.2</commons-lang3.version>
     <commons-pool.version>1.5.4</commons-pool.version>
     <commons-dbcp.version>1.4</commons-dbcp.version>
+    <commons-pool2.version>2.6.1</commons-pool2.version>
+    <commons-dbcp2.version>2.6.0</commons-dbcp2.version>
     <derby.version>10.14.1.0</derby.version>
     <dropwizard.version>3.1.0</dropwizard.version>
     <dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>