Skip to content

Upgrade Redis and use batching or transactions #11

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade Redis and use batching or transactions #11

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
2 changes: 1 addition & 1 deletion src/AzureFunctionExtensions/AzureFunctionExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.2" />
<PackageReference Include="StackExchange.Redis.StrongName.Core" Version="1.1.605" />
<PackageReference Include="StackExchange.Redis" Version="2.1.58" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />
</ItemGroup>

Expand Down
6 changes: 6 additions & 0 deletions src/AzureFunctionExtensions/Redis/RedisConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ public RedisConfiguration(IRedisDatabaseManager redisDatabaseManager)
/// </summary>
public bool SendInBatch { get; set; } = true;

/// <summary>
/// Send items in contiguous transaction to Redis
/// </summary>
public bool SendInTransaction { get; set; } = true;


/// <summary>
/// Sets the operation to performed in Redis
Expand All @@ -48,6 +53,7 @@ public RedisConfiguration(IRedisDatabaseManager redisDatabaseManager)
/// Time to live in Redis
/// </summary>
public TimeSpan? TimeToLive { get; set; }


/// <summary>
/// Initializes attributes, configuration and async collector
Expand Down
93 changes: 55 additions & 38 deletions src/AzureFunctionExtensions/Redis/RedisOutputAsyncCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public RedisOutputAsyncCollector(RedisConfiguration config, RedisOutputAttribute
{
BinaryValue = item.BinaryValue,
ObjectValue = item.ObjectValue,
TextValue = item.TextValue,
TextValue = item.TextValue,
Key = Utils.MergeValueForProperty(item.Key, attr.Key, config.Key),
TimeToLive = Utils.MergeValueForNullableProperty<TimeSpan>(item.TimeToLive, attr.TimeToLive, config.TimeToLive),
IncrementValue = item.IncrementValue,
Expand All @@ -70,7 +70,7 @@ public RedisOutputAsyncCollector(RedisConfiguration config, RedisOutputAttribute
else
{
await SendToRedis(finalItem);
}
}
}

/// <summary>
Expand All @@ -80,53 +80,70 @@ public RedisOutputAsyncCollector(RedisConfiguration config, RedisOutputAttribute
/// <returns></returns>
public async Task FlushAsync(CancellationToken cancellationToken = default(CancellationToken))
{
foreach (var item in this.redisOutputCollection)
{
await SendToRedis(item);

if (cancellationToken != null && cancellationToken.IsCancellationRequested)
break;
}
await SendToRedis(this.redisOutputCollection.ToArray());
}

/// <summary>
/// Sends <see cref="RedisOutput"/> to Redis
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
async Task SendToRedis(RedisOutput item)
async Task SendToRedis(params RedisOutput[] items)
{
var connectionString = Utils.MergeValueForProperty(attr.Connection, config.Connection);
var connectionString = Utils.MergeValueForProperty(attr.Connection, config.Connection);
var db = redisDatabaseManager.GetDatabase(connectionString); // TODO: add support for multiple databases

RedisValue value = CreateRedisValue(item);

switch (item.Operation)
IDatabaseAsync dbAsync = db;
IBatch batch = null;
ITransaction transaction = null;
if (items.Length > 1)
{
case RedisOutputOperation.SetKeyValue:
{
await db.StringSetAsync(item.Key, value, item.TimeToLive, When.Always, CommandFlags.FireAndForget);
break;
}

case RedisOutputOperation.IncrementValue:
{
await db.StringIncrementAsync(item.Key, item.IncrementValue);
break;
}

case RedisOutputOperation.ListRightPush:
{
await db.ListRightPushAsync(item.Key, value, When.Always, CommandFlags.FireAndForget);
break;
}

case RedisOutputOperation.ListLeftPush:
{
await db.ListLeftPushAsync(item.Key, value, When.Always, CommandFlags.FireAndForget);
break;
}
if (this.config.SendInTransaction)
{
dbAsync = transaction = db.CreateTransaction();
}
else
{
dbAsync = batch = db.CreateBatch();
}
}
var tasks = new List<Task>();
foreach (var item in items)
{
RedisValue value = CreateRedisValue(item);

switch (item.Operation)
{
case RedisOutputOperation.SetKeyValue:
{
tasks.Add(dbAsync.StringSetAsync(item.Key, value, item.TimeToLive, When.Always, CommandFlags.FireAndForget));
break;
}

case RedisOutputOperation.IncrementValue:
{
tasks.Add(dbAsync.StringIncrementAsync(item.Key, item.IncrementValue));
break;
}

case RedisOutputOperation.ListRightPush:
{
tasks.Add(dbAsync.ListRightPushAsync(item.Key, value, When.Always, CommandFlags.FireAndForget));
break;
}

case RedisOutputOperation.ListLeftPush:
{
tasks.Add(dbAsync.ListLeftPushAsync(item.Key, value, When.Always, CommandFlags.FireAndForget));
break;
}
}
}

transaction?.Execute();
batch?.Execute();

await Task.WhenAll(tasks).ConfigureAwait(false);

}

/// <summary>
Expand Down
5 changes: 5 additions & 0 deletions src/AzureFunctionExtensions/Redis/RedisOutputAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ public sealed class RedisOutputAttribute : Attribute, IConnectionProvider
/// </summary>
public bool SendInBatch { get; set; } = true;

/// <summary>
/// Send items in contiguous transaction to Redis
/// </summary>
public bool SendInTransaction { get; set; } = true;

/// <summary>
/// Sets the operation to performed in Redis
/// Default is <see cref="RedisOutputOperation.SetKeyValue"/>
Expand Down
Loading