Enhance IBD

- Add ForkBlockIndexes to IStore and LiteDBStore for fast fork
planetarium · Aug 21, 2019 · fc4bb70 · fc4bb70
1 parent 703b925
commit fc4bb70
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -36,6 +36,7 @@ To be released.
  -  `IStore.StoreStateReference<T>()` became to take the hash and index of the
     block instead of the block itself.  [[#420]]
      -  Therefore, it also became to lose type parameter `T`.
+ -  Added `IStore.ForkBlockIndexes()` method.  [[#420]]
 
 ### Added interfaces
 

diff --git a/Libplanet.Tests/Store/StoreTracker.cs b/Libplanet.Tests/Store/StoreTracker.cs
@@ -200,6 +200,15 @@ AddressStateMap states
                 sourceNamespace, destinationNamespace, branchPoint, addressesToStrip);
         }
 
+        public void ForkBlockIndexes(
+            string sourceNamespace,
+            string destinationNamespace,
+            HashDigest<SHA256> branchPoint)
+        {
+            _logs.Add((nameof(ForkBlockIndexes), null, null));
+            _store.ForkBlockIndexes(sourceNamespace, destinationNamespace, branchPoint);
+        }
+
         public IEnumerable<KeyValuePair<Address, long>> ListTxNonces(string @namespace)
         {
             _logs.Add((nameof(ListTxNonces), @namespace, null));

diff --git a/Libplanet/Blockchain/BlockChain.cs b/Libplanet/Blockchain/BlockChain.cs
@@ -815,15 +815,8 @@ internal BlockChain<T> Fork(HashDigest<SHA256> point)
             try
             {
                 _rwlock.EnterReadLock();
-                foreach (var index in Store.IterateIndex(id))
-                {
-                    Store.AppendIndex(forkedId, index);
-                    if (index.Equals(point))
-                    {
-                        break;
-                    }
-                }
 
+                Store.ForkBlockIndexes(id, forkedId, point);
                 Block<T> pointBlock = Blocks[point];
 
                 var addressesToStrip = new HashSet<Address>();

diff --git a/Libplanet/Store/BaseStore.cs b/Libplanet/Store/BaseStore.cs
@@ -38,6 +38,12 @@ long index
             HashDigest<SHA256> hash
         );
 
+        /// <inheritdoc />
+        public abstract void ForkBlockIndexes(
+            string sourceNamespace,
+            string destinationNamespace,
+            HashDigest<SHA256> branchPoint);
+
         /// <inheritdoc />
         public abstract IEnumerable<Address> ListAddresses(string @namespace);
 

diff --git a/Libplanet/Store/IStore.cs b/Libplanet/Store/IStore.cs
@@ -53,6 +53,26 @@ public interface IStore
 
         bool DeleteIndex(string @namespace, HashDigest<SHA256> hash);
 
+        /// <summary>
+        /// Forks block indexes from
+        /// <paramref name="sourceNamespace"/> to
+        /// <paramref name="destinationNamespace"/>.
+        /// </summary>
+        /// <param name="sourceNamespace">The namespace of block indexes to
+        /// fork.</param>
+        /// <param name="destinationNamespace">The namespace of destination
+        /// block indexes.</param>
+        /// <param name="branchPoint">The branch point <see cref="Block{T}"/>
+        /// to fork.</param>
+        /// <exception cref="NamespaceNotFoundException">Thrown when the given
+        /// <paramref name="sourceNamespace"/> does not exist.</exception>
+        /// <seealso cref="IterateIndex(string, int, int?)"/>
+        /// <seealso cref="AppendIndex(string, HashDigest{SHA256})"/>
+        void ForkBlockIndexes(
+            string sourceNamespace,
+            string destinationNamespace,
+            HashDigest<SHA256> branchPoint);
+
         /// <summary>
         /// Deletes an index, tx nonces, and state references in the given
         /// <paramref name="namespace"/>.

diff --git a/Libplanet/Store/LiteDBStore.cs b/Libplanet/Store/LiteDBStore.cs
@@ -191,6 +191,19 @@ public override bool DeleteIndex(string @namespace, HashDigest<SHA256> hash)
             return deleted > 0;
         }
 
+        /// <inheritdoc/>
+        public override void ForkBlockIndexes(
+            string sourceNamespace,
+            string destinationNamespace,
+            HashDigest<SHA256> branchPoint)
+        {
+            LiteCollection<HashDoc> srcColl = IndexCollection(sourceNamespace);
+            LiteCollection<HashDoc> destColl = IndexCollection(destinationNamespace);
+
+            destColl.InsertBulk(srcColl.FindAll().TakeWhile(i => !i.Hash.Equals(branchPoint)));
+            AppendIndex(destinationNamespace, branchPoint);
+        }
+
         /// <inheritdoc/>
         public override IEnumerable<Address> ListAddresses(string @namespace)
         {