Merge pull request #775 from sangria-graphql/introduce_cacheKeyReversed

use 'cacheKeyReversed' to avoid creating vectors
sangria-graphql · Oct 29, 2021 · d9bd889 · d9bd889
2 parents 3deafc1 + 47b5a4e
commit d9bd889
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/modules/core/src/main/scala/sangria/execution/ExecutionPath.scala b/modules/core/src/main/scala/sangria/execution/ExecutionPath.scala
@@ -38,6 +38,7 @@ class ExecutionPath private (
   }.toVector)
 
   def cacheKey: ExecutionPath.PathCacheKey = cacheKeyPath.reverseIterator.toVector
+  def cacheKeyReversed: ExecutionPath.PathCacheKeyReversed = cacheKeyPath
 
   override def toString: String = _path.reverseIterator
     .foldLeft(new StringBuilder) {
@@ -54,6 +55,7 @@ class ExecutionPath private (
 
 object ExecutionPath {
   type PathCacheKey = Vector[String]
+  type PathCacheKeyReversed = List[String]
 
   val empty = new ExecutionPath(List.empty, List.empty, pathSizeWithoutIndexes = 0)
 }
diff --git a/modules/core/src/main/scala/sangria/execution/FieldCollector.scala b/modules/core/src/main/scala/sangria/execution/FieldCollector.scala
@@ -17,14 +17,15 @@ class FieldCollector[Ctx, Val](
     valueCollector: ValueCollector[Ctx, _],
     exceptionHandler: ExceptionHandler) {
 
-  private val resultCache = Cache.empty[(ExecutionPath.PathCacheKey, String), Try[CollectedFields]]
+  private val resultCache =
+    Cache.empty[(ExecutionPath.PathCacheKeyReversed, String), Try[CollectedFields]]
 
   def collectFields(
       path: ExecutionPath,
       tpe: ObjectType[Ctx, _],
       selections: Vector[ast.SelectionContainer]): Try[CollectedFields] =
     resultCache.getOrElseUpdate(
-      path.cacheKey -> tpe.name, {
+      path.cacheKeyReversed -> tpe.name, {
         val builder: Try[CollectedFieldsBuilder] = Success(new CollectedFieldsBuilder)
 
         selections.foldLeft(builder) { case (acc, s) =>

diff --git a/modules/core/src/main/scala/sangria/execution/ValueCollector.scala b/modules/core/src/main/scala/sangria/execution/ValueCollector.scala
@@ -24,7 +24,7 @@ class ValueCollector[Ctx, Input](
     new ValueCoercionHelper[Ctx](sourceMapper, deprecationTracker, Some(userContext))
 
   private val argumentCache =
-    Cache.empty[(ExecutionPath.PathCacheKey, Vector[ast.Argument]), Try[Args]]
+    Cache.empty[(ExecutionPath.PathCacheKeyReversed, Vector[ast.Argument]), Try[Args]]
 
   def getVariableValues(
       definitions: Vector[ast.VariableDefinition],
@@ -83,7 +83,7 @@ class ValueCollector[Ctx, Input](
       ValueCollector.emptyArgs
     else
       argumentCache.getOrElseUpdate(
-        path.cacheKey -> argumentAsts,
+        path.cacheKeyReversed -> argumentAsts,
         getArgumentValues(forAstNode, argumentDefs, argumentAsts, variables))
 
   def getArgumentValues(