*: use new adt.IntervalTree interface

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-07-31 22:23:13 -07:00
parent ffe90b9ff3
commit 08124105ad
5 changed files with 8 additions and 6 deletions

View File

@ -27,8 +27,8 @@ func getMergedPerms(tx backend.BatchTx, userName string) *unifiedRangePermission
return nil return nil
} }
readPerms := &adt.IntervalTree{} readPerms := adt.NewIntervalTree()
writePerms := &adt.IntervalTree{} writePerms := adt.NewIntervalTree()
for _, roleName := range user.Roles { for _, roleName := range user.Roles {
role := getRole(tx, roleName) role := getRole(tx, roleName)
@ -128,6 +128,6 @@ func (as *authStore) invalidateCachedPerm(userName string) {
} }
type unifiedRangePermissions struct { type unifiedRangePermissions struct {
readPerms *adt.IntervalTree readPerms adt.IntervalTree
writePerms *adt.IntervalTree writePerms adt.IntervalTree
} }

View File

@ -46,7 +46,7 @@ func TestRangePermission(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
readPerms := &adt.IntervalTree{} readPerms := adt.NewIntervalTree()
for _, p := range tt.perms { for _, p := range tt.perms {
readPerms.Insert(p, struct{}{}) readPerms.Insert(p, struct{}{})
} }

View File

@ -179,7 +179,7 @@ func checkTxnRequest(r *pb.TxnRequest, maxTxnOps int) error {
// there is an overlap, returns an error. If no overlap, return put and delete // there is an overlap, returns an error. If no overlap, return put and delete
// sets for recursive evaluation. // sets for recursive evaluation.
func checkIntervals(reqs []*pb.RequestOp) (map[string]struct{}, adt.IntervalTree, error) { func checkIntervals(reqs []*pb.RequestOp) (map[string]struct{}, adt.IntervalTree, error) {
var dels adt.IntervalTree dels := adt.NewIntervalTree()
// collect deletes from this level; build first to check lower level overlapped puts // collect deletes from this level; build first to check lower level overlapped puts
for _, req := range reqs { for _, req := range reqs {

View File

@ -156,6 +156,7 @@ type watcherGroup struct {
func newWatcherGroup() watcherGroup { func newWatcherGroup() watcherGroup {
return watcherGroup{ return watcherGroup{
keyWatchers: make(watcherSetByKey), keyWatchers: make(watcherSetByKey),
ranges: adt.NewIntervalTree(),
watchers: make(watcherSet), watchers: make(watcherSet),
} }
} }

View File

@ -53,6 +53,7 @@ func keyFunc(req *pb.RangeRequest) string {
func NewCache(maxCacheEntries int) Cache { func NewCache(maxCacheEntries int) Cache {
return &cache{ return &cache{
lru: lru.New(maxCacheEntries), lru: lru.New(maxCacheEntries),
cachedRanges: adt.NewIntervalTree(),
compactedRev: -1, compactedRev: -1,
} }
} }