diff --git a/index/fragment_container.go b/index/fragment_container.go index fe0a00ca8..d448b9ce6 100644 --- a/index/fragment_container.go +++ b/index/fragment_container.go @@ -238,7 +238,7 @@ func getStorage(db string, slice int, frame string) Storage { func NewFragment(frag_id SUUID, db string, slice int, frame string) *Fragment { var impl Pilosa log.Println(fmt.Sprintf("XXXXXXXXXXXXXXXXXXXXXXXXXXX(%s)", frame)) - if strings.HasSuffix(frame, ".") { + if strings.HasSuffix(frame, ".n") { log.Println(frame + "TOP") impl = NewBrand(db, frame, slice, getStorage(db, slice, frame), 50000, 45000, 100) } else { diff --git a/index/general.go b/index/general.go index 41c70e8dc..148d6c723 100644 --- a/index/general.go +++ b/index/general.go @@ -59,8 +59,9 @@ func (self *General) SetBit(bitmap_id uint64, bit_pos uint64, filter uint64) boo return change } func (self *General) TopN(b IBitmap, n int, categories []uint64) []Pair { + var empty []Pair - return nil + return empty } func (self *General) Store(bitmap_id uint64, bm IBitmap, filter uint64) { //oldbm:=self.Get(bitmap_id) diff --git a/index/storage_cass.go b/index/storage_cass.go index 347afc494..2550d4db9 100644 --- a/index/storage_cass.go +++ b/index/storage_cass.go @@ -53,7 +53,7 @@ func (c *CassandraStorage) Fetch(bitmap_id uint64, db string, frame string, slic chunk_key, block int64 block_index uint32 s8 uint8 - filter uint64 + filter int ) log.Println("FETCHING ", bitmap_id, db, slice) @@ -77,7 +77,7 @@ func (c *CassandraStorage) Fetch(bitmap_id uint64, db string, frame string, slic } bitmap.SetCount(uint64(count)) - return bitmap, filter + return bitmap, uint64(filter) } func (c *CassandraStorage) Store(id int64, db string, frame string, slice int, filter uint64, bitmap *Bitmap) error { @@ -103,7 +103,7 @@ func (c *CassandraStorage) Store(id int64, db string, frame string, slice int, f func (c *CassandraStorage) StoreBlock(id int64, db string, frame string, slice int, filter uint64, chunk int64, block_index int32, block int64) error { if err := c.db.Query(` - INSERT INTO bitmap ( bitmap_id, db, frame, slice , filter, ChunkKey, BlockIndex, block) VALUES (?,?,?,?,?,?,?,?);`, id, db, frame, slice, filter, chunk, block_index, block).Exec(); err != nil { + INSERT INTO bitmap ( bitmap_id, db, frame, slice , filter, ChunkKey, BlockIndex, block) VALUES (?,?,?,?,?,?,?,?);`, id, db, frame, slice, int(filter), chunk, block_index, block).Exec(); err != nil { log.Println(err) log.Println("INSERT ", id, chunk, block_index) return err