Skip to content

Tune parser for query with lots of nested fields #2572

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 1 commit into from
Oct 30, 2019
Merged

Tune parser for query with lots of nested fields #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 49 additions & 48 deletions lib/graphql/language/lexer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:RCURLY, ts, te, meta)
emit(:RCURLY, ts, te, meta, "}")
end

end
Expand All @@ -328,7 +328,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:LCURLY, ts, te, meta)
emit(:LCURLY, ts, te, meta, "{")
end

end
Expand All @@ -342,7 +342,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:RPAREN, ts, te, meta)
emit(:RPAREN, ts, te, meta, ")")
end

end
Expand All @@ -356,7 +356,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:LPAREN, ts, te, meta)
emit(:LPAREN, ts, te, meta, "(")
end

end
Expand All @@ -370,7 +370,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:RBRACKET, ts, te, meta)
emit(:RBRACKET, ts, te, meta, "]")
end

end
Expand All @@ -384,7 +384,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:LBRACKET, ts, te, meta)
emit(:LBRACKET, ts, te, meta, "[")
end

end
Expand All @@ -398,7 +398,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:COLON, ts, te, meta)
emit(:COLON, ts, te, meta, ":")
end

end
Expand Down Expand Up @@ -440,7 +440,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:VAR_SIGN, ts, te, meta)
emit(:VAR_SIGN, ts, te, meta, "$")
end

end
Expand All @@ -454,7 +454,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:DIR_SIGN, ts, te, meta)
emit(:DIR_SIGN, ts, te, meta, "@")
end

end
Expand All @@ -468,7 +468,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:ELLIPSIS, ts, te, meta)
emit(:ELLIPSIS, ts, te, meta, "...")
end

end
Expand All @@ -482,7 +482,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:EQUALS, ts, te, meta)
emit(:EQUALS, ts, te, meta, "=")
end

end
Expand All @@ -496,7 +496,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:BANG, ts, te, meta)
emit(:BANG, ts, te, meta, "!")
end

end
Expand All @@ -510,7 +510,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:PIPE, ts, te, meta)
emit(:PIPE, ts, te, meta, "|")
end

end
Expand All @@ -524,7 +524,7 @@ def self.run_lexer(query_string)
begin
te = p+1;
begin
emit(:AMP, ts, te, meta)
emit(:AMP, ts, te, meta, "&")
end

end
Expand Down Expand Up @@ -738,63 +738,63 @@ def self.run_lexer(query_string)
begin
p = ((te))-1;
begin
emit(:ON, ts, te, meta)
emit(:ON, ts, te, meta, "on")
end

end
when 5 then
begin
p = ((te))-1;
begin
emit(:FRAGMENT, ts, te, meta)
emit(:FRAGMENT, ts, te, meta, "fragment")
end

end
when 6 then
begin
p = ((te))-1;
begin
emit(:TRUE, ts, te, meta)
emit(:TRUE, ts, te, meta, "true")
end

end
when 7 then
begin
p = ((te))-1;
begin
emit(:FALSE, ts, te, meta)
emit(:FALSE, ts, te, meta, "false")
end

end
when 8 then
begin
p = ((te))-1;
begin
emit(:NULL, ts, te, meta)
emit(:NULL, ts, te, meta, "null")
end

end
when 9 then
begin
p = ((te))-1;
begin
emit(:QUERY, ts, te, meta)
emit(:QUERY, ts, te, meta, "query")
end

end
when 10 then
begin
p = ((te))-1;
begin
emit(:MUTATION, ts, te, meta)
emit(:MUTATION, ts, te, meta, "mutation")
end

end
when 11 then
begin
p = ((te))-1;
begin
emit(:SUBSCRIPTION, ts, te, meta)
emit(:SUBSCRIPTION, ts, te, meta, "subscription")
end

end
Expand Down Expand Up @@ -1371,25 +1371,26 @@ def self.run_lexer(query_string)

def self.record_comment(ts, te, meta)
token = GraphQL::Language::Token.new(
name: :COMMENT,
value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
line: meta[:line],
col: meta[:col],
prev_token: meta[:previous_token],
:COMMENT,
meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
meta[:line],
meta[:col],
meta[:previous_token],
)

meta[:previous_token] = token

meta[:col] += te - ts
end

def self.emit(token_name, ts, te, meta)
def self.emit(token_name, ts, te, meta, token_value = nil)
token_value ||= meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING)
meta[:tokens] << token = GraphQL::Language::Token.new(
name: token_name,
value: meta[:data][ts, te - ts].pack(PACK_DIRECTIVE).force_encoding(UTF_8_ENCODING),
line: meta[:line],
col: meta[:col],
prev_token: meta[:previous_token],
token_name,
token_value,
meta[:line],
meta[:col],
meta[:previous_token],
)
meta[:previous_token] = token
# Bump the column counter for the next token
Expand Down Expand Up @@ -1428,30 +1429,30 @@ def self.emit_string(ts, te, meta, block:)
# (It's faster: https://bugs.ruby-lang.org/issues/8110)
if !value.valid_encoding? || value !~ VALID_STRING
meta[:tokens] << token = GraphQL::Language::Token.new(
name: :BAD_UNICODE_ESCAPE,
value: value,
line: meta[:line],
col: meta[:col],
prev_token: meta[:previous_token],
:BAD_UNICODE_ESCAPE,
value,
meta[:line],
meta[:col],
meta[:previous_token],
)
else
replace_escaped_characters_in_place(value)

if !value.valid_encoding?
meta[:tokens] << token = GraphQL::Language::Token.new(
name: :BAD_UNICODE_ESCAPE,
value: value,
line: meta[:line],
col: meta[:col],
prev_token: meta[:previous_token],
:BAD_UNICODE_ESCAPE,
value,
meta[:line],
meta[:col],
meta[:previous_token],
)
else
meta[:tokens] << token = GraphQL::Language::Token.new(
name: :STRING,
value: value,
line: meta[:line],
col: meta[:col],
prev_token: meta[:previous_token],
:STRING,
value,
meta[:line],
meta[:col],
meta[:previous_token],
)
end
end
Expand Down
Loading