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

Merge branch 'master' of ops:nuevo-pilosa

Browse source
This commit is contained in:
Todd Gruben 2014-04-08 10:22:25 -05:00
commit c60bad2ab9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
db/topology.go
View file

@ -181,6 +181,7 @@ func (d *Database) getFrame(name string) (*Frame, error) {
return frame, nil
}
}
log.Println("Missing frame:", d.Name, name)
return nil, FrameDoesNotExistError
}
@ -312,7 +313,11 @@ func (f *Fragment) GetLocation() *Location {
func (d *Database) GetFragmentForBitmap(slice *Slice, bitmap *Bitmap) (*Fragment, error) {
//d.mutex.Lock()
//defer d.mutex.Unlock()
frame, _ := d.getFrame(bitmap.FrameType)
frame, err := d.getFrame(bitmap.FrameType)
if err != nil {
log.Println(err)
return nil, err
}
//log.Println(frame, slice)
fsi, err := d.GetFrameSliceIntersect(frame, slice)
if err != nil {