You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2019/03/05 15:53:12 UTC
[hive] branch master updated (fc3eefa -> 3113f89)
This is an automated email from the ASF dual-hosted git repository.
jcamacho pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git.
from fc3eefa HIVE-21312: FSStatsAggregator::connect is slow (Rajesh Balamohan, reviewed by Zoltan Haindrich)
new 911e1eb HIVE-21383: JDBC storage handler: Use catalog and schema to retrieve tables if specified (Jesus Camacho Rodriguez, reviewed by Daniel Dai)
new 3113f89 HIVE-21384: Upgrade to dbcp2 in JDBC storage handler (Jesus Camacho Rodriguez, reviewed by Daniel Dai)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
common/src/java/org/apache/hadoop/hive/conf/Constants.java | 2 ++
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 ++
ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java | 4 +++-
6 files changed, 13 insertions(+), 13 deletions(-)
[hive] 01/02: HIVE-21383: JDBC storage handler: Use catalog and
schema to retrieve tables if specified (Jesus Camacho Rodriguez,
reviewed by Daniel Dai)
Posted by 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 911e1eb4b09bb369dc1962396bdd92617cd2e63c
Author: Jesus Camacho Rodriguez <jc...@apache.org>
AuthorDate: Mon Mar 4 14:41:54 2019 -0800
HIVE-21383: JDBC storage handler: Use catalog and schema to retrieve tables if specified (Jesus Camacho Rodriguez, reviewed by Daniel Dai)
---
common/src/java/org/apache/hadoop/hive/conf/Constants.java | 2 ++
ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/common/src/java/org/apache/hadoop/hive/conf/Constants.java b/common/src/java/org/apache/hadoop/hive/conf/Constants.java
index ee954d9..a2e6f49 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/Constants.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/Constants.java
@@ -45,6 +45,8 @@ public class Constants {
public static final String JDBC_HIVE_STORAGE_HANDLER_ID =
"org.apache.hive.storage.jdbc.JdbcStorageHandler";
public static final String JDBC_CONFIG_PREFIX = "hive.sql";
+ public static final String JDBC_CATALOG = JDBC_CONFIG_PREFIX + ".catalog";
+ public static final String JDBC_SCHEMA = JDBC_CONFIG_PREFIX + ".schema";
public static final String JDBC_TABLE = JDBC_CONFIG_PREFIX + ".table";
public static final String JDBC_DATABASE_TYPE = JDBC_CONFIG_PREFIX + ".database.type";
public static final String JDBC_URL = JDBC_CONFIG_PREFIX + ".jdbc.url";
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
index de88783..a7b9e62 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
@@ -2945,12 +2945,14 @@ public class CalcitePlanner extends SemanticAnalyzer {
String key = tabMetaData.getProperty(Constants.JDBC_KEY);
pswd = Utilities.getPasswdFromKeystore(keystore, key);
}
+ final String catalogName = tabMetaData.getProperty(Constants.JDBC_CATALOG);
+ final String schemaName = tabMetaData.getProperty(Constants.JDBC_SCHEMA);
final String tableName = tabMetaData.getProperty(Constants.JDBC_TABLE);
DataSource ds = JdbcSchema.dataSource(url, driver, user, pswd);
SqlDialect jdbcDialect = JdbcSchema.createDialect(SqlDialectFactoryImpl.INSTANCE, ds);
JdbcConvention jc = JdbcConvention.of(jdbcDialect, null, dataBaseType);
- JdbcSchema schema = new JdbcSchema(ds, jc.dialect, jc, null/*catalog */, null/*schema */);
+ JdbcSchema schema = new JdbcSchema(ds, jc.dialect, jc, catalogName, schemaName);
JdbcTable jt = (JdbcTable) schema.getTable(tableName);
if (jt == null) {
throw new SemanticException("Table " + tableName + " was not found in the database");
[hive] 02/02: HIVE-21384: Upgrade to dbcp2 in JDBC storage handler
(Jesus Camacho Rodriguez, reviewed by Daniel Dai)
Posted by 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>