Skip to content

Commit

Permalink
feat(framework): update to Orleans 7 (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiasmt
tiasmt authored Oct 12, 2023
1 parent d5a4ddb commit ac05501
Show file tree
Hide file tree
Showing 14 changed files with 183 additions and 240 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<!-- Shared Package Versions -->
Expand Down
301 changes: 121 additions & 180 deletions Orleans.Persistence.Redis/Config/RedisSiloHostBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,204 +18,145 @@
using OrleansSerializer = Orleans.Persistence.Redis.Serialization.OrleansSerializer;

// ReSharper disable once CheckNamespace
namespace Orleans.Hosting
namespace Orleans.Hosting;

public static class RedisSiloBuilderExtensions
{
public static class RedisSiloBuilderExtensions
public static RedisStorageOptionsBuilder AddRedisGrainStorage(
this ISiloBuilder builder,
string name
) => new RedisStorageOptionsBuilder(builder, name);

public static RedisStorageOptionsBuilder AddRedisGrainStorageAsDefault(
this ISiloBuilder builder
) => builder.AddRedisGrainStorage("Default");

internal static IServiceCollection AddRedisGrainStorage(
this IServiceCollection services,
string name,
Action<OptionsBuilder<RedisStorageOptions>> configureOptions = null
)
{
public static RedisStorageOptionsBuilder AddRedisGrainStorage(
this ISiloBuilder builder,
string name
) => new RedisStorageOptionsBuilder(builder, name);

public static RedisStorageOptionsBuilder AddRedisGrainStorageAsDefault(
this ISiloBuilder builder
) => builder.AddRedisGrainStorage("Default");

internal static ISiloBuilder AddRedisDefaultSerializer(this ISiloBuilder builder, string name)
=> builder.AddRedisSerializer<OrleansSerializer>(name);

internal static ISiloBuilder AddRedisDefaultHumanReadableSerializer(this ISiloBuilder builder, string name)
=> builder.AddRedisHumanReadableSerializer<JsonSerializer>(
name,
provider => new object[] { RedisDefaultJsonSerializerSettings.Get(provider) }
);

internal static ISiloBuilder AddCompression<TCompression>(this ISiloBuilder builder, string name)
where TCompression : ICompression
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<ICompression>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TCompression>(provider)));

internal static ISiloBuilder AddRedisSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
params object[] settings
)
where TSerializer : ISerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<ISerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloBuilder AddRedisHumanReadableSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
params object[] settings
)
where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloBuilder AddRedisHumanReadableSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
Func<IServiceProvider, object[]> cfg
) where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, cfg?.Invoke(provider)))
);
configureOptions?.Invoke(services.AddOptions<RedisStorageOptions>(name));
// services.AddTransient<IConfigurationValidator>(sp => new DynamoDBGrainStorageOptionsValidator(sp.GetService<IOptionsSnapshot<RedisStorageOptions>>().Get(name), name));
services.AddSingletonNamedService(name, CreateStateStore);
services.ConfigureNamedOptionForLogging<RedisStorageOptions>(name);
services.TryAddSingleton(sp =>
sp.GetServiceByName<IGrainStorage>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME));

return services
.AddSingletonNamedService(name, CreateDbConnection)
.AddSingletonNamedService(name, CreateRedisStorage)
.AddSingletonNamedService(name, (provider, n)
=> (ILifecycleParticipant<ISiloLifecycle>)provider.GetRequiredServiceByName<IGrainStorage>(n));
}

public static class RedisSiloHostBuilderExtensions
internal static ISiloBuilder AddRedisDefaultSerializer(this ISiloBuilder builder, string name)
=> builder.AddRedisSerializer<OrleansSerializer>(name);

internal static ISiloBuilder AddRedisDefaultBrotliSerializer(this ISiloBuilder builder, string name)
=> builder.AddRedisSerializer<BrotliSerializer>(name);

internal static ISiloBuilder AddRedisDefaultHumanReadableSerializer(this ISiloBuilder builder, string name)
=> builder.AddRedisHumanReadableSerializer<JsonSerializer>(
name,
provider => new object[] { RedisDefaultJsonSerializerSettings.Get(provider) }
);

internal static ISiloBuilder AddCompression<TCompression>(this ISiloBuilder builder, string name)
where TCompression : ICompression
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<ICompression>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TCompression>(provider)));

