Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/NRedisStack/Auxiliary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,31 @@ internal static void SetInfoInPipeline(this IDatabase db)
}
}

#if DEBUG
private const CommandFlags Flags = CommandFlags.NoRedirect; // disable redirect, so we spot -MOVED in tests
#else
private const CommandFlags Flags = CommandFlags.None;
#endif
public static RedisResult Execute(this IDatabase db, SerializedCommand command)
{
db.SetInfoInPipeline();
return db.Execute(command.Command, command.Args);
return db.Execute(command.Command, command.Args, flags: Flags);
}

internal static RedisResult Execute(this IServer server, int? db, SerializedCommand command)
{
return server.Execute(db, command.Command, command.Args);
return server.Execute(db, command.Command, command.Args, flags: Flags);
}

public static async Task<RedisResult> ExecuteAsync(this IDatabaseAsync db, SerializedCommand command)
{
((IDatabase)db).SetInfoInPipeline();
return await db.ExecuteAsync(command.Command, command.Args);
return await db.ExecuteAsync(command.Command, command.Args, flags: Flags);
}

internal static async Task<RedisResult> ExecuteAsync(this IServer server, int? db, SerializedCommand command)
{
return await server.ExecuteAsync(db, command.Command, command.Args);
return await server.ExecuteAsync(db, command.Command, command.Args, flags: Flags);
}

public static List<RedisResult> ExecuteBroadcast(this IDatabase db, string command)
Expand Down
4 changes: 2 additions & 2 deletions src/NRedisStack/Json/JsonCommandBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public static SerializedCommand Type(RedisKey key, string? path = null)
public static SerializedCommand DebugMemory(string key, string? path = null)
{
return (path != null)
? new(JSON.DEBUG, JSON.MEMORY, key, path)
: new SerializedCommand(JSON.DEBUG, JSON.MEMORY, key);
? new(JSON.DEBUG, JSON.MEMORY, (RedisKey)key, path)
: new SerializedCommand(JSON.DEBUG, JSON.MEMORY, (RedisKey)key);
}

public static SerializedCommand ArrAppend(RedisKey key, string? path = null, params object[] values)
Expand Down
8 changes: 4 additions & 4 deletions src/NRedisStack/Search/SearchCommandBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,20 +196,20 @@ public static SerializedCommand SpellCheck(string indexName, string query, FTSpe

public static SerializedCommand SugAdd(string key, string str, double score, bool increment = false, string? payload = null)
{
var args = new List<object> { key, str, score };
var args = new List<object> { (RedisKey)key, str, score };
if (increment) { args.Add(SearchArgs.INCR); }
if (payload != null) { args.Add(SearchArgs.PAYLOAD); args.Add(payload); }
return new(FT.SUGADD, args);
}

public static SerializedCommand SugDel(string key, string str)
{
return new(FT.SUGDEL, key, str);
return new(FT.SUGDEL, (RedisKey)key, str);
}

public static SerializedCommand SugGet(string key, string prefix, bool fuzzy = false, bool withScores = false, bool withPayloads = false, int? max = null)
{
var args = new List<object> { key, prefix };
var args = new List<object> { (RedisKey)key, prefix };
if (fuzzy) { args.Add(SearchArgs.FUZZY); }
if (withScores) { args.Add(SearchArgs.WITHSCORES); }
if (withPayloads) { args.Add(SearchArgs.WITHPAYLOADS); }
Expand All @@ -219,7 +219,7 @@ public static SerializedCommand SugGet(string key, string prefix, bool fuzzy = f

public static SerializedCommand SugLen(string key)
{
return new(FT.SUGLEN, key);
return new(FT.SUGLEN, (RedisKey)key);
}

public static SerializedCommand SynDump(string indexName)
Expand Down
7 changes: 3 additions & 4 deletions src/NRedisStack/Tdigest/TdigestCommandBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ public static class TdigestCommandBuilder
{
public static SerializedCommand Add(RedisKey key, params double[] values)
{
if (values.Length < 0) throw new ArgumentOutOfRangeException(nameof(values));
var args = new string[values.Length + 1];
args[0] = key.ToString();
var args = new object[values.Length + 1];
args[0] = key;
for (int i = 0; i < values.Length; i++)
{
args[i + 1] = values[i].ToString();
args[i + 1] = values[i];
}

return new(TDIGEST.ADD, args);
Expand Down
3 changes: 2 additions & 1 deletion src/NRedisStack/TimeSeries/DataTypes/TSParameters.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using NRedisStack.DataTypes;
using NRedisStack.Literals.Enums;
using StackExchange.Redis;

namespace NRedisStack;

Expand All @@ -17,7 +18,7 @@ internal TsBaseParams(IList<object> parameters)
this.parameters = parameters;
}

internal object[] ToArray(string key)
internal object[] ToArray(RedisKey key)
{
parameters.Insert(0, key);
return parameters.ToArray();
Expand Down
Loading
Loading