Merge pull request #5808 in CORE/base-third from release/11.0 to bugfix/11.0

* commit '2adee25ebf01ebf8d0f99887a9310a63008e3126':
  REPORT-71241 大数据集导出变慢
  REPORT-71241 大数据集导出变慢
  REPORT-71241 大数据集导出变慢
  REPORT-71021 恢复创建线程启停机制

fine-druid/readme.MD

@@ -1,4 +1,5 @@
 # Alibaba Druid
+
 - FineReport更新时间 `2022-04-27`
 - Druid版本 1.2.9
 - [github地址](https://github.com/alibaba/druid)
@@ -14,3 +15,4 @@
 | 1.2.9 | 2022-05-05 | MysqlUtils.getLastPacketReceivedTimeMs根据类加载器区分连接实现等，不在使用全局变量                        |
 | 1.2.9 | 2022-05-05 | com.fr.third.alibaba.druid.util.Utils.loadClass改为优先从线程类加载器加载类                       |
 | 1.2.9 | 2022-05-05 | 恢复com.fr.third.alibaba.druid.pool.DruidDataSourceFactory对hibernate配置属性的支持           |
+| 1.2.9 | 2022-05-10 | 恢复DruidDataSource中的创建线程启停机制                                                         |

fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidDataSource.java

@@ -134,6 +134,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     private volatile Future<?>               createSchedulerFuture;
 
     private CreateConnectionThread           createConnectionThread;
+    private PeriodDetectionThread            periodDetectionThread;
     private DestroyConnectionThread          destroyConnectionThread;
     private LogStatsThread                   logStatsThread;
     private int                              createTaskCount;
@@ -141,7 +142,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     private volatile long                    createTaskIdSeed          = 1L;
     private long[]                           createTasks;
 
-    private final CountDownLatch             initedLatch               = new CountDownLatch(2);
+    private CountDownLatch                   initedLatch               = new CountDownLatch(2);
 
     private volatile boolean                 enable                    = true;
 
@@ -161,6 +162,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     public static ThreadLocal<Long>          waitNanosLocal            = new ThreadLocal<Long>();
     private boolean                          logDifferentThread        = true;
     private volatile boolean                 keepAlive                 = false;
+    private SQLException                     initException             = null;
     private boolean                          asyncInit                 = false;
     protected boolean                        killWhenSocketReadTimeout = false;
     protected boolean                        checkExecuteTime          = false;
@@ -178,11 +180,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     protected static final AtomicLongFieldUpdater<DruidDataSource> createTaskIdSeedUpdater
             = AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "createTaskIdSeed");
 
-    public DruidDataSource(){
+    public DruidDataSource() {
         this(false);
     }
 
-    public DruidDataSource(boolean fairLock){
+    public DruidDataSource(boolean fairLock) {
         super(fairLock);
 
         configFromPropety(System.getProperties());
@@ -526,6 +528,45 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
     }
 
+    private synchronized void doSomethingBeforeCreationThreadBreak() {
+        String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this) + this.getUrl();
+        createConnectionThread = new CreateConnectionThread(threadName);
+        createConnectionThread.setStarted(false);
+        String destroyName = "Druid-ConnectionPool-Destroy-" + System.identityHashCode(this) + this.getUrl();
+        if (destroyConnectionThread != null) {
+            if (!destroyConnectionThread.isInterrupted()) {
+                destroyConnectionThread.interrupt();
+            }
+        }
+        destroyConnectionThread = new DestroyConnectionThread(destroyName);
+        destroyConnectionThread.setStarted(false);
+        initedLatch = new CountDownLatch(2);
+    }
+
+    private void checkThread() throws SQLException {
+        if (createConnectionThread == null) {
+            throw new IllegalStateException("createConnectionThread not start!");
+        }
+        if (destroyConnectionThread == null) {
+            throw new IllegalStateException("destroyConnectionThread not start!");
+        }
+        if (!createConnectionThread.isStarted() && !destroyConnectionThread.isStarted()) {
+            synchronized (this) {//线程安全问题，加个双检锁
+                if (!createConnectionThread.isStarted() && !destroyConnectionThread.isStarted()) {
+                    createConnectionThread.setStarted(true);
+                    createConnectionThread.start();
+                    destroyConnectionThread.setStarted(true);
+                    destroyConnectionThread.start();
+                    try {
+                        initedLatch.await();
+                    } catch (InterruptedException e) {
+                        throw new SQLException(e.getMessage(), e);
+                    }
+                }
+            }
+        }
+    }
+
     public boolean isKillWhenSocketReadTimeout() {
         return killWhenSocketReadTimeout;
     }
@@ -798,6 +839,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     }
 
     public void init() throws SQLException {
+        if (initException != null) {
+            LOG.error("{dataSource-" + this.getID() + "} init error", initException);
+            throw initException;
+        }
+
         if (inited) {
             return;
         }
@@ -944,6 +990,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             createAndLogThread();
             createAndStartCreatorThread();
             createAndStartDestroyThread();
+            createAndStartDetectThread();
 
             initedLatch.await();
             init = true;
@@ -968,16 +1015,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
         } catch (SQLException e) {
             LOG.error("{dataSource-" + this.getID() + "} init error", e);
+            initException = e;
             throw e;
         } catch (InterruptedException e) {
             throw new SQLException(e.getMessage(), e);
-        } catch (RuntimeException e){
-            LOG.error("{dataSource-" + this.getID() + "} init error", e);
-            throw e;
-        } catch (Error e){
-            LOG.error("{dataSource-" + this.getID() + "} init error", e);
+        } catch (Throwable e) {
+            initException = new SQLException(e.getMessage());
             throw e;
-
         } finally {
             inited = true;
             lock.unlock();
@@ -1075,7 +1119,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 period = 1000;
             }
             destroySchedulerFuture = destroyScheduler.scheduleAtFixedRate(destroyTask, period, period,
-                                                                          TimeUnit.MILLISECONDS);
+                    TimeUnit.MILLISECONDS);
             initedLatch.countDown();
             return;
         }
