Compatible with the official configuration of dbcp2 connection pool

xiejiajun · xiejiajun · commit 1f2eb555c088 · 2020-07-07T16:55:41.000+08:00
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -425,7 +425,7 @@ private void configConnectionPool(GenericObjectPool connectionPool, Properties p
     boolean testOnCreate = "true".equalsIgnoreCase(properties.getProperty("testOnCreate"));
     boolean testOnReturn = "true".equalsIgnoreCase(properties.getProperty("testOnReturn"));
     boolean testWhileIdle = "true".equalsIgnoreCase(properties.getProperty("testWhileIdle"));
-    long betweenEvictionRunsMillis = PropertiesUtil.getLong(properties, "betweenEvictionRunsMillis", -1L);
+    long timeBetweenEvictionRunsMillis = PropertiesUtil.getLong(properties, "timeBetweenEvictionRunsMillis", -1L);
     long maxWaitMillis = PropertiesUtil.getLong(properties, "maxWaitMillis", -1L);
     int maxIdle = PropertiesUtil.getInt(properties, "maxIdle", 8);
     int minIdle = PropertiesUtil.getInt(properties, "minIdle", 0);
@@ -435,7 +435,7 @@ private void configConnectionPool(GenericObjectPool connectionPool, Properties p
     connectionPool.setTestOnCreate(testOnCreate);
     connectionPool.setTestOnReturn(testOnReturn);
     connectionPool.setTestWhileIdle(testWhileIdle);
-    connectionPool.setTimeBetweenEvictionRunsMillis(betweenEvictionRunsMillis);
+    connectionPool.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
     connectionPool.setMaxIdle(maxIdle);
     connectionPool.setMinIdle(minIdle);
     connectionPool.setMaxTotal(maxTotal);
