scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-10 07:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '372-invalid-name-bug'

Browse source
This commit is contained in:
Matt Jaffee 2017-03-09 10:58:08 -06:00
commit 51390cdf47
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
index.go
View file

@ -79,10 +79,17 @@ func (i *Index) Open() error {
i.logger().Printf("opening database: %s", filepath.Base(fi.Name()))
db, err := i.newDB(i.DBPath(filepath.Base(fi.Name())), filepath.Base(fi.Name()))
if err != nil {
return ErrName
if err == ErrName {
i.logger().Printf("ERROR opening database: %s, err=%s", fi.Name(), err)
continue
} else if err != nil {
return err
}
if err := db.Open(); err != nil {
if err == ErrName {
i.logger().Printf("ERROR opening database: %s, err=%s", db.Name(), err)
continue
}
return fmt.Errorf("open db: name=%s, err=%s", db.Name(), err)
}
i.dbs[db.Name()] = db

2
pilosa.go
View file

@ -20,7 +20,7 @@ var (
ErrFrameExists = errors.New("frame already exists")
ErrFrameNotFound = errors.New("frame not found")
ErrName = errors.New("name restricted to [a-z0-9_-]")
ErrName = errors.New("invalid database or frame's name, must match [a-z0-9_-]")
// ErrFragmentNotFound is returned when a fragment does not exist.
ErrFragmentNotFound = errors.New("fragment not found")