diff --git standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java index 6ffc24a27a..530d6a65b8 100644 --- standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java +++ standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/datasource/HikariCPDataSourceProvider.java @@ -36,6 +36,7 @@ private static final Logger LOG = LoggerFactory.getLogger(HikariCPDataSourceProvider.class); public static final String HIKARI = "hikari"; + public static final String HIKARICP = "hikaricp"; private static final String CONNECTION_TIMEOUT_PROPERTY= "hikari.connectionTimeout"; @Override @@ -77,7 +78,7 @@ public boolean mayReturnClosedConnection() { public boolean supports(Configuration configuration) { String poolingType = MetastoreConf.getVar(configuration, MetastoreConf.ConfVars.CONNECTION_POOLING_TYPE).toLowerCase(); - if (HIKARI.equals(poolingType)) { + if (HIKARICP.equals(poolingType)) { int hikariPropsNr = DataSourceProvider.getPrefixedProperties(configuration, HIKARI).size(); LOG.debug("Found " + hikariPropsNr + " nr. of hikari specific configurations"); return hikariPropsNr > 0; diff --git standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java index c513b4d7de..3e115f4fd4 100644 --- standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java +++ standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java @@ -4166,7 +4166,7 @@ private static synchronized DataSource setupJdbcConnectionPool(Configuration con PoolableConnectionFactory poolConnFactory = new PoolableConnectionFactory(connFactory, objectPool, null, null, false, true); return new PoolingDataSource(objectPool); - } else if ("hikaricp".equals(connectionPooler)) { + } else if (HikariCPDataSourceProvider.HIKARICP.equals(connectionPooler)) { return new HikariCPDataSourceProvider().create(conf); } else if ("none".equals(connectionPooler)) { LOG.info("Choosing not to pool JDBC connections"); diff --git standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java index 2d45c29f97..b5ee6f92cf 100644 --- standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java +++ standalone-metastore/src/test/java/org/apache/hadoop/hive/metastore/datasource/TestDataSourceProviderFactory.java @@ -114,7 +114,7 @@ public void testSetBoneCpBooleanProperty() throws SQLException { @Test public void testCreateHikariCpDataSource() throws SQLException { - MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARI); + MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARICP); // This is needed to prevent the HikariDataSource from trying to connect to the DB conf.set(HikariCPDataSourceProvider.HIKARI + ".initializationFailTimeout", "-1"); @@ -128,7 +128,7 @@ public void testCreateHikariCpDataSource() throws SQLException { @Test public void testSetHikariCpStringProperty() throws SQLException { - MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARI); + MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARICP); conf.set(HikariCPDataSourceProvider.HIKARI + ".connectionInitSql", "select 1 from dual"); conf.set(HikariCPDataSourceProvider.HIKARI + ".initializationFailTimeout", "-1"); @@ -143,7 +143,7 @@ public void testSetHikariCpStringProperty() throws SQLException { @Test public void testSetHikariCpNumberProperty() throws SQLException { - MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARI); + MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARICP); conf.set(HikariCPDataSourceProvider.HIKARI + ".idleTimeout", "59999"); conf.set(HikariCPDataSourceProvider.HIKARI + ".initializationFailTimeout", "-1"); @@ -158,7 +158,7 @@ public void testSetHikariCpNumberProperty() throws SQLException { @Test public void testSetHikariCpBooleanProperty() throws SQLException { - MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARI); + MetastoreConf.setVar(conf, ConfVars.CONNECTION_POOLING_TYPE, HikariCPDataSourceProvider.HIKARICP); conf.set(HikariCPDataSourceProvider.HIKARI + ".allowPoolSuspension", "false"); conf.set(HikariCPDataSourceProvider.HIKARI + ".initializationFailTimeout", "-1");