From 82c0eeee8262467cf2052a73398e113f7f0a8f89 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Sat, 24 Dec 2022 16:28:16 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20UseSlaveWeight=20?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E4=B8=8B=E5=8F=AF=E8=83=BD=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B#1382?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql.DbContext/FreeSql.DbContext.xml | 9 - FreeSql/FreeSql.xml | 183 ------------------ FreeSql/FreeUtil.cs | 2 +- .../CommonProvider/AdoProvider/AdoProvider.cs | 3 +- .../AdoProvider/AdoProviderAsync.cs | 15 +- 5 files changed, 16 insertions(+), 196 deletions(-) diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 26522f10..537315e2 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -800,14 +800,5 @@ - - - 批量注入 Repository，可以参考代码自行调整 - - - - - - diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 21395735..ec33a9bf 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -3335,177 +3335,6 @@ - - - 测试数据库是否连接正确，本方法执行如下命令： - MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1 - Oracle: SELECT 1 FROM dual - - 命令超时设置(秒) - - true: 成功, false: 失败 - - - - 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 - - - - - - - - - - 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 在【主库】执行 - - - - - - - - - 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 在【主库】执行 - - - - - - - - - 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - - 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - - 执行SQL返回对象集合，Query<User>("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - - - 执行SQL返回对象集合，Query<User, Address>("select * from user where age > @age; select * from address", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 可自定义解析表达式 @@ -4496,12 +4325,6 @@ 超时 - - - 获取资源 - - - 使用完毕后，归还资源 @@ -4577,12 +4400,6 @@ 资源对象 - - - 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象 - - 资源对象 - 归还对象给对象池的时候触发 diff --git a/FreeSql/FreeUtil.cs b/FreeSql/FreeUtil.cs index 37e928c9..400f9aa0 100644 --- a/FreeSql/FreeUtil.cs +++ b/FreeSql/FreeUtil.cs @@ -12,7 +12,7 @@ public static class FreeUtil { private static DateTime dt1970 = new DateTime(1970, 1, 1); - private static ThreadLocal rnd = new ThreadLocal(() => new Random()); + internal static ThreadLocal rnd = new ThreadLocal(() => new Random()); private static readonly int __staticMachine = ((0x00ffffff & Environment.MachineName.GetHashCode()) + #if NETSTANDARD1_5 || NETSTANDARD1_6 1 diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs index 846a4c3d..4b415627 100644 --- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs +++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs @@ -33,7 +33,6 @@ namespace FreeSql.Internal.CommonProvider public CommonUtils _util { get; set; } protected int slaveUnavailables = 0; private object slaveLock = new object(); - private Random slaveRandom = new Random(); protected Func ResolveTransaction; public AdoProvider(DataType dataType, string connectionString, string[] slaveConnectionStrings) @@ -584,7 +583,7 @@ namespace FreeSql.Internal.CommonProvider if (availables.Count == 1) pool = availables[0]; else { - var rnd = slaveRandom.Next(availables.Sum(a => a.Policy.Weight)); + var rnd = FreeUtil.rnd.Value.Next(availables.Sum(a => a.Policy.Weight)); for(var a = 0; a < availables.Count; a++) { rnd -= availables[a].Policy.Weight; diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs index 5af47567..c5e51165 100644 --- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs +++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs @@ -501,7 +501,20 @@ namespace FreeSql.Internal.CommonProvider if (availables.Any()) { isSlave = true; - pool = availables.Count == 1 ? this.SlavePools[0] : availables[slaveRandom.Next(availables.Count)]; + if (availables.Count == 1) pool = availables[0]; + else + { + var rnd = FreeUtil.rnd.Value.Next(availables.Sum(a => a.Policy.Weight)); + for (var a = 0; a < availables.Count; a++) + { + rnd -= availables[a].Policy.Weight; + if (rnd < 0) + { + pool = availables[a]; + break; + } + } + } } } }