mirror of
https://github.com/retailcrm/graphql-php.git
synced 2024-11-25 06:16:05 +03:00
Removed memoization on executor resolveField (see #43)
This commit is contained in:
Jeremiah VALERIE
parent
0e1929f0b1
commit
3ae6c73367
@ -360,90 +360,59 @@ class Executor
|
|||||||
{
|
{
|
||||||
$fieldAST = $fieldASTs[0];
|
$fieldAST = $fieldASTs[0];
|
||||||
|
|
||||||
$uid = self::getFieldUid($fieldAST, $parentType);
|
$fieldName = $fieldAST->name->value;
|
||||||
|
|
||||||
// Get memoized variables if they exist
|
$fieldDef = self::getFieldDef($exeContext->schema, $parentType, $fieldName);
|
||||||
if (isset($exeContext->memoized['resolveField'][$uid])) {
|
|
||||||
$memoized = $exeContext->memoized['resolveField'][$uid];
|
|
||||||
$fieldDef = $memoized['fieldDef'];
|
|
||||||
$returnType = $fieldDef->getType();
|
|
||||||
$args = $memoized['args'];
|
|
||||||
$info = $memoized['info'];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$fieldName = $fieldAST->name->value;
|
|
||||||
|
|
||||||
$fieldDef = self::getFieldDef($exeContext->schema, $parentType, $fieldName);
|
if (!$fieldDef) {
|
||||||
|
return self::$UNDEFINED;
|
||||||
if (!$fieldDef) {
|
|
||||||
return self::$UNDEFINED;
|
|
||||||
}
|
|
||||||
|
|
||||||
$returnType = $fieldDef->getType();
|
|
||||||
|
|
||||||
// Build hash of arguments from the field.arguments AST, using the
|
|
||||||
// variables scope to fulfill any variable references.
|
|
||||||
$args = Values::getArgumentValues(
|
|
||||||
$fieldDef->args,
|
|
||||||
$fieldAST->arguments,
|
|
||||||
$exeContext->variableValues
|
|
||||||
);
|
|
||||||
|
|
||||||
// The resolve function's optional third argument is a collection of
|
|
||||||
// information about the current execution state.
|
|
||||||
$info = new ResolveInfo([
|
|
||||||
'fieldName' => $fieldName,
|
|
||||||
'fieldASTs' => $fieldASTs,
|
|
||||||
'returnType' => $returnType,
|
|
||||||
'parentType' => $parentType,
|
|
||||||
'schema' => $exeContext->schema,
|
|
||||||
'fragments' => $exeContext->fragments,
|
|
||||||
'rootValue' => $exeContext->rootValue,
|
|
||||||
'operation' => $exeContext->operation,
|
|
||||||
'variableValues' => $exeContext->variableValues,
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Memoizing results for same query field
|
|
||||||
// (useful for lists when several values are resolved against the same field)
|
|
||||||
$exeContext->memoized['resolveField'][$uid] = $memoized = [
|
|
||||||
'fieldDef' => $fieldDef,
|
|
||||||
'args' => $args,
|
|
||||||
'info' => $info,
|
|
||||||
'results' => new \SplObjectStorage
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// When source value is object it is possible to memoize certain subset of results
|
$returnType = $fieldDef->getType();
|
||||||
$isObject = is_object($source);
|
|
||||||
|
|
||||||
if ($isObject && isset($memoized['results'][$source])) {
|
// Build hash of arguments from the field.arguments AST, using the
|
||||||
$result = $memoized['results'][$source];
|
// variables scope to fulfill any variable references.
|
||||||
|
$args = Values::getArgumentValues(
|
||||||
|
$fieldDef->args,
|
||||||
|
$fieldAST->arguments,
|
||||||
|
$exeContext->variableValues
|
||||||
|
);
|
||||||
|
|
||||||
|
// The resolve function's optional third argument is a collection of
|
||||||
|
// information about the current execution state.
|
||||||
|
$info = new ResolveInfo([
|
||||||
|
'fieldName' => $fieldName,
|
||||||
|
'fieldASTs' => $fieldASTs,
|
||||||
|
'returnType' => $returnType,
|
||||||
|
'parentType' => $parentType,
|
||||||
|
'schema' => $exeContext->schema,
|
||||||
|
'fragments' => $exeContext->fragments,
|
||||||
|
'rootValue' => $exeContext->rootValue,
|
||||||
|
'operation' => $exeContext->operation,
|
||||||
|
'variableValues' => $exeContext->variableValues,
|
||||||
|
]);
|
||||||
|
|
||||||
|
|
||||||
|
if (isset($fieldDef->resolveFn)) {
|
||||||
|
$resolveFn = $fieldDef->resolveFn;
|
||||||
|
} else if (isset($parentType->resolveFieldFn)) {
|
||||||
|
$resolveFn = $parentType->resolveFieldFn;
|
||||||
} else {
|
} else {
|
||||||
if (isset($fieldDef->resolveFn)) {
|
$resolveFn = self::$defaultResolveFn;
|
||||||
$resolveFn = $fieldDef->resolveFn;
|
|
||||||
} else if (isset($parentType->resolveFieldFn)) {
|
|
||||||
$resolveFn = $parentType->resolveFieldFn;
|
|
||||||
} else {
|
|
||||||
$resolveFn = self::$defaultResolveFn;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the resolve function, regardless of if its result is normal
|
|
||||||
// or abrupt (error).
|
|
||||||
$result = self::resolveOrError($resolveFn, $source, $args, $info);
|
|
||||||
|
|
||||||
$result = self::completeValueCatchingError(
|
|
||||||
$exeContext,
|
|
||||||
$returnType,
|
|
||||||
$fieldASTs,
|
|
||||||
$info,
|
|
||||||
$result
|
|
||||||
);
|
|
||||||
|
|
||||||
if ($isObject) {
|
|
||||||
$memoized['results'][$source] = $result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the resolve function, regardless of if its result is normal
|
||||||
|
// or abrupt (error).
|
||||||
|
$result = self::resolveOrError($resolveFn, $source, $args, $info);
|
||||||
|
|
||||||
|
$result = self::completeValueCatchingError(
|
||||||
|
$exeContext,
|
||||||
|
$returnType,
|
||||||
|
$fieldASTs,
|
||||||
|
$info,
|
||||||
|
$result
|
||||||
|
);
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -547,99 +547,4 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->assertEquals($expected, $result->toArray());
|
$this->assertEquals($expected, $result->toArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testResolvedValueIsMemoized()
|
|
||||||
{
|
|
||||||
$doc = '
|
|
||||||
query Q {
|
|
||||||
a {
|
|
||||||
b {
|
|
||||||
c
|
|
||||||
d
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
';
|
|
||||||
|
|
||||||
$memoizedValue = new \ArrayObject([
|
|
||||||
'b' => 'id1'
|
|
||||||
]);
|
|
||||||
|
|
||||||
$A = null;
|
|
||||||
|
|
||||||
$Test = new ObjectType([
|
|
||||||
'name' => 'Test',
|
|
||||||
'fields' => [
|
|
||||||
'a' => [
|
|
||||||
'type' => function() use (&$A) {return Type::listOf($A);},
|
|
||||||
'resolve' => function() use ($memoizedValue) {
|
|
||||||
return [
|
|
||||||
$memoizedValue,
|
|
||||||
new \ArrayObject([
|
|
||||||
'b' => 'id2',
|
|
||||||
]),
|
|
||||||
$memoizedValue,
|
|
||||||
new \ArrayObject([
|
|
||||||
'b' => 'id2',
|
|
||||||
])
|
|
||||||
];
|
|
||||||
}
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]);
|
|
||||||
|
|
||||||
$callCounts = ['id1' => 0, 'id2' => 0];
|
|
||||||
|
|
||||||
$A = new ObjectType([
|
|
||||||
'name' => 'A',
|
|
||||||
'fields' => [
|
|
||||||
'b' => [
|
|
||||||
'type' => new ObjectType([
|
|
||||||
'name' => 'B',
|
|
||||||
'fields' => [
|
|
||||||
'c' => ['type' => Type::string()],
|
|
||||||
'd' => ['type' => Type::string()]
|
|
||||||
]
|
|
||||||
]),
|
|
||||||
'resolve' => function($value) use (&$callCounts) {
|
|
||||||
$callCounts[$value['b']]++;
|
|
||||||
|
|
||||||
switch ($value['b']) {
|
|
||||||
case 'id1':
|
|
||||||
return [
|
|
||||||
'c' => 'c1',
|
|
||||||
'd' => 'd1'
|
|
||||||
];
|
|
||||||
case 'id2':
|
|
||||||
return [
|
|
||||||
'c' => 'c2',
|
|
||||||
'd' => 'd2'
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Test that value resolved once is memoized for same query field
|
|
||||||
$schema = new Schema($Test);
|
|
||||||
|
|
||||||
$query = Parser::parse($doc);
|
|
||||||
$result = Executor::execute($schema, $query);
|
|
||||||
$expected = [
|
|
||||||
'data' => [
|
|
||||||
'a' => [
|
|
||||||
['b' => ['c' => 'c1', 'd' => 'd1']],
|
|
||||||
['b' => ['c' => 'c2', 'd' => 'd2']],
|
|
||||||
['b' => ['c' => 'c1', 'd' => 'd1']],
|
|
||||||
['b' => ['c' => 'c2', 'd' => 'd2']],
|
|
||||||
]
|
|
||||||
]
|
|
||||||
];
|
|
||||||
|
|
||||||
$this->assertEquals($expected, $result->toArray());
|
|
||||||
|
|
||||||
$this->assertSame($callCounts['id1'], 1); // Result for id1 is expected to be memoized after first call
|
|
||||||
$this->assertSame($callCounts['id2'], 2);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user