Skip to content

Commit c713f38

Browse files
Merge pull request #106153 from hyschumi/refactor_thread_safe_store
refactor: remove dup code Kubernetes-commit: e9fc46750f6da84d9434a8066d7d2ba1531c5d67
2 parents d85d0d9 + 547d6c8 commit c713f38

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ require (
3030
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
3131
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
3232
google.golang.org/protobuf v1.27.1
33-
k8s.io/api v0.0.0-20211201201118-1a737294b818
34-
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
33+
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
34+
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a
3535
k8s.io/klog/v2 v2.30.0
3636
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
3737
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
@@ -40,6 +40,6 @@ require (
4040
)
4141

4242
replace (
43-
k8s.io/api => k8s.io/api v0.0.0-20211201201118-1a737294b818
44-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
43+
k8s.io/api => k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
44+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a
4545
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
610610
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
611611
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
612612
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
613-
k8s.io/api v0.0.0-20211201201118-1a737294b818 h1:lqSDxT22/4cN4aRWwCD+1iOiIwTzc5JMV1UQl+4MoIM=
614-
k8s.io/api v0.0.0-20211201201118-1a737294b818/go.mod h1:Iod80qmyxDiUr9X93OyKup/yGuYZGx8VK8nLuWpK9Yc=
615-
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a h1:IggksFfccO+DgJNByne5JOJ+jfqpcMZRsYkwYGZ6qkA=
616-
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
613+
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de h1:sonP3TZF8wLYB7pZ9U+cFOmU+aowMk08AOJQLLLlE+c=
614+
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de/go.mod h1:UuggGDUdGB3f6prC8FzrBGPJ+A+oIqVWmF5HV1VeEIM=
615+
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a h1:oZgEV6uZiZ8pZC+VIbTkAuc0WF32K3tprAzYQXluxAk=
616+
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
617617
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
618618
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
619619
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

tools/cache/thread_safe_store.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ type threadSafeMap struct {
7171
}
7272

7373
func (c *threadSafeMap) Add(key string, obj interface{}) {
74-
c.lock.Lock()
75-
defer c.lock.Unlock()
76-
oldObject := c.items[key]
77-
c.items[key] = obj
78-
c.updateIndices(oldObject, obj, key)
74+
c.Update(key, obj)
7975
}
8076

8177
func (c *threadSafeMap) Update(key string, obj interface{}) {

0 commit comments

Comments
 (0)