diff --git a/catcher.go b/catcher.go index 92ce5b2b9..b4f23fa61 100644 --- a/catcher.go +++ b/catcher.go @@ -17,7 +17,7 @@ package pilosa import ( "github.com/molecula/featurebase/v2/roaring" txkey "github.com/molecula/featurebase/v2/short_txkey" - . "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v2/vprint" ) // catcher is useful to report error locations with a @@ -46,8 +46,8 @@ func (c *catcherTx) NewTxIterator(index, field, view string, shard uint64) *roar func (c *catcherTx) ImportRoaringBits(index, field, view string, shard uint64, rit roaring.RoaringIterator, clear bool, log bool, rowSize uint64) (changed int, rowSet map[uint64]int, err error) { defer func() { if r := recover(); r != nil { - AlwaysPrintf("see ImportRoaringBits() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see ImportRoaringBits() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.ImportRoaringBits(index, field, view, shard, rit, clear, log, rowSize) @@ -56,8 +56,8 @@ func (c *catcherTx) ImportRoaringBits(index, field, view string, shard uint64, r func (c *catcherTx) Rollback() { defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Rollback() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Rollback() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() c.b.Rollback() @@ -67,8 +67,8 @@ func (c *catcherTx) Commit() error { defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Commit() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Commit() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Commit() @@ -78,8 +78,8 @@ func (c *catcherTx) RoaringBitmap(index, field, view string, shard uint64) (*roa defer func() { if r := recover(); r != nil { - AlwaysPrintf("see RoaringBitmap() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see RoaringBitmap() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.RoaringBitmap(index, field, view, shard) @@ -89,8 +89,8 @@ func (c *catcherTx) Container(index, field, view string, shard uint64, key uint6 defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Container() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Container() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Container(index, field, view, shard, key) @@ -100,8 +100,8 @@ func (c *catcherTx) PutContainer(index, field, view string, shard uint64, key ui defer func() { if r := recover(); r != nil { - AlwaysPrintf("see PutContainer() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see PutContainer() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.PutContainer(index, field, view, shard, key, rc) @@ -111,8 +111,8 @@ func (c *catcherTx) RemoveContainer(index, field, view string, shard uint64, key defer func() { if r := recover(); r != nil { - AlwaysPrintf("see RemoveContainer() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see RemoveContainer() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.RemoveContainer(index, field, view, shard, key) @@ -122,8 +122,8 @@ func (c *catcherTx) Add(index, field, view string, shard uint64, a ...uint64) (c defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Add() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Add() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Add(index, field, view, shard, a...) @@ -133,8 +133,8 @@ func (c *catcherTx) Remove(index, field, view string, shard uint64, a ...uint64) defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Remove() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Remove() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Remove(index, field, view, shard, a...) @@ -144,8 +144,8 @@ func (c *catcherTx) Contains(index, field, view string, shard uint64, key uint64 defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Contains() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Contains() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Contains(index, field, view, shard, key) @@ -155,8 +155,8 @@ func (c *catcherTx) ContainerIterator(index, field, view string, shard uint64, f defer func() { if r := recover(); r != nil { - AlwaysPrintf("see ContainerIterator() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see ContainerIterator() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.ContainerIterator(index, field, view, shard, firstRoaringContainerKey) @@ -166,8 +166,8 @@ func (c *catcherTx) ForEach(index, field, view string, shard uint64, fn func(i u defer func() { if r := recover(); r != nil { - AlwaysPrintf("see ForEach() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see ForEach() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.ForEach(index, field, view, shard, fn) @@ -177,8 +177,8 @@ func (c *catcherTx) ForEachRange(index, field, view string, shard uint64, start, defer func() { if r := recover(); r != nil { - AlwaysPrintf("see ForEachRange() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see ForEachRange() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.ForEachRange(index, field, view, shard, start, end, fn) @@ -188,8 +188,8 @@ func (c *catcherTx) Count(index, field, view string, shard uint64) (uint64, erro defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Count() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Count() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Count(index, field, view, shard) @@ -199,8 +199,8 @@ func (c *catcherTx) Max(index, field, view string, shard uint64) (uint64, error) defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Max() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Max() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Max(index, field, view, shard) @@ -210,8 +210,8 @@ func (c *catcherTx) Min(index, field, view string, shard uint64) (uint64, bool, defer func() { if r := recover(); r != nil { - AlwaysPrintf("see Min() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see Min() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.Min(index, field, view, shard) @@ -221,8 +221,8 @@ func (c *catcherTx) CountRange(index, field, view string, shard uint64, start, e defer func() { if r := recover(); r != nil { - AlwaysPrintf("see CountRange() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see CountRange() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.CountRange(index, field, view, shard, start, end) @@ -232,8 +232,8 @@ func (c *catcherTx) OffsetRange(index, field, view string, shard, offset, start, defer func() { if r := recover(); r != nil { - AlwaysPrintf("see OffsetRange() PanicOn '%v' at '%v'", r, Stack()) - PanicOn(r) + vprint.AlwaysPrintf("see OffsetRange() PanicOn '%v' at '%v'", r, vprint.Stack()) + vprint.PanicOn(r) } }() return c.b.OffsetRange(index, field, view, shard, offset, start, end)