Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

(fix): bulk-load related collection mappings instead of findOne by $sequence

Browse Source 
The findOne by $sequence query fails validation because $sequence is an
internal id-type attribute. Instead, load ALL collections for the
database once on first relationship encounter and cache statically per
database per Swoole worker. No per-attribute queries needed.

Also fixes UUID sequence extraction — the previous explode('_') split
UUIDs incorrectly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jake Barnby
2026-04-02 18:39:31 +13:00
co-authored by Claude Opus 4.6
parent f66150aa8b
commit 1b665fdb6f
1 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/init/resources.php
+25 -36
View File
@@ -786,52 +786,41 @@ Http::setResource('getDatabasesDB', function (Group $pools, Database $dbForProje
}
// Also register related collections from relationship attributes
// Use static cache to avoid repeated queries across requests
static $relatedCache = [];
// Load ALL collections for this database once and cache statically
static $dbCollectionMaps = [];
$hasRelationships = false;
$attributes = $collection->getAttribute('attributes', []);
foreach ($attributes as $attr) {
if ($attr->getAttribute('type') !== \Utopia\Query\Schema\ColumnType::Relationship->value) {
continue;
if ($attr->getAttribute('type') === \Utopia\Query\Schema\ColumnType::Relationship->value) {
$hasRelationships = true;
break;
}
$options = $attr->getAttribute('options', []);
$relatedInternalName = \is_array($options) ? ($options['relatedCollection'] ?? null) : null;
$relatedInternalName ??= $attr->getAttribute('relatedCollection');
if ($relatedInternalName === null) {
continue;
}
// Check static cache first
$cacheKey = $dbPrefix . ':' . $relatedInternalName;
if (isset($relatedCache[$cacheKey])) {
[$relKey, $fullKey, $externalId] = $relatedCache[$cacheKey];
$metadata->setCollectionId($relKey, $externalId);
$metadata->setCollectionId($fullKey, $externalId);
continue;
}
// Extract sequence from internal name (e.g., 'collection_16' → '16')
$parts = \explode('_', $relatedInternalName);
$relSeq = \end($parts);
if (!\is_numeric($relSeq) && !\str_contains($relSeq, '-')) {
continue;
}
// Find the Appwrite collection document by sequence
}
if ($hasRelationships && !isset($dbCollectionMaps[$dbPrefix])) {
try {
$relatedCol = $authorization->skip(
$allCols = $authorization->skip(
fn () => $dbForProject->silent(
fn () => $dbForProject->findOne($dbPrefix, [
\Utopia\Database\Query::equal('$sequence', [$relSeq]),
\Utopia\Database\Query::select(['$id', '$sequence']),
fn () => $dbForProject->find($dbPrefix, [
\Utopia\Database\Query::limit(5000),
])
)
);
if ($relatedCol !== null && !$relatedCol->isEmpty()) {
$relKey = 'collection_' . $relSeq;
$fullKey = $dbPrefix . '_collection_' . $relSeq;
$metadata->setCollectionId($relKey, $relatedCol->getId());
$metadata->setCollectionId($fullKey, $relatedCol->getId());
$relatedCache[$cacheKey] = [$relKey, $fullKey, $relatedCol->getId()];
$map = [];
foreach ($allCols as $col) {
$colSeq = $col->getSequence();
if ($colSeq !== null) {
$map['collection_' . $colSeq] = $col->getId();
$map[$dbPrefix . '_collection_' . $colSeq] = $col->getId();
}
}
$dbCollectionMaps[$dbPrefix] = $map;
} catch (\Throwable) {
// Skip — related collection may not exist yet
$dbCollectionMaps[$dbPrefix] = [];
}
}
if (isset($dbCollectionMaps[$dbPrefix])) {
foreach ($dbCollectionMaps[$dbPrefix] as $k => $v) {
$metadata->setCollectionId($k, $v);
}
}
}