From 1559fec29aef29595587ef89c161fe48ff0567f8 Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:53:18 -0400 Subject: [PATCH 1/3] fix: Increasing buckets metadata --- app/config/collections.php | 2 +- src/Appwrite/Migration/Version/V21.php | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/config/collections.php b/app/config/collections.php index b8667d0b8d..e4dadcf0fc 100644 --- a/app/config/collections.php +++ b/app/config/collections.php @@ -5772,7 +5772,7 @@ $bucketCollections = [ '$id' => ID::custom('metadata'), 'type' => Database::VAR_STRING, 'format' => '', - 'size' => 16384, // https://tools.ietf.org/html/rfc4288#section-4.2 + 'size' => 75000, // https://tools.ietf.org/html/rfc4288#section-4.2 'signed' => true, 'required' => false, 'default' => null, diff --git a/src/Appwrite/Migration/Version/V21.php b/src/Appwrite/Migration/Version/V21.php index 7dd2912234..0e7a8b78db 100644 --- a/src/Appwrite/Migration/Version/V21.php +++ b/src/Appwrite/Migration/Version/V21.php @@ -36,6 +36,11 @@ class V21 extends Migration Console::info('Migrating Documents'); $this->forEachDocument([$this, 'fixDocument']); + + if ($this->project->getInternalId() !== 'console') { + Console::info('Migrating Buckets'); + $this->migrateBuckets(); + } } /** @@ -177,4 +182,20 @@ class V21 extends Migration return $document; } + + /** + * Migrating Buckets. + * + * @return void + * @throws Exception + * @throws PDOException + */ + private function migrateBuckets() + { + foreach ($this->documentsIterator('buckets') as $bucket) { + $bucketId = 'bucket_' . $bucket['$internalId']; + + $this->projectDB->updateAttribute($bucketId, 'metadata', size: 75000); + } + } } From 999c2cfac722128019f670be6a15cf07ed4689ef Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:39:32 -0400 Subject: [PATCH 2/3] fix: reviews --- src/Appwrite/Migration/Version/V21.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Appwrite/Migration/Version/V21.php b/src/Appwrite/Migration/Version/V21.php index 0e7a8b78db..2add928d4a 100644 --- a/src/Appwrite/Migration/Version/V21.php +++ b/src/Appwrite/Migration/Version/V21.php @@ -34,13 +34,13 @@ class V21 extends Migration Console::info('Migrating Collections'); $this->migrateCollections(); - Console::info('Migrating Documents'); - $this->forEachDocument([$this, 'fixDocument']); - if ($this->project->getInternalId() !== 'console') { Console::info('Migrating Buckets'); $this->migrateBuckets(); } + + Console::info('Migrating Documents'); + $this->forEachDocument([$this, 'fixDocument']); } /** @@ -187,15 +187,17 @@ class V21 extends Migration * Migrating Buckets. * * @return void - * @throws Exception - * @throws PDOException */ private function migrateBuckets() { foreach ($this->documentsIterator('buckets') as $bucket) { $bucketId = 'bucket_' . $bucket['$internalId']; - $this->projectDB->updateAttribute($bucketId, 'metadata', size: 75000); + try { + $this->projectDB->updateAttribute($bucketId, 'metadata', size: 75000); + } catch (\Throwable $th) { + Console::warning("'bucketId' from {$bucketId}: {$th->getMessage()}"); + } } } } From 821d0bee194b4b2b8d5fdb12e20e289208cbc7a5 Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Tue, 30 Jul 2024 20:36:29 -0400 Subject: [PATCH 3/3] feat: Purging collection cache --- src/Appwrite/Migration/Version/V21.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Appwrite/Migration/Version/V21.php b/src/Appwrite/Migration/Version/V21.php index 2add928d4a..af2d86a2ba 100644 --- a/src/Appwrite/Migration/Version/V21.php +++ b/src/Appwrite/Migration/Version/V21.php @@ -195,6 +195,7 @@ class V21 extends Migration try { $this->projectDB->updateAttribute($bucketId, 'metadata', size: 75000); + $this->projectDB->purgeCachedCollection($bucketId); } catch (\Throwable $th) { Console::warning("'bucketId' from {$bucketId}: {$th->getMessage()}"); }