diff --git a/chunkenc/bstream.go b/chunkenc/bstream.go index 72368dcf4..0a02a7303 100644 --- a/chunkenc/bstream.go +++ b/chunkenc/bstream.go @@ -39,8 +39,6 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -//lint:file-ignore U1000 Ignore all unused code. - package chunkenc import "io" @@ -55,16 +53,6 @@ func newBReader(b []byte) bstream { return bstream{stream: b, count: 8} } -func newBWriter(size int) *bstream { - return &bstream{stream: make([]byte, 0, size), count: 0} -} - -func (b *bstream) clone() *bstream { - d := make([]byte, len(b.stream)) - copy(d, b.stream) - return &bstream{stream: d, count: b.count} -} - func (b *bstream) bytes() []byte { return b.stream } diff --git a/encoding_helpers.go b/encoding_helpers.go index 38ce1f202..9c10e3160 100644 --- a/encoding_helpers.go +++ b/encoding_helpers.go @@ -11,14 +11,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -//lint:file-ignore U1000 Ignore all unused code. - package tsdb import ( "encoding/binary" - "hash" - "hash/crc32" "unsafe" "github.com/pkg/errors" @@ -34,17 +30,12 @@ type encbuf struct { func (e *encbuf) reset() { e.b = e.b[:0] } func (e *encbuf) get() []byte { return e.b } -func (e *encbuf) len() int { return len(e.b) } func (e *encbuf) putString(s string) { e.b = append(e.b, s...) } -func (e *encbuf) putBytes(b []byte) { e.b = append(e.b, b...) } func (e *encbuf) putByte(c byte) { e.b = append(e.b, c) } -func (e *encbuf) putBE32int(x int) { e.putBE32(uint32(x)) } -func (e *encbuf) putBE64int(x int) { e.putBE64(uint64(x)) } -func (e *encbuf) putBE64int64(x int64) { e.putBE64(uint64(x)) } -func (e *encbuf) putUvarint32(x uint32) { e.putUvarint64(uint64(x)) } -func (e *encbuf) putUvarint(x int) { e.putUvarint64(uint64(x)) } +func (e *encbuf) putBE64int64(x int64) { e.putBE64(uint64(x)) } +func (e *encbuf) putUvarint(x int) { e.putUvarint64(uint64(x)) } func (e *encbuf) putBE32(x uint32) { binary.BigEndian.PutUint32(e.c[:], x) @@ -73,16 +64,6 @@ func (e *encbuf) putUvarintStr(s string) { e.putString(s) } -// putHash appends a hash over the buffers current contents to the buffer. -func (e *encbuf) putHash(h hash.Hash) { - h.Reset() - _, err := h.Write(e.b) - if err != nil { - panic(err) // The CRC32 implementation does not error - } - e.b = h.Sum(e.b) -} - // decbuf provides safe methods to extract data from a byte slice. It does all // necessary bounds checking and advancing of the byte slice. // Several datums can be extracted without checking for errors. However, before using @@ -92,15 +73,8 @@ type decbuf struct { e error } -func (d *decbuf) uvarint() int { return int(d.uvarint64()) } -func (d *decbuf) uvarint32() uint32 { return uint32(d.uvarint64()) } -func (d *decbuf) be32int() int { return int(d.be32()) } -func (d *decbuf) be64int64() int64 { return int64(d.be64()) } - -// crc32 returns a CRC32 checksum over the remaining bytes. -func (d *decbuf) crc32() uint32 { - return crc32.Checksum(d.b, castagnoliTable) -} +func (d *decbuf) uvarint() int { return int(d.uvarint64()) } +func (d *decbuf) be64int64() int64 { return int64(d.be64()) } func (d *decbuf) uvarintStr() string { l := d.uvarint64() @@ -181,18 +155,6 @@ func (d *decbuf) byte() byte { return x } -func (d *decbuf) decbuf(l int) decbuf { - if d.e != nil { - return decbuf{e: d.e} - } - if l > len(d.b) { - return decbuf{e: errInvalidSize} - } - r := decbuf{b: d.b[:l]} - d.b = d.b[l:] - return r -} - func (d *decbuf) err() error { return d.e } func (d *decbuf) len() int { return len(d.b) } func (d *decbuf) get() []byte { return d.b } diff --git a/index/encoding_helpers.go b/index/encoding_helpers.go index 9076dd3d3..9afb1a055 100644 --- a/index/encoding_helpers.go +++ b/index/encoding_helpers.go @@ -11,8 +11,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//lint:file-ignore U1000 Ignore all unused code. - package index import ( @@ -33,12 +31,9 @@ func (e *encbuf) get() []byte { return e.b } func (e *encbuf) len() int { return len(e.b) } func (e *encbuf) putString(s string) { e.b = append(e.b, s...) } -func (e *encbuf) putBytes(b []byte) { e.b = append(e.b, b...) } func (e *encbuf) putByte(c byte) { e.b = append(e.b, c) } func (e *encbuf) putBE32int(x int) { e.putBE32(uint32(x)) } -func (e *encbuf) putBE64int(x int) { e.putBE64(uint64(x)) } -func (e *encbuf) putBE64int64(x int64) { e.putBE64(uint64(x)) } func (e *encbuf) putUvarint32(x uint32) { e.putUvarint64(uint64(x)) } func (e *encbuf) putUvarint(x int) { e.putUvarint64(uint64(x)) } @@ -88,10 +83,8 @@ type decbuf struct { e error } -func (d *decbuf) uvarint() int { return int(d.uvarint64()) } -func (d *decbuf) uvarint32() uint32 { return uint32(d.uvarint64()) } -func (d *decbuf) be32int() int { return int(d.be32()) } -func (d *decbuf) be64int64() int64 { return int64(d.be64()) } +func (d *decbuf) uvarint() int { return int(d.uvarint64()) } +func (d *decbuf) be32int() int { return int(d.be32()) } // crc32 returns a CRC32 checksum over the remaining bytes. func (d *decbuf) crc32() uint32 { @@ -164,31 +157,6 @@ func (d *decbuf) be32() uint32 { return x } -func (d *decbuf) byte() byte { - if d.e != nil { - return 0 - } - if len(d.b) < 1 { - d.e = errInvalidSize - return 0 - } - x := d.b[0] - d.b = d.b[1:] - return x -} - -func (d *decbuf) decbuf(l int) decbuf { - if d.e != nil { - return decbuf{e: d.e} - } - if l > len(d.b) { - return decbuf{e: errInvalidSize} - } - r := decbuf{b: d.b[:l]} - d.b = d.b[l:] - return r -} - func (d *decbuf) err() error { return d.e } func (d *decbuf) len() int { return len(d.b) } func (d *decbuf) get() []byte { return d.b }