From f53fd639d87fb03b864b7028fedbf9fb5668bee9 Mon Sep 17 00:00:00 2001 From: lvs007 Date: Tue, 28 May 2019 15:39:11 +0800 Subject: [PATCH 1/2] modify the class name --- src/main/java/org/tron/core/db/AccountStore.java | 6 +++--- src/main/java/org/tron/core/db/Manager.java | 8 +++----- .../db/{fast => accountstate}/AccountStateEntity.java | 2 +- .../tron/core/db/{fast => accountstate}/TrieService.java | 4 ++-- .../callback/AccountStateCallBack.java} | 8 ++++---- .../storetrie/AccountStateStoreTrie.java | 6 +++--- 6 files changed, 16 insertions(+), 18 deletions(-) rename src/main/java/org/tron/core/db/{fast => accountstate}/AccountStateEntity.java (96%) rename src/main/java/org/tron/core/db/{fast => accountstate}/TrieService.java (93%) rename src/main/java/org/tron/core/db/{fast/callback/FastSyncCallBack.java => accountstate/callback/AccountStateCallBack.java} (95%) rename src/main/java/org/tron/core/db/{fast => accountstate}/storetrie/AccountStateStoreTrie.java (91%) diff --git a/src/main/java/org/tron/core/db/AccountStore.java b/src/main/java/org/tron/core/db/AccountStore.java index d3174f93afd..b42d1f064ff 100644 --- a/src/main/java/org/tron/core/db/AccountStore.java +++ b/src/main/java/org/tron/core/db/AccountStore.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Component; import org.tron.core.Wallet; import org.tron.core.capsule.AccountCapsule; -import org.tron.core.db.fast.callback.FastSyncCallBack; -import org.tron.core.db.fast.storetrie.AccountStateStoreTrie; +import org.tron.core.db.accountstate.callback.AccountStateCallBack; +import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie; @Slf4j(topic = "DB") @Component @@ -21,7 +21,7 @@ public class AccountStore extends TronStoreWithRevoking { private static Map assertsAddress = new HashMap<>(); // key = name , value = address @Autowired - private FastSyncCallBack fastSyncCallBack; + private AccountStateCallBack fastSyncCallBack; @Autowired private AccountStateStoreTrie accountStateStoreTrie; diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java index 5608d22e1f3..eb6b08087d7 100644 --- a/src/main/java/org/tron/core/db/Manager.java +++ b/src/main/java/org/tron/core/db/Manager.java @@ -31,8 +31,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; @@ -77,8 +75,8 @@ import org.tron.core.config.args.GenesisBlock; import org.tron.core.db.KhaosDatabase.KhaosBlock; import org.tron.core.db.api.AssetUpdateHelper; -import org.tron.core.db.fast.TrieService; -import org.tron.core.db.fast.callback.FastSyncCallBack; +import org.tron.core.db.accountstate.TrieService; +import org.tron.core.db.accountstate.callback.AccountStateCallBack; import org.tron.core.db2.core.ISession; import org.tron.core.db2.core.ITronChainBase; import org.tron.core.db2.core.SnapshotManager; @@ -223,7 +221,7 @@ public class Manager { private ForkController forkController = ForkController.instance(); @Autowired - private FastSyncCallBack fastSyncCallBack; + private AccountStateCallBack fastSyncCallBack; @Autowired private TrieService trieService; diff --git a/src/main/java/org/tron/core/db/fast/AccountStateEntity.java b/src/main/java/org/tron/core/db/accountstate/AccountStateEntity.java similarity index 96% rename from src/main/java/org/tron/core/db/fast/AccountStateEntity.java rename to src/main/java/org/tron/core/db/accountstate/AccountStateEntity.java index 6055c05b388..45d8adb4df1 100644 --- a/src/main/java/org/tron/core/db/fast/AccountStateEntity.java +++ b/src/main/java/org/tron/core/db/accountstate/AccountStateEntity.java @@ -1,4 +1,4 @@ -package org.tron.core.db.fast; +package org.tron.core.db.accountstate; import lombok.extern.slf4j.Slf4j; import org.tron.core.Wallet; diff --git a/src/main/java/org/tron/core/db/fast/TrieService.java b/src/main/java/org/tron/core/db/accountstate/TrieService.java similarity index 93% rename from src/main/java/org/tron/core/db/fast/TrieService.java rename to src/main/java/org/tron/core/db/accountstate/TrieService.java index bb4c3edc60e..0dd5827006a 100644 --- a/src/main/java/org/tron/core/db/fast/TrieService.java +++ b/src/main/java/org/tron/core/db/accountstate/TrieService.java @@ -1,4 +1,4 @@ -package org.tron.core.db.fast; +package org.tron.core.db.accountstate; import com.google.protobuf.ByteString; import com.google.protobuf.Internal; @@ -9,7 +9,7 @@ import org.tron.common.crypto.Hash; import org.tron.core.capsule.BlockCapsule; import org.tron.core.db.Manager; -import org.tron.core.db.fast.storetrie.AccountStateStoreTrie; +import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie; @Slf4j(topic = "AccountState") @Component diff --git a/src/main/java/org/tron/core/db/fast/callback/FastSyncCallBack.java b/src/main/java/org/tron/core/db/accountstate/callback/AccountStateCallBack.java similarity index 95% rename from src/main/java/org/tron/core/db/fast/callback/FastSyncCallBack.java rename to src/main/java/org/tron/core/db/accountstate/callback/AccountStateCallBack.java index 577f1b89f4a..fe0d44896a3 100644 --- a/src/main/java/org/tron/core/db/fast/callback/FastSyncCallBack.java +++ b/src/main/java/org/tron/core/db/accountstate/callback/AccountStateCallBack.java @@ -1,4 +1,4 @@ -package org.tron.core.db.fast.callback; +package org.tron.core.db.accountstate.callback; import com.google.protobuf.ByteString; import com.google.protobuf.Internal; @@ -16,8 +16,8 @@ import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.utils.RLP; import org.tron.core.db.Manager; -import org.tron.core.db.fast.AccountStateEntity; -import org.tron.core.db.fast.storetrie.AccountStateStoreTrie; +import org.tron.core.db.accountstate.AccountStateEntity; +import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie; import org.tron.core.exception.BadBlockException; import org.tron.core.trie.TrieImpl; import org.tron.core.trie.TrieImpl.Node; @@ -25,7 +25,7 @@ @Slf4j(topic = "AccountState") @Component -public class FastSyncCallBack { +public class AccountStateCallBack { private BlockCapsule blockCapsule; private volatile boolean execute = false; diff --git a/src/main/java/org/tron/core/db/fast/storetrie/AccountStateStoreTrie.java b/src/main/java/org/tron/core/db/accountstate/storetrie/AccountStateStoreTrie.java similarity index 91% rename from src/main/java/org/tron/core/db/fast/storetrie/AccountStateStoreTrie.java rename to src/main/java/org/tron/core/db/accountstate/storetrie/AccountStateStoreTrie.java index 0c85c3ef34e..df3a3a157ee 100644 --- a/src/main/java/org/tron/core/db/fast/storetrie/AccountStateStoreTrie.java +++ b/src/main/java/org/tron/core/db/accountstate/storetrie/AccountStateStoreTrie.java @@ -1,4 +1,4 @@ -package org.tron.core.db.fast.storetrie; +package org.tron.core.db.accountstate.storetrie; import javax.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; @@ -9,8 +9,8 @@ import org.tron.core.capsule.BytesCapsule; import org.tron.core.capsule.utils.RLP; import org.tron.core.db.TronStoreWithRevoking; -import org.tron.core.db.fast.AccountStateEntity; -import org.tron.core.db.fast.TrieService; +import org.tron.core.db.accountstate.AccountStateEntity; +import org.tron.core.db.accountstate.TrieService; import org.tron.core.db2.common.DB; import org.tron.core.trie.TrieImpl; From 2e3306dcb082d160b23706605efb11beab3a451a Mon Sep 17 00:00:00 2001 From: lvs007 Date: Tue, 28 May 2019 15:45:45 +0800 Subject: [PATCH 2/2] modify the class name --- .../java/org/tron/core/db/AccountStore.java | 4 ++-- src/main/java/org/tron/core/db/Manager.java | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/tron/core/db/AccountStore.java b/src/main/java/org/tron/core/db/AccountStore.java index b42d1f064ff..7740eb9be97 100644 --- a/src/main/java/org/tron/core/db/AccountStore.java +++ b/src/main/java/org/tron/core/db/AccountStore.java @@ -21,7 +21,7 @@ public class AccountStore extends TronStoreWithRevoking { private static Map assertsAddress = new HashMap<>(); // key = name , value = address @Autowired - private AccountStateCallBack fastSyncCallBack; + private AccountStateCallBack accountStateCallBack; @Autowired private AccountStateStoreTrie accountStateStoreTrie; @@ -41,7 +41,7 @@ public AccountCapsule get(byte[] key) { @Override public void put(byte[] key, AccountCapsule item) { super.put(key, item); - fastSyncCallBack.accountCallBack(key, item); + accountStateCallBack.accountCallBack(key, item); } /** diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java index eb6b08087d7..258665e4294 100644 --- a/src/main/java/org/tron/core/db/Manager.java +++ b/src/main/java/org/tron/core/db/Manager.java @@ -221,7 +221,7 @@ public class Manager { private ForkController forkController = ForkController.instance(); @Autowired - private AccountStateCallBack fastSyncCallBack; + private AccountStateCallBack accountStateCallBack; @Autowired private TrieService trieService; @@ -432,7 +432,7 @@ public void stopRepushTriggerThread() { @PostConstruct public void init() { Message.setManager(this); - fastSyncCallBack.setManager(this); + accountStateCallBack.setManager(this); trieService.setManager(this); revokingStore.disable(); revokingStore.check(); @@ -1318,7 +1318,7 @@ public synchronized BlockCapsule generateBlock( session.reset(); session.setValue(revokingStore.buildSession()); // - fastSyncCallBack.preExecute(blockCapsule); + accountStateCallBack.preExecute(blockCapsule); if (needCheckWitnessPermission && !witnessService. validateWitnessPermission(witnessCapsule.getAddress())) { @@ -1369,9 +1369,9 @@ public synchronized BlockCapsule generateBlock( } // apply transaction try (ISession tmpSeesion = revokingStore.buildSession()) { - fastSyncCallBack.preExeTrans(); + accountStateCallBack.preExeTrans(); processTransaction(trx, blockCapsule); - fastSyncCallBack.exeTransFinish(); + accountStateCallBack.exeTransFinish(); tmpSeesion.merge(); // push into block blockCapsule.addTransaction(trx); @@ -1413,7 +1413,7 @@ public synchronized BlockCapsule generateBlock( } } // end of while - fastSyncCallBack.executeGenerateFinish(); + accountStateCallBack.executeGenerateFinish(); session.reset(); if (postponedTrxCount > 0) { @@ -1515,19 +1515,19 @@ public void processBlock(BlockCapsule block) } } try { - fastSyncCallBack.preExecute(block); + accountStateCallBack.preExecute(block); for (TransactionCapsule transactionCapsule : block.getTransactions()) { transactionCapsule.setBlockNum(block.getNum()); if (block.generatedByMyself) { transactionCapsule.setVerified(true); } - fastSyncCallBack.preExeTrans(); + accountStateCallBack.preExeTrans(); processTransaction(transactionCapsule, block); - fastSyncCallBack.exeTransFinish(); + accountStateCallBack.exeTransFinish(); } - fastSyncCallBack.executePushFinish(); + accountStateCallBack.executePushFinish(); } finally { - fastSyncCallBack.exceptionFinish(); + accountStateCallBack.exceptionFinish(); } boolean needMaint = needMaintenance(block.getTimeStamp());