!191 merge

Merge pull request !191 from AE86/ae86_dev

dbsyncer-biz/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-biz</artifactId>

dbsyncer-cache/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-cache</artifactId>

dbsyncer-cluster/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-cluster</artifactId>

dbsyncer-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-common</artifactId>

dbsyncer-connector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-connector</artifactId>

dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/DatabaseConnectorMapper.java

@@ -5,7 +5,6 @@ import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.database.ds.SimpleConnection;
 import org.dbsyncer.connector.database.ds.SimpleDataSource;
-import org.dbsyncer.connector.util.DatabaseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -33,7 +32,7 @@ public class DatabaseConnectorMapper implements ConnectorMapper<DatabaseConfig,
             logger.error(e.getMessage());
             throw new ConnectorException(e.getMessage(), e.getCause());
         } finally {
-            DatabaseUtil.close(connection);
+            dataSource.close(connection);
         }
     }
 

dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/ds/SimpleConnection.java

@@ -1,26 +1,35 @@
 package org.dbsyncer.connector.database.ds;
 
-import org.dbsyncer.common.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.*;
+import org.dbsyncer.connector.util.DatabaseUtil;
+
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
 import java.time.Instant;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
 public class SimpleConnection implements Connection {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
     private final Connection connection;
-    private final SimpleDataSource simpleDataSource;
-    private final long activeTime = Instant.now().toEpochMilli();
+    private final long ACTIVE_TIME = Instant.now().toEpochMilli();
     private boolean oracleDriver;
 
-    public SimpleConnection(SimpleDataSource simpleDataSource, Connection connection) {
-        this.simpleDataSource = simpleDataSource;
+    public SimpleConnection(Connection connection, boolean oracleDriver) {
         this.connection = connection;
-        oracleDriver = StringUtil.equals(simpleDataSource.getDriverClassName(), "oracle.jdbc.OracleDriver");
+        this.oracleDriver = oracleDriver;
     }
 
     @Override
@@ -65,24 +74,7 @@ public class SimpleConnection implements Connection {
 
     @Override
     public void close() {
-        if(activeTime + simpleDataSource.getLifeTime() < Instant.now().toEpochMilli()){
-            closeQuietly();
-            return;
-        }
-
-        // 回收连接
-        simpleDataSource.getPool().offer(this);
-    }
-
-    /**
-     * 断开连接
-     */
-    public void closeQuietly() {
-        try {
-            connection.close();
-        } catch (SQLException e) {
-            logger.error(e.getMessage());
-        }
+        DatabaseUtil.close(connection);
     }
 
     @Override
@@ -319,6 +311,10 @@ public class SimpleConnection implements Connection {
         return connection;
     }
 
+    public long getActiveTime() {
+        return ACTIVE_TIME;
+    }
+
     public boolean isOracleDriver() {
         return oracleDriver;
     }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/ds/SimpleDataSource.java

@@ -1,5 +1,6 @@
 package org.dbsyncer.connector.database.ds;
 
+import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.util.DatabaseUtil;
 
@@ -8,6 +9,7 @@ import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
+import java.time.Instant;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Logger;
@@ -15,7 +17,14 @@ import java.util.logging.Logger;
 public class SimpleDataSource implements DataSource, AutoCloseable {
 
     private final BlockingQueue<SimpleConnection> pool = new LinkedBlockingQueue<>(300);
-    private long lifeTime = 60 * 1000;
+    /**
+     * 有效期（毫秒），默认60s
+     */
+    private final long KEEP_ALIVE = 60000;
+    /**
+     * 有效检测时间（秒），默认10s
+     */
+    private final int VALID_TIMEOUT_SECONDS = 10;
     private String driverClassName;
     private String url;
     private String username;
@@ -30,21 +39,19 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
 
     @Override
     public Connection getConnection() throws SQLException {
-        SimpleConnection poll = null;
-        int i = 3;
-        do {
-            if (pool.isEmpty()) {
-                pool.offer(createConnection());
-            }
-            poll = pool.poll();
-            if (null != poll) {
-                break;
-            }
-            i--;
-        } while (i > 1);
-
+        SimpleConnection poll = pool.poll();
         if (null == poll) {
-            poll = createConnection();
+            return createConnection();
+        }
+
+        // 连接无效
+        if (!poll.isValid(VALID_TIMEOUT_SECONDS)) {
+            return createConnection();
+        }
+
+        // 连接过期
+        if (isExpired(poll)) {
+            return createConnection();
         }
         return poll;
     }
@@ -91,26 +98,41 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
 
     @Override
     public void close() {
-        pool.forEach(c -> c.closeQuietly());
+        pool.forEach(c -> c.close());
     }
 
-    private SimpleConnection createConnection() throws SQLException {
-        return new SimpleConnection(this, DatabaseUtil.getConnection(driverClassName, url, username, password));
-    }
+    public void close(Connection connection) {
+        if (connection != null && connection instanceof SimpleConnection) {
+            SimpleConnection simpleConnection = (SimpleConnection) connection;
+            // 连接过期
+            if (isExpired(simpleConnection)) {
+                simpleConnection.close();
+                return;
+            }
 
-    public String getDriverClassName() {
-        return driverClassName;
+            // 回收连接
+            pool.offer(simpleConnection);
+        }
     }
 
-    public BlockingQueue<SimpleConnection> getPool() {
-        return pool;
+    /**
+     * 连接是否过期
+     *
+     * @param connection
+     * @return
+     */
+    private boolean isExpired(SimpleConnection connection) {
+        return connection.getActiveTime() + KEEP_ALIVE < Instant.now().toEpochMilli();
     }
 
-    public long getLifeTime() {
-        return lifeTime;
+    /**
+     * 创建新连接
+     *
+     * @return
+     * @throws SQLException
+     */
+    private SimpleConnection createConnection() throws SQLException {
+        return new SimpleConnection(DatabaseUtil.getConnection(driverClassName, url, username, password), StringUtil.equals(driverClassName, "oracle.jdbc.OracleDriver"));
     }
 
-    public void setLifeTime(long lifeTime) {
-        this.lifeTime = lifeTime;
-    }
 }

dbsyncer-listener/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-listener</artifactId>

dbsyncer-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-manager</artifactId>

dbsyncer-monitor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-monitor</artifactId>

dbsyncer-parser/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-parser</artifactId>

dbsyncer-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-plugin</artifactId>

dbsyncer-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-storage</artifactId>

dbsyncer-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.6_1012</version>
+        <version>1.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-web</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.ghi</groupId>
     <artifactId>dbsyncer</artifactId>
-    <version>1.2.6_1012</version>
+    <version>1.2.7</version>
     <packaging>pom</packaging>
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>

version.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set CURRENT_DATE=%date:~5,2%%date:~8,2%
-set VERSION=1.2.6_%CURRENT_DATE%
+set VERSION=1.2.7_%CURRENT_DATE%
 set /p APP_VERSION=Please enter a new version number(%VERSION%): || set APP_VERSION=%VERSION%
 echo %APP_VERSION%