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

make ContainsByEnd return true when the key is empty and region's right bound is inf #1052

Merged
merged 8 commits into from
Nov 14, 2023
Merged

make ContainsByEnd return true when the key is empty and region's right bound is inf #1052

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acd16c2
make `ContainsByEnd` matches the semantic
YuJuncen Nov 8, 2023
e25f2fa
make it easier to be understand
YuJuncen Nov 8, 2023
a7c4a33
remove useless parens
YuJuncen Nov 8, 2023
1933ac2
address comments
YuJuncen Nov 9, 2023
5f26c43
make format
YuJuncen Nov 10, 2023
5ef0f75
Merge branch 'master' into fix-scan-to-inf
YuJuncen Nov 14, 2023
8dd7e7f
Merge branch 'master' into fix-scan-to-inf
disksing Nov 14, 2023
aa5c413
Merge branch 'master' into fix-scan-to-inf
disksing Nov 14, 2023
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
5 changes: 3 additions & 2 deletions internal/locate/region_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,8 +2468,9 @@ func (r *Region) Contains(key []byte) bool {
// for the maximum region endKey is empty.
// startKey < key <= endKey.
func (r *Region) ContainsByEnd(key []byte) bool {
return bytes.Compare(r.meta.GetStartKey(), key) < 0 &&
(bytes.Compare(key, r.meta.GetEndKey()) <= 0 || len(r.meta.GetEndKey()) == 0)
return len(key) == 0 && len(r.EndKey()) == 0 ||
bytes.Compare(r.meta.GetStartKey(), key) < 0 &&
(bytes.Compare(key, r.meta.GetEndKey()) <= 0 || len(r.meta.GetEndKey()) == 0)
YuJuncen marked this conversation as resolved.
Show resolved Hide resolved
}

// Store contains a kv process's address.
Expand Down
4 changes: 2 additions & 2 deletions internal/locate/region_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,9 +1374,9 @@ func (s *testRegionCacheSuite) TestContains() {
}

func (s *testRegionCacheSuite) TestContainsByEnd() {
s.False(createSampleRegion(nil, nil).ContainsByEnd([]byte{}))
s.True(createSampleRegion(nil, nil).ContainsByEnd([]byte{}))
s.True(createSampleRegion(nil, nil).ContainsByEnd([]byte{10}))
s.False(createSampleRegion([]byte{10}, nil).ContainsByEnd([]byte{}))
s.True(createSampleRegion([]byte{10}, nil).ContainsByEnd([]byte{}))
s.False(createSampleRegion([]byte{10}, nil).ContainsByEnd([]byte{10}))
s.True(createSampleRegion([]byte{10}, nil).ContainsByEnd([]byte{11}))
s.False(createSampleRegion(nil, []byte{10}).ContainsByEnd([]byte{}))
Expand Down
Loading