Clear data from MTRDevice's ClusterStateCache when elements are remov…

…ed. (project-chip#34212)

* Clear data from MTRDevice's ClusterStateCache when elements are removed.

The idea is for that cache to store DataVersions and cluster data sizes, so on
resubscribe we send the right data along.  But ClusterStateCache itself never
removes anything, so if we detect that an endpoint or cluster or attribute has
been removed, we need to explicitly remove the relevant bits from the cache.

Not doing that can lead to incorrect (so less efficient) DataVersion sorting for
the case when an attribute was removed, of to unnecessary DataVersions being
included in a subscribe (and potentially preventing useful ones from being
included) when a cluster or endpoint was removed.

* Address review comments.

src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h

@@ -22,6 +22,7 @@
 #include <app/BufferedReadCallback.h>
 #include <app/ClusterStateCache.h>
 #include <app/ConcreteAttributePath.h>
+#include <app/ConcreteClusterPath.h>
 #include <app/EventHeader.h>
 #include <app/MessageDef/StatusIB.h>
 #include <app/ReadClient.h>
@@ -93,6 +94,12 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac
 
  chip::app::BufferedReadCallback & GetBufferedCallback() { return mBufferedReadAdapter; }
 
+ // Methods to clear state from our cluster state cache. Must be called on
+ // the Matter queue.
+ void ClearCachedAttributeState(chip::EndpointId aEndpoint);
+ void ClearCachedAttributeState(const chip::app::ConcreteClusterPath & aCluster);
+ void ClearCachedAttributeState(const chip::app::ConcreteAttributePath & aAttribute);
+
  // We need to exist to get a ReadClient, so can't take this as a constructor argument.
  void AdoptReadClient(std::unique_ptr<chip::app::ReadClient> aReadClient) { mReadClient = std::move(aReadClient); }
  void AdoptClusterStateCache(std::unique_ptr<chip::app::ClusterStateCache> aClusterStateCache)

src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.mm

@@ -201,3 +201,27 @@
  });
  }
 }
+
+void MTRBaseSubscriptionCallback::ClearCachedAttributeState(EndpointId aEndpoint)
+{
+ assertChipStackLockedByCurrentThread();
+ if (mClusterStateCache) {
+ mClusterStateCache->ClearAttributes(aEndpoint);
+ }
+}
+
+void MTRBaseSubscriptionCallback::ClearCachedAttributeState(const ConcreteClusterPath & aCluster)
+{
+ assertChipStackLockedByCurrentThread();
+ if (mClusterStateCache) {
+ mClusterStateCache->ClearAttributes(aCluster);
+ }
+}
+
+void MTRBaseSubscriptionCallback::ClearCachedAttributeState(const ConcreteAttributePath & aAttribute)
+{
+ assertChipStackLockedByCurrentThread();
+ if (mClusterStateCache) {
+ mClusterStateCache->ClearAttribute(aAttribute);
+ }
+}

src/darwin/Framework/CHIP/MTRDevice.mm

@@ -3441,6 +3441,13 @@ - (void)_pruneEndpointsIn:(MTRDeviceDataValueDictionary)previousPartsListValue
  }
  [self _removeClusters:clusterPathsToRemove doRemoveFromDataStore:NO];
  [self.deviceController.controllerDataStore clearStoredClusterDataForNodeID:self.nodeID endpointID:endpoint];
+
+ [_deviceController asyncDispatchToMatterQueue:^{
+ std::lock_guard lock(self->_lock);
+ if (self->_currentSubscriptionCallback) {
+ self->_currentSubscriptionCallback->ClearCachedAttributeState(static_cast<EndpointId>(endpoint.unsignedLongLongValue));
+ }
+ } errorHandler:nil];
  }
 }
 
@@ -3461,6 +3468,17 @@ - (void)_pruneClustersIn:(MTRDeviceDataValueDictionary)previousServerListValue
  }
  }
  [self _removeClusters:clusterPathsToRemove doRemoveFromDataStore:YES];
+
+ [_deviceController asyncDispatchToMatterQueue:^{
+ std::lock_guard lock(self->_lock);
+ if (self->_currentSubscriptionCallback) {
+ for (NSNumber * cluster in toBeRemovedClusters) {
+ ConcreteClusterPath clusterPath(static_cast<EndpointId>(endpointID.unsignedLongLongValue),
+ static_cast<ClusterId>(cluster.unsignedLongLongValue));
+ self->_currentSubscriptionCallback->ClearCachedAttributeState(clusterPath);
+ }
+ }
+ } errorHandler:nil];
 }
 
 - (void)_pruneAttributesIn:(MTRDeviceDataValueDictionary)previousAttributeListValue
@@ -3474,6 +3492,18 @@ - (void)_pruneAttributesIn:(MTRDeviceDataValueDictionary)previousAttributeListVa
 
  [toBeRemovedAttributes minusSet:attributesStillInCluster];
  [self _removeAttributes:toBeRemovedAttributes fromCluster:clusterPath];
+
+ [_deviceController asyncDispatchToMatterQueue:^{
+ std::lock_guard lock(self->_lock);
+ if (self->_currentSubscriptionCallback) {
+ for (NSNumber * attribute in toBeRemovedAttributes) {
+ ConcreteAttributePath attributePath(static_cast<EndpointId>(clusterPath.endpoint.unsignedLongLongValue),
+ static_cast<ClusterId>(clusterPath.cluster.unsignedLongLongValue),
+ static_cast<AttributeId>(attribute.unsignedLongLongValue));
+ self->_currentSubscriptionCallback->ClearCachedAttributeState(attributePath);
+ }
+ }
+ } errorHandler:nil];
 }
 
 - (void)_pruneStoredDataForPath:(MTRAttributePath *)attributePath