Merge branch 'main' into mst/relative-cursors

Author: michaelstaib

dictionary.txt

@@ -57,6 +57,7 @@ Giroux
 GraphiQL
 graphqlconfig
 graphqlrc
+graphqls
 graphyne
 greendonut
 Hasura
@@ -76,6 +77,7 @@ LICEN*
 Linq
 Marek
 matchesBrics
+MediatR
 Memberwise
 mercurius
 mergeable
@@ -109,6 +111,7 @@ oneof
 OpenIddict
 opensgid
 OPTOUT
+overfetching
 OWIN
 pageable
 Partitioner
@@ -117,6 +120,7 @@ PKCE
 pkey
 Postgraphile
 preconfigured
+preparables
 PRIMEM
 PROJCS
 protobuf
@@ -156,6 +160,7 @@ streamable
 Structs
 subgraphs
 sublicensable
+subselections
 supergraph
 Swashbuckle
 SYSLIB
@@ -178,6 +183,3 @@ websockets
 Wilhuff
 Wunder
 xunit
-preparables
-MediatR
-overfetching

src/All.slnx

@@ -150,6 +150,7 @@
     <Project Path="HotChocolate/Data/test/Data.Filters.InMemory.Tests/HotChocolate.Data.Filters.InMemory.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.Filters.SqlServer.Tests/HotChocolate.Data.Filters.SqlServer.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.Filters.Tests/HotChocolate.Data.Filters.Tests.csproj" />
+    <Project Path="HotChocolate/Data/test/Data.NodaTime.Tests/HotChocolate.Data.NodaTime.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.PostgreSQL.Tests/HotChocolate.Data.PostgreSQL.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.Projections.SqlServer.Tests/HotChocolate.Data.Projections.SqlServer.Tests.csproj" />
     <Project Path="HotChocolate/Data/test/Data.Projections.Tests/HotChocolate.Data.Projections.Tests.csproj" />

src/Directory.Packages.props

@@ -37,7 +37,7 @@
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="NetTopologySuite" Version="2.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageVersion Include="NodaTime" Version="3.0.0" />
+    <PackageVersion Include="NodaTime" Version="3.2.1" />
     <PackageVersion Include="Npgsql" Version="8.0.4" />
     <PackageVersion Include="Opa.Native" Version="0.41.0" />
     <PackageVersion Include="OpenTelemetry.Api" Version="1.1.0" />
@@ -90,6 +90,7 @@
     <PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.2" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.3" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.3" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
     <PackageVersion Include="System.IO.Packaging" Version="9.0.2" />
     <PackageVersion Include="System.IO.Pipelines" Version="9.0.2" />
@@ -115,6 +116,7 @@
     <PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.4" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
     <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.8" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="8.0.8" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
     <PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HotChocolateAspNetCoreServiceCollectionExtensions.Warmup.cs

@@ -34,7 +34,7 @@ public static IRequestExecutorBuilder InitializeOnStartup(
             throw new ArgumentNullException(nameof(builder));
         }
 
-        builder.Services.AddHostedService<ExecutorWarmupService>();
+        builder.Services.AddHostedService<RequestExecutorWarmupService>();
         builder.Services.AddSingleton(new WarmupSchemaTask(builder.Name, keepWarm, warmup));
         return builder;
     }

src/HotChocolate/AspNetCore/src/AspNetCore/Warmup/ExecutorWarmupService.cs

@@ -0,0 +1,14 @@
+using Microsoft.Extensions.Hosting;
+
+namespace HotChocolate.AspNetCore.Warmup;
+
+internal sealed class RequestExecutorWarmupService(
+    IRequestExecutorWarmup executorWarmup)
+    : IHostedService
+{
+    public async Task StartAsync(CancellationToken cancellationToken)
+        => await executorWarmup.WarmupAsync(cancellationToken).ConfigureAwait(false);
+
+    public Task StopAsync(CancellationToken cancellationToken)
+        => Task.CompletedTask;
+}

src/HotChocolate/AspNetCore/src/AspNetCore/Warmup/RequestExecutorWarmupService.cs

@@ -1,26 +1,34 @@
 using HotChocolate.AspNetCore.Tests.Utilities;
+using HotChocolate.Execution;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace HotChocolate.AspNetCore;
 
