rename AnchorType to LedgerDataStructure enum

core

@@ -1 +1 @@
-Subproject commit 3f4cbffd18acd753cdea5b2e73408ae4143e3cf7
+Subproject commit 91d11e114f124b9f92eaac489e518ead6150d2c9

deploy/deploy-peer/src/main/resources/config/init/ledger.init

@@ -13,6 +13,8 @@ root-ca-path=
 #声明的账本创建时间；格式为 “yyyy-MM-dd HH:mm:ss.SSSZ”，表示”年-月-日 时:分:秒:毫秒时区“；例如：“2019-08-01 14:26:58.069+0800”，其中，+0800 表示时区是东8区
 created-time=2019-08-01 14:26:58.069+0800
 
+#账本数据底层结构，分为：MERKLE_TREE, KV两种，默认MERKLE_TREE
+ledger.data.structure=MERKLE_TREE
 
 #-----------------------------------------------
 # 初始的角色名称列表；可选项；
@@ -53,9 +55,6 @@ created-time=2019-08-01 14:26:58.069+0800
 #security.role.GUEST.ledger-privileges=
 #security.role.GUEST.tx-privileges=CONTRACT_OPERATION
 
-#账本数据库的锚定类型，分为：default, simple两种
-ledger.database.anchor=default
-
 #-----------------------------------------------
 #共识服务提供者；必须；
 consensus.service-provider=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider

framework

@@ -1 +1 @@
-Subproject commit b3fbcec5df1e493eb6fd5841b47356d3cc4cef44
+Subproject commit d3eb9e8ea44319d7244b7a3a7e924f12b8ee654f

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/NodeWebContext.java

@@ -7,8 +7,6 @@ import com.jd.blockchain.ledger.TransactionContent;
 import com.jd.blockchain.ledger.core.LedgerInitDecision;
 import com.jd.blockchain.ledger.core.LedgerInitProposal;
 import com.jd.blockchain.ledger.core.LedgerManager;
-import com.jd.blockchain.ledger.core.LedgerQuery;
-import com.jd.blockchain.storage.service.DbConnection;
 import com.jd.blockchain.storage.service.impl.composite.CompositeConnectionFactory;
 import com.jd.blockchain.tools.initializer.DBConnectionConfig;
 import com.jd.blockchain.tools.initializer.LedgerInitProcess;
@@ -63,12 +61,6 @@ public class NodeWebContext {
         this.serverAddress = serverAddress;
     }
 
-    public LedgerQuery registLedger(HashDigest ledgerHash) {
-        DbConnection conn = db.connect(dbConnConfig.getUri());
-        LedgerQuery ledgerRepo = ledgerManager.register(ledgerHash, conn.getStorageService(), dbConnConfig.getAnchor());
-        return ledgerRepo;
-    }
-
     public ThreadInvoker.AsyncCallback<HashDigest> startInit(PrivKey privKey, LedgerInitProperties setting,
                                                              DBConnectionConfig dbConnConfig, Prompter prompter, CountDownLatch quitLatch) {
 

samples/sdk-samples/src/main/resources/testnet/ledger-binding-mem-0.conf

@@ -5,6 +5,8 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
 #第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
 #账本的名字；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=sample-network
+#账本底层数据结构；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.data.structure=MERKLE_TREE
 #账本的当前共识参与方的ID；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=0
 #账本的当前共识参与方的名字；
@@ -21,5 +23,3 @@ binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.address=LdeP3fY7jJbN
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.uri=memory://local/0
 #账本的存储数据库的连接口令；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.pwd=
-#账本的存储数据库的锚定类型；
-binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.anchor=default

samples/sdk-samples/src/main/resources/testnet/ledger-binding-mem-1.conf

@@ -5,6 +5,8 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
 #第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
 #账本的名字；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=sample-network
+#账本底层数据结构；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.data.structure=MERKLE_TREE
 #账本的当前共识参与方的ID；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=1
 #账本的当前共识参与方的名字；
@@ -21,5 +23,3 @@ binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.address=LdeNnz88dH6C
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.uri=memory://local/1
 #账本的存储数据库的连接口令；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.pwd=
-#账本的存储数据库的锚定类型；
-binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.anchor=default

samples/sdk-samples/src/main/resources/testnet/ledger-binding-mem-2.conf

@@ -5,6 +5,8 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
 #第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
 #账本的名字；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=sample-network
+#账本底层数据结构；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.data.structure=MERKLE_TREE
 #账本的当前共识参与方的ID；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=2
 #账本的当前共识参与方的名字；
@@ -21,5 +23,3 @@ binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.address=LdeNmdpT4DiT
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.uri=memory://local/2
 #账本的存储数据库的连接口令；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.pwd=
-#账本的存储数据库的锚定类型；
-binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.anchor=default

samples/sdk-samples/src/main/resources/testnet/ledger-binding-mem-3.conf

@@ -5,6 +5,8 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
 #第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
 #账本的名字；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=sample-network
+#账本底层数据结构；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.data.structure=MERKLE_TREE
 #账本的当前共识参与方的ID；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=3
 #账本的当前共识参与方的名字；
@@ -21,5 +23,3 @@ binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.address=LdeNekdXMHqy
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.uri=memory://local/3
 #账本的存储数据库的连接口令；
 binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.pwd=
-#账本的存储数据库的锚定类型；
-binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.db.anchor=default

samples/sdk-samples/src/main/resources/testnet/ledger.init

@@ -17,8 +17,8 @@ consensus.conf=classpath:testnet/bftsmart.config
 crypto.service-providers=com.jd.blockchain.crypto.service.classic.ClassicCryptoService, \
 com.jd.blockchain.crypto.service.sm.SMCryptoService
 
-#账本数据库的锚定类型，分为：default, simple两种
-ledger.database.anchor=default
+#账本数据底层结构，分为：MERKLE_TREE, KV两种，默认MERKLE_TREE
+ledger.data.structure=MERKLE_TREE
 
 #参与方的个数，后续以 cons_parti.id 分别标识每一个参与方的配置；
 cons_parti.count=4

test

@@ -1 +1 @@
-Subproject commit b6392819e9dd9ee1ba27f391f2e2b05b44547622
+Subproject commit 4f2559f06c4a506f44515505043e4596f805f38e