Avoid using zipWithIndex in executor (#2013)

ghostdogpr · Nov 18, 2023 · 3cb5e02 · 3cb5e02
1 parent 9dd513e
commit 3cb5e02
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/core/src/main/scala/caliban/execution/Executor.scala b/core/src/main/scala/caliban/execution/Executor.scala
@@ -107,12 +107,15 @@ object Executor {
             )
           )
         case ListStep(steps)                =>
-          reduceList(
-            steps.zipWithIndex.map { case (step, i) =>
-              reduceStep(step, currentField, arguments, Right(i) :: path)
-            },
-            Types.listOf(currentField.fieldType).fold(false)(_.isNullable)
-          )
+          var i         = 0
+          val lb        = List.newBuilder[ReducedStep[R]]
+          var remaining = steps
+          while (!remaining.isEmpty) {
+            lb += reduceStep(remaining.head, currentField, arguments, Right(i) :: path)
+            i += 1
+            remaining = remaining.tail
+          }
+          reduceList(lb.result(), Types.listOf(currentField.fieldType).fold(false)(_.isNullable))
         case StreamStep(stream)             =>
           if (request.operationType == OperationType.Subscription) {
             ReducedStep.StreamStep(