From 6ff792c164183289450cd12131d3bf3d6f9a0818 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Fri, 29 Jun 2018 08:12:04 -0500
Subject: [PATCH 1/2] remove dead code (deadcode)

---
 field.go     | 37 -------------------------------------
 translate.go |  3 ---
 view.go      |  5 -----
 3 files changed, 45 deletions(-)

diff --git a/field.go b/field.go
index 9eb4f75b8..37cf17c2d 100644
--- a/field.go
+++ b/field.go
@@ -1298,43 +1298,6 @@ func (b *bsiGroup) validate() error {
 	return nil
 }
 
-func encodeBSIGroup(b *bsiGroup) *internal.BSIGroup {
-	if b == nil {
-		return nil
-	}
-	return &internal.BSIGroup{
-		Name: b.Name,
-		Type: b.Type,
-		Min:  int64(b.Min),
-		Max:  int64(b.Max),
-	}
-}
-
-func decodeBSIGroup(b *internal.BSIGroup) *bsiGroup {
-	if b == nil {
-		return nil
-	}
-	return &bsiGroup{
-		Name: b.Name,
-		Type: b.Type,
-		Min:  b.Min,
-		Max:  b.Max,
-	}
-}
-
-// importBitSet represents slices of row and column ids.
-// This is used to sort data during import.
-type importBitSet struct {
-	rowIDs, columnIDs []uint64
-}
-
-func (p importBitSet) Swap(i, j int) {
-	p.rowIDs[i], p.rowIDs[j] = p.rowIDs[j], p.rowIDs[i]
-	p.columnIDs[i], p.columnIDs[j] = p.columnIDs[j], p.columnIDs[i]
-}
-func (p importBitSet) Len() int           { return len(p.rowIDs) }
-func (p importBitSet) Less(i, j int) bool { return p.rowIDs[i] < p.rowIDs[j] }
-
 // Cache types.
 const (
 	CacheTypeLRU    = "lru"
diff --git a/translate.go b/translate.go
index 7c716640b..99a52acf5 100644
--- a/translate.go
+++ b/translate.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/binary"
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -1004,5 +1003,3 @@ func UvarintSize(x uint64) (i int) {
 	}
 	return i + 1
 }
-
-func hexdump(b []byte) { os.Stderr.Write([]byte(hex.Dump(b))) }
diff --git a/view.go b/view.go
index 3256fbc1b..fab7d7e1b 100644
--- a/view.go
+++ b/view.go
@@ -34,11 +34,6 @@ const (
 	viewBSIGroupPrefix = "bsig_"
 )
 
-// isValidView returns true if name is valid.
-func isValidView(name string) bool {
-	return name == ViewStandard
-}
-
 // View represents a container for field data.
 type View struct {
 	mu    sync.RWMutex

From d73ff9bfe2434335feaaa6a9b4596cea3ba8af72 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Fri, 29 Jun 2018 08:12:20 -0500
Subject: [PATCH 2/2] collapse memAttrStore

memAttrStore is not used, but I opted to leave it in order to encourage its use
by future unit tests. Since it is unexported, however, and its fairly obvious
what it does, I didn't think the docstrings were adding much value, and it's more
readable in this compact form.
---
 attr.go | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/attr.go b/attr.go
index e73f303af..34d14a280 100644
--- a/attr.go
+++ b/attr.go
@@ -233,44 +233,19 @@ type memAttrStore struct {
 	store map[uint64]map[string]interface{}
 }
 
-// Path is an in-memory implementation of AttrStore Path method.
-func (s *memAttrStore) Path() string { return "" }
-
-// Open is an in-memory implementation of AttrStore Open method.
-func (s *memAttrStore) Open() error {
-	return nil
-}
-
-// Close is an in-memory implementation of AttrStore Close method.
-func (s *memAttrStore) Close() error {
-	return nil
-}
-
-// Attrs returns a set of attributes by ID.
-func (s *memAttrStore) Attrs(id uint64) (m map[string]interface{}, err error) {
-	return s.store[id], nil
-}
-
-// SetAttrs sets attribute values for a given ID.
+func (s *memAttrStore) Path() string                                          { return "" }
+func (s *memAttrStore) Open() error                                           { return nil }
+func (s *memAttrStore) Close() error                                          { return nil }
+func (s *memAttrStore) Attrs(id uint64) (m map[string]interface{}, err error) { return s.store[id], nil }
 func (s *memAttrStore) SetAttrs(id uint64, m map[string]interface{}) error {
 	s.store[id] = m
 	return nil
 }
-
-// SetBulkAttrs sets attribute values for a set of ids.
 func (s *memAttrStore) SetBulkAttrs(m map[uint64]map[string]interface{}) error {
 	for id, v := range m {
 		s.store[id] = v
 	}
 	return nil
 }
-
-// Blocks is an in-memory implementation of AttrStore Blocks method.
-func (s *memAttrStore) Blocks() ([]AttrBlock, error) {
-	return nil, nil
-}
-
-// BlockData is an in-memory implementation of AttrStore BlockData method.
-func (s *memAttrStore) BlockData(i uint64) (map[uint64]map[string]interface{}, error) {
-	return nil, nil
-}
+func (s *memAttrStore) Blocks() ([]AttrBlock, error)                                  { return nil, nil }
+func (s *memAttrStore) BlockData(i uint64) (map[uint64]map[string]interface{}, error) { return nil, nil }