diff --git a/source/base/src/main/resources/log4j2.xml b/source/base/src/main/resources/log4j2.xml index c889aa69..26f090d7 100644 --- a/source/base/src/main/resources/log4j2.xml +++ b/source/base/src/main/resources/log4j2.xml @@ -1,62 +1,74 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/gateway/src/main/resources/log4j2.xml b/source/gateway/src/main/resources/log4j2.xml index 3fe4b122..d81fe1dc 100644 --- a/source/gateway/src/main/resources/log4j2.xml +++ b/source/gateway/src/main/resources/log4j2.xml @@ -8,7 +8,7 @@ - + diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionalEditor.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionalEditor.java index 4330d8dc..5113dde4 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionalEditor.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/LedgerTransactionalEditor.java @@ -45,6 +45,7 @@ public class LedgerTransactionalEditor implements LedgerEditor { private boolean committed = false; +// private BufferedKVStorage baseStorage; private BufferedKVStorage bufferedStorage; /** @@ -65,6 +66,17 @@ public class LedgerTransactionalEditor implements LedgerEditor { this.stagedSnapshots.push(startingPoint); } + /** + * 创建账本新区块的编辑器； + * + * @param ledgerHash + * @param ledgerSetting + * @param previousBlock + * @param ledgerKeyPrefix + * @param ledgerExStorage + * @param ledgerVerStorage + * @return + */ public static LedgerTransactionalEditor createEditor(HashDigest ledgerHash, LedgerSetting ledgerSetting, LedgerBlock previousBlock, String ledgerKeyPrefix, ExPolicyKVStorage ledgerExStorage, VersioningKVStorage ledgerVerStorage) { @@ -82,6 +94,15 @@ public class LedgerTransactionalEditor implements LedgerEditor { ledgerKeyPrefix, txStagedStorage); } + /** + * 创建创世区块的编辑器； + * + * @param initSetting + * @param ledgerKeyPrefix + * @param ledgerExStorage + * @param ledgerVerStorage + * @return + */ public static LedgerTransactionalEditor createEditor(LedgerInitSetting initSetting, String ledgerKeyPrefix, ExPolicyKVStorage ledgerExStorage, VersioningKVStorage ledgerVerStorage) { LedgerBlockData genesisBlock = new LedgerBlockData(0, null, null); diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditorTest.java similarity index 99% rename from source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java rename to source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditorTest.java index dfab92c9..7ce6908b 100644 --- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java +++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditorTest.java @@ -39,7 +39,7 @@ import com.jd.blockchain.utils.Bytes; import com.jd.blockchain.utils.io.BytesUtils; import com.jd.blockchain.utils.net.NetworkAddress; -public class LedgerEditerTest { +public class LedgerEditorTest { private static final String[] SUPPORTED_PROVIDERS = { ClassicCryptoService.class.getName(), SMCryptoService.class.getName() }; diff --git a/source/peer/src/main/resources/log4j2.xml b/source/peer/src/main/resources/log4j2.xml index c889aa69..b3630520 100644 --- a/source/peer/src/main/resources/log4j2.xml +++ b/source/peer/src/main/resources/log4j2.xml @@ -8,7 +8,7 @@ - + diff --git a/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/ExPolicyKVStorage.java b/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/ExPolicyKVStorage.java index 469ea308..ac8f3af8 100644 --- a/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/ExPolicyKVStorage.java +++ b/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/ExPolicyKVStorage.java @@ -10,37 +10,6 @@ import com.jd.blockchain.utils.Bytes; */ public interface ExPolicyKVStorage extends BatchStorageService{ -// /** -// * 返回“键”对应的“值”；
-// * 如果“键”不存在，则返回 null； -// * -// * @param key -// * @return -// */ -// byte[] get(String key); -// -// /** -// * 如果满足指定的存在性策略，则创建/更新指定的“键-值”； -// * -// * @param key -// * 键； -// * @param value -// * 值； -// * @param ex -// * 如果指定 {@link ExPolicy#EXISTING} ，则只有键存在时才更新；
-// * 如果指定 {@link ExPolicy#NOT_EXISTING} ，则只有键不存在时才更新/创建； -// * @return 如果符合存在性策略，并执行了创建/更新操作，则返回 true，否则返回 false； -// */ -// boolean set(String key, byte[] value, ExPolicy ex); -// -// /** -// * 指定的 key 是否存在； -// * -// * @param key -// * @return -// */ -// boolean exist(String key); - /** * 返回“键”对应的“值”；
* 如果“键”不存在，则返回 null； diff --git a/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java b/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java index e6a00854..f9d859ff 100644 --- a/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java +++ b/source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java @@ -19,65 +19,6 @@ import com.jd.blockchain.utils.Bytes; */ public interface VersioningKVStorage extends BatchStorageService { -// /** -// * Return the latest version entry associated the specified key; -// * -// * If the key doesn't exist, then return -1; -// * -// * @param key -// * @return -// */ -// long getVersion(String key); -// -// /** -// * Return the specified verson's entry;
-// * -// * It will return the latest one if the version is -1;
-// * -// * It will return null if the key or version not exist. -// * -// * @param key -// * @param version -// * @return -// */ -// VersioningKVEntry getEntry(String key, long version); -// -// /** -// * Return the specified verson's value;
-// * -// * If the specified version of key doesn't exist, then return null;
-// * -// * If the version is specified to -1, then return the latest version's -// * value;
-// * -// * @param key -// * @param version -// * @return -// */ -// byte[] get(String key, long version); -// -// /** -// * Update the value of the key;
-// * -// * If key exist, and the specified version equals to latest , then the value is -// * updated and version is increased by 1;
-// * If key not exist, and the specified version is -1, then the value will be -// * created and initialized it's version by 0;
-// * -// * @param key -// * the key; -// * @param value -// * the new value to update if expected version match the actual -// * version; -// * @param version -// * the latest version expected; -// * @return The latest version entry after setting.
-// * If the version checking fail, or concurrent confliction occur, then -// * return -1 as indication.
-// */ -// long set(String key, byte[] value, long version); -// - /** * Return the latest version entry associated the specified key; *