vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #9705 from acbodine/9311-truncindex-error-duplicate-id-on-ambiguous-id

Browse source 
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
This commit is contained in:
Michael Crosby 2015-02-06 14:01:28 -08:00
commit 7637041156
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
truncindex/truncindex.go
View file

@ -10,10 +10,8 @@ import (
) )
var ( var (
// ErrNoID is thrown when attempting to use empty prefixes ErrEmptyPrefix = errors.New("Prefix can't be empty")
ErrNoID = errors.New("prefix can't be empty") ErrAmbiguousPrefix = errors.New("Multiple IDs found with provided prefix")
// ErrDuplicateID is thrown when a duplicated id was found
ErrDuplicateID = errors.New("multiple IDs were found")
) )
func init() { func init() {
@ -47,7 +45,7 @@ func (idx *TruncIndex) addID(id string) error {
return fmt.Errorf("illegal character: ' '") return fmt.Errorf("illegal character: ' '")
} }
if id == "" { if id == "" {
return ErrNoID return ErrEmptyPrefix
} }
if _, exists := idx.ids[id]; exists { if _, exists := idx.ids[id]; exists {
return fmt.Errorf("id already exists: '%s'", id) return fmt.Errorf("id already exists: '%s'", id)
@ -87,26 +85,26 @@ func (idx *TruncIndex) Delete(id string) error {
// Get retrieves an ID from the TruncIndex. If there are multiple IDs // Get retrieves an ID from the TruncIndex. If there are multiple IDs
// with the given prefix, an error is thrown. // with the given prefix, an error is thrown.
func (idx *TruncIndex) Get(s string) (string, error) { func (idx *TruncIndex) Get(s string) (string, error) {
idx.RLock() if s == "" {
defer idx.RUnlock() return "", ErrEmptyPrefix
}
var ( var (
id string id string
) )
if s == "" {
return "", ErrNoID
}
subTreeVisitFunc := func(prefix patricia.Prefix, item patricia.Item) error { subTreeVisitFunc := func(prefix patricia.Prefix, item patricia.Item) error {
if id != "" { if id != "" {
// we haven't found the ID if there are two or more IDs // we haven't found the ID if there are two or more IDs
id = "" id = ""
return ErrDuplicateID return ErrAmbiguousPrefix
} }
id = string(prefix) id = string(prefix)
return nil return nil
} }
idx.RLock()
defer idx.RUnlock()
if err := idx.trie.VisitSubtree(patricia.Prefix(s), subTreeVisitFunc); err != nil { if err := idx.trie.VisitSubtree(patricia.Prefix(s), subTreeVisitFunc); err != nil {
return "", fmt.Errorf("no such id: %s", s) return "", err
} }
if id != "" { if id != "" {
return id, nil return id, nil

5
truncindex/truncindex_test.go
View file

@ -59,6 +59,11 @@ func TestTruncIndex(t *testing.T) {
assertIndexGet(t, index, id[:4], "", true) assertIndexGet(t, index, id[:4], "", true)
assertIndexGet(t, index, id[:1], "", true) assertIndexGet(t, index, id[:1], "", true)
// An ambiguous id prefix should return an error
if _, err := index.Get(id[:4]); err == nil || err == nil {
t.Fatal("An ambiguous id prefix should return an error")
}
// 7 characters should NOT conflict // 7 characters should NOT conflict
assertIndexGet(t, index, id[:7], id, false) assertIndexGet(t, index, id[:7], id, false)
assertIndexGet(t, index, id2[:7], id2, false) assertIndexGet(t, index, id2[:7], id2, false)