-public class EvictSchemaTests : ServerTestBase
+public class EvictSchemaTests(TestServerFactory serverFactory) : ServerTestBase(serverFactory)
 {
-    public EvictSchemaTests(TestServerFactory serverFactory)
-        : base(serverFactory)
-    {
-    }
-
     [Fact]
     public async Task Evict_Default_Schema()
     {
         // arrange
+        var newExecutorCreatedResetEvent = new AutoResetEvent(false);
         var server = CreateStarWarsServer();
 
         var time1 = await server.GetAsync(
             new ClientQueryRequest { Query = "{ time }", });
 
+        var resolver = server.Services.GetRequiredService<IRequestExecutorResolver>();
+        resolver.Events.Subscribe(new RequestExecutorEventObserver(@event =>
+        {
+            if (@event.Type == RequestExecutorEventType.Created)
+            {
+                newExecutorCreatedResetEvent.Set();
+            }
+        }));
+
         // act
         await server.GetAsync(
             new ClientQueryRequest { Query = "{ evict }", });
+        newExecutorCreatedResetEvent.WaitOne(5000);
 
         // assert
         var time2 = await server.GetAsync(
@@ -32,16 +40,27 @@ await server.GetAsync(
     public async Task Evict_Named_Schema()
     {
         // arrange
+        var newExecutorCreatedResetEvent = new AutoResetEvent(false);
         var server = CreateStarWarsServer();
 
         var time1 = await server.GetAsync(
             new ClientQueryRequest { Query = "{ time }", },
             "/evict");
 
+        var resolver = server.Services.GetRequiredService<IRequestExecutorResolver>();
+        resolver.Events.Subscribe(new RequestExecutorEventObserver(@event =>
+        {
+            if (@event.Type == RequestExecutorEventType.Created)
+            {
+                newExecutorCreatedResetEvent.Set();
+            }
+        }));
+
         // act
         await server.GetAsync(
             new ClientQueryRequest { Query = "{ evict }", },
             "/evict");
+        newExecutorCreatedResetEvent.WaitOne(5000);
 
         // assert
         var time2 = await server.GetAsync(

src/HotChocolate/AspNetCore/src/AspNetCore/Warmup/WarmupSchemaTask.cs

@@ -21,9 +21,7 @@ private AutoUpdateRequestExecutorProxy(
         _executorProxy = requestExecutorProxy;
         _executor = initialExecutor;
 
-        _executorProxy.ExecutorEvicted += (_, _) => BeginUpdateExecutor();
-
-        BeginUpdateExecutor();
+        _executorProxy.ExecutorUpdated += (_, args) => _executor = args.Executor;
     }
 
     /// <summary>
@@ -144,26 +142,6 @@ public Task<IResponseStream> ExecuteBatchAsync(
         CancellationToken cancellationToken = default)
         => _executor.ExecuteBatchAsync(requestBatch, cancellationToken);
 
-    private void BeginUpdateExecutor()
-        => UpdateExecutorAsync().FireAndForget();
-
-    private async ValueTask UpdateExecutorAsync()
-    {
-        await _semaphore.WaitAsync().ConfigureAwait(false);
-
-        try
-        {
-            var executor = await _executorProxy
-                .GetRequestExecutorAsync(CancellationToken.None)
-                .ConfigureAwait(false);
-            _executor = executor;
-        }
-        finally
-        {
-            _semaphore.Release();
-        }
-    }
-
     /// <inheritdoc cref="IDisposable" />
     public void Dispose()
     {

src/HotChocolate/AspNetCore/test/AspNetCore.Tests/EvictSchemaTests.cs

@@ -0,0 +1,6 @@
+namespace HotChocolate.Execution.Caching;
+
+internal sealed class PreparedOperationCacheOptions
+{
+    public int Capacity { get; set; } = 100;
+}

src/HotChocolate/Core/src/Execution/AutoUpdateRequestExecutorProxy.cs

@@ -154,10 +154,8 @@ internal static IServiceCollection TryAddRequestExecutorResolver(
         this IServiceCollection services)
     {
         services.TryAddSingleton<RequestExecutorResolver>();
-        services.TryAddSingleton<IRequestExecutorResolver>(
-            sp => sp.GetRequiredService<RequestExecutorResolver>());
-        services.TryAddSingleton<IInternalRequestExecutorResolver>(
-            sp => sp.GetRequiredService<RequestExecutorResolver>());
+        services.TryAddSingleton<IRequestExecutorResolver>(sp => sp.GetRequiredService<RequestExecutorResolver>());
+        services.TryAddSingleton<IRequestExecutorWarmup>(sp => sp.GetRequiredService<RequestExecutorResolver>());
         return services;
     }
 
@@ -166,8 +164,8 @@ internal static IServiceCollection TryAddDefaultCaches(
     {
         services.TryAddSingleton<IDocumentCache>(
             _ => new DefaultDocumentCache());
-        services.TryAddSingleton<IPreparedOperationCache>(
-            _ => new DefaultPreparedOperationCache());
+        services.TryAddSingleton<PreparedOperationCacheOptions>(
+            _ => new PreparedOperationCacheOptions { Capacity = 100 });
         return services;
     }
 

src/HotChocolate/Core/src/Execution/Caching/PreparedOperationCacheOptions.cs

@@ -163,15 +163,6 @@ private static IRequestExecutorBuilder CreateBuilder(
 
         builder.Services.AddValidation(schemaName);
 
-        builder.Configure(
-            (sp, e) =>
-            {
-                e.OnRequestExecutorEvictedHooks.Add(
-                    // when ever we evict this schema we will clear the caches.
-                    new OnRequestExecutorEvictedAction(
-                        _ => sp.GetRequiredService<IPreparedOperationCache>().Clear()));
-            });
-
         builder.TryAddNoOpTransactionScopeHandler();
         builder.TryAddTypeInterceptor<DataLoaderRootFieldTypeInterceptor>();
         builder.TryAddTypeInterceptor<RequirementsTypeInterceptor>();
@@ -193,11 +184,9 @@ public static IServiceCollection AddOperationCache(
         this IServiceCollection services,
         int capacity = 100)
     {
-        services.RemoveAll<IPreparedOperationCache>();
-
-        services.AddSingleton<IPreparedOperationCache>(
-            _ => new DefaultPreparedOperationCache(capacity));
-
+        services.RemoveAll<PreparedOperationCacheOptions>();
+        services.AddSingleton<PreparedOperationCacheOptions>(
+            _ => new PreparedOperationCacheOptions{ Capacity = capacity });
         return services;
     }