Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cede to mark rdf expensive operations #4710

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Add cede to mark rdf expensive operations #4710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6034421
Add cede to mark rdf expensive operations
Feb 1, 2024
db42287
Merge branch 'master' into add-cede-for-expensive-rdf-operations
imsdu Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion delta/rdf/src/main/scala/ch/epfl/bluebrain/nexus/delta/rdf/graph/Graph.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ final case class Graph private (rootNode: IriOrBNode, value: DatasetGraph) { sel
resolvedCtx <- JsonLdContext(contextValue)
ctx = dotContext(rootResource, resolvedCtx)
string <-
ioTryOrRdfError(RDFWriter.create().lang(DOT).source(collapseGraphs).context(ctx).asString(), DOT.getName)
tryExpensiveIO(RDFWriter.create().lang(DOT).source(collapseGraphs).context(ctx).asString(), DOT.getName)
} yield Dot(string, rootNode)

/**
Expand Down
22 changes: 11 additions & 11 deletions delta/rdf/src/main/scala/ch/epfl/bluebrain/nexus/delta/rdf/jsonld/api/JsonLdJavaApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri
import ch.epfl.bluebrain.nexus.delta.rdf.{ExplainResult, RdfError}
import ch.epfl.bluebrain.nexus.delta.rdf.RdfError.{ConversionError, RemoteContextCircularDependency, RemoteContextError, UnexpectedJsonLd, UnexpectedJsonLdContext}
import ch.epfl.bluebrain.nexus.delta.rdf.implicits._
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.JsonLdJavaApi.{ioTryOrRdfError, tryOrRdfError}
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.JsonLdJavaApi.{tryExpensiveIO, tryOrRdfError}
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.JsonLdApiConfig.ErrorHandling
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords
import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context._
Expand Down Expand Up @@ -35,10 +35,10 @@ final class JsonLdJavaApi(config: JsonLdApiConfig) extends JsonLdApi {
ctx: ContextValue
)(implicit opts: JsonLdOptions, rcr: RemoteContextResolution): IO[JsonObject] =
for {
obj <- ioTryOrRdfError(JsonUtils.fromString(input.noSpaces), "building input")
ctxObj <- ioTryOrRdfError(JsonUtils.fromString(ctx.toString), "building context")
obj <- tryExpensiveIO(JsonUtils.fromString(input.noSpaces), "building input")
ctxObj <- tryExpensiveIO(JsonUtils.fromString(ctx.toString), "building context")
options <- documentLoader(input, ctx.contextObj.asJson).map(toOpts)
compacted <- ioTryOrRdfError(JsonUtils.toString(JsonLdProcessor.compact(obj, ctxObj, options)), "compacting")
compacted <- tryExpensiveIO(JsonUtils.toString(JsonLdProcessor.compact(obj, ctxObj, options)), "compacting")
compactedObj <- IO.fromEither(toJsonObjectOrErr(compacted))
} yield compactedObj

Expand All @@ -51,10 +51,10 @@ final class JsonLdJavaApi(config: JsonLdApiConfig) extends JsonLdApi {
input: Json
)(implicit opts: JsonLdOptions, rcr: RemoteContextResolution): IO[ExplainResult[Seq[JsonObject]]] =
for {
obj <- ioTryOrRdfError(JsonUtils.fromString(input.noSpaces), "building input")
obj <- tryExpensiveIO(JsonUtils.fromString(input.noSpaces), "building input")
remoteContexts <- remoteContexts(input)
options = toOpts(documentLoader(remoteContexts))
expanded <- ioTryOrRdfError(JsonUtils.toString(JsonLdProcessor.expand(obj, options)), "expanding")
expanded <- tryExpensiveIO(JsonUtils.toString(JsonLdProcessor.expand(obj, options)), "expanding")
expandedSeqObj <- IO.fromEither(toSeqJsonObjectOrErr(expanded))
} yield ExplainResult(remoteContexts, expandedSeqObj)

Expand All @@ -63,10 +63,10 @@ final class JsonLdJavaApi(config: JsonLdApiConfig) extends JsonLdApi {
frame: Json
)(implicit opts: JsonLdOptions, rcr: RemoteContextResolution): IO[JsonObject] =
for {
obj <- ioTryOrRdfError(JsonUtils.fromString(input.noSpaces), "building input")
ff <- ioTryOrRdfError(JsonUtils.fromString(frame.noSpaces), "building frame")
obj <- tryExpensiveIO(JsonUtils.fromString(input.noSpaces), "building input")
ff <- tryExpensiveIO(JsonUtils.fromString(frame.noSpaces), "building frame")
options <- documentLoader(input, frame).map(toOpts)
framed <- ioTryOrRdfError(JsonUtils.toString(JsonLdProcessor.frame(obj, ff, options)), "framing")
framed <- tryExpensiveIO(JsonUtils.toString(JsonLdProcessor.frame(obj, ff, options)), "framing")
framedObj <- IO.fromEither(toJsonObjectOrErr(framed))
} yield framedObj

Expand Down Expand Up @@ -188,8 +188,8 @@ object JsonLdJavaApi {
JsonLdApiConfig(strict = false, extraChecks = false, errorHandling = ErrorHandling.NoWarning)
)

private[rdf] def ioTryOrRdfError[A](value: => A, stage: String): IO[A] =
IO.fromEither(tryOrRdfError(value, stage))
private[rdf] def tryExpensiveIO[A](value: => A, stage: String): IO[A] =
IO.cede *> IO.fromEither(tryOrRdfError(value, stage)).guarantee(IO.cede)

private[rdf] def tryOrRdfError[A](value: => A, stage: String): Either[RdfError, A] =
Try(value).toEither.leftMap {
Expand Down