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.

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

add generic sets to utils #243

Merged
merged 4 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 10 additions & 0 deletions sets/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See the OWNERS docs at https://go.k8s.io/owners

reviewers:
- logicalhan
- thockin
- lavalamp
approvers:
- logicalhan
- thockin
- lavalamp
187 changes: 187 additions & 0 deletions sets/set.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
/*
Copyright 2022 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package sets
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're nitpicking, why not set - set.Set[int] or even set.S[int] ?

Or should this be containers.Set[int] or something? stl.Set[int] ? :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I renamed the package to set.


import "sort"

type Ordered interface {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"golang.org/x/exp/constraints" has Ordered - should we use that? or at least define this the same way (everything is ~type)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The apimachinery implementation uses comparable instead (which requires Go 1.20 to work properly).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need go 1.20, we need to delay adding this until the oldest supported release is on 1.20 - is that worthwhile?

Would it be a compatible change to move from Ordered to comparable later? Obviously all ordered types are comparable...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternately: sets.Set[any] seems like a terrible idea ANYWAY, so do we care if it doesn't work on older versions (corner-case of a corner-case)?

int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr | float32 | float64 | string
}

// Empty is public since it is used by some internal API objects for conversions between external
// string arrays and internal sets, and conversion logic requires public types today.
type Empty struct{}

type Set[E Ordered] map[E]Empty

// NewSet creates a new set.
func NewSet[E Ordered](items ...E) Set[E] {
ss := Set[E]{}
ss.Insert(items...)
return ss
}

// NewSetFromMapKeys creates a Set[E] from a keys of a map[E](? extends interface{}).
func NewSetFromMapKeys[E Ordered, A any](theMap map[E]A) Set[E] {
ret := Set[E]{}
for key := range theMap {
ret.Insert(key)
}
return ret
}

// Insert adds items to the set.
func (s Set[E]) Insert(items ...E) Set[E] {
for _, item := range items {
s[item] = Empty{}
}
return s
}

// Delete removes all items from the set.
func (s Set[E]) Delete(items ...E) Set[E] {
for _, item := range items {
delete(s, item)
}
return s
}

// Has returns true if and only if item is contained in the set.
func (s Set[E]) Has(item E) bool {
_, contained := s[item]
return contained
}

// HasAll returns true if and only if all items are contained in the set.
func (s Set[E]) HasAll(items ...E) bool {
for _, item := range items {
if !s.Has(item) {
return false
}
}
return true
}

// HasAny returns true if any items are contained in the set.
func (s Set[E]) HasAny(items ...E) bool {
for _, item := range items {
if s.Has(item) {
return true
}
}
return false
}

func (s Set[E]) Union(s2 Set[E]) Set[E] {
result := Set[E]{}
result.Insert(s.List()...)
result.Insert(s2.List()...)
return result
}

// Len returns the size of the set.
func (s Set[E]) Len() int {
return len(s)
}

func (s Set[E]) Intersection(s2 Set[E]) Set[E] {
var walk, other Set[E]
result := Set[E]{}
if s.Len() < s2.Len() {
walk = s
other = s2
} else {
walk = s2
other = s
}
for key := range walk {
if other.Has(key) {
result.Insert(key)
}
}
return result
}

// IsSuperset returns true if and only if s1 is a superset of s2.
func (s Set[E]) IsSuperset(s2 Set[E]) bool {
for item := range s2 {
if !s.Has(item) {
return false
}
}
return true
}

// Difference returns a set of objects that are not in s2
// For example:
// s1 = {a1, a2, a3}
// s2 = {a1, a2, a4, a5}
// s1.Difference(s2) = {a3}
// s2.Difference(s1) = {a4, a5}
func (s Set[E]) Difference(s2 Set[E]) Set[E] {
result := Set[E]{}
for key := range s {
if !s2.Has(key) {
result.Insert(key)
}
}
return result
}

// Equal returns true if and only if s1 is equal (as a set) to s2.
// Two sets are equal if their membership is identical.
// (In practice, this means same elements, order doesn't matter)
func (s Set[E]) Equal(s2 Set[E]) bool {
return s.Len() == s.Len() && s.IsSuperset(s2)
}

type sortableSlice[E Ordered] []E

func (s sortableSlice[E]) Len() int {
return len(s)
}
func (s sortableSlice[E]) Less(i, j int) bool { return s[i] < s[j] }
func (s sortableSlice[E]) Swap(i, j int) { s[i], s[j] = s[j], s[i] }

// List returns the contents as a sorted int slice.
func (s Set[E]) List() []E {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opiniuon sought: Should we just call this SortedList() to match UnsortedList()?

res := make(sortableSlice[E], 0, s.Len())
for key := range s {
res = append(res, key)
}
sort.Sort(res)
return res
}

// UnsortedList returns the slice with contents in random order.
func (s Set[E]) UnsortedList() []E {
res := make(sortableSlice[E], 0, len(s))
for key := range s {
res = append(res, key)
}
return res
}

// PopAny returns a single element from the set.
func (s Set[E]) PopAny() (E, bool) {
for key := range s {
s.Delete(key)
return key, true
}
var zeroValue E
return zeroValue, false
}
Loading