Skip to content

Commit 5bbf60f

Browse files
author
Gabriel Erzse
committed
Remove use of collection literals
Collection literals are not supported by older dotnet versions, it seems, so stop using them for now.
1 parent 04d0b9b commit 5bbf60f

File tree

5 files changed

+24
-22
lines changed

5 files changed

+24
-22
lines changed

src/NRedisStack/CoreCommands/CoreCommandBuilder.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ public static SerializedCommand BzmPop(int timeout, RedisKey[] keys, MinMaxModif
2828
throw new ArgumentException("At least one key must be provided.");
2929
}
3030

31-
List<object> args = [
31+
List<object> args = new List<object> {
3232
timeout,
33-
keys.Length,
34-
.. keys.Cast<object>(),
35-
minMaxModifier == MinMaxModifier.Min ? CoreArgs.MIN : CoreArgs.MAX
36-
];
33+
keys.Length
34+
};
35+
36+
args.AddRange(keys.Cast<object>());
37+
38+
args.Add(minMaxModifier == MinMaxModifier.Min ? CoreArgs.MIN : CoreArgs.MAX);
3739

3840
if (count != null)
3941
{

src/NRedisStack/CoreCommands/CoreCommands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static bool ClientSetInfo(this IDatabase db, SetInfoAttr attr, string val
7575
/// <remarks><seealso href="https://redis.io/commands/bzmpop"/></remarks>
7676
public static Tuple<RedisKey, List<RedisValueWithScore>>? BzmPop(this IDatabase db, int timeout, RedisKey key, MinMaxModifier minMaxModifier, long? count = null)
7777
{
78-
return BzmPop(db, timeout, [key], minMaxModifier, count);
78+
return BzmPop(db, timeout, new[] { key }, minMaxModifier, count);
7979
}
8080
}
8181
}

src/NRedisStack/ResponseParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ public static Dictionary<string, RedisResult>[] ToDictionarys(this RedisResult r
738738
var resultKey = resultArray[0].ToRedisKey();
739739
var resultSetItems = resultArray[1].ToArray();
740740

741-
List<RedisValueWithScore> valuesWithScores = [];
741+
List<RedisValueWithScore> valuesWithScores = new List<RedisValueWithScore>();
742742

743743
foreach (var resultSetItem in resultSetItems)
744744
{

tests/NRedisStack.Tests/Core Commands/CoreTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void TestBzmPop()
153153
var db = redis.GetDatabase(null);
154154
db.Execute("FLUSHALL");
155155

156-
var sortedSetKey = "my-set";
156+
var sortedSetKey = new RedisKey("my-set");
157157

158158
db.SortedSetAdd(sortedSetKey, "a", 1.5);
159159
db.SortedSetAdd(sortedSetKey, "b", 5.1);
@@ -162,7 +162,7 @@ public void TestBzmPop()
162162
db.SortedSetAdd(sortedSetKey, "e", 7.76);
163163

164164
// Pop two items with default order, which means it will pop the minimum values.
165-
var resultWithDefaultOrder = db.BzmPop(0, [sortedSetKey], MinMaxModifier.Min, 2);
165+
var resultWithDefaultOrder = db.BzmPop(0, new[] { sortedSetKey }, MinMaxModifier.Min, 2);
166166

167167
Assert.NotNull(resultWithDefaultOrder);
168168
Assert.Equal(sortedSetKey, resultWithDefaultOrder!.Item1);
@@ -171,7 +171,7 @@ public void TestBzmPop()
171171
Assert.Equal("c", resultWithDefaultOrder.Item2[1].Value.ToString());
172172

173173
// Pop one more item, with descending order, which means it will pop the maximum value.
174-
var resultWithDescendingOrder = db.BzmPop(0, [sortedSetKey], MinMaxModifier.Max, 1);
174+
var resultWithDescendingOrder = db.BzmPop(0, new[] { sortedSetKey }, MinMaxModifier.Max, 1);
175175

176176
Assert.NotNull(resultWithDescendingOrder);
177177
Assert.Equal(sortedSetKey, resultWithDescendingOrder!.Item1);
@@ -188,7 +188,7 @@ public void TestBzmPopNull()
188188
db.Execute("FLUSHALL");
189189

190190
// Nothing in the set, and a short server timeout, which yields null.
191-
var result = db.BzmPop(1, ["my-set"], MinMaxModifier.Min, null);
191+
var result = db.BzmPop(1, "my-set", MinMaxModifier.Min);
192192

193193
Assert.Null(result);
194194
}
@@ -205,7 +205,7 @@ public void TestBzmPopMultiplexerTimeout()
205205
db.Execute("FLUSHALL");
206206

207207
// Server would wait forever, but the multiplexer times out in 1 second.
208-
Assert.Throws<RedisTimeoutException>(() => db.BzmPop(0, ["my-set"], MinMaxModifier.Min));
208+
Assert.Throws<RedisTimeoutException>(() => db.BzmPop(0, "my-set", MinMaxModifier.Min));
209209
}
210210

