From 0ac99503ca93abc5c5b0b21356f03775335c35ff Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:51:36 +0200 Subject: [PATCH] refactor(runtime): reduce loop iteration complexity of `checkStoreUpgrade` (backport #21791) (#21793) Co-authored-by: winniehere Co-authored-by: Julien Robert --- runtime/store.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/runtime/store.go b/runtime/store.go index a38b24ad2f..65124226ea 100644 --- a/runtime/store.go +++ b/runtime/store.go @@ -217,29 +217,31 @@ func checkStoreUpgrade(storeUpgrades *store.StoreUpgrades) error { } // check for duplicates - exists := make(map[string]bool) + addedFilter := make(map[string]struct{}) + deletedFilter := make(map[string]struct{}) + for _, key := range storeUpgrades.Added { - if exists[key] { + if _, ok := addedFilter[key]; ok { return fmt.Errorf("store upgrade has duplicate key %s in added", key) } - - if storeUpgrades.IsDeleted(key) { - return fmt.Errorf("store upgrade has key %s in both added and deleted", key) - } - - exists[key] = true + addedFilter[key] = struct{}{} } - exists = make(map[string]bool) for _, key := range storeUpgrades.Deleted { - if exists[key] { + if _, ok := deletedFilter[key]; ok { return fmt.Errorf("store upgrade has duplicate key %s in deleted", key) } + deletedFilter[key] = struct{}{} + } - if storeUpgrades.IsAdded(key) { + for _, key := range storeUpgrades.Added { + if _, ok := deletedFilter[key]; ok { + return fmt.Errorf("store upgrade has key %s in both added and deleted", key) + } + } + for _, key := range storeUpgrades.Deleted { + if _, ok := addedFilter[key]; ok { return fmt.Errorf("store upgrade has key %s in both added and deleted", key) } - - exists[key] = true } return nil