Skip to content

Commit c05d4cd

Browse files
atakavciatakavci
authored
Merge branch 'master' into dependabot/nuget/BouncyCastle.Cryptography-2.3.0
2 parents ad159ed + e152ef2 commit c05d4cd

File tree

80 files changed

+6197
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+6197
-587
lines changed

‎.github/dockers/cluster.redis.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
protected-mode no
22
enable-debug-command yes
33
loadmodule /opt/redis-stack/lib/redisearch.so
4-
loadmodule /opt/redis-stack/lib/redisgraph.so
4+
# loadmodule /opt/redis-stack/lib/redisgraph.so
55
loadmodule /opt/redis-stack/lib/redistimeseries.so
66
loadmodule /opt/redis-stack/lib/rejson.so
77
loadmodule /opt/redis-stack/lib/redisbloom.so

‎.github/workflows/integration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
6060

6161
- name: Test
62-
run: dotnet test -f net8.0 --no-build --verbosity detailed
62+
run: dotnet test -f net8.0 --no-build --verbosity detailed -p:BuildInParallel=false tests/Test.proj --logger GitHubActions
6363

6464
dotnet_6_cluster:
6565
name: .NET 6 on [redis-stack cluster]
@@ -175,4 +175,4 @@ jobs:
175175
shell: cmd
176176
run: |
177177
START wsl ./redis-stack-server-${{env.redis_stack_version}}/bin/redis-stack-server &
178-
dotnet test -f net481 --no-build --verbosity detailed
178+
dotnet test -f net481 --no-build --verbosity detailed -p:BuildInParallel=false tests/Test.proj --logger GitHubActions

‎.github/workflows/reusable.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Run redis-stack-server docker
4343
working-directory: .github
44-
run: docker-compose up -d redis-stack-${{inputs.redis_stack_type}}
44+
run: docker compose up -d redis-stack-${{inputs.redis_stack_type}}
4545

4646
- name: Set .env variables
4747
uses: xom9ikk/dotenv@v2
@@ -70,7 +70,7 @@ jobs:
7070
echo "${{secrets.REDIS_CA_PEM}}" > tests/NRedisStack.Tests/bin/Debug/${{inputs.clr_version}}/redis_ca.pem
7171
echo "${{secrets.REDIS_USER_CRT}}" > tests/NRedisStack.Tests/bin/Debug/${{inputs.clr_version}}/redis_user.crt
7272
echo "${{secrets.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/${{inputs.clr_version}}/redis_user_private.key
73-
dotnet test -f ${{inputs.clr_version}} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
73+
dotnet test -f ${{inputs.clr_version}} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover -p:BuildInParallel=false tests/Test.proj --logger GitHubActions
7474
- name: Codecov
7575
uses: codecov/codecov-action@v3
7676
with:
@@ -90,5 +90,5 @@ jobs:
9090
dotnet nuget remove source nuget.org
9191
dotnet nuget list source
9292
find . -name '*.csproj' | xargs -I {} sed -E -i 's|<TargetFrameworks(.*)>.*</TargetFrameworks>|<TargetFramework\1>${{inputs.clr_version}}</TargetFramework>|' {}
93-
dotnet restore -s test-source
93+
dotnet restore -s test-source -v detailed
9494
dotnet run

‎src/NRedisStack/Bloom/IBloomCommands.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ public interface IBloomCommands
4747
/// <param name="items">One or more items to add.</param>
4848
/// <param name="capacity">(Optional) Specifies the desired capacity for the filter to be created.</param>
4949
/// <param name="error">(Optional) Specifies the error ratio of the newly created filter if it does not yet exist.</param>
50-
/// <param name="expansion">(Optional) When capacity is reached, an additional sub-filter is
51-
/// created in size of the last sub-filter multiplied by expansion.</param>
52-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
53-
/// filter should not be created if it does not already exist.</param>
54-
/// <param name="nonscaling">(Optional) <see langword="true"/> toprevent the filter
55-
/// from creating additional sub-filters if initial capacity is reached.</param>
50+
/// <param name="expansion">(Optional) When capacity is reached, an additional sub-filter is created in size of the last sub-filter multiplied by expansion.</param>
51+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
52+
/// <param name="nonscaling">(Optional) <see langword="true"/> toprevent the filter from creating additional sub-filters if initial capacity is reached.</param>
5653
/// <returns>An array of booleans. Each element is either true or false depending on whether the
5754
/// corresponding input element was newly added to the filter or may have previously existed.</returns>
5855
/// <remarks><seealso href="https://redis.io/commands/bf.insert"/></remarks>

