Merge pull request #4899 from rmosolgo/ast-strings

Reduce duplicated identifier strings in C parser

Author: rmosolgo

.github/workflows/ci.yaml

@@ -44,7 +44,6 @@ jobs:
         include:
           - gemfile: Gemfile
             ruby: 3.2
-          # Rails 6.1 is tested with Postgresql below
           - gemfile: gemfiles/rails_7.0.gemfile
             ruby: 3.1
           - gemfile: gemfiles/rails_master.gemfile
@@ -93,14 +92,14 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - run: echo BUNDLE_GEMFILE='gemfiles/rails_6.1_postgresql.gemfile' > $GITHUB_ENV
+    - run: echo BUNDLE_GEMFILE='gemfiles/rails_7.1_postgresql.gemfile' > $GITHUB_ENV
     - run: echo DATABASE='POSTGRESQL' > $GITHUB_ENV
     - run: echo PGPASSWORD='postgres' > $GITHUB_ENV
     - run: echo GRAPHQL_CPARSER=1 > $GITHUB_ENV
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: "3.3"
         bundler-cache: true
     - run: bundle exec rake compile test
   mongodb_test:

Rakefile

@@ -124,6 +124,12 @@ namespace :bench do
     GraphQLBenchmark.profile_to_definition
   end
 
+  desc "Load schema from SDL"
+  task :profile_from_definition do
+    prepare_benchmark
+    GraphQLBenchmark.profile_from_definition
+  end
+
   desc "Compare GraphQL-Batch and GraphQL-Dataloader"
   task :profile_batch_loaders do
     prepare_benchmark

benchmark/run.rb

@@ -487,6 +487,26 @@ def self.profile_to_definition
     report.pretty_print
   end
 
+  def self.profile_from_definition
+    # require "graphql/c_parser"
+    schema_str = SILLY_LARGE_SCHEMA.to_definition
+
+    Benchmark.ips do |x|
+      x.report("from_definition") { GraphQL::Schema.from_definition(schema_str) }
+    end
+
+    result = StackProf.run(mode: :wall, interval: 1) do
+      GraphQL::Schema.from_definition(schema_str)
+    end
+    StackProf::Report.new(result).print_text
+
+    report = MemoryProfiler.report do
+      GraphQL::Schema.from_definition(schema_str)
+    end
+
+    report.pretty_print
+  end
+
   def self.profile_batch_loaders
     require_relative "./batch_loading"
     include BatchLoading

gemfiles/rails_6.1.gemfile

@@ -6,8 +6,11 @@ gem "bootsnap"
 gem "ruby-prof", platform: :ruby
 gem "pry"
 gem "pry-stack_explorer", platform: :ruby
-gem "rails", "~> 6.1.0", require: "rails/all"
+gem "rails", "~> 7.1.0", require: "rails/all"
 gem "pg", platform: :ruby
 gem "sequel"
+gem "evt"
+gem "async"
+gem "libev_scheduler"
 
 gemspec path: "../"

gemfiles/rails_6.1_postgresql.gemfile renamed to gemfiles/rails_7.1_postgresql.gemfile

@@ -1,7 +1,7 @@
 #include "graphql_c_parser_ext.h"
 
-VALUE GraphQL_CParser_Lexer_tokenize_with_c(VALUE self, VALUE query_string) {
-  return tokenize(query_string);
+VALUE GraphQL_CParser_Lexer_tokenize_with_c_internal(VALUE self, VALUE query_string, VALUE fstring_identifiers) {
+  return tokenize(query_string, RTEST(fstring_identifiers));
 }
 
 VALUE GraphQL_CParser_Parser_c_parse(VALUE self) {
@@ -13,7 +13,7 @@ void Init_graphql_c_parser_ext() {
   VALUE GraphQL = rb_define_module("GraphQL");
   VALUE CParser = rb_define_module_under(GraphQL, "CParser");
   VALUE Lexer = rb_define_module_under(CParser, "Lexer");
-  rb_define_singleton_method(Lexer, "tokenize_with_c", GraphQL_CParser_Lexer_tokenize_with_c, 1);
+  rb_define_singleton_method(Lexer, "tokenize_with_c_internal", GraphQL_CParser_Lexer_tokenize_with_c_internal, 2);
   setup_static_token_variables();
 
   VALUE Parser = rb_define_class_under(CParser, "Parser", rb_cObject);

graphql-c_parser/ext/graphql_c_parser_ext/graphql_c_parser_ext.c

@@ -1,6 +1,7 @@
 #ifndef Graphql_ext_h
 #define Graphql_ext_h
 #include <ruby.h>
+#include <ruby/encoding.h>
 #include "lexer.h"
 #include "parser.h"
 void Init_graphql_c_parser_ext();