Skip to content

Feat/index length #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 4 commits into from
May 13, 2025
Merged

Feat/index length #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54b11df
updated index validator length test cases
ArnabChatterjee20k May 13, 2025
3bc1774
Merge branch 'main' into feat/index-length
ArnabChatterjee20k May 13, 2025
6a197b5
added tests
ArnabChatterjee20k May 13, 2025
86c8f17
updated message
ArnabChatterjee20k May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Database/Validator/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,12 @@ public function checkIndexLength(Document $index): bool

$total = 0;
$lengths = $index->getAttribute('lengths', []);

foreach ($index->getAttribute('attributes', []) as $attributePosition => $attributeName) {
$attributes = $index->getAttribute('attributes', []);
if (count($lengths) > count($attributes)) {
$this->message = 'Invalid index lengths. Count of lengths must be equal or less than the number of attributes.';
return false;
}
foreach ($attributes as $attributePosition => $attributeName) {
$attribute = $this->attributes[\strtolower($attributeName)];

switch ($attribute->getAttribute('type')) {
Expand All @@ -194,6 +198,10 @@ public function checkIndexLength(Document $index): bool
$indexLength = 1;
break;
}
if ($indexLength < 0) {
$this->message = 'Negative index length provided for ' . $attributeName;
return false;
}

if ($attribute->getAttribute('array', false)) {
$attributeSize = Database::ARRAY_INDEX_LENGTH;
Expand Down
43 changes: 43 additions & 0 deletions tests/e2e/Adapter/Scopes/IndexTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,49 @@ public function testIndexValidation(): void
} catch (Exception $e) {
$this->assertEquals($errorMessage, $e->getMessage());
}


$indexes = [
new Document([
'$id' => ID::custom('index_negative_length'),
'type' => Database::INDEX_KEY,
'attributes' => ['title1'],
'lengths' => [-1],
'orders' => [],
]),
];

$errorMessage = 'Negative index length provided for title1';
$this->assertFalse($validator->isValid($indexes[0]));
$this->assertEquals($errorMessage, $validator->getDescription());

try {
static::getDatabase()->createCollection(ID::unique(), $attributes, $indexes);
$this->fail('Failed to throw exception');
} catch (Exception $e) {
$this->assertEquals($errorMessage, $e->getMessage());
}

$indexes = [
new Document([
'$id' => ID::custom('index_extra_lengths'),
'type' => Database::INDEX_KEY,
'attributes' => ['title1', 'title2'],
'lengths' => [100, 100, 100],
'orders' => [],
]),
];

$errorMessage = 'Invalid index lengths. Count of lengths must be equal or less than the number of attributes.';
$this->assertFalse($validator->isValid($indexes[0]));
$this->assertEquals($errorMessage, $validator->getDescription());

try {
static::getDatabase()->createCollection(ID::unique(), $attributes, $indexes);
$this->fail('Failed to throw exception');
} catch (Exception $e) {
$this->assertEquals($errorMessage, $e->getMessage());
}
}

public function testRenameIndex(): void
Expand Down