cleanup from go-staticcheck

collection.go

@@ -99,7 +99,6 @@ func (c *Collection) free(idx uint32) {
 	c.fill.Remove(idx)
 	atomic.StoreUint64(&c.count, uint64(c.fill.Count()))
 	c.lock.Unlock()
-	return
 }
 
 // findFreeIndex finds a free index for insertion

column_expire.go

@@ -75,7 +75,7 @@ func (s rwTTL) Extend(delta time.Duration) {
 
 // readTTL converts expiration to a TTL
 func readTTL(expireAt int64) time.Duration {
-	return time.Unix(0, expireAt).Sub(time.Now())
+	return time.Until(time.Unix(0, expireAt))
 }
 
 // writeTTL converts ttl to expireAt

column_index.go

@@ -192,7 +192,6 @@ func newSortIndex(indexName, columnName string) *column {
 
 // Grow grows the size of the column until we have enough to store
 func (c *columnSortIndex) Grow(idx uint32) {
-	return
 }
 
 // Column returns the target name of the column on which this index should apply.
@@ -222,7 +221,7 @@ func (c *columnSortIndex) Apply(chunk commit.Chunk, r *commit.Reader) {
 				Value: r.Index(),
 			})
 		case commit.Delete:
-			delKey, _ := c.backMap[r.Index()]
+			delKey := c.backMap[r.Index()]
 			c.btree.Delete(sortIndexItem{
 				Key:   delKey,
 				Value: r.Index(),

commit/buffer_test.go

@@ -273,6 +273,7 @@ func TestBufferWriteTo(t *testing.T) {
 
 	output := NewBuffer(0)
 	m, err := output.ReadFrom(buffer)
+	assert.NoError(t, err)
 	assert.Equal(t, int64(buffer.Len()), m)
 	assert.Equal(t, input, output)
 }

commit/commit_test.go

@@ -189,17 +189,6 @@ func newInterleaved(columnName string) *Buffer {
 	return buf
 }
 
-// updatesAt reads a set of int64 updates from a buffer at a given chunk
-func updatesAt(buffer *Buffer, chunk Chunk) (updates []int64) {
-	reader := NewReader()
-	reader.Range(buffer, chunk, func(r *Reader) {
-		for r.Next() {
-			updates = append(updates, r.Int64())
-		}
-	})
-	return
-}
-
 // --------------------------- Mocks ----------------------------
 
 type limitWriter struct {

txn_test.go

@@ -314,9 +314,7 @@ func TestSortIndex(t *testing.T) {
 
 	// Range
 	assert.Error(t, c.Query(func(txn *Txn) error {
-		return txn.Ascend("nonexistent", func(i uint32) {
-			return
-		})
+		return txn.Ascend("nonexistent", func(i uint32) {})
 	}))
 
 	var res [3]string