Merge pull request #326 from microsoft/bugfix/backing-store-perf

fix: performance issue with the backing store

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.11.1] - 2024-08-12
+
+### Changed
+
+- Fixed a performance regression with the backing store introduced in version 1.9.2 by #243
+
 ## [1.11.0] - 2024-08-08
 
 - Enabled Continuous Access evaluation by default.

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <!-- Common default project properties for ALL projects-->
   <PropertyGroup>
-    <VersionPrefix>1.11.0</VersionPrefix>
+    <VersionPrefix>1.11.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <!-- This is overidden in test projects by setting to true-->
     <IsTestProject>false</IsTestProject>

src/abstractions/store/InMemoryBackingStore.cs

@@ -206,12 +206,12 @@ private void EnsureCollectionPropertyIsConsistent(string key, object? storeItem)
                 // Call Get<>() on nested properties so that this method may be called recursively to ensure collections are consistent
                 foreach(var item in collectionTuple.Item1)
                 {
-                    if(item is IBackedModel backedModel)
+                    if(item is not IBackedModel backedModel) break;
+                    // there are no mixed collections if the first element is not a IBackedModel, not need to iterate over the collection
+
+                    foreach(var innerItem in backedModel.BackingStore.Enumerate())
                     {
-                        foreach(var innerItem in backedModel.BackingStore.Enumerate())
-                        {
-                            backedModel.BackingStore.Get<object>(innerItem.Key);
-                        }
+                        backedModel.BackingStore.Get<object>(innerItem.Key);
                     }
                 }
 

tests/abstractions/Store/InMemoryBackingStoreTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Kiota.Abstractions.Store;
@@ -466,6 +467,21 @@ public void TestsBackingStoreNestedInvocationCounts()
 
             Assert.Equal(2, invocationCount);// only called twice
         }
+        private readonly int[] _testArray = Enumerable.Range(0, 100000000).ToArray();
+        [Fact]
+        public void TestsLargeArrayPerformsWell()
+        {
+            // Arrange
+            var testBackingStore = new InMemoryBackingStore();
+            // Act
+            Assert.Empty(testBackingStore.Enumerate());
+            testBackingStore.Set("email", _testArray);
+            var stopWatch = Stopwatch.StartNew();
+            testBackingStore.InitializationCompleted = true;
+            stopWatch.Stop();
+            // Assert
+            Assert.InRange(stopWatch.ElapsedMilliseconds, 0, 2);
+        }
 
         /// <summary>
         /// Helper function to pull out the private `subscriptions` collection property from the InMemoryBackingStore class