Merge pull request #303 from ONLYOFFICE/feature/context-optimize

DbContext: optimization
ONLYOFFICE · Jul 15, 2021 · 0b49e4b · 0b49e4b
2 parents b184ad7 + 2d75554
commit 0b49e4b
Show file tree

Hide file tree

Showing 24 changed files with 97 additions and 71 deletions.
diff --git a/common/ASC.Core.Common/Data/DbSubscriptionService.cs b/common/ASC.Core.Common/Data/DbSubscriptionService.cs
@@ -40,10 +40,12 @@ class DbSubscriptionService : ISubscriptionService
     {
         private Expression<Func<Subscription, SubscriptionRecord>> FromSubscriptionToSubscriptionRecord { get; set; }
         private Expression<Func<DbSubscriptionMethod, SubscriptionMethod>> FromDbSubscriptionMethodToSubscriptionMethod { get; set; }
-        private UserDbContext UserDbContext { get; set; }
+        private Lazy<UserDbContext> LazyUserDbContext { get; }
+        private UserDbContext UserDbContext { get => LazyUserDbContext.Value; }
+
         public DbSubscriptionService(DbContextManager<UserDbContext> dbContextManager)
         {
-            UserDbContext = dbContextManager.Value;
+            LazyUserDbContext = new Lazy<UserDbContext>(() => dbContextManager.Value);
 
             FromSubscriptionToSubscriptionRecord = r => new SubscriptionRecord
             {

diff --git a/common/ASC.Feed/Data/FeedAggregateDataProvider.cs b/common/ASC.Feed/Data/FeedAggregateDataProvider.cs
@@ -48,12 +48,13 @@ public class FeedAggregateDataProvider
         private AuthContext AuthContext { get; }
         private TenantManager TenantManager { get; }
         private TenantUtil TenantUtil { get; }
-        private FeedDbContext FeedDbContext { get; }
+        private Lazy<FeedDbContext> LazyFeedDbContext { get; }
+        private FeedDbContext FeedDbContext { get => LazyFeedDbContext.Value; }
 
         public FeedAggregateDataProvider(AuthContext authContext, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FeedDbContext> dbContextManager)
             : this(authContext, tenantManager, tenantUtil)
         {
-            FeedDbContext = dbContextManager.Get(Constants.FeedDbId);
+            LazyFeedDbContext = new Lazy<FeedDbContext>(() => dbContextManager.Get(Constants.FeedDbId));
         }
 
         public FeedAggregateDataProvider(AuthContext authContext, TenantManager tenantManager, TenantUtil tenantUtil)

diff --git a/common/ASC.Feed/Data/FeedReadedDataProvider.cs b/common/ASC.Feed/Data/FeedReadedDataProvider.cs
@@ -41,13 +41,14 @@ public class FeedReadedDataProvider
 
         private AuthContext AuthContext { get; }
         private TenantManager TenantManager { get; }
-        private FeedDbContext FeedDbContext { get; }
+        private Lazy<FeedDbContext> LazyFeedDbContext { get; }
+        private FeedDbContext FeedDbContext { get => LazyFeedDbContext.Value; }
 
         public FeedReadedDataProvider(AuthContext authContext, TenantManager tenantManager, DbContextManager<FeedDbContext> dbContextManager)
         {
             AuthContext = authContext;
             TenantManager = tenantManager;
-            FeedDbContext = dbContextManager.Get(dbId);
+            LazyFeedDbContext = new Lazy<FeedDbContext>(() => dbContextManager.Get(dbId));
         }
 
         public DateTime GetTimeReaded()

diff --git a/common/ASC.IPSecurity/IPRestrictionsRepository.cs b/common/ASC.IPSecurity/IPRestrictionsRepository.cs
@@ -24,6 +24,7 @@
 */
 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -39,11 +40,12 @@ public class IPRestrictionsRepository
     {
         private const string dbId = "core";
 
-        private TenantDbContext TenantDbContext { get; }
+        private Lazy<TenantDbContext> LazyTenantDbContext { get; }
+        private TenantDbContext TenantDbContext { get => LazyTenantDbContext.Value; }
 
         public IPRestrictionsRepository(DbContextManager<TenantDbContext> dbContextManager)
         {
-            TenantDbContext = dbContextManager.Get(dbId);
+            LazyTenantDbContext = new Lazy<TenantDbContext>(() => dbContextManager.Get(dbId));
         }
 
         public List<IPRestriction> Get(int tenant)

diff --git a/common/ASC.VoipService/Dao/AbstractDao.cs b/common/ASC.VoipService/Dao/AbstractDao.cs
@@ -36,11 +36,12 @@ public class AbstractDao
     {
         private readonly string dbid = "default";
 
-        protected VoipDbContext VoipDbContext { get; set; }
+        private Lazy<VoipDbContext> LazyVoipDbContext { get; }
+        protected VoipDbContext VoipDbContext { get => LazyVoipDbContext.Value; }
 
         protected AbstractDao(DbContextManager<VoipDbContext> dbOptions, TenantManager tenantManager)
         {
-            VoipDbContext = dbOptions.Get(dbid);
+            LazyVoipDbContext = new Lazy<VoipDbContext>(() => dbOptions.Get(dbid));
             TenantID = tenantManager.GetCurrentTenant().TenantId;
         }
 

diff --git a/common/services/ASC.AuditTrail/AuditEventsRepository.cs b/common/services/ASC.AuditTrail/AuditEventsRepository.cs
@@ -44,14 +44,15 @@ public class AuditEventsRepository
     {
         private MessageTarget MessageTarget { get; set; }
         private UserFormatter UserFormatter { get; set; }
-        private AuditTrailContext AuditTrailContext { get; }
+        private Lazy<AuditTrailContext> LazyAuditTrailContext { get; }
+        private AuditTrailContext AuditTrailContext { get => LazyAuditTrailContext.Value; }
         private AuditActionMapper AuditActionMapper { get; }
 
         public AuditEventsRepository(MessageTarget messageTarget, UserFormatter userFormatter, DbContextManager<AuditTrailContext> dbContextManager, AuditActionMapper auditActionMapper)
         {
             MessageTarget = messageTarget;
             UserFormatter = userFormatter;
-            AuditTrailContext = dbContextManager.Value;
+            LazyAuditTrailContext = new Lazy<AuditTrailContext>(() => dbContextManager.Value );
             AuditActionMapper = auditActionMapper;
         }
 

diff --git a/common/services/ASC.AuditTrail/LoginEventsRepository.cs b/common/services/ASC.AuditTrail/LoginEventsRepository.cs
@@ -43,14 +43,15 @@ namespace ASC.AuditTrail.Data
     [Scope]
     public class LoginEventsRepository
     {
-        private UserFormatter UserFormatter { get; }
-        private AuditTrailContext AuditTrailContext { get; }
+        private UserFormatter UserFormatter { get; }
+        private Lazy<AuditTrailContext> LazyAuditTrailContext { get; }
+        private AuditTrailContext AuditTrailContext { get => LazyAuditTrailContext.Value; }
         private AuditActionMapper AuditActionMapper { get; }
 
         public LoginEventsRepository(UserFormatter userFormatter, DbContextManager<AuditTrailContext> dbContextManager, AuditActionMapper auditActionMapper)
         {
             UserFormatter = userFormatter;
-            AuditTrailContext = dbContextManager.Value;
+            LazyAuditTrailContext = new Lazy<AuditTrailContext>(() => dbContextManager.Value);
             AuditActionMapper = auditActionMapper;
         }
 

diff --git a/common/services/ASC.Data.Backup/Storage/BackupRepository.cs b/common/services/ASC.Data.Backup/Storage/BackupRepository.cs
@@ -37,12 +37,13 @@ namespace ASC.Data.Backup.Storage
 {
     [Scope]
     public class BackupRepository : IBackupRepository
-    {
-        private BackupsContext BackupContext { get; }
+    {
+        private Lazy<BackupsContext> LazyBackupsContext { get; }
+        private BackupsContext BackupContext { get => LazyBackupsContext.Value; }
 
         public BackupRepository(DbContextManager<BackupsContext> backupContext)
         {
-            BackupContext = backupContext.Value;
+            LazyBackupsContext = new Lazy<BackupsContext>(() => backupContext.Value);
         }
 
         public void SaveBackupRecord(BackupRecord backup)

diff --git a/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs b/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs
@@ -63,15 +63,16 @@ public class BackupPortalTask : PortalTaskBase
         private bool Dump { get; set; }
         private TenantManager TenantManager { get; set; }
         private TempStream TempStream { get; }
-        private BackupsContext BackupRecordContext { get; set; }
+        private Lazy<BackupsContext> LazyBackupsContext { get; }
+        private BackupsContext BackupRecordContext { get => LazyBackupsContext.Value; }
 
         public BackupPortalTask(DbFactory dbFactory, DbContextManager<BackupsContext> dbContextManager, IOptionsMonitor<ILog> options, TenantManager tenantManager, CoreBaseSettings coreBaseSettings, StorageFactory storageFactory, StorageFactoryConfig storageFactoryConfig, ModuleProvider moduleProvider, TempStream tempStream)
             : base(dbFactory, options, storageFactory, storageFactoryConfig, moduleProvider)
         {
             Dump = coreBaseSettings.Standalone;
             TenantManager = tenantManager;
             TempStream = tempStream;
-            BackupRecordContext = dbContextManager.Get(DbFactory.ConnectionStringSettings.ConnectionString);
+            LazyBackupsContext = new Lazy<BackupsContext>(() => dbContextManager.Get(DbFactory.ConnectionStringSettings.ConnectionString));
         }
 
         public void Init(int tenantId, string fromConfigPath, string toFilePath, int limit)

diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -92,8 +92,9 @@ public class BaseIndexer<T> where T : class, ISearchItem
         private TenantManager TenantManager { get; }
         private BaseIndexerHelper BaseIndexerHelper { get; }
         private Settings Settings { get; }
-        private IServiceProvider ServiceProvider { get; }
-        private WebstudioDbContext WebstudioDbContext { get; }
+        private IServiceProvider ServiceProvider { get; }
+        private Lazy<WebstudioDbContext> LazyWebstudioDbContext { get; }
+        private WebstudioDbContext WebstudioDbContext { get => LazyWebstudioDbContext.Value; }
 
         public BaseIndexer(
             Client client,
@@ -110,7 +111,7 @@ public BaseIndexer(
             BaseIndexerHelper = baseIndexerHelper;
             Settings = settings;
             ServiceProvider = serviceProvider;
-            WebstudioDbContext = dbContextManager.Value;
+            LazyWebstudioDbContext = new Lazy<WebstudioDbContext>(() => dbContextManager.Value);
         }
 
         internal void Index(T data, bool immediately = true)

diff --git a/products/ASC.CRM/Server/Configuration/CRMsSpaceUsageStatManager.cs b/products/ASC.CRM/Server/Configuration/CRMsSpaceUsageStatManager.cs
@@ -31,7 +31,7 @@
 using ASC.Common;
 using ASC.Common.Web;
 using ASC.Core;
-using ASC.Core.Common.EF;
+using ASC.Core.Common.EF;
 using ASC.CRM.Resources;
 using ASC.Files.Core.EF;
 using ASC.Web.Core;
@@ -44,16 +44,18 @@ namespace ASC.Web.CRM.Configuration
     [Scope]
     public class CrmSpaceUsageStatManager : SpaceUsageStatManager
     {
-        private int _tenantId;
-        private FilesDbContext _filesDbContext;
+        private int _tenantId;
+        private Lazy<FilesDbContext> LazyFilesDbContext { get; }
+        private FilesDbContext _filesDbContext { get => LazyFilesDbContext.Value; }
+
         private PathProvider _pathProvider;
 
         public CrmSpaceUsageStatManager(DbContextManager<FilesDbContext> filesDbContext,
                                         PathProvider pathProvider,
                                         TenantManager tenantManager)
         {
             _pathProvider = pathProvider;
-            _filesDbContext = filesDbContext.Value;
+            LazyFilesDbContext = new Lazy<FilesDbContext>(() => filesDbContext.Value);
             _tenantId = tenantManager.GetCurrentTenant().TenantId;
         }
 

diff --git a/products/ASC.CRM/Server/Core/Dao/AbstractDao.cs b/products/ASC.CRM/Server/Core/Dao/AbstractDao.cs
@@ -45,8 +45,11 @@ namespace ASC.CRM.Core.Dao
 {
     public class AbstractDao
     {
-        protected readonly List<EntityType> _supportedEntityType = new List<EntityType>();
-        public CrmDbContext CrmDbContext { get; }
+        protected readonly List<EntityType> _supportedEntityType = new List<EntityType>();
+
+        private Lazy<CrmDbContext> LazyCrmDbContext { get; }
+        public CrmDbContext CrmDbContext { get => LazyCrmDbContext.Value; }
+
         protected readonly SecurityContext _securityContext;
         protected readonly ICache _cache;
         protected ILog _logger;
@@ -66,7 +69,7 @@ IMapper mapper
 
             _cache = ascCache;
 
-            CrmDbContext = dbContextManager.Get(CrmConstants.DatabaseId);
+            LazyCrmDbContext = new Lazy<CrmDbContext>(() => dbContextManager.Get(CrmConstants.DatabaseId));
 
             TenantID = tenantManager.GetCurrentTenant().TenantId;
             _securityContext = securityContext;

diff --git a/products/ASC.CRM/Server/Core/Dao/ReportDao.cs b/products/ASC.CRM/Server/Core/Dao/ReportDao.cs
@@ -73,13 +73,11 @@ public class ReportDao : AbstractDao
         private CurrencyInfo _defaultCurrency;
         private TenantUtil _tenantUtil;
         private DaoFactory _daoFactory;
-        private UserDbContext _userDbContext;
         private DisplayUserSettingsHelper _displayUserSettings;
 
         #region Constructor
 
         public ReportDao(DbContextManager<CrmDbContext> dbContextManager,
-                        DbContextManager<UserDbContext> dbUserContextManager,
                        TenantManager tenantManager,
                        SecurityContext securityContext,
                        FilesIntegration filesIntegration,
@@ -112,8 +110,6 @@ public ReportDao(DbContextManager<CrmDbContext> dbContextManager,
 
             var crmSettings = settingsManager.Load<CrmSettings>();
 
-            _userDbContext = dbUserContextManager.Get(CrmConstants.DatabaseId);
-
             _defaultCurrency = currencyProvider.Get(crmSettings.DefaultCurrency);
 
             _displayUserSettings = displayUserSettingsHelper;
@@ -313,7 +309,7 @@ public List<string> GetMissingRates(string defaultCurrency)
 
                     var file = _daoFactory.GetFileDao().SaveFile(document, stream);
 
-                    SaveFile((int)file.ID, -1);
+                    SaveFile(file.ID, -1);
 
                     result.Add(file);
                 }

diff --git a/products/ASC.CRM/Server/Core/Dao/TaskDao.cs b/products/ASC.CRM/Server/Core/Dao/TaskDao.cs
@@ -52,10 +52,12 @@ namespace ASC.CRM.Core.Dao
     [Scope]
     public class TaskDao : AbstractDao
     {
-        private readonly UserDbContext _userDbContext;
         private readonly FactoryIndexerTask _factoryIndexer;
         private readonly TenantUtil _tenantUtil;
         private readonly CrmSecurity _crmSecurity;
+
+        private Lazy<UserDbContext> LazyUserDbContext { get; }
+        private UserDbContext _userDbContext { get => LazyUserDbContext.Value; }
 
         public TaskDao(DbContextManager<CrmDbContext> dbContextManager,
                        TenantManager tenantManager,
@@ -77,7 +79,7 @@ public TaskDao(DbContextManager<CrmDbContext> dbContextManager,
             _crmSecurity = crmSecurity;
             _tenantUtil = tenantUtil;
             _factoryIndexer = factoryIndexer;
-            _userDbContext = userDbContext.Value;
+            LazyUserDbContext = new Lazy<UserDbContext>(() => userDbContext.Value);
             _mapper = mapper;
         }
 

diff --git a/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs b/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
@@ -44,8 +44,9 @@ namespace ASC.Web.Files
 {
     [Scope]
     public class FilesSpaceUsageStatManager : SpaceUsageStatManager
-    {
-        private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get; }
+    {
+        private Lazy<ASC.Files.Core.EF.FilesDbContext> LazyFilesDbContext { get; }
+        private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
         private TenantManager TenantManager { get; }
         private UserManager UserManager { get; }
         private UserPhotoManager UserPhotoManager { get; }
@@ -64,7 +65,7 @@ public FilesSpaceUsageStatManager(
             GlobalFolderHelper globalFolderHelper,
             PathProvider pathProvider)
         {
-            FilesDbContext = dbContextManager.Get(FileConstant.DatabaseId);
+            LazyFilesDbContext = new Lazy<ASC.Files.Core.EF.FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
             TenantManager = tenantManager;
             UserManager = userManager;
             UserPhotoManager = userPhotoManager;
@@ -126,15 +127,16 @@ public override List<UsageSpaceStatItem> GetStatData()
 
     [Scope]
     public class FilesUserSpaceUsage : IUserSpaceUsage
-    {
-        private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get; }
+    {
+        private Lazy<ASC.Files.Core.EF.FilesDbContext> LazyFilesDbContext { get; }
+        private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
         private TenantManager TenantManager { get; }
 
         public FilesUserSpaceUsage(
             DbContextManager<ASC.Files.Core.EF.FilesDbContext> dbContextManager,
             TenantManager tenantManager)
         {
-            FilesDbContext = dbContextManager.Get(FileConstant.DatabaseId);
+            LazyFilesDbContext = new Lazy<ASC.Files.Core.EF.FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
             TenantManager = tenantManager;
         }
 

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
@@ -49,9 +49,10 @@ namespace ASC.Files.Core.Data
 {
     public class AbstractDao
     {
-        protected readonly ICache cache;
-
-        public FilesDbContext FilesDbContext { get; }
+        protected readonly ICache cache;
+
+        private Lazy<FilesDbContext> LazyFilesDbContext { get; }
+        public FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
 
         private int tenantID;
         protected internal int TenantID { get => tenantID != 0 ? tenantID : (tenantID = TenantManager.GetCurrentTenant().TenantId); }
@@ -83,7 +84,7 @@ protected AbstractDao(
             ICache cache)
         {
             this.cache = cache;
-            FilesDbContext = dbContextManager.Get(FileConstant.DatabaseId);
+            LazyFilesDbContext = new Lazy<FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
             UserManager = userManager;
             TenantManager = tenantManager;
             TenantUtil = tenantUtil;

diff --git a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
@@ -211,8 +211,9 @@ internal abstract class ThirdPartyProviderDao<T> : ThirdPartyProviderDao, IDispo
         public int TenantID { get; private set; }
         protected IServiceProvider ServiceProvider { get; }
         protected UserManager UserManager { get; }
-        protected TenantUtil TenantUtil { get; }
-        protected FilesDbContext FilesDbContext { get; }
+        protected TenantUtil TenantUtil { get; }
+        private Lazy<FilesDbContext> LazyFilesDbContext { get; }
+        protected FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
         protected SetupInfo SetupInfo { get; }
         protected ILog Log { get; }
         protected FileUtility FileUtility { get; }
@@ -237,7 +238,7 @@ public ThirdPartyProviderDao(
             ServiceProvider = serviceProvider;
             UserManager = userManager;
             TenantUtil = tenantUtil;
-            FilesDbContext = dbContextManager.Get(FileConstant.DatabaseId);
+            LazyFilesDbContext = new Lazy<FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
             SetupInfo = setupInfo;
             Log = monitor.CurrentValue;
             FileUtility = fileUtility;

diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
@@ -80,8 +80,9 @@ public enum ProviderTypes
     internal class ProviderAccountDao : IProviderDao
     {
         private int tenantID;
-        protected int TenantID { get => tenantID != 0 ? tenantID : (tenantID = TenantManager.GetCurrentTenant().TenantId); }
-        private FilesDbContext FilesDbContext { get; }
+        protected int TenantID { get => tenantID != 0 ? tenantID : (tenantID = TenantManager.GetCurrentTenant().TenantId); }
+        private Lazy<FilesDbContext> LazyFilesDbContext { get; }
+        private FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
         public ILog Logger { get; }
         private IServiceProvider ServiceProvider { get; }
         private TenantUtil TenantUtil { get; }
@@ -102,7 +103,7 @@ public ProviderAccountDao(
             DbContextManager<FilesDbContext> dbContextManager,
             IOptionsMonitor<ILog> options)
         {
-            FilesDbContext = dbContextManager.Get(FileConstant.DatabaseId);
+            LazyFilesDbContext = new Lazy<FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
             Logger = options.Get("ASC.Files");
             ServiceProvider = serviceProvider;
             TenantUtil = tenantUtil;