Cache objects in HistoryStorage. fix #332

src/main/scala/org/ergoplatform/nodeView/history/storage/HistoryStorage.scala

@@ -1,26 +1,29 @@
 package org.ergoplatform.nodeView.history.storage
 
+import com.google.common.cache.CacheBuilder
 import io.iohk.iodb.{ByteArrayWrapper, Store}
 import org.ergoplatform.modifiers.ErgoPersistentModifier
 import org.ergoplatform.modifiers.history.HistoryModifierSerializer
+import org.ergoplatform.settings.Algos
 import scorex.core.ModifierId
 import scorex.core.utils.{ScorexEncoding, ScorexLogging}
 
-import scala.util.{Failure, Success}
+import scalacache._
+import scalacache.guava._
+import scalacache.modes.try_.mode
 
 class HistoryStorage(indexStore: Store, objectsStore: ObjectsStore) extends ScorexLogging with AutoCloseable
   with ScorexEncoding {
 
-  def modifierById(id: ModifierId): Option[ErgoPersistentModifier] = objectsStore.get(id)
-    .flatMap { bBytes =>
-      HistoryModifierSerializer.parseBytes(bBytes) match {
-        case Success(b) =>
-          Some(b)
-        case Failure(e) =>
-          log.warn(s"Failed to parse modifier ${encoder.encode(id)} from db (bytes are: ${bBytes.mkString("-")}): ", e)
-          None
-      }
+  // TODO move size to config?
+  val underlyingGuavaCache = CacheBuilder.newBuilder().maximumSize(100L).build[String, Entry[ErgoPersistentModifier]]
+  implicit val modifiersCache: Cache[ErgoPersistentModifier] = GuavaCache(underlyingGuavaCache)
+
+  def modifierById(id: ModifierId): Option[ErgoPersistentModifier] = {
+    cachingF(Algos.encode(id))(ttl = None) {
+      HistoryModifierSerializer.parseBytes(objectsStore.get(id).get)
     }
+  }.toOption
 
   def getIndex(id: ByteArrayWrapper): Option[ByteArrayWrapper] = indexStore.get(id)
 

src/main/scala/org/ergoplatform/nodeView/history/storage/modifierprocessors/FullBlockSectionProcessor.scala

@@ -10,6 +10,7 @@ import scorex.core.validation.{ModifierValidator, RecoverableModifierError, Vali
 
 import scala.util.{Failure, Try}
 
+
 /**
   * Trait that implements BlockSectionProcessor interfaces for regimes where the node
   * downloads and process full blocks.