Merge branch 'hotfix/v2.0.2' of github.com:ONLYOFFICE/DocSpace-server…

… into hotfix/v2.0.2
ONLYOFFICE · Jan 25, 2024 · 4b67470 · 4b67470
2 parents ca4c2ec + 339e56b
commit 4b67470
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 66 deletions.
diff --git a/common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs b/common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
@@ -123,26 +123,6 @@ private async Task DoDump(IDataWriteOperator writer)
     {
         var databases = new Dictionary<Tuple<string, string>, List<string>>();
 
-        try
-        {
-            await using var connection = DbFactory.OpenConnection();
-            var command = connection.CreateCommand();
-            command.CommandText = "select id, connection_string from mail_server_server";
-            ExecuteList(command).ForEach(r =>
-            {
-                var connectionString = GetConnectionString((int)r[0], JsonConvert.DeserializeObject<Dictionary<string, object>>(Convert.ToString(r[1]))["DbConnection"].ToString());
-
-                var command = connection.CreateCommand();
-                command.CommandText = "show tables";
-                var tables = ExecuteList(command).Select(r => Convert.ToString(r[0])).ToList();
-                databases.Add(new Tuple<string, string>(connectionString.Name, connectionString.ConnectionString), tables);
-            });
-        }
-        catch (Exception e)
-        {
-            _logger.ErrorWithException(e);
-        }
-
         await using (var connection = DbFactory.OpenConnection())
         {
             var command = connection.CreateCommand();

diff --git a/common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs b/common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
@@ -213,21 +213,6 @@ private async Task RestoreFromDump(IDataReadOperator dataReader)
 
             Task.WaitAll(tasks.ToArray());
         }
-        try
-        {
-            await using var connection = DbFactory.OpenConnection();
-            var command = connection.CreateCommand();
-            command.CommandText = "select id, connection_string from mail_server_server";
-            ExecuteList(command).ForEach(r =>
-            {
-                var connectionString = GetConnectionString((int)r[0], JsonConvert.DeserializeObject<Dictionary<string, object>>(Convert.ToString(r[1]))["DbConnection"].ToString());
-                databases.Add(new Tuple<string, string>(connectionString.Name, connectionString.ConnectionString), databasesFromDirs[connectionString.Name]);
-            });
-        }
-        catch (Exception e)
-        {
-            _logger.ErrorWithException(e);
-        }
 
         foreach (var database in databases)
         {

diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -94,14 +94,18 @@ public BaseIndexer(
         _serviceProvider = serviceProvider;
     }
 
-    public async Task<IEnumerable<List<T>>> IndexAllAsync(
+    public async IAsyncEnumerable<List<T>> IndexAllAsync(
         Func<DateTime, (int, int, int)> getCount,
         Func<DateTime, List<int>> getIds,
         Func<long, long, DateTime, List<T>> getData)
-    {
-        await using var webstudioDbContext = await _dbContextFactory.CreateDbContextAsync();
+    {        
         var now = DateTime.UtcNow;
-        var lastIndexed = await Queries.LastIndexedAsync(webstudioDbContext, Wrapper.IndexName);
+        DateTime lastIndexed;
+
+        await using (var webStudioDbContext = await _dbContextFactory.CreateDbContextAsync())
+        {
+            lastIndexed = await Queries.LastIndexedAsync(webStudioDbContext, Wrapper.IndexName);
+        }
 
         if (lastIndexed.Equals(DateTime.MinValue))
         {
@@ -111,26 +115,27 @@ public async Task<IEnumerable<List<T>>> IndexAllAsync(
         var (count, max, min) = getCount(lastIndexed);
         _logger.DebugIndex(IndexName, count, max, min);
 
-        var ids = new List<int>() { min };
+        var ids = new List<int> { min };
         ids.AddRange(getIds(lastIndexed));
         ids.Add(max);
+
+        for (var i = 0; i < ids.Count - 1; i++)
+        {
+            yield return getData(ids[i], ids[i + 1], lastIndexed);
+        }
 
-        await webstudioDbContext.AddOrUpdateAsync(q => q.WebstudioIndex, new DbWebstudioIndex()
+        await using (var webStudioDbContext = await _dbContextFactory.CreateDbContextAsync())
         {
-            IndexName = Wrapper.IndexName,
-            LastModified = now
-        });
+            await webStudioDbContext.AddOrUpdateAsync(q => q.WebstudioIndex, new DbWebstudioIndex
+            {
+                IndexName = Wrapper.IndexName, 
+                LastModified = now
+            });
 
-        await webstudioDbContext.SaveChangesAsync();
+            await webStudioDbContext.SaveChangesAsync();
+        }
 
         _logger.DebugIndexCompleted(Wrapper.IndexName);
-
-        var list = new List<List<T>>();
-        for (var i = 0; i < ids.Count - 1; i++)
-        {
-            list.Add(getData(ids[i], ids[i + 1], lastIndexed));
-        }
-        return list;
     }
 
     public async Task ReIndrexAsync()

diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
@@ -1575,22 +1575,17 @@ select f
     }
 
     protected internal async Task<DbFile> InitDocumentAsync(DbFile dbFile)
-    {
+    {  
+        dbFile.Document = new Document
+        {
+            Data = Convert.ToBase64String(Encoding.UTF8.GetBytes(""))
+        };
+
         if (!await _factoryIndexer.CanIndexByContentAsync(dbFile))
         {
-            dbFile.Document = new Document
-            {
-                Data = Convert.ToBase64String(Encoding.UTF8.GetBytes(""))
-            };
-
             return dbFile;
         }
-
-        return await InternalInitDocumentAsync(dbFile);
-    }
-
-    private async Task<DbFile> InternalInitDocumentAsync(DbFile dbFile)
-    {
+
         var file = _serviceProvider.GetService<File<int>>();
         file.Id = dbFile.Id;
         file.Title = dbFile.Title;

diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
@@ -95,7 +95,7 @@ public override async Task IndexAllAsync()
             var j = 0;
             var tasks = new List<Task>();
 
-            foreach (var data in await _indexer.IndexAllAsync(GetCount, GetIds, GetData))
+            await foreach (var data in _indexer.IndexAllAsync(GetCount, GetIds, GetData))
             {
                 if (_settings.Threads == 1)
                 {
@@ -125,6 +125,8 @@ public override async Task IndexAllAsync()
             throw;
         }
 
+        return;
+
         List<int> GetIds(DateTime lastIndexed)
         {
             var start = 0;

diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
@@ -98,7 +98,7 @@ List<int> getIds(DateTime lastIndexed)
             var j = 0;
             var tasks = new List<Task>();
 
-            foreach (var data in await _indexer.IndexAllAsync(getCount, getIds, getData))
+            await foreach (var data in _indexer.IndexAllAsync(getCount, getIds, getData))
             {
                 if (_settings.Threads == 1)
                 {