internal static ISiloBuilder AddRedisSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
params object[] settings
)
where TSerializer : ISerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<ISerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloBuilder AddRedisHumanReadableSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
params object[] settings
)
where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloBuilder AddRedisHumanReadableSerializer<TSerializer>(
this ISiloBuilder builder,
string name,
Func<IServiceProvider, object[]> cfg
) where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, cfg?.Invoke(provider)))
);

private static IGrainStorage CreateRedisStorage(IServiceProvider services, string name)
{
public static RedisStorageSiloHostBuilderOptionsBuilder AddRedisGrainStorage(
this ISiloHostBuilder builder,
string name
) => new RedisStorageSiloHostBuilderOptionsBuilder(builder, name);

public static RedisStorageSiloHostBuilderOptionsBuilder AddRedisGrainStorageAsDefault(
this ISiloHostBuilder builder
) => builder.AddRedisGrainStorage("Default");

internal static IServiceCollection AddRedisGrainStorage(
this IServiceCollection services,
string name,
Action<OptionsBuilder<RedisStorageOptions>> configureOptions = null
)
{
configureOptions?.Invoke(services.AddOptions<RedisStorageOptions>(name));
// services.AddTransient<IConfigurationValidator>(sp => new DynamoDBGrainStorageOptionsValidator(sp.GetService<IOptionsSnapshot<RedisStorageOptions>>().Get(name), name));
services.AddSingletonNamedService(name, CreateStateStore);
services.ConfigureNamedOptionForLogging<RedisStorageOptions>(name);
services.TryAddSingleton(sp =>
sp.GetServiceByName<IGrainStorage>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME));

return services
.AddSingletonNamedService(name, CreateDbConnection)
.AddSingletonNamedService(name, CreateRedisStorage)
.AddSingletonNamedService(name, (provider, n)
=> (ILifecycleParticipant<ISiloLifecycle>)provider.GetRequiredServiceByName<IGrainStorage>(n));
}

internal static ISiloHostBuilder AddRedisDefaultSerializer(this ISiloHostBuilder builder, string name)
=> builder.AddRedisSerializer<OrleansSerializer>(name);

internal static ISiloHostBuilder AddRedisDefaultBrotliSerializer(this ISiloHostBuilder builder, string name)
=> builder.AddRedisSerializer<BrotliSerializer>(name);

internal static ISiloHostBuilder AddRedisDefaultHumanReadableSerializer(this ISiloHostBuilder builder,
string name)
=> builder.AddRedisHumanReadableSerializer<JsonSerializer>(
name,
provider => new object[] { RedisDefaultJsonSerializerSettings.Get(provider) });

internal static ISiloHostBuilder AddRedisSerializer<TSerializer>(this ISiloHostBuilder builder, string name,
params object[] settings)
where TSerializer : ISerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<ISerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloHostBuilder AddRedisHumanReadableSerializer<TSerializer>(this ISiloHostBuilder builder,
string name, params object[] settings)
where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, settings))
);

internal static ISiloHostBuilder AddRedisHumanReadableSerializer<TSerializer>(
this ISiloHostBuilder builder,
string name,
Func<IServiceProvider, object[]> cfg
) where TSerializer : IHumanReadableSerializer
=> builder.ConfigureServices(services =>
services.AddSingletonNamedService<IHumanReadableSerializer>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TSerializer>(provider, cfg?.Invoke(provider)))
);

internal static ISiloHostBuilder AddCompression<TCompression>(this ISiloHostBuilder builder, string name)
where TCompression : ICompression
{
return builder.ConfigureServices(services =>
services.AddSingletonNamedService<ICompression>(name, (provider, n)
=> ActivatorUtilities.CreateInstance<TCompression>(provider)));
}

private static IGrainStorage CreateRedisStorage(IServiceProvider services, string name)
{
var store = services.GetRequiredServiceByName<IGrainStateStore>(name);
var connection = services.GetRequiredServiceByName<DbConnection>(name);
return ActivatorUtilities.CreateInstance<RedisGrainStorage>(services, name, store, connection);
}
var store = services.GetRequiredServiceByName<IGrainStateStore>(name);
var connection = services.GetRequiredServiceByName<DbConnection>(name);
return ActivatorUtilities.CreateInstance<RedisGrainStorage>(services, name, store, connection);
}

