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

Do not consider archives that are already loaded in engine (#2898)

Browse Source
This commit is contained in:
Jussi Mäki 2019-09-13 17:44:18 +02:00 committed by mergify[bot]
parent 68023ac289
commit 6ed6e0e990
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/CompiledPackages.scala
View File

@ -25,7 +25,7 @@ final class PureCompiledPackages private (
packages: Map[PackageId, Package], packages: Map[PackageId, Package],
defns: Map[SDefinitionRef, SExpr]) defns: Map[SDefinitionRef, SExpr])
extends CompiledPackages { extends CompiledPackages {
override def packageIds = packages.keySet override def packageIds: Set[PackageId] = packages.keySet
override def getPackage(pkgId: PackageId): Option[Package] = packages.get(pkgId) override def getPackage(pkgId: PackageId): Option[Package] = packages.get(pkgId)
override def getDefinition(dref: SDefinitionRef): Option[SExpr] = defns.get(dref) override def getDefinition(dref: SDefinitionRef): Option[SExpr] = defns.get(dref)
} }

5
ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessPackageUpload.scala
View File

@ -80,6 +80,11 @@ private[kvutils] case class ProcessPackageUpload(
// Filter out archives that already exists. // Filter out archives that already exists.
val filteredArchives = archives val filteredArchives = archives
.filterNot(
a =>
Ref.PackageId
.fromString(a.getHash)
.fold(_ => false, loadedPackages.contains))
.filter { archive => .filter { archive =>
val stateKey = DamlStateKey.newBuilder val stateKey = DamlStateKey.newBuilder
.setPackageId(archive.getHash) .setPackageId(archive.getHash)