‎src/NRedisStack/Bloom/IBloomCommandsAsync.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ public interface IBloomCommandsAsync
5050
/// <param name="error">(Optional) Specifies the error ratio of the newly created filter if it does not yet exist.</param>
5151
/// <param name="expansion">(Optional) When capacity is reached, an additional sub-filter is
5252
/// created in size of the last sub-filter multiplied by expansion.</param>
53-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
54-
/// filter should not be created if it does not already exist.</param>
55-
/// <param name="nonscaling">(Optional) <see langword="true"/> toprevent the filter
56-
/// from creating additional sub-filters if initial capacity is reached.</param>
53+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
54+
/// <param name="nonscaling">(Optional) <see langword="true"/> toprevent the filter from creating additional sub-filters if initial capacity is reached.</param>
5755
/// <returns>An array of booleans. Each element is either true or false depending on whether the
5856
/// corresponding input element was newly added to the filter or may have previously existed.</returns>
5957
/// <remarks><seealso href="https://redis.io/commands/bf.insert"/></remarks>

‎src/NRedisStack/CuckooFilter/ICuckooCommands.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public interface ICuckooCommands
6464
/// <param name="key">The name of the filter.</param>
6565
/// <param name="items">One or more items to add.</param>
6666
/// <param name="capacity">(Optional) Specifies the desired capacity for the filter to be created.</param>
67-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
67+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
6868
/// <returns>An array of booleans.</returns>
6969
/// <remarks><seealso href="https://redis.io/commands/cf.insert"/></remarks>
7070
bool[] Insert(RedisKey key, RedisValue[] items, int? capacity = null, bool nocreate = false);
@@ -76,7 +76,7 @@ public interface ICuckooCommands
7676
/// <param name="key">The name of the filter.</param>
7777
/// <param name="items">One or more items to add.</param>
7878
/// <param name="capacity">(Optional) Specifies the desired capacity for the filter to be created.</param>
79-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
79+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
8080
/// <returns>An array of booleans.where <see langword="true"/> means the item has been added to the filter,
8181
/// and <see langword="false"/> mean, the item already existed</returns>
8282
/// <remarks><seealso href="https://redis.io/commands/cf.insertnx"/></remarks>

‎src/NRedisStack/CuckooFilter/ICuckooCommandsAsync.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public interface ICuckooCommandsAsync
6464
/// <param name="key">The name of the filter.</param>
6565
/// <param name="items">One or more items to add.</param>
6666
/// <param name="capacity">(Optional) Specifies the desired capacity for the filter to be created.</param>
67-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
67+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
6868
/// <returns>An array of booleans.</returns>
6969
/// <remarks><seealso href="https://redis.io/commands/cf.insert"/></remarks>
7070
Task<bool[]> InsertAsync(RedisKey key, RedisValue[] items, int? capacity = null, bool nocreate = false);
@@ -76,9 +76,8 @@ public interface ICuckooCommandsAsync
7676
/// <param name="key">The name of the filter.</param>
7777
/// <param name="items">One or more items to add.</param>
7878
/// <param name="capacity">(Optional) Specifies the desired capacity for the filter to be created.</param>
79-
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the
80-
/// <returns>An array of booleans.where <see langword="true"/> means the item has been added to the filter,
81-
/// and <see langword="false"/> mean, the item already existed</returns>
79+
/// <param name="nocreate">(Optional) <see langword="true"/> to indicates that the filter should not be created if it does not already exist.</param>
80+
/// <returns>An array of booleans.where <see langword="true"/> means the item has been added to the filter, and <see langword="false"/> mean, the item already existed</returns>
8281
/// <remarks><seealso href="https://redis.io/commands/cf.insertnx"/></remarks>
8382
Task<bool[]> InsertNXAsync(RedisKey key, RedisValue[] items, int? capacity = null, bool nocreate = false);
8483