@@ -1087,7 +1131,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     protected void createAndStartCreatorThread() {
         if (createScheduler == null) {
-            String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this);
+            String threadName = "Druid-ConnectionPool-Create-" + System.identityHashCode(this) + this.getUrl();
             createConnectionThread = new CreateConnectionThread(threadName);
             createConnectionThread.start();
             return;
@@ -1096,6 +1140,15 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         initedLatch.countDown();
     }
 
+    private void createAndStartDetectThread() {
+        if (createScheduler == null) {
+            String threadName = "Druid-ConnectionPool-Detection-" + System.identityHashCode(this) + this.getUrl();
+            periodDetectionThread = new PeriodDetectionThread(threadName);
+            periodDetectionThread.start();
+        }
+    }
+
+
     /**
      * load filters from SPI ServiceLoader
      *
@@ -1181,21 +1234,21 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             return;
         }
 
-        String errorMessage = "";
+        String infoMessage = "";
 
-        if (testOnBorrow) {
-            errorMessage += "testOnBorrow is true, ";
+        if (isTestOnBorrow()) {
+            infoMessage += "testOnBorrow is true, ";
         }
 
-        if (testOnReturn) {
-            errorMessage += "testOnReturn is true, ";
+        if (isTestOnReturn()) {
+            infoMessage += "testOnReturn is true, ";
         }
 
-        if (testWhileIdle) {
-            errorMessage += "testWhileIdle is true, ";
+        if (isTestWhileIdle()) {
+            infoMessage += "testWhileIdle is true, ";
         }
 
-        LOG.error(errorMessage + "validationQuery not set");
+        LOG.info(infoMessage + "validationQuery not set");
     }
 
     protected void resolveDriver() throws SQLException {
@@ -1233,7 +1286,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             if (driver.getMajorVersion() < 10) {
                 throw new SQLException("not support oracle driver " + driver.getMajorVersion() + "."
-                                       + driver.getMinorVersion());
+                        + driver.getMinorVersion());
             }
 
             if (driver.getMajorVersion() == 10 && isUseOracleImplicitCache()) {
@@ -1277,7 +1330,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         if (query instanceof SQLSelectQueryBlock) {
             if (((SQLSelectQueryBlock) query).getFrom() == null) {
                 LOG.error("invalid oracle validationQuery. " + validationQuery + ", may should be : " + validationQuery
-                          + " FROM DUAL");
+                        + " FROM DUAL");
             }
         }
     }
@@ -1306,7 +1359,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         if (query instanceof SQLSelectQueryBlock) {
             if (((SQLSelectQueryBlock) query).getFrom() == null) {
                 LOG.error("invalid db2 validationQuery. " + validationQuery + ", may should be : " + validationQuery
-                          + " FROM SYSDUMMY");
+                        + " FROM SYSDUMMY");
             }
         }
     }
@@ -1325,8 +1378,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             this.validConnectionChecker = new OracleValidConnectionChecker();
 
         } else if (realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER)
-                   || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_SQLJDBC4)
-                   || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_JTDS)) {
+                || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_SQLJDBC4)
+                || realDriverClassName.equals(JdbcConstants.SQL_SERVER_DRIVER_JTDS)) {
             this.validConnectionChecker = new MSSQLValidConnectionChecker();
 
         } else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER)
@@ -1351,7 +1404,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
 
-        for (Class<?> driverClass = driver.getClass();;) {
+        for (Class<?> driverClass = driver.getClass(); ; ) {
             String realDriverClassName = driverClass.getName();
             if (realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER) //
                     || realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER_6)) {
@@ -1402,6 +1455,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     public DruidPooledConnection getConnection(long maxWaitMillis) throws SQLException {
         init();
 
+        checkThread();
         if (filters.size() > 0) {
             FilterChainImpl filterChain = new FilterChainImpl(this);
             return filterChain.dataSource_connect(this, maxWaitMillis);
@@ -1422,7 +1476,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLException {
         int notFullTimeoutRetryCnt = 0;
-        for (;;) {
+        for (; ; ) {
             // handle notFullTimeoutRetry
             DruidPooledConnection poolableConnection;
             try {
@@ -1456,10 +1510,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
                 if (testWhileIdle) {
                     final DruidConnectionHolder holder = poolableConnection.holder;
-                    long currentTimeMillis             = System.currentTimeMillis();
-                    long lastActiveTimeMillis          = holder.lastActiveTimeMillis;
-                    long lastExecTimeMillis            = holder.lastExecTimeMillis;
-                    long lastKeepTimeMillis            = holder.lastKeepTimeMillis;
+                    long currentTimeMillis = System.currentTimeMillis();
+                    long lastActiveTimeMillis = holder.lastActiveTimeMillis;
+                    long lastExecTimeMillis = holder.lastExecTimeMillis;
+                    long lastKeepTimeMillis = holder.lastKeepTimeMillis;
 
                     if (checkExecuteTime
                             && lastExecTimeMillis != lastActiveTimeMillis) {
@@ -1470,7 +1524,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                         lastActiveTimeMillis = lastKeepTimeMillis;
                     }
 
-                    long idleMillis                    = currentTimeMillis - lastActiveTimeMillis;
+                    long idleMillis = currentTimeMillis - lastActiveTimeMillis;
 
                     long timeBetweenEvictionRunsMillis = this.timeBetweenEvictionRunsMillis;
 
@@ -1480,7 +1534,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
                     if (idleMillis >= timeBetweenEvictionRunsMillis
                             || idleMillis < 0 // unexcepted branch
-                            ) {
+                    ) {
                         boolean validate = testConnectionInternal(poolableConnection.holder, poolableConnection.conn);
                         if (!validate) {
                             if (LOG.isDebugEnabled()) {
@@ -1488,7 +1542,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                             }
 
                             discardConnection(poolableConnection.holder);
-                             continue;
+                            continue;
                         }
                     }
                 }
@@ -1591,7 +1645,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
         DruidConnectionHolder holder;
 
-        for (boolean createDirect = false;;) {
+        for (boolean createDirect = false; ; ) {
             if (createDirect) {
                 createStartNanosUpdater.set(this, System.nanoTime());
                 if (creatingCountUpdater.compareAndSet(this, 0, 1)) {
@@ -1740,10 +1794,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             StringBuilder buf = new StringBuilder(128);
             buf.append("wait millis ")//
-               .append(waitNanos / (1000 * 1000))//
-               .append(", active ").append(activeCount)//
-               .append(", maxActive ").append(maxActive)//
-               .append(", creating ").append(creatingCount)//
+                    .append(waitNanos / (1000 * 1000))//
+                    .append(", active ").append(activeCount)//
+                    .append(", maxActive ").append(maxActive)//
+                    .append(", creating ").append(creatingCount)//
             ;
             if (creatingCount > 0 && createStartNanos > 0) {
                 long createElapseMillis = (System.nanoTime() - createStartNanos) / (1000 * 1000);
@@ -1756,17 +1810,21 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 buf.append(", createErrorCount ").append(createErrorCount);
             }
 
-            List<JdbcSqlStatValue> sqlList = this.getDataSourceStat().getRuningSqlList();
-            for (int i = 0; i < sqlList.size(); ++i) {
-                if (i != 0) {
-                    buf.append('\n');
-                } else {
-                    buf.append(", ");
+            JdbcDataSourceStat sourceStat = this.getDataSourceStat();
+            if (sourceStat != null) {
+                List<JdbcSqlStatValue> sqlList = sourceStat.getRuningSqlList();
+                for (int i = 0; i < sqlList.size(); ++i) {
+                    if (i != 0) {
+                        buf.append('\n');
+                    } else {
+                        buf.append(", ");
+                    }
+                    JdbcSqlStatValue sql = sqlList.get(i);
+                    buf.append("runningSqlCount ");
+                    buf.append(sql.getRunningCount());
+                    buf.append(" : ");
+                    buf.append(sql.getSql());
                 }
-                JdbcSqlStatValue sql = sqlList.get(i);
-                buf.append("runningSqlCount ").append(sql.getRunningCount());
-                buf.append(" : ");
-                buf.append(sql.getSql());
             }
 
             String errorMessage = buf.toString();
@@ -1858,13 +1916,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             lock.unlock();
         }
 
-        if(onFatalError && holder != null && holder.getDataSource() != null) {
+        if (onFatalError && holder != null && holder.getDataSource() != null) {
             ReentrantLock dataSourceLock = holder.getDataSource().lock;
             dataSourceLock.lock();
             try {
                 emptySignal();
-            }
-            finally {
+            } finally {
                 dataSourceLock.unlock();
             }
         }
@@ -1901,8 +1958,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         if (logDifferentThread //
-            && (!isAsyncCloseConnectionEnable()) //
-            && pooledConnection.ownerThread != Thread.currentThread()//
+                && (!isAsyncCloseConnectionEnable()) //
+                && pooledConnection.ownerThread != Thread.currentThread()//
         ) {
             LOG.warn("get/close not same thread");
         }
@@ -2097,6 +2154,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 destroyConnectionThread.interrupt();
             }
 
+            if (periodDetectionThread != null) {
+                periodDetectionThread.interrupt();
+            }
+
             if (createSchedulerFuture != null) {
                 createSchedulerFuture.cancel(true);
             }
@@ -2154,7 +2215,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 @Override
                 public Object run() {
                     ObjectName objectName = DruidDataSourceStatManager.addDataSource(DruidDataSource.this,
-                                                                                     DruidDataSource.this.name);
+                            DruidDataSource.this.name);
 
                     DruidDataSource.this.setObjectName(objectName);
                     DruidDataSource.this.mbeanRegistered = true;
@@ -2248,7 +2309,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     private DruidConnectionHolder pollLast(long nanos) throws InterruptedException, SQLException {
         long estimate = nanos;
 
-        for (;;) {
+        for (; ; ) {
             if (poolingCount == 0) {
                 emptySignal(); // send signal to CreateThread create connection
 
@@ -2269,8 +2330,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 try {
                     long startEstimate = estimate;
                     estimate = notEmpty.awaitNanos(estimate); // signal by
-                                                              // recycle or
-                                                              // creator
+                    // recycle or
+                    // creator
                     notEmptyWaitCount++;
                     notEmptyWaitNanos += (startEstimate - estimate);
 
@@ -2494,7 +2555,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         value.setCommitCount(commitCountUpdater.getAndSet(this, 0));
         value.setRollbackCount(rollbackCountUpdater.getAndSet(this, 0));
 
-        value.setPstmtCacheHitCount(cachedPreparedStatementHitCountUpdater.getAndSet(this,0));
+        value.setPstmtCacheHitCount(cachedPreparedStatementHitCountUpdater.getAndSet(this, 0));
         value.setPstmtCacheMissCount(cachedPreparedStatementMissCountUpdater.getAndSet(this, 0));
 
         value.setStartTransactionCount(startTransactionCountUpdater.getAndSet(this, 0));
@@ -2572,7 +2633,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 clearCreateTask(createTaskId);
 
                 if (poolingCount + createTaskCount < notEmptyWaitThreadCount //
-                    && activeCount + poolingCount + createTaskCount < maxActive) {
+                        && activeCount + poolingCount + createTaskCount < maxActive) {
                     emptySignal();
                 }
             }
@@ -2584,7 +2645,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public class CreateConnectionTask implements Runnable {
 
-        private int errorCount   = 0;
+        private int errorCount = 0;
         private boolean initTask = false;
         private final long taskId;
 
@@ -2603,7 +2664,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         private void runInternal() {
-            for (;;) {
+            for (; ; ) {
 
                 // addLast
                 lock.lock();
@@ -2769,8 +2830,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     }
 
     public class CreateConnectionThread extends Thread {
+        private volatile boolean started = true;
 
-        public CreateConnectionThread(String name){
+        public CreateConnectionThread(String name) {
             super(name);
             this.setDaemon(true);
         }
@@ -2780,7 +2842,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             long lastDiscardCount = 0;
             int errorCount = 0;
-            for (;;) {
+            for (; ; ) {
                 // addLast
                 try {
                     lock.lockInterruptibly();
@@ -2829,6 +2891,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     if ((!closing) && (!closed)) {
                         LOG.error("create connection Thread Interrupted, url: " + jdbcUrl, e);
                     }
+                    DruidDataSource.this.doSomethingBeforeCreationThreadBreak();
                     break;
                 } finally {
                     lock.unlock();
@@ -2838,9 +2901,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
                 try {
                     connection = createPhysicalConnection();
-                } catch (SQLException e) {
-                    LOG.error("create connection SQLException, url: " + jdbcUrl + ", errorCode " + e.getErrorCode()
-                              + ", state " + e.getSQLState(), e);
+                } catch (SQLException | RuntimeException e) {
+                    if (e instanceof SQLException) {
+                        LOG.error("create connection error, url: " + jdbcUrl + ", errorCode " + ((SQLException) e).getErrorCode()
+                                + ", state " + ((SQLException) e).getSQLState(), e);
+                    } else {
+                        LOG.error("create connection error", e);
+                    }
 
                     errorCount++;
                     if (errorCount > connectionErrorRetryAttempts && timeBetweenConnectErrorMillis > 0) {
@@ -2861,17 +2928,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
                         try {
                             Thread.sleep(timeBetweenConnectErrorMillis);
-                        } catch (InterruptedException interruptEx) {
-                            break;
+                        } catch (InterruptedException ignore) {
+
                         }
+                        DruidDataSource.this.doSomethingBeforeCreationThreadBreak();
+                        break;
                     }
-                } catch (RuntimeException e) {
-                    LOG.error("create connection RuntimeException", e);
-                    setFailContinuous(true);
-                    continue;
                 } catch (Error e) {
                     LOG.error("create connection Error", e);
                     setFailContinuous(true);
+                    DruidDataSource.this.doSomethingBeforeCreationThreadBreak();
                     break;
                 }
 
@@ -2892,11 +2958,49 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 }
             }
         }
+
+        public boolean isStarted() {
+            return started;
+        }
+
+        public void setStarted(boolean started) {
+            this.started = started;
+        }
+    }
+
+    //周期性检查生产线程状态,因为在终止生产线程的时候，为了不让生产线程疯狂重试数据库，只是生成了一个生产线程，但是并没有start,需要一个守护线程
+    //周期性检查线程状态，帮助其启动。
+    private class PeriodDetectionThread extends Thread {
+        public PeriodDetectionThread(String name) {
+            super(name);
+            this.setDaemon(true);
+        }
+
+        public void run() {
+            while (true) {
+                synchronized (DruidDataSource.this) {
+                    //生产线程发生了切换，并且有线程在等待连接，需要主动唤醒生产线程，否则由getConnection方法来唤醒生产线程
+                    if (!createConnectionThread.started && !destroyConnectionThread.started && notEmptyWaitThreadCount > 0) {
+                        createConnectionThread.setStarted(true);
+                        createConnectionThread.start();
+                        destroyConnectionThread.setStarted(true);
+                        destroyConnectionThread.start();
+                    }
+                }
+                try {
+                    Thread.sleep(30000);
+                } catch (InterruptedException ignore) {
+                    break;
+                }
+            }
+        }
     }
 
     public class DestroyConnectionThread extends Thread {
 
-        public DestroyConnectionThread(String name){
+        private volatile boolean started = true;
+
+        public DestroyConnectionThread(String name) {
             super(name);
             this.setDaemon(true);
         }
@@ -2904,7 +3008,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         public void run() {
             initedLatch.countDown();
 
-            for (;;) {
+            for (; ; ) {
                 // 从前面开始删除
                 try {
                     if (closed || closing) {
@@ -2928,6 +3032,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             }
         }
 
+        public boolean isStarted() {
+            return started;
+        }
+
+        public void setStarted(boolean started) {
+            this.started = started;
+        }
     }
 
     public class DestroyTask implements Runnable {
@@ -2948,14 +3059,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
     public class LogStatsThread extends Thread {
 
-        public LogStatsThread(String name){
+        public LogStatsThread(String name) {
             super(name);
             this.setDaemon(true);
         }
 
         public void run() {
             try {
-                for (;;) {
+                for (; ; ) {
                     try {
                         logStats();
                     } catch (Exception e) {
@@ -2981,7 +3092,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         try {
             Iterator<DruidPooledConnection> iter = activeConnections.keySet().iterator();
 
-            for (; iter.hasNext();) {
+            for (; iter.hasNext(); ) {
                 DruidPooledConnection pooledConnection = iter.next();
 
                 if (pooledConnection.isRunning()) {
@@ -3033,7 +3144,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     }
 
                     buf.append("ownerThread current state is " + pooledConnection.getOwnerThread().getState()
-                               + ", current stackTrace\n");
+                            + ", current stackTrace\n");
                     trace = pooledConnection.getOwnerThread().getStackTrace();
                     for (int i = 0; i < trace.length; i++) {
                         buf.append("\tat ");
@@ -3049,7 +3160,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         return removeCount;
     }
 
-    /** Instance key */
+    /**
+     * Instance key
+     */
     protected String instanceKey = null;
 
     public Reference getReference() throws NamingException {
@@ -3130,7 +3243,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             for (int i = 0; i < poolingCount; ++i) {
                 DruidConnectionHolder connection = connections[i];
 
-                if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis))  {
+                if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) {
                     keepAliveConnections[keepAliveCount++] = connection;
                     continue;
                 }
