digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-11-10 00:35:25 +03:00
Code Issues Projects Releases Wiki Activity

Make template id lookup concurrency-safe. (#16883)

Browse Source
This commit is contained in:
Raphael Speyer 2023-05-19 04:55:12 +10:00 committed by GitHub
parent 434b33d1e5
commit 50b2c59572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ledger-service/db-backend/src/main/scala/com/digitalasset/http/dbbackend/Queries.scala
View File

@ -23,7 +23,6 @@ import scalaz.std.AllInstances._
import spray.json._
import cats.instances.list._
import cats.Applicative
import cats.syntax.applicative._
import cats.syntax.functor._
import com.daml.http.metrics.HttpJsonApiMetrics
import com.daml.http.util.Logging.InstanceUUID
@ -189,19 +188,19 @@ sealed abstract class Queries(tablePrefix: String, tpIdCacheMaxEntries: Long)(im
private def surrogateTemplateIdFromDb(packageId: String, moduleName: String, entityName: String)(
implicit log: LogHandler
): ConnectionIO[SurrogateTpId] =
sql"""SELECT tpid FROM $templateIdTableName
WHERE (package_id = $packageId AND template_module_name = $moduleName
AND template_entity_name = $entityName)"""
.query[SurrogateTpId]
.option flatMap {
_.cata(
_.pure[ConnectionIO],
sql"""INSERT INTO $templateIdTableName (package_id, template_module_name, template_entity_name)
VALUES ($packageId, $moduleName, $entityName)""".update
.withUniqueGeneratedKeys[SurrogateTpId]("tpid"),
)
}
): ConnectionIO[SurrogateTpId] = for {
_ <- insertTemplateIdIfNotExists(packageId, moduleName, entityName).update.run
tpid <- sql"""SELECT tpid FROM $templateIdTableName
WHERE (package_id = $packageId AND template_module_name = $moduleName
AND template_entity_name = $entityName)""".query[SurrogateTpId].unique
} yield tpid
protected def insertTemplateIdIfNotExists(
packageId: String,
moduleName: String,
entityName: String,
): Fragment
final def lastOffset(parties: PartySet, tpid: SurrogateTpId)(implicit
log: LogHandler
@ -849,6 +848,16 @@ private final class PostgresQueries(tablePrefix: String, tpIdCacheMaxEntries: Lo
}
sql"${fragmentContractPath(path)} $opc ${literalScalar}::jsonb"
}
protected override def insertTemplateIdIfNotExists(
packageId: String,
moduleName: String,
entityName: String,
): Fragment =
sql"""INSERT INTO $templateIdTableName (package_id, template_module_name, template_entity_name)
VALUES ($packageId, $moduleName, $entityName)
ON CONFLICT (package_id, template_module_name, template_entity_name) DO NOTHING"""
}
import OracleQueries.DisableContractPayloadIndexing
@ -1126,6 +1135,15 @@ private final class OracleQueries(
sql"JSON_EXISTS($contractColumnName, " ++
sql"""${oracleShortPathEscape(pathc)}${passingValueAsX})"""
}
protected override def insertTemplateIdIfNotExists(
packageId: String,
moduleName: String,
entityName: String,
): Fragment =
sql"""INSERT /*+ ignore_row_on_dupkey_index($templateIdTableName(package_id, template_module_name, template_entity_name)) */
INTO $templateIdTableName (package_id, template_module_name, template_entity_name)
VALUES ($packageId, $moduleName, $entityName)"""
}
private[http] object OracleQueries {