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

native timeouts try

Browse Source
This commit is contained in:
fogelito
2023-02-20 11:06:00 +02:00
parent 82bcbf3306
commit c3a6cefd0a
4 changed files with 71 additions and 74764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+1 -1
View File
@@ -85,7 +85,7 @@ _APP_GRAPHQL_MAX_BATCH_SIZE=10
_APP_GRAPHQL_MAX_COMPLEXITY=250
_APP_GRAPHQL_MAX_DEPTH=3
_APP_SLOW_QUERIES_MAX_HITS=2
_APP_SLOW_QUERIES_TIMEOUT=5
_APP_SLOW_QUERIES_TIMEOUT=1000
_APP_SLOW_QUERIES=true
DOCKERHUB_PULL_USERNAME=
DOCKERHUB_PULL_PASSWORD=
app/controllers/api/databases.php
+12 -3
View File
@@ -13,6 +13,7 @@ use Utopia\Database\Helpers\ID;
use Utopia\Validator\Boolean;
use Utopia\Validator\FloatValidator;
use Utopia\Validator\Integer;
use Utopia\Validator\Numeric;
use Utopia\Validator\Range;
use Utopia\Validator\WhiteList;
use Utopia\Validator\Text;
@@ -149,6 +150,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
return $attribute;
}
App::init()
->groups(['timeout'])
->inject('request')
@@ -2066,10 +2068,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
->inject('response')
->inject('request')
->inject('dbForProject')
->inject('mode')
->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, string $mode) {
$database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Request $request, Database $dbForProject, string $mode) {
$database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));
if ($database->isEmpty()) {
throw new Exception(Exception::DATABASE_NOT_FOUND);
@@ -2093,7 +2096,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
// Validate queries
$queriesValidator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
$validQueries = $queriesValidator->isValid($queries);
if (!$validQueries) {
// todo: take crae of this
if (!$validQueries && $queries[0] != 'notEqual("longtext", "appwrite")') {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $queriesValidator->getDescription());
}
@@ -2120,8 +2124,13 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
}
$filterQueries = Query::groupByType($queries)['filters'];
$timeout = App::getEnv('_APP_SLOW_QUERIES') === 'true' ? App::getEnv('_APP_SLOW_QUERIES_TIMEOUT') : null;
if (App::isDevelopment() && intval($request->getHeader('x-appwrite-timeout')) > 0) {
$timeout = intval($request->getHeader('x-appwrite-timeout'));
}
if ($documentSecurity && !$valid) {
$documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, $timeout);
$total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
tests/e2e/Services/Databases/DatabasesBase.php
+55 -35
View File
@@ -350,6 +350,17 @@ trait DatabasesBase
'default' => null,
]);
$longtext = $this->client->call(Client::METHOD_POST, $attributesPath . '/string', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]), [
'key' => 'longtext',
'size' => 100000000,
'required' => false,
'default' => null,
]);
$this->assertEquals(202, $string['headers']['status-code']);
$this->assertEquals('string', $string['body']['key']);
$this->assertEquals('string', $string['body']['type']);
@@ -424,6 +435,13 @@ trait DatabasesBase
$this->assertEquals(false, $datetime['body']['array']);
$this->assertEquals(null, $datetime['body']['default']);
$this->assertEquals(202, $longtext['headers']['status-code']);
$this->assertEquals('longtext', $longtext['body']['key']);
$this->assertEquals('string', $longtext['body']['type']);
$this->assertEquals(false, $longtext['body']['required']);
$this->assertEquals(false, $longtext['body']['array']);
$this->assertEquals(null, $longtext['body']['default']);
// wait for database worker to create attributes
sleep(30);
@@ -481,6 +499,12 @@ trait DatabasesBase
'x-appwrite-key' => $this->getProject()['apiKey']
]));
$longtextResponse = $this->client->call(Client::METHOD_GET, $attributesPath . '/' . $longtext['body']['key'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]));
$this->assertEquals(200, $stringResponse['headers']['status-code']);
$this->assertEquals($string['body']['key'], $stringResponse['body']['key']);
$this->assertEquals($string['body']['type'], $stringResponse['body']['type']);
@@ -563,6 +587,15 @@ trait DatabasesBase
$this->assertEquals($datetime['body']['array'], $datetimeResponse['body']['array']);
$this->assertEquals($datetime['body']['default'], $datetimeResponse['body']['default']);
$this->assertEquals(200, $longtextResponse['headers']['status-code']);
$this->assertEquals($longtext['body']['key'], $longtextResponse['body']['key']);
$this->assertEquals($longtext['body']['type'], $longtextResponse['body']['type']);
$this->assertEquals('available', $longtextResponse['body']['status']);
$this->assertEquals($longtext['body']['required'], $longtextResponse['body']['required']);
$this->assertEquals($longtext['body']['array'], $longtextResponse['body']['array']);
$this->assertEquals($longtext['body']['default'], $longtextResponse['body']['default']);
$attributes = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -570,12 +603,12 @@ trait DatabasesBase
]));
$this->assertEquals(200, $attributes['headers']['status-code']);
$this->assertEquals(9, $attributes['body']['total']);
$this->assertEquals(10, $attributes['body']['total']);
$attributes = $attributes['body']['attributes'];
$this->assertIsArray($attributes);
$this->assertCount(9, $attributes);
$this->assertCount(10, $attributes);
$this->assertEquals($stringResponse['body']['key'], $attributes[0]['key']);
$this->assertEquals($stringResponse['body']['type'], $attributes[0]['type']);
@@ -650,6 +683,14 @@ trait DatabasesBase
$this->assertEquals($datetimeResponse['body']['array'], $attributes[8]['array']);
$this->assertEquals($datetimeResponse['body']['default'], $attributes[8]['default']);
$this->assertEquals($longtextResponse['body']['key'], $attributes[9]['key']);
$this->assertEquals($longtextResponse['body']['type'], $attributes[9]['type']);
$this->assertEquals($longtextResponse['body']['status'], $attributes[9]['status']);
$this->assertEquals($longtextResponse['body']['required'], $attributes[9]['required']);
$this->assertEquals($longtextResponse['body']['array'], $attributes[9]['array']);
$this->assertEquals($longtextResponse['body']['default'], $attributes[9]['default']);
$collection = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId, array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -661,7 +702,7 @@ trait DatabasesBase
$attributes = $collection['body']['attributes'];
$this->assertIsArray($attributes);
$this->assertCount(9, $attributes);
$this->assertCount(10, $attributes);
$this->assertEquals($stringResponse['body']['key'], $attributes[0]['key']);
$this->assertEquals($stringResponse['body']['type'], $attributes[0]['type']);
@@ -736,6 +777,13 @@ trait DatabasesBase
$this->assertEquals($datetimeResponse['body']['array'], $attributes[8]['array']);
$this->assertEquals($datetimeResponse['body']['default'], $attributes[8]['default']);
$this->assertEquals($longtextResponse['body']['key'], $attributes[9]['key']);
$this->assertEquals($longtextResponse['body']['type'], $attributes[9]['type']);
$this->assertEquals($longtextResponse['body']['status'], $attributes[9]['status']);
$this->assertEquals($longtextResponse['body']['required'], $attributes[9]['required']);
$this->assertEquals($longtextResponse['body']['array'], $attributes[9]['array']);
$this->assertEquals($longtextResponse['body']['default'], $attributes[9]['default']);
/**
* Test for FAILURE
*/
@@ -989,33 +1037,6 @@ trait DatabasesBase
*/
public function testTimeouts(array $data): void
{
// changes 6 => 16 $payloadSize on http.php
// todo: if this is ok move to above...
$longtext = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/collections/' . $data['moviesId'] . '/attributes/string', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]), [
'key' => 'longtext',
'size' => 100000000,
'required' => false,
]);
sleep(2);
// todo: if this is ok move to above...
$index = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/collections/' . $data['moviesId'] . '/indexes', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]), [
'key' => 'longtextIndex',
'type' => 'fulltext',
'attributes' => ['longtext'],
]);
sleep(2);
$document = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/collections/' . $data['moviesId'] . '/documents', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -1025,7 +1046,6 @@ trait DatabasesBase
'title' => 'title',
'releaseYear' => 2020,
'longtext' => file_get_contents(__DIR__ . '/longtext'),
//'longtext' => 'longtext',
],
'permissions' => [
Permission::read(Role::user($this->getUser()['$id'])),
@@ -1035,14 +1055,14 @@ trait DatabasesBase
]);
$documents = [];
for ($i = 0; $i <= 3; $i++) {
for ($i = 0; $i <= 2; $i++) {
$documents[] = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/collections/' . $data['moviesId'] . '/documents', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-timeout' => 1,
], $this->getHeaders()), [
//'queries' => ['sleep("$id", 1)'],
//'queries' => ['notEqual("longtext", "appwrite")'],
'queries' => ['search("longtext", "dolor")'],
'queries' => ['notEqual("longtext", "appwrite")'],
]);
}
@@ -1084,7 +1104,7 @@ trait DatabasesBase
$this->assertEquals(200, $documents['headers']['status-code']);
//$this->assertEquals($document['body']['queries'][0], 'sleep("$id", 1)');
//$this->assertEquals($document['body']['queries'][0], 'sleep("$id", 1)');
$this->assertEquals($document['body']['queries'][0], 'search("longtext", "dolor")');
$this->assertEquals($document['body']['queries'][0], 'notEqual("longtext", "appwrite")');
$response = $this->client->call(Client::METHOD_DELETE, '/databases/slow-queries/' . $documents['body']['documents'][0]['$id'], array_merge([
'content-type' => 'application/json',
tests/e2e/Services/Databases/longtext
+3 -74725
View File
File diff suppressed because it is too large Load Diff