Merge 00584c2 into 4706914

Author: jtung-apple

src/darwin/Framework/CHIP/MTRDeviceClusterData.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 MTR_TESTABLE
 @interface MTRDeviceClusterData : NSObject <NSSecureCoding, NSCopying>
 @property (nonatomic, nullable) NSNumber * dataVersion;
+@property (nonatomic, nullable) NSNumber * pendingDataVersion; // for holding new data version during a report, and not encoded
 @property (nonatomic, readonly) NSDictionary<NSNumber *, MTRDeviceDataValueDictionary> * attributes; // attributeID => data-value dictionary
 
 - (void)storeValue:(MTRDeviceDataValueDictionary _Nullable)value forAttribute:(NSNumber *)attribute;

src/darwin/Framework/CHIP/MTRDevice_Concrete.mm

@@ -1855,6 +1855,11 @@ - (void)_persistClusterDataAsNeeded
         return;
     }
 
+    // Do not persist partial data in the middle of receiving a report. _handleReportEnd will schedule next persistence
+    if (_receivingReport) {
+        return;
+    }
+
     NSDate * lastReportTime = [_mostRecentReportTimes lastObject];
     NSTimeInterval intervalSinceLastReport = -[lastReportTime timeIntervalSinceNow];
     if (intervalSinceLastReport < [self _reportToPersistenceDelayTimeAfterMutiplier]) {
@@ -2054,6 +2059,7 @@ - (void)_handleReportEnd
     _receivingPrimingReport = NO;
     _estimatedStartTimeFromGeneralDiagnosticsUpTime = nil;
 
+    [self _commitPendingDataVersions];
     [self _scheduleClusterDataPersistence];
 
     // After the handling of the report, if we detected a device configuration change, notify the delegate
@@ -2519,6 +2525,30 @@ - (nullable MTRDeviceClusterData *)_clusterDataForPath:(MTRClusterPath *)cluster
     return dataVersions;
 }
 
+- (void)_commitPendingDataVersionsForClusterPath:(MTRClusterPath *)path
+{
+    os_unfair_lock_assert_owner(&self->_lock);
+    MTRDeviceClusterData * clusterData = _clusterDataToPersist[path];
+    if (clusterData.pendingDataVersion) {
+        clusterData.dataVersion = clusterData.pendingDataVersion;
+        clusterData.pendingDataVersion = nil;
+    }
+}
+
+- (void)_commitPendingDataVersions
+{
+    os_unfair_lock_assert_owner(&self->_lock);
+
+    if (!_clusterDataToPersist) {
+        // nothing to do
+        return;
+    }
+
+    for (MTRClusterPath * path in _clusterDataToPersist) {
+        [self _commitPendingDataVersionsForClusterPath:path];
+    }
+}
+
 - (MTRDeviceDataValueDictionary _Nullable)_cachedAttributeValueForPath:(MTRAttributePath *)path
 {
     os_unfair_lock_assert_owner(&self->_lock);
@@ -3919,10 +3949,11 @@ - (void)_noteDataVersion:(NSNumber *)dataVersion forClusterPath:(MTRClusterPath
     // Update data version used for subscription filtering
     MTRDeviceClusterData * clusterData = [self _clusterDataForPath:clusterPath];
     if (!clusterData) {
-        clusterData = [[MTRDeviceClusterData alloc] initWithDataVersion:dataVersion attributes:nil];
+        clusterData = [[MTRDeviceClusterData alloc] init];
+        clusterData.pendingDataVersion = dataVersion;
         dataVersionChanged = YES;
     } else if (![clusterData.dataVersion isEqualToNumber:dataVersion]) {
-        clusterData.dataVersion = dataVersion;
+        clusterData.pendingDataVersion = dataVersion;
         dataVersionChanged = YES;
     }