211211
[SkipIfRedis(Is.OSSCluster, Comparison.LessThan, "7.0.0")]
@@ -229,14 +229,14 @@ public void TestBzmPopMultipleSets()
229229
Assert.Single(result.Item2);
230230
Assert.Equal("d", result.Item2[0].Value.ToString());
231231

232-
result = db.BzmPop(0, ["set-two", "set-one"], MinMaxModifier.Min);
232+
result = db.BzmPop(0, new[] { new RedisKey("set-two"), new RedisKey("set-one") }, MinMaxModifier.Min);
233233

234234
Assert.NotNull(result);
235235
Assert.Equal("set-two", result!.Item1);
236236
Assert.Single(result.Item2);
237237
Assert.Equal("e", result.Item2[0].Value.ToString());
238238

239-
result = db.BzmPop(0, ["set-two", "set-one"], MinMaxModifier.Max);
239+
result = db.BzmPop(0, new[] { new RedisKey("set-two"), new RedisKey("set-one") }, MinMaxModifier.Max);
240240

241241
Assert.NotNull(result);
242242
Assert.Equal("set-one", result!.Item1);
@@ -261,7 +261,7 @@ public void TestBzmPopNoKeysProvided()
261261
db.Execute("FLUSHALL");
262262

263263
// Server would wait forever, but the multiplexer times out in 1 second.
264-
Assert.Throws<ArgumentException>(() => db.BzmPop(0, [], MinMaxModifier.Min));
264+
Assert.Throws<ArgumentException>(() => db.BzmPop(0, Array.Empty<RedisKey>(), MinMaxModifier.Min));
265265
}
266266

267267
[SkipIfRedis(Is.OSSCluster, Comparison.LessThan, "7.0.0")]
@@ -279,15 +279,15 @@ public void TestBzmPopWithOrderEnum()
279279
db.SortedSetAdd(sortedSetKey, "c", 3.7);
280280

281281
// Pop two items with default order, which means it will pop the minimum values.
282-
var resultWithDefaultOrder = db.BzmPop(0, [sortedSetKey], Order.Ascending.ToMinMax());
282+
var resultWithDefaultOrder = db.BzmPop(0, sortedSetKey, Order.Ascending.ToMinMax());
283283

284284
Assert.NotNull(resultWithDefaultOrder);
285285
Assert.Equal(sortedSetKey, resultWithDefaultOrder!.Item1);
286286
Assert.Single(resultWithDefaultOrder.Item2);
287287
Assert.Equal("a", resultWithDefaultOrder.Item2[0].Value.ToString());
288288

289289
// Pop one more item, with descending order, which means it will pop the maximum value.
290-
var resultWithDescendingOrder = db.BzmPop(0, [sortedSetKey], Order.Descending.ToMinMax());
290+
var resultWithDescendingOrder = db.BzmPop(0, sortedSetKey, Order.Descending.ToMinMax());
291291

292292
Assert.NotNull(resultWithDescendingOrder);
293293
Assert.Equal(sortedSetKey, resultWithDescendingOrder!.Item1);

tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMRange.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,18 +322,18 @@ public void TestMRangeLatest()
322322
(long)TimeSpan.FromHours(1).TotalMilliseconds, // 1h used to force partial bucket
323323
TsAggregation.Sum);
324324

325-
ts.Create(primaryTsKey, labels: [label]);
326-
ts.Create(compactedTsKey, labels: [label, compactedLabel]);
325+
ts.Create(primaryTsKey, labels: new[] { label });
326+
ts.Create(compactedTsKey, labels: new[] { label, compactedLabel });
327327
ts.CreateRule(primaryTsKey, compactionRule);
328-
var tuples = CreateData(ts, 50, [primaryTsKey]);
328+
var tuples = CreateData(ts, 50, new[] { primaryTsKey });
329329

330-
var results = ts.MRange("-", "+", ["key=MRangeLatest", "compact=true"], latest: true);
330+
var results = ts.MRange("-", "+", new[] { "key=MRangeLatest", "compact=true" }, latest: true);
331331
Assert.Single(results);
332332
Assert.Equal(compactedTsKey, results[0].key);
333333
Assert.NotEmpty(results[0].values);
334334
Assert.Equal(tuples.Sum(x => x.Val), results[0].values.Sum(x => x.Val));
335335

336-
results = ts.MRange("-", "+", ["key=MRangeLatest", "compact=true"], latest: false);
336+
results = ts.MRange("-", "+", new[] { "key=MRangeLatest", "compact=true" }, latest: false);
337337
Assert.Single(results);
338338
Assert.Equal(compactedTsKey, results[0].key);
339339
Assert.Empty(results[0].values);

0 commit comments

Comments
 (0)