Merge pull request prisma#2143 from graphcool/ReduceExportChunkSize

Reduce export chunksize to 1mb
ziedg · Mar 23, 2018 · 931801f · 931801f
2 parents 90a874d + 3cc4213
commit 931801f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/servers/api/src/main/scala/com/prisma/api/ApiDependencies.scala b/server/servers/api/src/main/scala/com/prisma/api/ApiDependencies.scala
@@ -36,7 +36,7 @@ trait ApiDependencies extends AwaitUtils {
   lazy val graphQlRequestHandler: GraphQlRequestHandler = GraphQlRequestHandlerImpl(println)
   lazy val auth: Auth                                   = AuthImpl
   lazy val requestHandler: RequestHandler               = RequestHandler(projectFetcher, apiSchemaBuilder, graphQlRequestHandler, auth, println)
-  lazy val maxImportExportSize: Int                     = 10000000
+  lazy val maxImportExportSize: Int                     = 1000000
 
   val sssEventsPubSub: PubSub[String]
   lazy val sssEventsPublisher: PubSubPublisher[String] = sssEventsPubSub

diff --git a/server/servers/api/src/main/scala/com/prisma/api/import_export/BulkExport.scala b/server/servers/api/src/main/scala/com/prisma/api/import_export/BulkExport.scala
@@ -129,7 +129,7 @@ class BulkExport(project: Project)(implicit apiDependencies: ApiDependencies) {
 
   private def serializeDataItems(in: JsonBundle, dataItems: Seq[JsValue], info: ExportInfo): ResultFormat = {
     val combinedElements = in.jsonElements ++ dataItems
-    val combinedSize     = in.size + dataItems.map(_.toString.size).sum
+    val combinedSize     = in.size + dataItems.map(_.toString.length).sum
     val out              = JsonBundle(combinedElements, combinedSize)
     val numberSerialized = dataItems.length