Merge branch 'master' into field-extension-overhead-fix

Author: rmosolgo

.github/workflows/ci.yaml

@@ -99,7 +99,7 @@ jobs:
     - run: echo BUNDLE_GEMFILE='gemfiles/rails_6.1_postgresql.gemfile' > $GITHUB_ENV
     - run: echo DATABASE='POSTGRESQL' > $GITHUB_ENV
     - run: echo PGPASSWORD='postgres' > $GITHUB_ENV
-    - run: echo GRAPHQL_CLEXER=1 > $GITHUB_ENV
+    - run: echo GRAPHQL_CPARSER=1 > $GITHUB_ENV
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:

CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### Bug fixes
 
+# 2.0.20 (30 March 2023)
+
+### Bug fixes
+
+- `.resolve_type`: fix returning `[Type, false]` from resolve_type #4412
+- Parsing: improve usage of `GraphQL.default_parser` #4411
+- AppsignalTrace: implement missing methods #4390
+- Runtime: Fix `current_depth` method in some lazy lists #4386
+- Performance: improve `Object` object shape #4365
+- Tracing: return execution errors raised from field resolution to `execute_field` hooks #4398
 
 # 2.0.19 (14 March 2023)
 
@@ -42,6 +52,19 @@
 - Performance: add `GraphQL::Tracing::Trace` as a lower-overhead tracing API #4344
 - Connections: fix `hasNextPage` for already-loaded ActiveRecord Relations #4349
 
+
+# 2.0.17.2 (29 March 2023)
+
+### Bug fixes
+
+- Unions and Interfaces: support returning `[type_module, false]` from `resolve_type` #4413
+
+# 2.0.17.1 (27 March 2023)
+
+### Bug fixes
+
+- Tracing: restore behavior returning execution errors raised during field resolution #4402
+
 # 2.0.17 (14 February 2023)
 
 ### Breaking changes

Rakefile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "bundler/setup"
+require "bundler/gem_helper"
 Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
@@ -201,5 +201,15 @@ Rake::ExtensionTask.new("graphql_c_parser_ext") do |t|
   t.lib_dir = "graphql-c_parser/lib/graphql"
 end
 
+task :build_yacc_parser do
+  assert_dependency_version("Bison", "3.8", "yacc --version")
+  `yacc graphql-c_parser/ext/graphql_c_parser_ext/parser.y -o graphql-c_parser/ext/graphql_c_parser_ext/parser.c -Wyacc`
+end
+
+task :move_binary do
+  # For some reason my local env doesn't respect the `lib_dir` configured above
+  `mv graphql-c_parser/lib/*.bundle graphql-c_parser/lib/graphql`
+end
+
 desc "Build the C Extension"
-task build_ext: [:build_c_lexer, "compile:graphql_c_parser_ext"]
+task build_ext: [:build_c_lexer, :build_yacc_parser, "compile:graphql_c_parser_ext", :move_binary]

benchmark/run.rb

@@ -37,13 +37,16 @@ def self.run(task)
         x.report("validate - big query") { BIG_SCHEMA.validate(BIG_QUERY) }
         x.report("validate - fields will merge") { FIELDS_WILL_MERGE_SCHEMA.validate(FIELDS_WILL_MERGE_QUERY) }
       when "scan"
-        x.report("scan c - introspection") { GraphQL::Language::CLexer.tokenize(QUERY_STRING) }
-        x.report("scan - introspection") { GraphQL.scan(QUERY_STRING) }
-        x.report("scan c - fragments") { GraphQL::Language::CLexer.tokenize(ABSTRACT_FRAGMENTS_2_QUERY_STRING) }
-        x.report("scan - fragments") { GraphQL.scan(ABSTRACT_FRAGMENTS_2_QUERY_STRING) }
-        x.report("scan c - big query") { GraphQL::Language::CLexer.tokenize(BIG_QUERY_STRING) }
-        x.report("scan - big query") { GraphQL.scan(BIG_QUERY_STRING) }
+        require "graphql/c_parser"
+        x.report("scan c - introspection") { GraphQL.scan_with_c(QUERY_STRING) }
+        x.report("scan - introspection") { GraphQL.scan_with_ruby(QUERY_STRING) }
+        x.report("scan c - fragments") { GraphQL.scan_with_c(ABSTRACT_FRAGMENTS_2_QUERY_STRING) }
+        x.report("scan - fragments") { GraphQL.scan_with_ruby(ABSTRACT_FRAGMENTS_2_QUERY_STRING) }
+        x.report("scan c - big query") { GraphQL.scan_with_c(BIG_QUERY_STRING) }
+        x.report("scan - big query") { GraphQL.scan_with_ruby(BIG_QUERY_STRING) }
       when "parse"
+        # Uncomment this to use the C parser:
+        # require "graphql/c_parser"
         x.report("parse - introspection") { GraphQL.parse(QUERY_STRING) }
         x.report("parse - fragments") { GraphQL.parse(ABSTRACT_FRAGMENTS_2_QUERY_STRING) }
         x.report("parse - big query") { GraphQL.parse(BIG_QUERY_STRING) }
@@ -54,11 +57,8 @@ def self.run(task)
   end
 
   def self.profile_parse
-    GraphQL.module_eval do
-      def self.scan(str)
-        GraphQL::Clexer.tokenize(str)
-      end
-    end
+    # To profile the C parser instead:
+    # require "graphql/c_parser"
 
     report = MemoryProfiler.report do
       GraphQL.parse(BIG_QUERY_STRING)

graphql-c_parser/ext/graphql_c_parser_ext/graphql_c_parser_ext.c

@@ -1,14 +1,22 @@
 #include "graphql_c_parser_ext.h"
 
-VALUE GraphQL_Language_CLexer_tokenize(VALUE self, VALUE query_string) {
-  VALUE tokens = tokenize(query_string);
-  return tokens;
+VALUE GraphQL_CParser_Lexer_tokenize(VALUE self, VALUE query_string) {
+  return tokenize(query_string);
+}
+
+VALUE GraphQL_CParser_Parser_c_parse(VALUE self) {
+  yyparse(self, rb_ivar_get(self, rb_intern("@filename")));
+  return Qnil;
 }
 
 void Init_graphql_c_parser_ext() {
   VALUE GraphQL = rb_define_module("GraphQL");
-  VALUE Language = rb_define_module_under(GraphQL, "Language");
-  VALUE CLexer = rb_define_module_under(Language, "CLexer");
-  rb_define_singleton_method(CLexer, "tokenize", GraphQL_Language_CLexer_tokenize, 1);
+  VALUE CParser = rb_define_module_under(GraphQL, "CParser");
+  VALUE Lexer = rb_define_module_under(CParser, "Lexer");
+  rb_define_singleton_method(Lexer, "tokenize", GraphQL_CParser_Lexer_tokenize, 1);
   setup_static_token_variables();
+
+  VALUE Parser = rb_define_class_under(CParser, "Parser", rb_cObject);
+  rb_define_method(Parser, "c_parse", GraphQL_CParser_Parser_c_parse, 0);
+  initialize_node_class_variables();
 }

graphql-c_parser/ext/graphql_c_parser_ext/graphql_c_parser_ext.h

@@ -2,5 +2,6 @@
 #define Graphql_ext_h
 #include <ruby.h>
 #include "lexer.h"
+#include "parser.h"
 void Init_graphql_c_parser_ext();
 #endif