Skip to content

Improve perf of separateOperations #710

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
merged 3 commits into from
Feb 7, 2017
Merged

Improve perf of separateOperations #710

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae96377
Improve perf of separateOperations
Feb 6, 2017
36ea2ba
Use a Map<Node> for original indices
leebyron Feb 7, 2017
f801089
semi
leebyron Feb 7, 2017
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
32 changes: 23 additions & 9 deletions src/utilities/separateOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import { visit } from '../language/visitor';
import type {
DocumentNode,
FragmentDefinitionNode,
OperationDefinitionNode,
} from '../language/ast';

Expand All @@ -24,18 +25,22 @@ export function separateOperations(
documentAST: DocumentNode
): { [operationName: string]: DocumentNode } {

const operations = [];
const definitions: DefinitionMap = Object.create(null);
const depGraph: DepGraph = Object.create(null);
let fromName;
let idx = 0;

// Populate the list of operations and build a dependency graph.
// Populate the list of definitions and build a dependency graph.
visit(documentAST, {
OperationDefinition(node) {
operations.push(node);
fromName = opName(node);
definitions[fromName] = { idx, node };
++idx;
},
FragmentDefinition(node) {
fromName = node.name.value;
definitions[fromName] = { idx, node };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's currently nothing to guarantee that an operation and fragment definition will always have distinct names. It would be safer to have separate operationDefinitions and fragmentDefinitions maps

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also - lookups into this map are happening only for fragments, so you only need these

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I didn't realize definition names were not global.

++idx;
},
FragmentSpread(node) {
const toName = node.name.value;
Expand All @@ -47,23 +52,32 @@ export function separateOperations(
// For each operation, produce a new synthesized AST which includes only what
// is necessary for completing that operation.
const separatedDocumentASTs = Object.create(null);
operations.forEach(operation => {
const operationName = opName(operation);
const operationNames = Object.keys(definitions).filter(defName =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving the existing list of operations as it was would remove the need to do a second pass through all the definitions

definitions[defName].node.kind === 'OperationDefinition'
);
operationNames.forEach(operationName => {
const dependencies = Object.create(null);
collectTransitiveDependencies(dependencies, depGraph, operationName);
dependencies[operationName] = true;

separatedDocumentASTs[operationName] = {
kind: 'Document',
definitions: documentAST.definitions.filter(def =>
def === operation ||
def.kind === 'FragmentDefinition' && dependencies[def.name.value]
)
definitions: Object.keys(dependencies)
.map(defName => definitions[defName])
.sort((def1, def2) => def1.idx - def2.idx)
.map(def => def.node)
};
});

return separatedDocumentASTs;
}

type DefinitionMap = {
[defName: string]: {
idx: number,
node: OperationDefinitionNode | FragmentDefinitionNode
}
};
type DepGraph = {[from: string]: {[to: string]: boolean}};

// Provides the empty string for anonymous operations.
Expand Down