Merge pull request #73295 from CyrusNajmabadi/noDispose

dotnet · May 2, 2024 · d8f3b0b · d8f3b0b
2 parents 32a019d + 09f7017
commit d8f3b0b
Show file tree

Hide file tree

Showing 25 changed files with 265 additions and 658 deletions.
diff --git a/src/EditorFeatures/Test/Preview/PreviewWorkspaceTests.cs b/src/EditorFeatures/Test/Preview/PreviewWorkspaceTests.cs
@@ -125,7 +125,7 @@ public async Task TestPreviewServices()
             using var previewWorkspace = new PreviewWorkspace(EditorTestCompositions.EditorFeatures.GetHostServices());
             var persistentService = previewWorkspace.Services.SolutionServices.GetPersistentStorageService();
 
-            await using var storage = await persistentService.GetStorageAsync(SolutionKey.ToSolutionKey(previewWorkspace.CurrentSolution), CancellationToken.None);
+            var storage = await persistentService.GetStorageAsync(SolutionKey.ToSolutionKey(previewWorkspace.CurrentSolution), CancellationToken.None);
             Assert.IsType<NoOpPersistentStorage>(storage);
         }
 

diff --git a/src/Tools/AnalyzerRunner/IncrementalAnalyzerRunner.cs b/src/Tools/AnalyzerRunner/IncrementalAnalyzerRunner.cs
@@ -53,7 +53,7 @@ public async Task RunAsync(CancellationToken cancellationToken)
             if (usePersistentStorage)
             {
                 var persistentStorageService = _workspace.Services.SolutionServices.GetPersistentStorageService();
-                await using var persistentStorage = await persistentStorageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), cancellationToken).ConfigureAwait(false);
+                var persistentStorage = await persistentStorageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), cancellationToken).ConfigureAwait(false);
                 if (persistentStorage is NoOpPersistentStorage)
                 {
                     throw new InvalidOperationException("Benchmark is not configured to use persistent storage.");

diff --git a/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs b/src/Tools/IdeBenchmarks/SQLitePersistentStorageBenchmark.cs
@@ -61,10 +61,9 @@ public void GlobalSetup()
     </Project>
 </Workspace>");
 
-            var connectionPoolService = _workspace.ExportProvider.GetExportedValue<SQLiteConnectionPoolService>();
             var asyncListener = _workspace.ExportProvider.GetExportedValue<IAsynchronousOperationListenerProvider>().GetListener(FeatureAttribute.PersistentStorage);
 
-            _storageService = new SQLitePersistentStorageService(connectionPoolService, new StorageConfiguration(), asyncListener);
+            _storageService = new SQLitePersistentStorageService(new StorageConfiguration(), asyncListener);
 
             var solution = _workspace.CurrentSolution;
             _storage = _storageService.GetStorageAsync(SolutionKey.ToSolutionKey(solution), CancellationToken.None).AsTask().GetAwaiter().GetResult();
@@ -83,7 +82,6 @@ public void GlobalCleanup()
             }
 
             _document = null!;
-            _storage.Dispose();
             _storage = null!;
             _storageService = null!;
             _workspace.Dispose();

diff --git a/src/Tools/IdeCoreBenchmarks/FindReferencesBenchmarks.cs b/src/Tools/IdeCoreBenchmarks/FindReferencesBenchmarks.cs
@@ -84,10 +84,8 @@ private async Task LoadSolutionAsync()
             if (storageService == null)
                 throw new ArgumentException("Couldn't get storage service");
 
-            using (var storage = await storageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), CancellationToken.None))
-            {
-                Console.WriteLine("Sucessfully got persistent storage instance");
-            }
+            var storage = await storageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), CancellationToken.None);
+            Console.WriteLine("Successfully got persistent storage instance");
 
             // There might be multiple projects with this name.  That's ok.  FAR goes and finds all the linked-projects
             // anyways  to perform the search on all the equivalent symbols from them.  So the end perf cost is the

diff --git a/src/Tools/IdeCoreBenchmarks/NavigateToBenchmarks.cs b/src/Tools/IdeCoreBenchmarks/NavigateToBenchmarks.cs
@@ -183,24 +183,24 @@ public async Task RunFullParallelIndexing()
             Console.WriteLine("Starting indexing");
 
             var storageService = _workspace.Services.SolutionServices.GetPersistentStorageService();
-            using (var storage = await storageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), CancellationToken.None))
-            {
-                Console.WriteLine("Successfully got persistent storage instance");
-                var start = DateTime.Now;
-                var indexTime = TimeSpan.Zero;
-                var tasks = _workspace.CurrentSolution.Projects.SelectMany(p => p.Documents).Select(d => Task.Run(
-                    async () =>
-                    {
-                        var tree = await d.GetSyntaxRootAsync();
-                        var stopwatch = SharedStopwatch.StartNew();
-                        await TopLevelSyntaxTreeIndex.GetIndexAsync(d, default);
-                        await SyntaxTreeIndex.GetIndexAsync(d, default);
-                        indexTime += stopwatch.Elapsed;
-                    })).ToList();
-                await Task.WhenAll(tasks);
-                Console.WriteLine("Indexing time    : " + indexTime);
-                Console.WriteLine("Solution parallel: " + (DateTime.Now - start));
-            }
+            var storage = await storageService.GetStorageAsync(SolutionKey.ToSolutionKey(_workspace.CurrentSolution), CancellationToken.None);
+
+            Console.WriteLine("Successfully got persistent storage instance");
+            var start = DateTime.Now;
+            var indexTime = TimeSpan.Zero;
+            var tasks = _workspace.CurrentSolution.Projects.SelectMany(p => p.Documents).Select(d => Task.Run(
+                async () =>
+                {
+                    var tree = await d.GetSyntaxRootAsync();
+                    var stopwatch = SharedStopwatch.StartNew();
+                    await TopLevelSyntaxTreeIndex.GetIndexAsync(d, default);
+                    await SyntaxTreeIndex.GetIndexAsync(d, default);
+                    indexTime += stopwatch.Elapsed;
+                })).ToList();
+            await Task.WhenAll(tasks);
+            Console.WriteLine("Indexing time    : " + indexTime);
+            Console.WriteLine("Solution parallel: " + (DateTime.Now - start));
+
             Console.WriteLine("DB flushed");
             Console.ReadLine();
         }