Parameterise batch size

utopia-php · Aug 5, 2024 · 6644708 · 6644708
1 parent 2f54112
commit 6644708
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 13 deletions.
diff --git a/src/Migration/Destination.php b/src/Migration/Destination.php
@@ -27,12 +27,22 @@ public function setSource(Source $source): self
      * @param array<string> $resources Resources to transfer
      * @param callable $callback Callback to run after transfer
      * @param string $rootResourceId Root resource ID, If enabled you can only transfer a single root resource
+     * @param int $batchSize The number of resources to transfer in a single batch
      */
-    public function run(array $resources, callable $callback, string $rootResourceId = ''): void
-    {
-        $this->source->run($resources, function (array $resources) use ($callback) {
-            $this->import($resources, $callback);
-        }, $rootResourceId);
+    public function run(
+        array $resources,
+        callable $callback,
+        string $rootResourceId = '',
+        int $batchSize = 100,
+    ): void {
+        $this->source->run(
+            $resources,
+            function (array $resources) use ($callback) {
+                $this->import($resources, $callback);
+            },
+            $rootResourceId,
+            $batchSize
+        );
     }
 
     /**

diff --git a/src/Migration/Resources/Database/Attributes/Email.php b/src/Migration/Resources/Database/Attributes/Email.php
@@ -2,7 +2,6 @@
 
 namespace Utopia\Migration\Resources\Database\Attributes;
 
-use Utopia\Database\Database;
 use Utopia\Migration\Resources\Database\Attribute;
 use Utopia\Migration\Resources\Database\Collection;
 

diff --git a/src/Migration/Source.php b/src/Migration/Source.php
@@ -27,7 +27,7 @@ public function callback(array $resources): void
      * @param callable $callback Callback to run after transfer
      * @param string $rootResourceId Root resource ID, If enabled you can only transfer a single root resource
      */
-    public function run(array $resources, callable $callback, string $rootResourceId = ''): void
+    public function run(array $resources, callable $callback, string $rootResourceId = '', int $batchSize = 100): void
     {
         $this->rootResourceId = $rootResourceId;
 
@@ -46,7 +46,7 @@ public function run(array $resources, callable $callback, string $rootResourceId
             $this->cache->addAll($prunedResources);
         };
 
-        $this->exportResources($resources, 100);
+        $this->exportResources($resources, $batchSize);
     }
 
     /**

diff --git a/src/Migration/Sources/Appwrite.php b/src/Migration/Sources/Appwrite.php
@@ -10,6 +10,7 @@
 use Appwrite\Services\Storage;
 use Appwrite\Services\Teams;
 use Appwrite\Services\Users;
+use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Migration\Exception;
 use Utopia\Migration\Resource;
 use Utopia\Migration\Resources\Auth\Hash;
@@ -38,7 +39,6 @@
 use Utopia\Migration\Resources\Storage\File;
 use Utopia\Migration\Source;
 use Utopia\Migration\Transfer;
-use Utopia\Database\Database as UtopiaDatabase;
 
 class Appwrite extends Source
 {

diff --git a/src/Migration/Transfer.php b/src/Migration/Transfer.php
@@ -180,12 +180,16 @@ public function getStatusCounters(): array
      *
      * @param  array<string>  $resources Resources to transfer
      * @param  callable  $callback Callback to run after transfer
-     * @param  string|null  $rootResourceId Root resource ID, If enabled you can only transfer a single root resource
+     * @param  string  $rootResourceId Root resource ID, If enabled you can only transfer a single root resource
      *
      * @throws \Exception
      */
-    public function run(array $resources, callable $callback, string $rootResourceId = null): void
-    {
+    public function run(
+        array $resources,
+        callable $callback,
+        string $rootResourceId = '',
+        int $batchSize = 100
+    ): void {
         // Allows you to push entire groups if you want.
         $computedResources = [];
         foreach ($resources as $resource) {
@@ -208,7 +212,13 @@ public function run(array $resources, callable $callback, string $rootResourceId
         }
 
         $this->resources = $computedResources;
-        $this->destination->run($computedResources, $callback, $rootResourceId);
+
+        $this->destination->run(
+            $computedResources,
+            $callback,
+            $rootResourceId,
+            $batchSize
+        );
     }
 
     /**