private static IGrainStateStore CreateStateStore(IServiceProvider provider, string name)
{
var connection = provider.GetRequiredServiceByName<DbConnection>(name);
var serializer = provider.GetRequiredServiceByName<ISerializer>(name);
var humanReadableSerializer = provider.GetServiceByName<IHumanReadableSerializer>(name);
var options = provider.GetRequiredService<IOptionsSnapshot<RedisStorageOptions>>();
var compress = provider.GetServiceByName<ICompression>(name);

if (compress != null)
return ActivatorUtilities.CreateInstance<GrainStateStore>(
provider,
connection,
options.Get(name),
serializer,
humanReadableSerializer,
compress
);
private static IGrainStateStore CreateStateStore(IServiceProvider provider, string name)
{
var connection = provider.GetRequiredServiceByName<DbConnection>(name);
var serializer = provider.GetRequiredServiceByName<ISerializer>(name);
var humanReadableSerializer = provider.GetServiceByName<IHumanReadableSerializer>(name);
var options = provider.GetRequiredService<IOptionsSnapshot<RedisStorageOptions>>();
var compress = provider.GetServiceByName<ICompression>(name);

if (compress != null)
return ActivatorUtilities.CreateInstance<GrainStateStore>(
provider,
connection,
options.Get(name),
serializer,
humanReadableSerializer
humanReadableSerializer,
compress
);
}

private static DbConnection CreateDbConnection(IServiceProvider provider, string name)
{
var optionsSnapshot = provider.GetRequiredService<IOptionsSnapshot<RedisStorageOptions>>();
var logger = provider.GetRequiredService<ILogger<DbConnection>>();
return ActivatorUtilities.CreateInstance<DbConnection>(provider, optionsSnapshot.Get(name), logger);
}
return ActivatorUtilities.CreateInstance<GrainStateStore>(
provider,
connection,
options.Get(name),
serializer,
humanReadableSerializer
);
}

public static class RedisDefaultJsonSerializerSettings
private static DbConnection CreateDbConnection(IServiceProvider provider, string name)
{
public static JsonSerializerSettings Get(IServiceProvider provider)
{
var settings = OrleansJsonSerializer.GetDefaultSerializerSettings(
provider.GetRequiredService<ITypeResolver>(),
provider.GetRequiredService<IGrainFactory>()
);
var optionsSnapshot = provider.GetRequiredService<IOptionsSnapshot<RedisStorageOptions>>();
var logger = provider.GetRequiredService<ILogger<DbConnection>>();
return ActivatorUtilities.CreateInstance<DbConnection>(provider, optionsSnapshot.Get(name), logger);
}
}

settings.ContractResolver = new DefaultContractResolver
public static class RedisDefaultJsonSerializerSettings
{
public static JsonSerializerSettings Get(IServiceProvider provider)
{
var settings = OrleansJsonSerializerSettings.GetDefaultSerializerSettings(provider);

settings.ContractResolver = new DefaultContractResolver
{
NamingStrategy = new DefaultNamingStrategy
{
NamingStrategy = new DefaultNamingStrategy
{
ProcessDictionaryKeys = false
}
};

return settings;
}
ProcessDictionaryKeys = false
}
};

return settings;
}
}
12 changes: 6 additions & 6 deletions Orleans.Persistence.Redis/Config/RedisStorageOptions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Microsoft.Extensions.Options;
using Orleans.Hosting;
using Orleans.Persistence.Redis.Compression;
using Orleans.Persistence.Redis.Compression;
using Orleans.Persistence.Redis.Serialization;
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Options;
using Orleans.Hosting;

namespace Orleans.Persistence.Redis.Config
{
Expand Down Expand Up @@ -52,12 +52,12 @@ public RedisStorageOptions WithKeyBuilder(Func<string, string> keyBuilder)

public class RedisStorageSiloHostBuilderOptionsBuilder
{
private readonly ISiloHostBuilder _builder;
private readonly ISiloBuilder _builder;
private bool _humanSerializerAdded;
private bool _serializerAdded;
private readonly string _name;

public RedisStorageSiloHostBuilderOptionsBuilder(ISiloHostBuilder builder, string name)
public RedisStorageSiloHostBuilderOptionsBuilder(ISiloBuilder builder, string name)
{
_builder = builder;
_name = name;
Expand Down Expand Up @@ -115,7 +115,7 @@ public RedisStorageSiloHostBuilderOptionsBuilder AddCompression<TCompression>()
return this;
}

public ISiloHostBuilder Build(Action<OptionsBuilder<RedisStorageOptions>> configureOptions)
public ISiloBuilder Build(Action<OptionsBuilder<RedisStorageOptions>> configureOptions)
{
if (!_serializerAdded)
_builder.AddRedisDefaultSerializer(_name);
Expand Down
Loading

0 comments on commit ac05501

Please sign in to comment.