NewLife
/
Redis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化非集群模式时ToDictionary使用，减少GC

This commit is contained in:
大石头 2025-02-02 11:52:00 +08:00
parent 1b16e8369d
commit 5f803cfa50
3 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
NewLife.Redis/FullRedis.cs
View File

@ -319,10 +319,14 @@ public class FullRedis : Redis
InitCluster();
keys = keys.Select(GetKey).ToArray();
//keys = keys.Select(GetKey).ToArray();
for (var i = 0; i < keys.Length; i++)
{
keys[i] = GetKey(keys[i]);
}
// 如果不支持集群，或者只有一个key，直接执行
if (Cluster == null || keys.Length == 1) return [Execute(keys.FirstOrDefault(), (rds, k) => func(rds, keys), write)];
if (Cluster == null || keys.Length == 1) return [Execute(keys[0], (rds, k) => func(rds, keys), write)];
// 计算每个key所在的节点
var dic = new Dictionary<String, List<String>>();
@ -470,24 +474,17 @@ public class FullRedis : Redis
{
if (keys == null || keys.Length == 0) return 0;
//keys = keys.Select(GetKey).ToArray();
if (keys.Length == 1) return base.Remove(keys[0]);
InitCluster();
if (Cluster != null) return Execute(keys, (rds, ks) => rds.Execute<Int32>("DEL", ks), true).Sum();
for (var i = 0; i < keys.Length; i++)
{
keys[i] = GetKey(keys[i]);
}
if (keys.Length == 1) return base.Remove(keys[0]);
InitCluster();
if (Cluster != null)
{
return Execute(keys, (rds, ks) => rds.Execute<Int32>("DEL", ks), true).Sum();
}
else
{
return Execute(keys[0], (rds, k) => rds.Execute<Int32>("DEL", keys), true);
}
}
#endregion
#region 集合操作
@ -499,12 +496,17 @@ public class FullRedis : Redis
{
if (keys == null || !keys.Any()) return new Dictionary<String, T>();
var keys2 = keys.ToArray();
var keys2 = keys as String[] ?? keys.ToArray();
for (var i = 0; i < keys2.Length; i++)
{
keys2[i] = GetKey(keys2[i]);
}
if (keys2.Length == 1) return new Dictionary<String, T> { [keys2[0]] = Get<T>(keys2[0])! };
keys2 = keys2.Select(GetKey).ToArray();
if (keys2.Length == 1 || Cluster == null) return base.GetAll<T>(keys2);
InitCluster();
if (Cluster == null) return base.GetAll<T>(keys2);
//Execute(keys.FirstOrDefault(), (rds, k) => rds.GetAll<T>(keys));
var rs = Execute(keys2, (rds, ks) => rds.GetAll<T>(ks), false);
var dic = new Dictionary<String, T?>();
@ -542,9 +544,14 @@ public class FullRedis : Redis
return;
}
var keys = values.Keys.Select(GetKey).ToArray();
//Execute(values.FirstOrDefault().Key, (rds, k) => rds.SetAll(values), true);
var rs = Execute(keys, (rds, ks) => rds.SetAll(ks.ToDictionary(e => e, e => values[e])), true);
var keys = values.Keys.ToArray();
// 非集群模式
InitCluster();
if (Cluster == null)
Execute(keys[0], (rds, ks) => rds.SetAll(values), true);
else
Execute(keys, (rds, ks) => rds.SetAll(ks.ToDictionary(e => e, e => values[e])), true);
// 使用管道批量设置过期时间
if (expire > 0)

8
NewLife.Redis/Redis.cs
View File

@ -809,7 +809,13 @@ public class Redis : Cache, IConfigMapping, ILogFeature
/// <typeparam name="T"></typeparam>
/// <param name="keys"></param>
/// <returns></returns>
public override IDictionary<String, T> GetAll<T>(IEnumerable<String> keys) => Execute(keys.FirstOrDefault(), (rds, k) => rds.GetAll<T>(keys));
public override IDictionary<String, T> GetAll<T>(IEnumerable<String> keys)
{
var ks = keys as String[] ?? keys.ToArray();
if (ks.Length == 0) return new Dictionary<String, T>();
return Execute(ks[0], (rds, k) => rds.GetAll<T>(ks));
}
/// <summary>批量设置缓存项</summary>
/// <typeparam name="T"></typeparam>

14
NewLife.Redis/RedisClient.cs
View File

@ -1023,20 +1023,18 @@ public class RedisClient : DisposeBase
/// <typeparam name="T"></typeparam>
/// <param name="keys"></param>
/// <returns></returns>
public IDictionary<String, T?> GetAll<T>(IEnumerable<String> keys)
public IDictionary<String, T?> GetAll<T>(String[] keys)
{
if (keys == null || !keys.Any()) throw new ArgumentNullException(nameof(keys));
if (keys == null || keys.Length == 0) throw new ArgumentNullException(nameof(keys));
var ks = keys.ToArray();
var dic = new Dictionary<String, T?>(keys.Length);
if (Execute<Object[]>("MGET", keys) is not Object[] rs) return dic;
var dic = new Dictionary<String, T?>(ks.Length);
if (Execute<Object[]>("MGET", ks) is not Object[] rs) return dic;
for (var i = 0; i < ks.Length && i < rs.Length; i++)
for (var i = 0; i < keys.Length && i < rs.Length; i++)
{
if (rs[i] is IPacket pk)
{
dic[ks[i]] = (T?)Host.Encoder.Decode(pk, typeof(T));
dic[keys[i]] = (T?)Host.Encoder.Decode(pk, typeof(T));
}
}