Skip to content
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

Fix schema initializer not registered #1918

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Fix schema initializer not registered #1918

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
110 changes: 41 additions & 69 deletions benchmarks/GraphQL.Benchmarks/ExecutionBenchmarks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Order;
Expand Down Expand Up @@ -29,30 +30,21 @@ public class ExecutionBenchmarks
private ExecutableDocument _subscription;
private Executor _nonValidatingExecutor;

//[Benchmark]
//public async Task Mutation_with_defaults()
//{
//var result = await Executor.ExecuteAsync(new ExecutionOptions
// {
// Document = _mutation,
// Schema = _schema
// });

// AssertResult(result.Errors);
//}

//[Benchmark]
//public async Task Mutation_without_validation()
//{
// var result = await Executor.ExecuteAsync(new ExecutionOptions
// {
// Document = _mutation,
// Schema = _schema,
// Validate = null
// });

// AssertResult(result.Errors);
//}
[Benchmark]
public async Task Mutation_with_defaults()
{
var result = await _executor.Execute(new GraphQLRequest(_mutation));

AssertResult(result.Errors);
}

[Benchmark]
public async Task Mutation_without_validation()
{
var result = await _nonValidatingExecutor.Execute(new GraphQLRequest(_mutation));

AssertResult(result.Errors);
}

[Benchmark]
public async Task Query_with_validation()
Expand Down Expand Up @@ -102,51 +94,31 @@ public void Setup()
});
}

//[Benchmark]
//public async Task Subscribe_with_defaults()
//{
// var cts = new CancellationTokenSource();
// var result = await Executor.SubscribeAsync(new ExecutionOptions
// {
// Document = _subscription,
// Schema = _schema
// }, cts.Token);

// AssertResult(result.Errors);
// cts.Cancel();
//}

//[Benchmark]
//public async Task Subscribe_with_defaults_and_get_value()
//{
// var cts = new CancellationTokenSource();
// var result = await Executor.SubscribeAsync(new ExecutionOptions
// {
// Document = _subscription,
// Schema = _schema
// }, cts.Token);

// AssertResult(result.Errors);

// var value = await result.Source.Reader.ReadAsync(cts.Token);
// AssertResult(value.Errors);
// cts.Cancel();
//}

//[Benchmark]
//public async Task Subscribe_without_validation()
//{
// var cts = new CancellationTokenSource();
// var result = await Executor.SubscribeAsync(new ExecutionOptions
// {
// Document = _subscription,
// Schema = _schema,
// Validate = null
// }, cts.Token);

// AssertResult(result.Errors);
// cts.Cancel();
//}
[Benchmark]
public async Task Subscribe_with_defaults()
{
var cts = new CancellationTokenSource();
var result = await _executor.Subscribe(new GraphQLRequest()
{
Query = _subscription,
}, cts.Token).SingleAsync(cancellationToken: cts.Token);

AssertResult(result.Errors);
cts.Cancel();
}

[Benchmark]
public async Task Subscribe_without_validation()
{
var cts = new CancellationTokenSource();
var result = await _nonValidatingExecutor.Subscribe(new GraphQLRequest()
{
Query = _subscription,
}, cts.Token).SingleAsync(cancellationToken: cts.Token);

AssertResult(result.Errors);
cts.Cancel();
}

private static void AssertResult(IEnumerable<ExecutionError> errors)
{
Expand Down
1 change: 1 addition & 0 deletions benchmarks/GraphQL.Benchmarks/GraphQL.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="GraphQL-Parser" Version="9.5.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/GraphQL.Server/GraphQLApplicationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public GraphQLApplicationBuilder AddWebSockets()

private void AddDefaultTankaGraphQLServerServices()
{
ApplicationServices.TryAddSingleton<IHostedService, SchemaInitializer>();
ApplicationServices.AddHostedService<SchemaInitializer>();
ApplicationServices.TryAddSingleton<SchemaCollection>();
ApplicationServices.TryAddSingleton<GraphQLApplication>();
ApplicationServices.AddDefaultTankaGraphQLServices();
Expand Down
22 changes: 0 additions & 22 deletions templates/GraphQL.Template.HelloWorld/.template.config/template.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions templates/GraphQL.Template.HelloWorld/GraphQL.Template.HelloWorld.csproj
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions templates/GraphQL.Template.HelloWorld/Program.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions templates/GraphQL.Template.HelloWorld/Properties/launchSettings.json
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions templates/GraphQL.Template.HelloWorld/appsettings.Development.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions templates/GraphQL.Template.HelloWorld/appsettings.json
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions templates/GraphQL.Template/.template.config/template.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions templates/GraphQL.Template/GraphQL.Template.csproj
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions templates/GraphQL.Template/Program.cs
View file
Open in desktop

This file was deleted.

Loading
Loading