Skip to content

reduce map contention #1264

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

Open
yanns wants to merge 1 commit into
base: main
Choose a base branch
from
Open

reduce map contention #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 18 additions & 11 deletions modules/core/src/main/scala/sangria/execution/FieldCollector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import sangria.ast.OperationType
import sangria.ast.SourceMapper
import sangria.schema._
import sangria.ast
import sangria.util.Cache

import java.util.concurrent.ConcurrentHashMap
import scala.collection.mutable.{ArrayBuffer, Map => MutableMap, Set => MutableSet}
import scala.util.{Failure, Success, Try}

Expand All @@ -18,23 +18,30 @@ class FieldCollector[Ctx, Val](
exceptionHandler: ExceptionHandler) {

private val resultCache =
Cache.empty[(ExecutionPath.PathCacheKeyReversed, String), Try[CollectedFields]]
new ConcurrentHashMap[
ExecutionPath.PathCacheKeyReversed,
ConcurrentHashMap[String, Try[CollectedFields]]]

def collectFields(
path: ExecutionPath,
tpe: ObjectType[Ctx, _],
selections: Vector[ast.SelectionContainer]): Try[CollectedFields] =
resultCache.getOrElseUpdate(
path.cacheKeyReversed -> tpe.name, {
val builder: Try[CollectedFieldsBuilder] = Success(new CollectedFieldsBuilder)
resultCache
.computeIfAbsent(
path.cacheKeyReversed,
key => new ConcurrentHashMap[String, Try[CollectedFields]])
.computeIfAbsent(
tpe.name,
name => {
val builder: Try[CollectedFieldsBuilder] = Success(new CollectedFieldsBuilder)

selections.foldLeft(builder) { case (acc, s) =>
collectFieldsInternal(tpe, s.selections, MutableSet.empty, acc)
}
selections.foldLeft(builder) { case (acc, s) =>
collectFieldsInternal(tpe, s.selections, MutableSet.empty, acc)
}

builder.map(_.build)
}
)
builder.map(_.build)
}
)

private def collectFieldsInternal(
tpe: ObjectType[Ctx, _],
Expand Down
15 changes: 11 additions & 4 deletions modules/core/src/main/scala/sangria/execution/ValueCollector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import sangria.schema._
import sangria.util.Cache
import sangria.validation._

import java.util.concurrent.ConcurrentHashMap
import scala.collection.immutable.VectorBuilder
import scala.util.{Failure, Success, Try}

Expand All @@ -24,7 +25,9 @@ class ValueCollector[Ctx, Input](
new ValueCoercionHelper[Ctx](sourceMapper, deprecationTracker, Some(userContext))

private val argumentCache =
Cache.empty[(ExecutionPath.PathCacheKeyReversed, Vector[ast.Argument]), Try[Args]]
new ConcurrentHashMap[
ExecutionPath.PathCacheKeyReversed,
ConcurrentHashMap[Vector[ast.Argument], Try[Args]]]

def getVariableValues(
definitions: Vector[ast.VariableDefinition],
Expand Down Expand Up @@ -106,9 +109,13 @@ class ValueCollector[Ctx, Input](
if (argumentDefs.isEmpty)
ValueCollector.emptyArgs
else
argumentCache.getOrElseUpdate(
path.cacheKeyReversed -> argumentAsts,
getArgumentValues(forAstNode, argumentDefs, argumentAsts, variables))
argumentCache
.computeIfAbsent(
path.cacheKeyReversed,
key => new ConcurrentHashMap[Vector[ast.Argument], Try[Args]])
.computeIfAbsent(
argumentAsts,
argumentAsts => getArgumentValues(forAstNode, argumentDefs, argumentAsts, variables))

def getArgumentValues(
forAstNode: Option[ast.AstNode],
Expand Down