digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 09:17:43 +03:00
Code Issues Projects Releases Wiki Activity

Clean-up unused methods in MutableCacheBackedContractStore (#15213)

Browse Source 
changelog_begin
changelog_end
This commit is contained in:
tudor-da 2022-10-12 09:55:43 +02:00 committed by GitHub
parent cedb09825a
commit 500a1f2ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ledger/participant-integration-api/src/main/scala/platform/index/IndexServiceOwner.scala
View File

@ -60,7 +60,7 @@ final class IndexServiceOwner(
metrics,
ledgerDao.contractsReader,
contractStateCaches = inMemoryState.contractStateCaches,
)(servicesExecutionContext, loggingContext)
)(servicesExecutionContext)
lfValueTranslation = new LfValueTranslation(
metrics = metrics,

36
ledger/participant-integration-api/src/main/scala/platform/store/cache/MutableCacheBackedContractStore.scala vendored
View File

@ -12,7 +12,6 @@ import com.daml.metrics.Metrics
import com.daml.platform.store.cache.ContractKeyStateValue._
import com.daml.platform.store.cache.ContractStateValue._
import com.daml.platform.store.cache.MutableCacheBackedContractStore._
import com.daml.platform.store.dao.events.ContractStateEvent
import com.daml.platform.store.interfaces.LedgerDaoContractsReader
import com.daml.platform.store.interfaces.LedgerDaoContractsReader.{
ActiveContract,
@ -29,16 +28,11 @@ private[platform] class MutableCacheBackedContractStore(
metrics: Metrics,
contractsReader: LedgerDaoContractsReader,
private[cache] val contractStateCaches: ContractStateCaches,
)(implicit executionContext: ExecutionContext, loggingContext: LoggingContext)
)(implicit executionContext: ExecutionContext)
extends ContractStore {
private val logger = ContextualizedLogger.get(getClass)
def push(eventsBatch: Vector[ContractStateEvent]): Unit = {
debugEvents(eventsBatch)
contractStateCaches.push(eventsBatch)
}
override def lookupActiveContract(readers: Set[Party], contractId: ContractId)(implicit
loggingContext: LoggingContext
): Future[Option[Contract]] =
@ -177,34 +171,6 @@ private[platform] class MutableCacheBackedContractStore(
private def nonEmptyIntersection[T](one: Set[T], other: Set[T]): Boolean =
one.intersect(other).nonEmpty
private def debugEvents(
eventsBatch: Seq[ContractStateEvent]
)(implicit loggingContext: LoggingContext): Unit =
eventsBatch.foreach {
case ContractStateEvent.Created(
contractId,
_,
globalKey,
_,
_,
eventOffset,
eventSequentialId,
) =>
logger.debug(
s"State events update: Created(contractId=${contractId.coid}, globalKey=$globalKey, offset=$eventOffset, eventSequentialId=$eventSequentialId)"
)
case ContractStateEvent.Archived(
contractId,
globalKey,
_,
eventOffset,
eventSequentialId,
) =>
logger.debug(
s"State events update: Archived(contractId=${contractId.coid}, globalKey=$globalKey, offset=$eventOffset, eventSequentialId=$eventSequentialId)"
)
}
}
private[platform] object MutableCacheBackedContractStore {

6
ledger/participant-integration-api/src/test/suite/scala/platform/store/cache/MutableCacheBackedContractStoreRaceTests.scala vendored
View File

@ -108,7 +108,7 @@ private object MutableCacheBackedContractStoreRaceTests {
// Use Future.delegate here to ensure immediate control handover to the next statement
val keyLookupF = Future.delegate(contractStore.lookupContractKey(stakeholders, event.key))
// Update the mutable contract state cache synchronously
contractStore.push(Vector(contractStateEvent))
contractStore.contractStateCaches.push(Vector(contractStateEvent))
for {
// Lookup after synchronous update
@ -132,7 +132,7 @@ private object MutableCacheBackedContractStoreRaceTests {
val keyLookupF =
Future.delegate(contractStore.lookupActiveContract(stakeholders, event.contractId))
// Update the mutable contract state cache synchronously
contractStore.push(Vector(contractStateEvent))
contractStore.contractStateCaches.push(Vector(contractStateEvent))
for {
// Lookup after synchronous update
@ -311,7 +311,7 @@ private object MutableCacheBackedContractStoreRaceTests {
maxKeyCacheSize = 1L,
metrics = metrics,
)(ec, loggingContext),
)(ec, loggingContext)
)(ec)
}
private val toContractStateEvent: SimplifiedContractStateEvent => ContractStateEvent = {

4
ledger/participant-integration-api/src/test/suite/scala/platform/store/cache/MutableCacheBackedContractStoreSpec.scala vendored
View File

@ -47,7 +47,7 @@ class MutableCacheBackedContractStoreSpec extends AsyncWordSpec with Matchers wi
val event2 = event1.copy(eventSequentialId = 2L)
val updateBatch = Vector(event1, event2)
contractStore.push(updateBatch)
contractStore.contractStateCaches.push(updateBatch)
verify(contractStateCaches).push(updateBatch)
succeed
@ -273,7 +273,7 @@ object MutableCacheBackedContractStoreSpec {
scala.concurrent.ExecutionContext.global,
loggingContext,
),
)(scala.concurrent.ExecutionContext.global, loggingContext)
)(scala.concurrent.ExecutionContext.global)
Resource.successful(contractStore)
}