[#204]

xuejmnet · xuejmnet · commit f09306530bac · 2022-10-18T10:51:22.000+08:00
diff --git a/src/ShardingCore/EFCores/EFCore2x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore2x/ShardingModelSource.cs
@@ -57,15 +57,14 @@ public override IModel GetModel(DbContext context, IConventionSetBuilder convent
             }
 
             int waitSeconds = 3;
-            if (context is IShardingModelCacheOption shardingModelCacheOption)
-            {
-                waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
-            }
 
             var cacheKey = Dependencies.ModelCacheKeyFactory.Create(context);
             if (!_models.TryGetValue(cacheKey, out var model))
             {
-
+                if (context is IShardingModelCacheOption shardingModelCacheOption)
+                {
+                    waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
+                }
                 var acquire = Monitor.TryEnter(_syncObject, TimeSpan.FromSeconds(waitSeconds));
                 if (!acquire)
                 {
diff --git a/src/ShardingCore/EFCores/EFCore3x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore3x/ShardingModelSource.cs
@@ -67,16 +67,16 @@ public override IModel GetModel(
                     priority = CacheItemPriority.Normal;
                 }
             }
-            if (context is IShardingModelCacheOption shardingModelCacheOption)
-            {
-                priority = shardingModelCacheOption.GetModelCachePriority();
-                size = shardingModelCacheOption.GetModelCacheEntrySize();
-                waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
-            }
             var cache = Dependencies.MemoryCache;
             var cacheKey = Dependencies.ModelCacheKeyFactory.Create(context);
             if (!cache.TryGetValue(cacheKey, out IModel model))
             {
+                if (context is IShardingModelCacheOption shardingModelCacheOption)
+                {
+                    priority = shardingModelCacheOption.GetModelCachePriority();
+                    size = shardingModelCacheOption.GetModelCacheEntrySize();
+                    waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
+                }
                 // Make sure OnModelCreating really only gets called once, since it may not be thread safe.
 
                 var acquire = Monitor.TryEnter(_syncObject, TimeSpan.FromSeconds(waitSeconds));
diff --git a/src/ShardingCore/EFCores/EFCore5x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore5x/ShardingModelSource.cs
@@ -83,16 +83,16 @@ public override IModel GetModel(
                     priority = CacheItemPriority.Normal;
                 }
             }
-            if (context is IShardingModelCacheOption shardingModelCacheOption)
-            {
-                priority = shardingModelCacheOption.GetModelCachePriority();
-                size = shardingModelCacheOption.GetModelCacheEntrySize();
-                waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
-            }
             var cache = Dependencies.MemoryCache;
             var cacheKey = Dependencies.ModelCacheKeyFactory.Create(context);
             if (!cache.TryGetValue(cacheKey, out IModel model))
             {
+                if (context is IShardingModelCacheOption shardingModelCacheOption)
+                {
+                    priority = shardingModelCacheOption.GetModelCachePriority();
+                    size = shardingModelCacheOption.GetModelCacheEntrySize();
+                    waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
+                }
                 // Make sure OnModelCreating really only gets called once, since it may not be thread safe.
                 var acquire = Monitor.TryEnter(_syncObject, TimeSpan.FromSeconds(waitSeconds));
                 if (!acquire)
diff --git a/src/ShardingCore/EFCores/EFCore6x/ShardingModelSource.cs b/src/ShardingCore/EFCores/EFCore6x/ShardingModelSource.cs
@@ -98,17 +98,16 @@ public override IModel GetModel(
                     priority = CacheItemPriority.Normal;
                 }
             }
-
-            if (context is IShardingModelCacheOption shardingModelCacheOption)
-            {
-                priority = shardingModelCacheOption.GetModelCachePriority();
-                size = shardingModelCacheOption.GetModelCacheEntrySize();
-                waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
-            }
             var cache = Dependencies.MemoryCache;
             var cacheKey = Dependencies.ModelCacheKeyFactory.Create(context, designTime);
             if (!cache.TryGetValue(cacheKey, out IModel model))
             {
+                if (context is IShardingModelCacheOption shardingModelCacheOption)
+                {
+                    priority = shardingModelCacheOption.GetModelCachePriority();
+                    size = shardingModelCacheOption.GetModelCacheEntrySize();
+                    waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();
+                }
                 // Make sure OnModelCreating really only gets called once, since it may not be thread safe.
                 var acquire = Monitor.TryEnter(_syncObject, TimeSpan.FromSeconds(waitSeconds));
                 if (!acquire)

Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,14 @@ public override IModel GetModel(DbContext context, IConventionSetBuilder convent`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`int waitSeconds = 3;`
`60`		`- if (context is IShardingModelCacheOption shardingModelCacheOption)`
`61`		`- {`
`62`		`- waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();`
`63`		`- }`
`64`	`60`
`65`	`61`	`var cacheKey = Dependencies.ModelCacheKeyFactory.Create(context);`
`66`	`62`	`if (!_models.TryGetValue(cacheKey, out var model))`
`67`	`63`	`{`
`68`		`-`
	`64`	`+ if (context is IShardingModelCacheOption shardingModelCacheOption)`
	`65`	`+ {`
	`66`	`+ waitSeconds = shardingModelCacheOption.GetModelCacheLockObjectSeconds();`
	`67`	`+ }`
`69`	`68`	`var acquire = Monitor.TryEnter(_syncObject, TimeSpan.FromSeconds(waitSeconds));`
`70`	`69`	`if (!acquire)`
`71`	`70`	`{`