Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Very minor nil-or-empty cleanup #5745

Merged
merged 3 commits into from
Mar 7, 2024
Merged

Very minor nil-or-empty cleanup #5745

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29f952e
Very minor nil-or-empty cleanup
Groxx Mar 6, 2024
721c4e2
Merge branch 'master' into minor
Groxx Mar 7, 2024
a346ccf
Merge branch 'master' into minor
Groxx Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions common/dynamicconfig/configstore/config_store_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ func (csc *configStoreClient) UpdateValue(name dc.Key, value interface{}) error
}

func (csc *configStoreClient) RestoreValue(name dc.Key, filters map[dc.Filter]interface{}) error {
//if empty filter provided, update fallback value.
//if u want to remove entire entry, just do update value with empty
// if empty filter provided, update fallback value.
// if u want to remove entire entry, just do update value with empty
loaded := csc.values.Load()
if loaded == nil {
return dc.NotFoundError
Expand Down Expand Up @@ -345,20 +345,20 @@ func (csc *configStoreClient) ListValue(name dc.Key) ([]*types.DynamicConfigEntr
}
listAll := false
if name == nil {
//if key is not specified, return all entries
// if key is not specified, return all entries
listAll = true
} else if _, ok := currentCached.dcEntries[name.String()]; !ok {
//if key is not known, return all entries
// if key is not known, return all entries
listAll = true
}
if listAll {
//if key is not known/specified, return all entries
// if key is not known/specified, return all entries
resList = make([]*types.DynamicConfigEntry, 0, len(currentCached.dcEntries))
for _, entry := range currentCached.dcEntries {
resList = append(resList, copyDynamicConfigEntry(entry))
}
} else {
//if key is known, return just that specific entry
// if key is known, return just that specific entry
resList = make([]*types.DynamicConfigEntry, 0, 1)
resList = append(resList, currentCached.dcEntries[name.String()])
}
Expand All @@ -385,9 +385,9 @@ func (csc *configStoreClient) Start() {
}

func (csc *configStoreClient) updateValue(name dc.Key, dcValues []*types.DynamicConfigValue, retryAttempts int) error {
//since values are not unique, no way to know if you are trying to update a specific value
//or if you want to add another of the same value with different filters.
//UpdateValue will replace everything associated with dc key.
// since values are not unique, no way to know if you are trying to update a specific value
// or if you want to add another of the same value with different filters.
// UpdateValue will replace everything associated with dc key.
for _, dcValue := range dcValues {
if err := validateKeyDataBlobPair(name, dcValue.Value); err != nil {
return err
Expand All @@ -410,7 +410,7 @@ func (csc *configStoreClient) updateValue(name dc.Key, dcValues []*types.Dynamic

existingEntry, entryExists := currentCached.dcEntries[keyName]

if dcValues == nil || len(dcValues) == 0 {
if len(dcValues) == 0 {
newEntries = make([]*types.DynamicConfigEntry, 0, len(currentCached.dcEntries))

for _, entry := range currentCached.dcEntries {
Expand Down Expand Up @@ -465,12 +465,12 @@ func (csc *configStoreClient) updateValue(name dc.Key, dcValues []*types.Dynamic

select {
case <-ctx.Done():
//potentially we can retry on timeout
// potentially we can retry on timeout
return errors.New("timeout error on update")
default:
if err != nil {
if _, ok := err.(*persistence.ConditionFailedError); ok && retryAttempts > 0 {
//fetch new config and retry
// fetch new config and retry
err := csc.update()
if err != nil {
return err
Expand Down Expand Up @@ -575,7 +575,7 @@ func (csc *configStoreClient) update() error {
}

func (csc *configStoreClient) storeValues(snapshot *persistence.DynamicConfigSnapshot) error {
//Converting the list of dynamic config entries into a map for better lookup performance
// Converting the list of dynamic config entries into a map for better lookup performance
var dcEntryMap map[string]*types.DynamicConfigEntry
if snapshot.Values.Entries == nil {
dcEntryMap = nil
Expand Down
Loading