@@ -3754,7 +3867,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         if (this.statLogger != null
-            && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) {
+                && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) {
             return true;
         }
 
@@ -3770,7 +3883,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         if (this.statLogger != null
-            && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) {
+                && (this.statLogger.getClass() == iface || DruidDataSourceStatLogger.class == iface)) {
             return (T) statLogger;
         }
 
@@ -3814,7 +3927,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         }
 
         int fillCount = 0;
-        for (;;) {
+        for (; ; ) {
             try {
                 lock.lockInterruptibly();
             } catch (InterruptedException e) {

fine-poi/src/main/java/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFCell.java

@@ -221,8 +221,8 @@ public class HSSFCell extends CellBase {
                 BoolErrRecord boolErrRecord = ( BoolErrRecord ) record;
 
                 return boolErrRecord.isBoolean()
-                         ? CellType.BOOLEAN
-                         : CellType.ERROR;
+                        ? CellType.BOOLEAN
+                        : CellType.ERROR;
         }
         throw new RuntimeException("Bad cell value rec (" + cval.getClass().getName() + ")");
     }
@@ -412,7 +412,7 @@ public class HSSFCell extends CellBase {
                 throw new IllegalStateException("Invalid cell type: " + cellType);
         }
         if (cellType != _cellType &&
-            _cellType != CellType._NONE )  // Special Value to indicate an uninitialized Cell
+                _cellType != CellType._NONE )  // Special Value to indicate an uninitialized Cell
         {
             _sheet.getSheet().replaceValueRecord(_record);
         }
@@ -643,7 +643,7 @@ public class HSSFCell extends CellBase {
 
     private static RuntimeException typeMismatch(CellType expectedTypeCode, CellType actualTypeCode, boolean isFormulaCell) {
         String msg = "Cannot get a " + expectedTypeCode + " value from a " + actualTypeCode
-            + " " + (isFormulaCell ? "formula " : "") + "cell";
+                + " " + (isFormulaCell ? "formula " : "") + "cell";
         return new IllegalStateException(msg);
     }
     private static void checkFormulaCachedValueType(CellType expectedTypeCode, FormulaRecord fr) {
@@ -723,8 +723,8 @@ public class HSSFCell extends CellBase {
      */
     public String getStringCellValue()
     {
-      HSSFRichTextString str = getRichStringCellValue();
-      return str.getString();
+        HSSFRichTextString str = getRichStringCellValue();
+        return str.getString();
     }
 
     /**
@@ -863,7 +863,7 @@ public class HSSFCell extends CellBase {
             case NUMERIC:
                 return NumberToTextConverter.toText(((NumberRecord)_record).getValue());
             case ERROR:
-                   return FormulaError.forInt(((BoolErrRecord)_record).getErrorValue()).getString();
+                return FormulaError.forInt(((BoolErrRecord)_record).getErrorValue()).getString();
             case FORMULA:
                 // should really evaluate, but HSSFCell can't call HSSFFormulaEvaluator
                 // just use cached formula result instead
@@ -970,9 +970,9 @@ public class HSSFCell extends CellBase {
      */
     public HSSFCellStyle getCellStyle()
     {
-      short styleIndex=_record.getXFIndex();
-      ExtendedFormatRecord xf = _book.getWorkbook().getExFormatAt(styleIndex);
-      return new HSSFCellStyle(styleIndex, xf, _book);
+        short styleIndex=_record.getXFIndex();
+        ExtendedFormatRecord xf = _book.getWorkbook().getExFormatAt(styleIndex);
+        return new HSSFCellStyle(styleIndex, xf, _book);
     }
 
     /**
@@ -1038,7 +1038,7 @@ public class HSSFCell extends CellBase {
                     sdf.setTimeZone(LocaleUtil.getUserTimeZone());
                     return sdf.format(getDateCellValue());
                 }
-				return  String.valueOf(getNumericCellValue());
+                return  String.valueOf(getNumericCellValue());
             case STRING:
                 return getStringCellValue();
             default:
@@ -1069,7 +1069,7 @@ public class HSSFCell extends CellBase {
      *
      * @return comment associated with this cell
      */
-     public HSSFComment getCellComment(){
+    public HSSFComment getCellComment(){
         if (_comment == null) {
             _comment = _sheet.findCellComment(_record.getRow(), _record.getColumn());
         }
@@ -1258,5 +1258,9 @@ public class HSSFCell extends CellBase {
 
         return styleIndex;
     }
+
+    public boolean isRichText() {
+        return false;
+    }
 }
 

fine-poi/src/main/java/com/fr/third/v2/org/apache/poi/ss/usermodel/Cell.java

@@ -71,7 +71,7 @@ public interface Cell {
      *
      * @return the Row that owns this cell
      */
-     Row getRow();
+    Row getRow();
 
     /**
      * Set the cells type (blank, numeric, boolean, error or string).
@@ -253,7 +253,7 @@ public interface Cell {
      */
     void setCellValue(String value);
 
-
+    boolean isRichText();
     /**
      * Sets formula for this cell.
      * <p>If {@code formula} is not null, sets or updates the formula. If {@code formula} is null, removes the formula.
@@ -355,7 +355,7 @@ public interface Cell {
      *        precalculated value, for booleans we'll set its value. For other types we
      *        will change the cell to a boolean cell and set its value.
      */
-     void setCellValue(boolean value);
+    void setCellValue(boolean value);
 
     /**
      * Set a error value for the cell
@@ -419,7 +419,7 @@ public interface Cell {
      */
     void setAsActiveCell();
 
-   /**
+    /**
      * Gets the address of this cell
      *
      * @return <code>A1</code> style address of this cell

fine-poi/src/main/java/com/fr/third/v2/org/apache/poi/xssf/streaming/SXSSFCell.java

@@ -741,6 +741,11 @@ public class SXSSFCell extends CellBase {
         }
     }
 
+    public boolean isRichText() {
+        CellType cellType = this.getCellType();
+        return cellType == CellType.STRING ? ((SXSSFCell.StringValue)this._value).isRichText() : false;
+    }
+
     @Override
     public void setCellValue(BigInteger value) {
         ensureTypeOrFormulaType(CellType.NUMERIC_BIG_INTEGER);

fine-poi/src/main/java/com/fr/third/v2/org/apache/poi/xssf/streaming/SheetDataWriter.java

@@ -202,196 +202,198 @@ public class SheetDataWriter implements Closeable {
         _numberLastFlushedRow = Math.max(rownum, _numberLastFlushedRow);
         _numberOfCellsOfLastFlushedRow = row.getLastCellNum();
         _numberOfFlushedRows++;
-        beginRow(rownum, row);
+        int size = this._numberOfCellsOfLastFlushedRow > 0 ? this._numberOfCellsOfLastFlushedRow : 1;
+        StringBuilder sb = new StringBuilder(size << 6);
+        beginRow(rownum, row, sb);
         Iterator<Cell> cells = row.allCellsIterator();
         int columnIndex = 0;
         while (cells.hasNext()) {
-            writeCell(columnIndex++, cells.next());
+            writeCell(columnIndex++, cells.next(),sb);
         }
-        endRow();
+        endRow(sb);
+        this._out.write(sb.toString());
     }
 
-    void beginRow(int rownum, SXSSFRow row) throws IOException {
-        _out.write("<row");
-        writeAttribute("r", Integer.toString(rownum + 1));
+    void beginRow(int rownum, SXSSFRow row,StringBuilder sb) throws IOException {
+        sb.append("<row");
+        writeAttribute("r", Integer.toString(rownum + 1), sb);
         if (row.hasCustomHeight()) {
-            writeAttribute("customHeight", "true");
-            writeAttribute("ht", Float.toString(row.getHeightInPoints()));
+            writeAttribute("customHeight", "true", sb);
+            writeAttribute("ht", Float.toString(row.getHeightInPoints()), sb);
         }
         if (row.getZeroHeight()) {
-            writeAttribute("hidden", "true");
+            writeAttribute("hidden", "true", sb);
         }
         if (row.isFormatted()) {
-            writeAttribute("s", Integer.toString(row.getRowStyleIndex()));
-            writeAttribute("customFormat", "1");
+            writeAttribute("s", Integer.toString(row.getRowStyleIndex()), sb);
+            writeAttribute("customFormat", "1", sb);
         }
         if (row.getOutlineLevel() != 0) {
-            writeAttribute("outlineLevel", Integer.toString(row.getOutlineLevel()));
+            writeAttribute("outlineLevel", Integer.toString(row.getOutlineLevel()), sb);
         }
         if (row.getHidden() != null) {
-            writeAttribute("hidden", row.getHidden() ? "1" : "0");
+            writeAttribute("hidden", row.getHidden() ? "1" : "0", sb);
         }
         if (row.getCollapsed() != null) {
-            writeAttribute("collapsed", row.getCollapsed() ? "1" : "0");
+            writeAttribute("collapsed", row.getCollapsed() ? "1" : "0", sb);
         }
 
-        _out.write(">\n");
+        sb.append(">\n");
         this._rownum = rownum;
     }
 
-    void endRow() throws IOException {
-        _out.write("</row>\n");
+    void endRow(StringBuilder sb) throws IOException {
+        sb.append("</row>\n");
     }
 
-    public void writeCell(int columnIndex, Cell cell) throws IOException {
+    public void writeCell(int columnIndex, Cell cell,StringBuilder sb) throws IOException {
         if (cell == null) {
             return;
         }
         String ref = new CellReference(_rownum, columnIndex).formatAsString();
-        _out.write("<c");
-        writeAttribute("r", ref);
+        sb.append("<c");
+        writeAttribute("r", ref,sb);
         CellStyle cellStyle = cell.getCellStyle();
         if (cellStyle.getIndex() != 0) {
             // need to convert the short to unsigned short as the indexes can be up to 64k
             // ideally we would use int for this index, but that would need changes to some more
             // APIs
-            writeAttribute("s", Integer.toString(cellStyle.getIndex() & 0xffff));
+            writeAttribute("s", Integer.toString(cellStyle.getIndex() & 0xffff),sb);
         }
         CellType cellType = cell.getCellType();
         switch (cellType) {
             case BLANK: {
-                _out.write('>');
+                sb.append('>');
                 break;
             }
             case FORMULA: {
                 switch (cell.getCachedFormulaResultType()) {
                     case NUMERIC:
-                        writeAttribute("t", "n");
+                        writeAttribute("t", "n",sb);
                         break;
                     case STRING:
-                        writeAttribute("t", STCellType.STR.toString());
+                        writeAttribute("t", STCellType.STR.toString(),sb);
                         break;
                     case BOOLEAN:
-                        writeAttribute("t", "b");
+                        writeAttribute("t", "b",sb);
                         break;
                     case ERROR:
-                        writeAttribute("t", "e");
+                        writeAttribute("t", "e",sb);
                         break;
                 }
-                _out.write("><f>");
-                outputQuotedString(cell.getCellFormula());
-                _out.write("</f>");
+                sb.append("><f>");
+                outputQuotedString(cell.getCellFormula(),sb);
+                sb.append("</f>");
                 switch (cell.getCachedFormulaResultType()) {
                     case NUMERIC:
                         double nval = cell.getNumericCellValue();
                         if (!Double.isNaN(nval)) {
-                            _out.write("<v>");
-                            _out.write(Double.toString(nval));
-                            _out.write("</v>");
+                            sb.append("<v>");
+                            sb.append(Double.toString(nval));
+                            sb.append("</v>");
                         }
                         break;
                     case STRING:
                         String value = cell.getStringCellValue();
                         if (value != null && !value.isEmpty()) {
-                            _out.write("<v>");
-                            _out.write(value);
-                            _out.write("</v>");
+                            sb.append("<v>");
+                            sb.append(value);
+                            sb.append("</v>");
                         }
                         break;
                     case BOOLEAN:
-                        _out.write("><v>");
-                        _out.write(cell.getBooleanCellValue() ? "1" : "0");
-                        _out.write("</v>");
+                        sb.append("><v>");
+                        sb.append(cell.getBooleanCellValue() ? "1" : "0");
+                        sb.append("</v>");
                         break;
                     case ERROR: {
                         FormulaError error = FormulaError.forInt(cell.getErrorCellValue());
 
-                        _out.write("><v>");
-                        _out.write(error.getString());
-                        _out.write("</v>");
+                        sb.append("><v>");
+                        sb.append(error.getString());
+                        sb.append("</v>");
                         break;
                     }
                 }
                 break;
             }
             case STRING: {
-                if (_sharedStringSource != null) {
-                    //XSSFRichTextString rt = new XSSFRichTextString(cell.getStringCellValue());
+                if (_sharedStringSource != null&& cell.isRichText()) {
                     RichTextString rt = cell.getRichStringCellValue();
                     int sRef = _sharedStringSource.addSharedStringItem(rt);
 
-                    writeAttribute("t", STCellType.S.toString());
-                    _out.write("><v>");
-                    _out.write(String.valueOf(sRef));
-                    _out.write("</v>");
+                    writeAttribute("t", STCellType.S.toString(),sb);
+                    sb.append("><v>");
+                    sb.append(String.valueOf(sRef));
+                    sb.append("</v>");
                 } else {
-                    writeAttribute("t", "inlineStr");
-                    _out.write("><is><t");
+                    writeAttribute("t", "inlineStr",sb);
+                    sb.append("><is><t");
                     if (hasLeadingTrailingSpaces(cell.getStringCellValue())) {
-                        writeAttribute("xml:space", "preserve");
+                        writeAttribute("xml:space", "preserve",sb);
                     }
-                    _out.write(">");
-                    outputQuotedString(cell.getStringCellValue());
-                    _out.write("</t></is>");
+                    sb.append(">");
+                    outputQuotedString(cell.getStringCellValue(),sb);
+                    sb.append("</t></is>");
                 }
                 break;
             }
             case NUMERIC_STRING: {
-                _out.write(" t=\"n\"><v>");
-                _out.write(cell.getNumericStringCellValue());
-                _out.write("</v>");
+                sb.append(" t=\"n\"><v>");
+                sb.append(cell.getNumericStringCellValue());
+                sb.append("</v>");
                 break;
             }
             case NUMERIC_BIG_DECIMAL: {
-                _out.write(" t=\"n\">");
-                _out.write("<v>");
-                _out.write(cell.getNumericBigDecimalCellValue().toString());
-                _out.write("</v>");
+                sb.append(" t=\"n\">");
+                sb.append("<v>");
+                sb.append(cell.getNumericBigDecimalCellValue().toString());
+                sb.append("</v>");
                 break;
             }
             case NUMERIC_BIG_INTEGER: {
-                _out.write(" t=\"n\">");
-                _out.write("<v>");
-                _out.write(cell.getNumericBigIntegerCellValue().toString());
-                _out.write("</v>");
+                sb.append(" t=\"n\">");
+                sb.append("<v>");
+                sb.append(cell.getNumericBigIntegerCellValue().toString());
+                sb.append("</v>");
                 break;
             }
             case NUMERIC: {
-                writeAttribute("t", "n");
-                _out.write("><v>");
-                _out.write(Double.toString(cell.getNumericCellValue()));
-                _out.write("</v>");
+                writeAttribute("t", "n",sb);
+                sb.append("><v>");
+                sb.append(Double.toString(cell.getNumericCellValue()));
+                sb.append("</v>");
                 break;
             }
             case BOOLEAN: {
-                writeAttribute("t", "b");
-                _out.write("><v>");
-                _out.write(cell.getBooleanCellValue() ? "1" : "0");
-                _out.write("</v>");
+                writeAttribute("t", "b",sb);
+                sb.append("><v>");
+                sb.append(cell.getBooleanCellValue() ? "1" : "0");
+                sb.append("</v>");
                 break;
             }
             case ERROR: {
                 FormulaError error = FormulaError.forInt(cell.getErrorCellValue());
 
-                writeAttribute("t", "e");
-                _out.write("><v>");
-                _out.write(error.getString());
-                _out.write("</v>");
+                writeAttribute("t", "e",sb);
+                sb.append("><v>");
+                sb.append(error.getString());
+                sb.append("</v>");
                 break;
             }
             default: {
                 throw new IllegalStateException("Invalid cell type: " + cellType);
             }
         }
-        _out.write("</c>");
+        sb.append("</c>");
     }
 
-    private void writeAttribute(String name, String value) throws IOException {
-        _out.write(' ');
-        _out.write(name);
-        _out.write("=\"");
-        _out.write(value);
-        _out.write('\"');
+    private void writeAttribute(String name, String value,StringBuilder sb) throws IOException {
+        sb.append(' ');
+        sb.append(name);
+        sb.append("=\"");
+        sb.append(value);
+        sb.append('\"');
     }
 
     /**
@@ -407,7 +409,7 @@ public class SheetDataWriter implements Closeable {
         return false;
     }
 
-    protected void outputQuotedString(String s) throws IOException {
+    protected void outputQuotedString(String s,StringBuilder sb) throws IOException {
         if (s == null || s.length() == 0) {
             return;
         }
@@ -415,29 +417,29 @@ public class SheetDataWriter implements Closeable {
         for (String codepoint : new StringCodepointsIterable(s)) {
             switch (codepoint) {
                 case "<":
-                    _out.write("&lt;");
+                    sb.append("&lt;");
                     break;
                 case ">":
-                    _out.write("&gt;");
+                    sb.append("&gt;");
                     break;
                 case "&":
-                    _out.write("&amp;");
+                    sb.append("&amp;");
                     break;
                 case "\"":
-                    _out.write("&quot;");
+                    sb.append("&quot;");
                     break;
                 // Special characters
                 case "\n":
-                    _out.write("&#xa;");
+                    sb.append("&#xa;");
                     break;
                 case "\r":
-                    _out.write("&#xd;");
+                    sb.append("&#xd;");
                     break;
                 case "\t":
-                    _out.write("&#x9;");
+                    sb.append("&#x9;");
                     break;
                 case "\u00A0": // NO-BREAK SPACE
-                    _out.write("&#xa0;");
+                    sb.append("&#xa0;");
                     break;
                 default:
                     if (codepoint.length() == 1) {
@@ -445,12 +447,12 @@ public class SheetDataWriter implements Closeable {
                         // YK: XmlBeans silently replaces all ISO control characters ( < 32) with question marks.
                         // the same rule applies to "not a character" symbols.
                         if (replaceWithQuestionMark(c)) {
-                            _out.write('?');
+                            sb.append('?');
                         } else {
-                            _out.write(c);
+                            sb.append(c);
                         }
                     } else {
-                        _out.write(codepoint);
+                        sb.append(codepoint);
                     }
                     break;
             }

fine-poi/src/main/java/com/fr/third/v2/org/apache/poi/xssf/usermodel/XSSFCell.java

@@ -301,17 +301,17 @@ public final class XSSFCell extends CellBase {
                 return 0.0;
             case NUMERIC:
                 if(_cell.isSetV()) {
-                   String v = _cell.getV();
-                   if (v.isEmpty()) {
-                       return 0.0;
-                   }
-                   try {
-                      return Double.parseDouble(v);
-                   } catch(NumberFormatException e) {
-                      throw typeMismatch(CellType.NUMERIC, CellType.STRING, false);
-                   }
+                    String v = _cell.getV();
+                    if (v.isEmpty()) {
+                        return 0.0;
+                    }
+                    try {
+                        return Double.parseDouble(v);
+                    } catch(NumberFormatException e) {
+                        throw typeMismatch(CellType.NUMERIC, CellType.STRING, false);
+                    }
                 } else {
-                   return 0.0;
+                    return 0.0;
                 }
             case FORMULA:
                 throw new AssertionError();
@@ -736,7 +736,7 @@ public final class XSSFCell extends CellBase {
             case STCellType.INT_S: // String is in shared strings
             case STCellType.INT_INLINE_STR: // String is inline in cell
             case STCellType.INT_STR:
-                 return CellType.STRING;
+                return CellType.STRING;
             default:
                 throw new IllegalStateException("Illegal cell type: " + this._cell.getT());
         }
@@ -1076,7 +1076,7 @@ public final class XSSFCell extends CellBase {
 
     /**
      * Removes the comment for this cell, if there is one.
-    */
+     */
     @Override
     public void removeCellComment() {
         XSSFComment comment = getCellComment();
@@ -1218,7 +1218,7 @@ public final class XSSFCell extends CellBase {
                     return FALSE;
                 }
                 throw new IllegalStateException("Unexpected boolean cached formula value '"
-                    + textValue + "'.");
+                        + textValue + "'.");
 
             case STRING:
                 // fall-through
@@ -1266,5 +1266,9 @@ public final class XSSFCell extends CellBase {
         ctCell.setR(r);
     }
 
+    public boolean isRichText() {
+        return false;
+    }
+
 }