You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ng...@apache.org on 2021/04/06 15:40:21 UTC
[hive] 37/38: HIVE-24396: Remaining comments from the feedback
(Naveen Gangam)
This is an automated email from the ASF dual-hosted git repository.
ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit 34720cfaf3ed3e6dd371fe7394ce9e1495ffa3a8
Author: Naveen Gangam <ng...@cloudera.com>
AuthorDate: Mon Mar 29 12:28:37 2021 -0400
HIVE-24396: Remaining comments from the feedback (Naveen Gangam)
---
.../properties/AlterDataConnectorSetPropertiesAnalyzer.java | 5 ++---
.../apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java | 2 +-
.../org/apache/hadoop/hive/metastore/cache/CachedStore.java | 6 ------
.../dataconnector/JDBCConnectorProviderFactory.java | 13 -------------
.../dataconnector/jdbc/AbstractJDBCConnectorProvider.java | 5 +++--
5 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/dataconnector/alter/properties/AlterDataConnectorSetPropertiesAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/dataconnector/alter/properties/AlterDataConnectorSetPropertiesAnalyzer.java
index 1ddb73f..e8fb1b9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/dataconnector/alter/properties/AlterDataConnectorSetPropertiesAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/dataconnector/alter/properties/AlterDataConnectorSetPropertiesAnalyzer.java
@@ -43,11 +43,10 @@ public class AlterDataConnectorSetPropertiesAnalyzer extends AbstractAlterDataCo
Map<String, String> dbProps = null;
for (int i = 1; i < root.getChildCount(); i++) {
ASTNode childNode = (ASTNode) root.getChild(i);
- switch (childNode.getToken().getType()) {
- case HiveParser.TOK_DATACONNECTORPROPERTIES:
+ if (childNode.getToken().getType() == HiveParser.TOK_DATACONNECTORPROPERTIES) {
dbProps = getProps((ASTNode) childNode.getChild(0));
break;
- default:
+ } else {
throw new SemanticException("Unrecognized token in ALTER CONNECTOR statement");
}
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
index 3f58661..7f3b641 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
@@ -1729,7 +1729,7 @@ public abstract class BaseSemanticAnalyzer {
try {
connector = db.getDataConnector(dcName);
} catch (Exception e) {
- throw new SemanticException(e.getMessage(), e);
+ throw new SemanticException(e);
}
if (connector == null && throwException) {
throw new SemanticException(ErrorMsg.DATACONNECTOR_NOT_EXISTS.getMsg(dcName));
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java
index b792f78..253031d 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java
@@ -1165,12 +1165,6 @@ public class CachedStore implements RawStore, Configurable {
@Override public void createDataConnector(DataConnector connector) throws InvalidObjectException, MetaException {
rawStore.createDataConnector(connector);
- // in case of event based cache update, cache will be updated during commit.
- /*
- if (!canUseEvents) {
- sharedCache.addDatabaseToCache(connector);
- }
- */
}
@Override public DataConnector getDataConnector(String dcName) throws NoSuchObjectException {
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/JDBCConnectorProviderFactory.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/JDBCConnectorProviderFactory.java
index b1ebfe0..10ab2bf 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/JDBCConnectorProviderFactory.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/JDBCConnectorProviderFactory.java
@@ -14,19 +14,6 @@ public class JDBCConnectorProviderFactory {
switch(connector.getType().toLowerCase()) {
case MYSQL_TYPE:
provider = new MySQLConnectorProvider(dbName, connector);
- /*
- try {
- Class.forName(driverClassName);
- handle = DriverManager.getConnection(jdbcUrl, username, password);
- isOpen = true;
- } catch (ClassNotFoundException cnfe) {
- LOG.warn("Driver class not found in classpath:" + driverClassName);
- throw new RuntimeException("Driver class not found:" + driverClassName);
- } catch (SQLException sqle) {
- LOG.warn("Could not connect to remote data source at " + jdbcUrl);
- throw new ConnectException("Could not connect to remote datasource at " + jdbcUrl + ",cause:" + sqle.getMessage());
- }
- */
break;
case POSTGRES_TYPE:
provider = new PostgreSQLConnectorProvider(dbName, connector);
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/AbstractJDBCConnectorProvider.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/AbstractJDBCConnectorProvider.java
index 72a6efb..e53a356 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/AbstractJDBCConnectorProvider.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/AbstractJDBCConnectorProvider.java
@@ -88,7 +88,7 @@ public abstract class AbstractJDBCConnectorProvider extends AbstractDataConnecto
isOpen = true;
} catch (ClassNotFoundException cnfe) {
LOG.warn("Driver class not found in classpath:" + driverClassName);
- throw new RuntimeException("Driver class not found:" + driverClassName);
+ throw new RuntimeException("Driver class not found:" + driverClassName, cnfe);
} catch (SQLException sqle) {
LOG.warn("Could not connect to remote data source at " + jdbcUrl);
throw new ConnectException("Could not connect to remote datasource at " + jdbcUrl + ",cause:" + sqle.getMessage());
@@ -100,7 +100,7 @@ public abstract class AbstractJDBCConnectorProvider extends AbstractDataConnecto
if (!isOpen)
open();
} catch (ConnectException ce) {
- throw new RuntimeException(ce.getMessage());
+ throw new RuntimeException(ce.getMessage(), ce);
}
if (handle instanceof Connection)
@@ -115,6 +115,7 @@ public abstract class AbstractJDBCConnectorProvider extends AbstractDataConnecto
((Connection)handle).close();
} catch (SQLException sqle) {
LOG.warn("Could not close jdbc connection to " + jdbcUrl, sqle);
+ throw new RuntimeException(sqle);
}
}
}