Merge pull request #5665 from tronprotocol/release_4.7.3.1

merge release_4.7.3.1

Author: halibobo1205

chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java

@@ -56,7 +56,6 @@ public class BlockCapsule implements ProtoCapsule<Block> {
 
   private Block block;
   private List<TransactionCapsule> transactions = new ArrayList<>();
-  private StringBuilder toStringBuff = new StringBuilder();
   private boolean isSwitch;
   @Getter
   @Setter
@@ -314,7 +313,7 @@ public boolean hasWitnessSignature() {
 
   @Override
   public String toString() {
-    toStringBuff.setLength(0);
+    StringBuilder toStringBuff = new StringBuilder();
 
     toStringBuff.append("BlockCapsule \n[ ");
     toStringBuff.append("hash=").append(getBlockId()).append("\n");

chainbase/src/main/java/org/tron/core/store/WitnessStore.java

@@ -11,25 +11,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.tron.common.cache.CacheManager;
-import org.tron.common.cache.CacheStrategies;
-import org.tron.common.cache.CacheType;
-import org.tron.common.cache.TronCache;
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.config.Parameter;
 import org.tron.core.db.TronStoreWithRevoking;
 
 @Slf4j(topic = "DB")
 @Component
 public class WitnessStore extends TronStoreWithRevoking<WitnessCapsule> {
- // cache for 127 SR
-  private final TronCache<Integer, List<WitnessCapsule>> witnessStandbyCache;
 
   @Autowired
   protected WitnessStore(@Value("witness") String dbName) {
     super(dbName);
-    String strategy =  String.format(CacheStrategies.PATTERNS, 1, 1, "30s", 1);
-    witnessStandbyCache = CacheManager.allocate(CacheType.witnessStandby, strategy);
   }
 
   /**
@@ -48,19 +40,8 @@ public WitnessCapsule get(byte[] key) {
   }
 
   public List<WitnessCapsule> getWitnessStandby() {
-    List<WitnessCapsule> list =
-        witnessStandbyCache.getIfPresent(Parameter.ChainConstant.WITNESS_STANDBY_LENGTH);
-    if (list != null) {
-      return list;
-    }
-    return updateWitnessStandby(null);
-  }
-
-  public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
     List<WitnessCapsule> ret;
-    if (all == null) {
-      all = getAllWitnesses();
-    }
+    List<WitnessCapsule> all = getAllWitnesses();
     all.sort(Comparator.comparingLong(WitnessCapsule::getVoteCount)
         .reversed().thenComparing(Comparator.comparingInt(
             (WitnessCapsule w) -> w.getAddress().hashCode()).reversed()));
@@ -71,7 +52,6 @@ public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
     }
     // trim voteCount = 0
     ret.removeIf(w -> w.getVoteCount() < 1);
-    witnessStandbyCache.put(Parameter.ChainConstant.WITNESS_STANDBY_LENGTH, ret);
     return ret;
   }
 

consensus/src/main/java/org/tron/consensus/ConsensusDelegate.java

@@ -108,10 +108,6 @@ public List<WitnessCapsule> getAllWitnesses() {
     return witnessStore.getAllWitnesses();
   }
 
-  public List<WitnessCapsule> updateWitnessStandby(List<WitnessCapsule> all) {
-    return witnessStore.updateWitnessStandby(all);
-  }
-
   public void saveStateFlag(int flag) {
     dynamicPropertiesStore.saveStateFlag(flag);
   }

consensus/src/main/java/org/tron/consensus/dpos/MaintenanceManager.java

@@ -151,13 +151,11 @@ public void doMaintenance() {
     if (dynamicPropertiesStore.allowChangeDelegation()) {
       long nextCycle = dynamicPropertiesStore.getCurrentCycleNumber() + 1;
       dynamicPropertiesStore.saveCurrentCycleNumber(nextCycle);
-      List<WitnessCapsule> all = consensusDelegate.getAllWitnesses();
-      all.forEach(witness -> {
+      consensusDelegate.getAllWitnesses().forEach(witness -> {
         delegationStore.setBrokerage(nextCycle, witness.createDbKey(),
             delegationStore.getBrokerage(witness.createDbKey()));
         delegationStore.setWitnessVote(nextCycle, witness.createDbKey(), witness.getVoteCount());
       });
-      consensusDelegate.updateWitnessStandby(all);
     }
   }
 

framework/src/main/java/org/tron/common/cache/CacheManagerTest.java

@@ -0,0 +1,14 @@
+package org.tron.common.cache;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CacheManagerTest {
+
+  @Test
+  public void allocate() {
+    String strategy = String.format(CacheStrategies.PATTERNS, 1, 1, "30s", 1);
+    TronCache<String, String> cache = CacheManager.allocate(CacheType.witnessStandby, strategy);
+    Assert.assertNull(cache.getIfPresent("test"));
+  }
+}

framework/src/main/java/org/tron/program/Version.java

@@ -4,7 +4,7 @@ public class Version {
 
   public static final String VERSION_NAME = "GreatVoyage-v4.7.2-140-g9d13f9cb69";
   public static final String VERSION_CODE = "18173";
-  private static final String VERSION = "4.7.3";
+  private static final String VERSION = "4.7.3.1";
 
   public static String getVersion() {
     return VERSION;

framework/src/test/java/org/tron/core/capsule/BlockCapsuleTest.java

@@ -2,7 +2,9 @@
 
 import com.google.protobuf.ByteString;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -146,4 +148,20 @@ public void testGetTimeStamp() {
     Assert.assertEquals(1234L, blockCapsule0.getTimeStamp());
   }
 
+  @Test
+  public void testConcurrentToString() throws InterruptedException {
+    List<Thread> threadList = new ArrayList<>();
+    int n = 10;
+    for (int i = 0; i < n; i++) {
+      threadList.add(new Thread(() -> blockCapsule0.toString()));
+    }
+    for (int i = 0; i < n; i++) {
+      threadList.get(i).start();
+    }
+    for (int i = 0; i < n; i++) {
+      threadList.get(i).join();
+    }
+    Assert.assertTrue(true);
+  }
+
 }

framework/src/test/java/org/tron/core/db/ManagerTest.java

@@ -581,14 +581,24 @@ public void pushSwitchFork()
       AccountResourceInsufficientException, EventBloomException {
 
     String key = "f31db24bfbd1a2ef19beddca0a0fa37632eded9ac666a05d3bd925f01dde1f62";
+    String key2 = "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
     byte[] privateKey = ByteArray.fromHexString(key);
     final ECKey ecKey = ECKey.fromPrivate(privateKey);
     byte[] address = ecKey.getAddress();
-
+    WitnessCapsule sr1 = new WitnessCapsule(
+        ByteString.copyFrom(address), "www.tron.net/first");
+    sr1.setVoteCount(1000000000L);
+    byte[] privateKey2 = ByteArray.fromHexString(key2);
+    final ECKey ecKey2 = ECKey.fromPrivate(privateKey2);
+    byte[] address2 = ecKey2.getAddress();
+    WitnessCapsule sr2 = new WitnessCapsule(
+        ByteString.copyFrom(address2), "www.tron.net/second");
+    sr2.setVoteCount(100000L);
+    chainManager.getWitnessStore().put(address, sr1);
     WitnessCapsule witnessCapsule = new WitnessCapsule(ByteString.copyFrom(address));
     chainManager.getWitnessScheduleStore().saveActiveWitnesses(new ArrayList<>());
     chainManager.addWitness(ByteString.copyFrom(address));
-
+    List<WitnessCapsule> witnessStandby1 = chainManager.getWitnessStore().getWitnessStandby();
     Block block = getSignedBlock(witnessCapsule.getAddress(), 1533529947843L, privateKey);
     dbManager.pushBlock(new BlockCapsule(block));
 
@@ -625,6 +635,9 @@ public void pushSwitchFork()
     } catch (Exception e) {
       Assert.assertTrue(e instanceof Exception);
     }
+    chainManager.getWitnessStore().put(address, sr2);
+    List<WitnessCapsule> witnessStandby2 = chainManager.getWitnessStore().getWitnessStandby();
+    Assert.assertNotEquals(witnessStandby1, witnessStandby2);
   }
 
 

plugins/src/main/java/org/tron/plugins/DbLite.java

@@ -355,15 +355,7 @@ private void generateInfoProperties(String propertyfile, long num)
   private long getLatestBlockHeaderNum(String databaseDir) throws IOException, RocksDBException {
     // query latest_block_header_number from checkpoint first
     final String latestBlockHeaderNumber = "latest_block_header_number";
-    List<String> cpList = getCheckpointV2List(databaseDir);
-    DBInterface checkpointDb;
-    if (cpList.size() > 0) {
-      String lastestCp = cpList.get(cpList.size() - 1);
-      checkpointDb = DbTool.getDB(
-          databaseDir + "/" + DBUtils.CHECKPOINT_DB_V2, lastestCp);
-    } else {
-      checkpointDb = DbTool.getDB(databaseDir, CHECKPOINT_DB);
-    }
+    DBInterface checkpointDb = getCheckpointDb(databaseDir);
     Long blockNumber = getLatestBlockHeaderNumFromCP(checkpointDb,
         latestBlockHeaderNumber.getBytes());
     if (blockNumber != null) {
@@ -594,7 +586,7 @@ private void mergeBak2Database(String liteDir, BlockNumInfo blockNumInfo) throws
   private byte[] getDataFromSourceDB(String sourceDir, String dbName, byte[] key)
           throws IOException, RocksDBException {
     DBInterface sourceDb = DbTool.getDB(sourceDir, dbName);
-    DBInterface checkpointDb = DbTool.getDB(sourceDir, CHECKPOINT_DB);
+    DBInterface checkpointDb = getCheckpointDb(sourceDir);
     // get data from tmp first.
     byte[] valueFromTmp = checkpointDb.get(Bytes.concat(simpleEncode(dbName), key));
     byte[] value;
@@ -672,6 +664,19 @@ private long getSecondBlock(String databaseDir) throws RocksDBException, IOExcep
     return num;
   }
 
+  private DBInterface getCheckpointDb(String sourceDir) throws IOException, RocksDBException {
+    List<String> cpList = getCheckpointV2List(sourceDir);
+    DBInterface checkpointDb;
+    if (cpList.size() > 0) {
+      String latestCp = cpList.get(cpList.size() - 1);
+      checkpointDb = DbTool.getDB(
+          sourceDir + "/" + DBUtils.CHECKPOINT_DB_V2, latestCp);
+    } else {
+      checkpointDb = DbTool.getDB(sourceDir, CHECKPOINT_DB);
+    }
+    return checkpointDb;
+  }
+
   @VisibleForTesting
   public static void setRecentBlks(long recentBlks) {
     RECENT_BLKS = recentBlks;