!205 merge

Merge pull request !205 from AE86/ae86_dev

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

@@ -57,6 +57,19 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
      */
     private final String SYS_EXPRESSION = "^[$].*[$]$";
 
+    private static final Set<String> SYS_QUARTZ_FILTER = new HashSet<>();
+
+    static {
+        SYS_QUARTZ_FILTER.add("$timestamp_begin$");
+        SYS_QUARTZ_FILTER.add("$timestamp_end$");
+        SYS_QUARTZ_FILTER.add("$date_begin$");
+        SYS_QUARTZ_FILTER.add("$date_end$");
+        SYS_QUARTZ_FILTER.add("$date_yes_begin$");
+        SYS_QUARTZ_FILTER.add("$date_yes_end$");
+        SYS_QUARTZ_FILTER.add("$timestamp_yes_begin$");
+        SYS_QUARTZ_FILTER.add("$timestamp_yes_end$");
+    }
+
     @Override
     public ConnectorMapper connect(DatabaseConfig config) {
         try {
@@ -501,10 +514,12 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
      */
     protected String buildFilterValue(String value) {
         if (StringUtil.isNotBlank(value)) {
-            // 系统函数表达式 $select max(update_time)$
-            Matcher matcher = Pattern.compile(SYS_EXPRESSION).matcher(value);
-            if (matcher.find()) {
-                return StringUtil.substring(value, 1, value.length() - 1);
+            if (!SYS_QUARTZ_FILTER.contains(value)) {
+                // 系统函数表达式 $select max(update_time)$
+                Matcher matcher = Pattern.compile(SYS_EXPRESSION).matcher(value);
+                if (matcher.find()) {
+                    return StringUtil.substring(value, 1, value.length() - 1);
+                }
             }
         }
         return new StringBuilder(StringUtil.SINGLE_QUOTATION).append(value).append(StringUtil.SINGLE_QUOTATION).toString();

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

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.connector.database.ds;
 
 import org.dbsyncer.connector.util.DatabaseUtil;

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

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.connector.database.ds;
 
 import org.dbsyncer.common.util.StringUtil;
@@ -12,7 +15,6 @@ import java.sql.SQLFeatureNotSupportedException;
 import java.time.Instant;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -24,11 +26,6 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
      */
     private final int MAX_IDLE = 300;
 
-    /**
-     * 连接上限后最大等待时间（秒）
-     */
-    private final int MAX_WAIT_SECONDS = 3;
-
     /**
      * 从缓存队列获取连接次数
      */
@@ -68,11 +65,7 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
             lock.lock();
             //如果当前连接数大于或等于最大连接数
             if (activeNum.get() >= MAX_IDLE) {
-                //等待3秒
-                TimeUnit.SECONDS.sleep(MAX_WAIT_SECONDS);
-                if (activeNum.get() >= MAX_IDLE) {
-                    throw new ConnectorException(String.format("数据库连接数超过上限%d，url=%s", MAX_IDLE, url));
-                }
+                throw new ConnectorException(String.format("数据库连接数超过上限%d，url=%s", MAX_IDLE, url));
             }
             int time = MAX_PULL_TIME;
             while (time-- > 0){
@@ -91,8 +84,6 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
 
             // 兜底方案，保证一定能获取连接
             return createConnection();
-        } catch (InterruptedException e) {
-            throw new ConnectorException(e);
         } finally {
             lock.unlock();
         }