‎src/NRedisStack/Gears/GearsCommandBuilder.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
namespace NRedisStack
44
{
55

6+
[Obsolete]
67
public static class GearsCommandBuilder
78
{
9+
[Obsolete]
810
public static SerializedCommand TFunctionLoad(string libraryCode, bool replace = false, string? config = null)
911
{
1012
var args = new List<object>() { GearsArgs.LOAD };
@@ -23,11 +25,13 @@ public static SerializedCommand TFunctionLoad(string libraryCode, bool replace =
2325
return new SerializedCommand(RG.TFUNCTION, args);
2426
}
2527

28+
[Obsolete]
2629
public static SerializedCommand TFunctionDelete(string libraryName)
2730
{
2831
return new SerializedCommand(RG.TFUNCTION, GearsArgs.DELETE, libraryName);
2932
}
3033

34+
[Obsolete]
3135
public static SerializedCommand TFunctionList(bool withCode = false, int verbose = 0, string? libraryName = null)
3236
{
3337
var args = new List<object>() { GearsArgs.LIST };
@@ -55,6 +59,7 @@ public static SerializedCommand TFunctionList(bool withCode = false, int verbose
5559
return new SerializedCommand(RG.TFUNCTION, args);
5660
}
5761

62+
[Obsolete]
5863
public static SerializedCommand TFCall(string libraryName, string functionName, string[]? keys = null, string[]? args = null, bool async = false)
5964
{
6065
string command = async ? RG.TFCALLASYNC : RG.TFCALL;

‎src/NRedisStack/Gears/GearsCommands.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using StackExchange.Redis;
22
namespace NRedisStack
33
{
4-
4+
[Obsolete]
55
public static class GearsCommands //: GearsCommandsAsync, IGearsCommands
66
{
77

@@ -17,6 +17,7 @@ public static class GearsCommands //: GearsCommandsAsync, IGearsCommands
1717
/// <param name="replace">an optional argument, instructs RedisGears to replace the function if its already exists.</param>
1818
/// <returns><see langword="true"/> if everything was done correctly, Error otherwise.</returns>
1919
/// <remarks><seealso href="https://redis.io/commands/tfunction-load/"/></remarks> //TODO: check this link when it's available
20+
[Obsolete]
2021
public static bool TFunctionLoad(this IDatabase db, string libraryCode, bool replace = false, string? config = null)
2122
{
2223
return db.Execute(GearsCommandBuilder.TFunctionLoad(libraryCode, replace, config)).OKtoBoolean();
@@ -28,6 +29,7 @@ public static bool TFunctionLoad(this IDatabase db, string libraryCode, bool rep
2829
/// <param name="libraryName">the name of the library to delete.</param>
2930
/// <returns><see langword="true"/> if the library was deleted successfully, Error otherwise.</returns>
3031
/// <remarks><seealso href="https://redis.io/commands/tfunction-delete/"/></remarks> //TODO: check this link when it's available
32+
[Obsolete]
3133
public static bool TFunctionDelete(this IDatabase db, string libraryName)
3234
{
3335
return db.Execute(GearsCommandBuilder.TFunctionDelete(libraryName)).OKtoBoolean();
@@ -42,6 +44,7 @@ public static bool TFunctionDelete(this IDatabase db, string libraryName)
4244
/// multiple times to show multiple libraries in a single command)</param>
4345
/// <returns>Information about the requested libraries.</returns>
4446
/// <remarks><seealso href="https://redis.io/commands/tfunction-list/"/></remarks> //TODO: check this link when it's available
47+
[Obsolete]
4548
public static Dictionary<string, RedisResult>[] TFunctionList(this IDatabase db, bool withCode = false, int verbose = 0, string? libraryName = null)
4649
{
4750
return db.Execute(GearsCommandBuilder.TFunctionList(withCode, verbose, libraryName)).ToDictionarys();
@@ -54,8 +57,9 @@ public static Dictionary<string, RedisResult>[] TFunctionList(this IDatabase db,
5457
/// <param name="functionName">The function name to run.</param>
5558
/// <param name="keys">keys that will be touched by the function.</param>
5659
/// <param name="args">Additional argument to pass to the function.</param>
57-
/// <returns>The return value from the sync & async function on error in case of failure.</returns>
60+
/// <returns>The return value from the sync &amp; async function on error in case of failure.</returns>
5861
/// <remarks><seealso href="https://redis.io/commands/tfcall"/></remarks>
62+
[Obsolete]
5963
public static RedisResult TFCall_(this IDatabase db, string libraryName, string functionName, string[]? keys = null, string[]? args = null)
6064
{
6165
return db.Execute(GearsCommandBuilder.TFCall(libraryName, functionName, keys, args, async: false));
@@ -68,8 +72,9 @@ public static RedisResult TFCall_(this IDatabase db, string libraryName, string
6872
/// <param name="functionName">The function name to run.</param>
6973
/// <param name="keys">keys that will be touched by the function.</param>
7074
/// <param name="args">Additional argument to pass to the function.</param>
71-
/// <returns>The return value from the sync & async function on error in case of failure.</returns>
75+
/// <returns>The return value from the sync &amp; async function on error in case of failure.</returns>
7276
/// <remarks><seealso href="https://redis.io/commands/tfcallasync"/></remarks>
77+
[Obsolete]
7378
public static RedisResult TFCallAsync_(this IDatabase db, string libraryName, string functionName, string[]? keys = null, string[]? args = null)
7479
{
7580
return db.Execute(GearsCommandBuilder.TFCall(libraryName, functionName, keys, args, async: true));

‎src/NRedisStack/Gears/GearsCommandsAsync.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public static class GearsCommandsAsync //: IGearsCommandsAsync
1616
/// <param name="replace">an optional argument, instructs RedisGears to replace the function if its already exists.</param>
1717
/// <returns><see langword="true"/> if everything was done correctly, Error otherwise.</returns>
1818
/// <remarks><seealso href="https://redis.io/commands/"/></remarks> //TODO: add link to the command when it's available
19+
[Obsolete]
1920
public static async Task<bool> TFunctionLoadAsync(this IDatabase db, string libraryCode, string? config = null, bool replace = false)
2021
{
2122
return (await db.ExecuteAsync(GearsCommandBuilder.TFunctionLoad(libraryCode, replace, config))).OKtoBoolean();
@@ -27,6 +28,7 @@ public static async Task<bool> TFunctionLoadAsync(this IDatabase db, string libr
2728
/// <param name="libraryName">the name of the library to delete.</param>
2829
/// <returns><see langword="true"/> if the library was deleted successfully, Error otherwise.</returns>
2930
/// <remarks><seealso href="https://redis.io/commands/"/></remarks> //TODO: add link to the command when it's available
31+
[Obsolete]
3032
public static async Task<bool> TFunctionDeleteAsync(this IDatabase db, string libraryName)
3133
{
3234
return (await db.ExecuteAsync(GearsCommandBuilder.TFunctionDelete(libraryName))).OKtoBoolean();
@@ -41,6 +43,7 @@ public static async Task<bool> TFunctionDeleteAsync(this IDatabase db, string li
4143
/// multiple times to show multiple libraries in a single command)</param>
4244
/// <returns>Information about the requested libraries.</returns>
4345
/// <remarks><seealso href="https://redis.io/commands/"/></remarks> //TODO: add link to the command when it's available
46+
[Obsolete]
4447
public static async Task<Dictionary<string, RedisResult>[]> TFunctionListAsync(this IDatabase db, bool withCode = false, int verbose = 0, string? libraryName = null)
4548
{
4649
return (await db.ExecuteAsync(GearsCommandBuilder.TFunctionList(withCode, verbose, libraryName))).ToDictionarys();
@@ -53,8 +56,9 @@ public static async Task<Dictionary<string, RedisResult>[]> TFunctionListAsync(t
5356
/// <param name="functionName">The function name to run.</param>
5457
/// <param name="keys">keys that will be touched by the function.</param>
5558
/// <param name="args">Additional argument to pass to the function.</param>
56-
/// <returns>The return value from the sync & async function on error in case of failure.</returns>
59+
/// <returns>The return value from the sync &amp; async function on error in case of failure.</returns>
5760
/// <remarks><seealso href="https://redis.io/commands/tfcall"/></remarks>
61+
[Obsolete]
5862
public async static Task<RedisResult> TFCall_Async(this IDatabase db, string libraryName, string functionName, string[]? keys = null, string[]? args = null)
5963
{
6064
return await db.ExecuteAsync(GearsCommandBuilder.TFCall(libraryName, functionName, keys, args, async: false));
@@ -67,8 +71,9 @@ public async static Task<RedisResult> TFCall_Async(this IDatabase db, string lib
6771
/// <param name="functionName">The function name to run.</param>
6872
/// <param name="keys">keys that will be touched by the function.</param>
6973
/// <param name="args">Additional argument to pass to the function.</param>
70-
/// <returns>The return value from the sync & async function on error in case of failure.</returns>
74+
/// <returns>The return value from the sync &amp; async function on error in case of failure.</returns>
7175
/// <remarks><seealso href="https://redis.io/commands/tfcallasync"/></remarks>
76+
[Obsolete]
7277
public async static Task<RedisResult> TFCallAsync_Async(this IDatabase db, string libraryName, string functionName, string[]? keys = null, string[]? args = null)
7378
{
7479
return await db.ExecuteAsync(GearsCommandBuilder.TFCall(libraryName, functionName, keys, args, async: true));

0 commit comments

Comments
 (0)