Merge pull request tronprotocol#4471 from wubin01/generate_block_optimize

Optimize generate block logic

Author: forfreeday

framework/src/main/java/org/tron/core/db/Manager.java

@@ -1428,6 +1428,12 @@ public synchronized BlockCapsule generateBlock(Miner miner, long blockTime, long
             MetricLabels.Gauge.QUEUE_REPUSH);
       }
 
+      if (fromPending) {
+        pendingTransactions.poll();
+        Metrics.gaugeInc(MetricKeys.Gauge.MANAGER_QUEUE, -1,
+                MetricLabels.Gauge.QUEUE_PENDING);
+      }
+
       if (trx == null) {
         //  transaction may be removed by rePushLoop.
         logger.warn("Trx is null,fromPending:{},pending:{},repush:{}.",
@@ -1474,11 +1480,6 @@ public synchronized BlockCapsule generateBlock(Miner miner, long blockTime, long
         if (Objects.nonNull(result)) {
           transactionRetCapsule.addTransactionInfo(result);
         }
-        if (fromPending) {
-          pendingTransactions.poll();
-          Metrics.gaugeInc(MetricKeys.Gauge.MANAGER_QUEUE, -1,
-              MetricLabels.Gauge.QUEUE_PENDING);
-        }
       } catch (Exception e) {
         logger.error("Process trx {} failed when generating block: {}", trx.getTransactionId(),
             e.getMessage());