Skip to content

Commit

Permalink
apollo-parser: optimises performance of peek_n and peek_data_n (#113)
Browse files Browse the repository at this point in the history
* query parsing benchmark
* avoid allocations in peek_n and peek_data_n
  • Loading branch information
Geal authored Nov 17, 2021
1 parent e8f3929 commit 6e8e8a8
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 12 deletions.
35 changes: 35 additions & 0 deletions crates/apollo-parser/benches/peek_n.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#![feature(test)]
extern crate test;
use apollo_parser::ast;
use test::{black_box, Bencher};

#[bench]
fn bench_peek_n(b: &mut Bencher) {
let query = "query ExampleQuery($topProductsFirst: Int) {\n me { \n id\n }\n topProducts(first: $topProductsFirst) {\n name\n price\n inStock\n weight\n test test test test test test test test test test test test }\n}";

b.iter(|| {
let parser = apollo_parser::Parser::new(query);
let tree = parser.parse();

if !tree.errors().is_empty() {
panic!("error parsing query: {:?}", tree.errors());
}
let document = tree.document();

for definition in document.definitions() {
if let ast::Definition::OperationDefinition(operation) = definition {
let selection_set = operation
.selection_set()
.expect("the node SelectionSet is not optional in the spec; qed");
for selection in selection_set.selections() {
match selection {
ast::Selection::Field(field) => {
let _selection_set = field.selection_set();
}
_ => {}
}
}
}
}
});
}
22 changes: 10 additions & 12 deletions crates/apollo-parser/src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,12 @@ impl Parser {

/// Peek Token `n` and return its TokenKind.
pub(crate) fn peek_n(&self, n: usize) -> Option<TokenKind> {
let tok = self
.tokens
.clone()
.into_iter()
self.tokens
.iter()
.rev()
.filter(|token| !matches!(token.kind(), TokenKind::Whitespace | TokenKind::Comment))
.collect::<Vec<Token>>();
tok.get(tok.len() - n).map(|token| token.kind())
.nth(n - 1)
.map(|token| token.kind())
}

/// Peek next Token's `data` property.
Expand All @@ -211,13 +210,12 @@ impl Parser {

/// Peek `n` Token's `data` property.
pub(crate) fn peek_data_n(&self, n: usize) -> Option<String> {
let tok = self
.tokens
.clone()
.into_iter()
self.tokens
.iter()
.rev()
.filter(|token| !matches!(token.kind(), TokenKind::Whitespace | TokenKind::Comment))
.collect::<Vec<Token>>();
tok.get(tok.len() - n).map(|token| token.data().to_string())
.nth(n - 1)
.map(|token| token.data().to_string())
}
}

Expand Down

0 comments on commit 6e8e8a8

Please sign in to comment.