config: minor cleanup: remove DeltaSubscriptionState::resource_names_ (#8918)

Bill Gallagher · mattklein123 · commit 80aedc1c4a1a · 2019-11-14T13:40:40.000-08:00
Signed-off-by: Bill Gallagher &lt;bgallagher@lyft.com&gt;
diff --git a/source/common/config/delta_subscription_state.cc b/source/common/config/delta_subscription_state.cc
@@ -105,7 +105,7 @@ void DeltaSubscriptionState::handleGoodResponse(
   // initial_resource_versions messages, but will remind us to explicitly tell the server "I'm
   // cancelling my subscription" when we lose interest.
   for (const auto& resource_name : message.removed_resources()) {
-    if (resource_names_.find(resource_name) != resource_names_.end()) {
+    if (resource_versions_.find(resource_name) != resource_versions_.end()) {
       setResourceWaitingForServer(resource_name);
     }
   }
@@ -175,17 +175,14 @@ void* DeltaSubscriptionState::getNextRequestWithAck(const UpdateAck& ack) {
 void DeltaSubscriptionState::setResourceVersion(const std::string& resource_name,
                                                 const std::string& resource_version) {
   resource_versions_[resource_name] = ResourceVersion(resource_version);
-  resource_names_.insert(resource_name);
 }
 
 void DeltaSubscriptionState::setResourceWaitingForServer(const std::string& resource_name) {
   resource_versions_[resource_name] = ResourceVersion();
-  resource_names_.insert(resource_name);
 }
 
 void DeltaSubscriptionState::setLostInterestInResource(const std::string& resource_name) {
   resource_versions_.erase(resource_name);
-  resource_names_.erase(resource_name);
 }
 
 } // namespace Config

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void DeltaSubscriptionState::handleGoodResponse(`
`105`	`105`	`// initial_resource_versions messages, but will remind us to explicitly tell the server "I'm`
`106`	`106`	`// cancelling my subscription" when we lose interest.`
`107`	`107`	`for (const auto& resource_name : message.removed_resources()) {`
`108`		`- if (resource_names_.find(resource_name) != resource_names_.end()) {`
	`108`	`+ if (resource_versions_.find(resource_name) != resource_versions_.end()) {`
`109`	`109`	`setResourceWaitingForServer(resource_name);`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -175,17 +175,14 @@ void* DeltaSubscriptionState::getNextRequestWithAck(const UpdateAck& ack) {`
`175`	`175`	`void DeltaSubscriptionState::setResourceVersion(const std::string& resource_name,`
`176`	`176`	`const std::string& resource_version) {`
`177`	`177`	`resource_versions_[resource_name] = ResourceVersion(resource_version);`
`178`		`- resource_names_.insert(resource_name);`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`void DeltaSubscriptionState::setResourceWaitingForServer(const std::string& resource_name) {`
`182`	`181`	`resource_versions_[resource_name] = ResourceVersion();`
`183`		`- resource_names_.insert(resource_name);`
`184`	`182`	`}`
`185`	`183`
`186`	`184`	`void DeltaSubscriptionState::setLostInterestInResource(const std::string& resource_name) {`
`187`	`185`	`resource_versions_.erase(resource_name);`
`188`		`- resource_names_.erase(resource_name);`
`189`	`186`	`}`
`190`	`187`
`191`	`188`	`} // namespace Config`