un-export some top-level functions

cluster.go

@@ -943,14 +943,14 @@ func (c *Cluster) markAsJoined() {
 }
 
 func (c *Cluster) needTopologyAgreement() bool {
-	return c.State() == ClusterStateStarting && !StringSlicesAreEqual(c.Topology.NodeIDs, c.nodeIDs())
+	return c.State() == ClusterStateStarting && !stringSlicesAreEqual(c.Topology.NodeIDs, c.nodeIDs())
 }
 
 func (c *Cluster) haveTopologyAgreement() bool {
 	if c.Static {
 		return true
 	}
-	return StringSlicesAreEqual(c.Topology.NodeIDs, c.nodeIDs())
+	return stringSlicesAreEqual(c.Topology.NodeIDs, c.nodeIDs())
 }
 
 func (c *Cluster) allNodesReady() bool {

executor.go

@@ -752,7 +752,7 @@ func (e *Executor) executeRangeSlice(ctx context.Context, index string, c *pql.C
 
 	// Union bitmaps across all time-based views.
 	row := &Row{}
-	for _, view := range ViewsByTimeRange(ViewStandard, startTime, endTime, q) {
+	for _, view := range viewsByTimeRange(ViewStandard, startTime, endTime, q) {
 		f := e.Holder.Fragment(index, field, view, slice)
 		if f == nil {
 			continue

field.go

@@ -82,7 +82,7 @@ func OptFieldFieldOptions(o FieldOptions) FieldOption {
 
 // NewField returns a new instance of field.
 func NewField(path, index, name string, opts ...FieldOption) (*Field, error) {
-	err := ValidateName(name)
+	err := validateName(name)
 	if err != nil {
 		return nil, err
 	}
@@ -645,7 +645,7 @@ func (f *Field) ViewRow(viewName string, rowID uint64) (*Row, error) {
 // SetBit sets a bit on a view within the field.
 func (f *Field) SetBit(name string, rowID, colID uint64, t *time.Time) (changed bool, err error) {
 	// Validate view name.
-	if !IsValidView(name) {
+	if !isValidView(name) {
 		return false, ErrInvalidView
 	}
 
@@ -668,7 +668,7 @@ func (f *Field) SetBit(name string, rowID, colID uint64, t *time.Time) (changed
 	}
 
 	// If a timestamp is specified then set bits across all views for the quantum.
-	for _, subname := range ViewsByTime(name, *t, f.TimeQuantum()) {
+	for _, subname := range viewsByTime(name, *t, f.TimeQuantum()) {
 		view, err := f.CreateViewIfNotExists(subname)
 		if err != nil {
 			return changed, errors.Wrapf(err, "creating view %s", subname)
@@ -687,7 +687,7 @@ func (f *Field) SetBit(name string, rowID, colID uint64, t *time.Time) (changed
 // ClearBit clears a bit within the field.
 func (f *Field) ClearBit(name string, rowID, colID uint64, t *time.Time) (changed bool, err error) {
 	// Validate view name.
-	if !IsValidView(name) {
+	if !isValidView(name) {
 		return false, ErrInvalidView
 	}
 
@@ -710,7 +710,7 @@ func (f *Field) ClearBit(name string, rowID, colID uint64, t *time.Time) (change
 	}
 
 	// If a timestamp is specified then clear bits across all views for the quantum.
-	for _, subname := range ViewsByTime(name, *t, f.TimeQuantum()) {
+	for _, subname := range viewsByTime(name, *t, f.TimeQuantum()) {
 		view, err := f.CreateViewIfNotExists(subname)
 		if err != nil {
 			return changed, errors.Wrapf(err, "creating view %s", subname)
@@ -899,7 +899,7 @@ func (f *Field) Import(rowIDs, columnIDs []uint64, timestamps []*time.Time) erro
 		if timestamp == nil {
 			standard = []string{ViewStandard}
 		} else {
-			standard = ViewsByTime(ViewStandard, *timestamp, q)
+			standard = viewsByTime(ViewStandard, *timestamp, q)
 			// In order to match the logic of `SetBit()`, we want bits
 			// with timestamps to write to both time and standard views.
 			standard = append(standard, ViewStandard)
@@ -1233,8 +1233,8 @@ const (
 	CacheTypeNone   = "none"
 )
 
-// IsValidCacheType returns true if v is a valid cache type.
-func IsValidCacheType(v string) bool {
+// isValidCacheType returns true if v is a valid cache type.
+func isValidCacheType(v string) bool {
 	switch v {
 	case CacheTypeLRU, CacheTypeRanked, CacheTypeNone:
 		return true

gossip/gossip.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"net"
 	"strconv"
 	"strings"
 	"sync"
@@ -213,7 +214,7 @@ func NewGossipMemberSet(name string, host string, cfg Config, ger *GossipEventRe
 	conf.BindAddr = host
 	conf.BindPort = port
 	conf.AdvertisePort = port
-	conf.AdvertiseAddr = pilosa.HostToIP(host)
+	conf.AdvertiseAddr = hostToIP(host)
 	//
 	conf.TCPTimeout = time.Duration(cfg.StreamTimeout)
 	conf.SuspicionMult = cfg.SuspicionMult
@@ -580,3 +581,21 @@ type Config struct {
 	Nodes         int           `toml:"nodes"`
 	ToTheDeadTime toml.Duration `toml:"to-the-dead-time"`
 }
+
+// hostToIP converts host to an IP4 address based on net.LookupIP().
+func hostToIP(host string) string {
+	// if host is not an IP addr, check net.LookupIP()
+	if net.ParseIP(host) == nil {
+		hosts, err := net.LookupIP(host)
+		if err != nil {
+			return host
+		}
+		for _, h := range hosts {
+			// this restricts pilosa to IP4
+			if h.To4() != nil {
+				return h.String()
+			}
+		}
+	}
+	return host
+}

index.go

@@ -53,7 +53,7 @@ type Index struct {
 
 // NewIndex returns a new instance of Index.
 func NewIndex(path, name string) (*Index, error) {
-	err := ValidateName(name)
+	err := validateName(name)
 	if err != nil {
 		return nil, errors.Wrap(err, "validating name")
 	}
@@ -295,7 +295,7 @@ func (i *Index) CreateFieldIfNotExists(name string, opt FieldOptions) (*Field, e
 func (i *Index) createField(name string, opt FieldOptions) (*Field, error) {
 	if name == "" {
 		return nil, errors.New("field name required")
-	} else if opt.CacheType != "" && !IsValidCacheType(opt.CacheType) {
+	} else if opt.CacheType != "" && !isValidCacheType(opt.CacheType) {
 		return nil, ErrInvalidCacheType
 	}
 

pilosa.go

@@ -16,9 +16,7 @@ package pilosa
 
 import (
 	"errors"
-	"net"
 	"regexp"
-	"strings"
 
 	"github.com/pilosa/pilosa/internal"
 )
@@ -108,26 +106,16 @@ func EncodeColumnAttrSet(set *ColumnAttrSet) *internal.ColumnAttrSet {
 // TimeFormat is the go-style time format used to parse string dates.
 const TimeFormat = "2006-01-02T15:04"
 
-// ValidateName ensures that the name is a valid format.
-func ValidateName(name string) error {
+// validateName ensures that the name is a valid format.
+func validateName(name string) error {
 	if !nameRegexp.Match([]byte(name)) {
 		return ErrName
 	}
 	return nil
 }
 
-// StringInSlice checks for substring a in the slice.
-func StringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-// StringSlicesAreEqual determines if two string slices are equal.
-func StringSlicesAreEqual(a, b []string) bool {
+// stringSlicesAreEqual determines if two string slices are equal.
+func stringSlicesAreEqual(a, b []string) bool {
 
 	if a == nil && b == nil {
 		return true
@@ -150,54 +138,6 @@ func StringSlicesAreEqual(a, b []string) bool {
 	return true
 }
 
-// SliceDiff returns the difference between two uint64 slices.
-func SliceDiff(a, b []uint64) []uint64 {
-	m := make(map[uint64]uint64)
-
-	for _, y := range b {
-		m[y]++
-	}
-
-	var ret []uint64
-	for _, x := range a {
-		if m[x] > 0 {
-			m[x]--
-			continue
-		}
-		ret = append(ret, x)
-	}
-
-	return ret
-}
-
-// ContainsSubstring checks to see if substring a is contained in any string in the slice.
-func ContainsSubstring(a string, list []string) bool {
-	for _, b := range list {
-		if strings.Contains(b, a) {
-			return true
-		}
-	}
-	return false
-}
-
-// HostToIP converts host to an IP4 address based on net.LookupIP().
-func HostToIP(host string) string {
-	// if host is not an IP addr, check net.LookupIP()
-	if net.ParseIP(host) == nil {
-		hosts, err := net.LookupIP(host)
-		if err != nil {
-			return host
-		}
-		for _, h := range hosts {
-			// this restricts pilosa to IP4
-			if h.To4() != nil {
-				return h.String()
-			}
-		}
-	}
-	return host
-}
-
 // AddressWithDefaults converts addr into a valid address,
 // using defaults when necessary.
 func AddressWithDefaults(addr string) (*URI, error) {

pilosa_internal_test.go

@@ -0,0 +1,43 @@
+// Copyright 2017 Pilosa Corp.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pilosa
+
+import (
+	"testing"
+)
+
+func TestValidateName(t *testing.T) {
+	names := []string{
+		"a", "ab", "ab1", "b-c", "d_e",
+		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+	}
+	for _, name := range names {
+		if validateName(name) != nil {
+			t.Fatalf("Should be valid index name: %s", name)
+		}
+	}
+}
+
+func TestValidateNameInvalid(t *testing.T) {
+	names := []string{
+		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce", "1", "_", "-",
+		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1",
+	}
+	for _, name := range names {
+		if validateName(name) == nil {
+			t.Fatalf("Should be invalid index name: %s", name)
+		}
+	}
+}

pilosa_test.go

@@ -22,54 +22,6 @@ import (
 	_ "github.com/pilosa/pilosa/test"
 )
 
-func TestValidateName(t *testing.T) {
-	names := []string{
-		"a", "ab", "ab1", "b-c", "d_e",
-		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-	}
-	for _, name := range names {
-		if pilosa.ValidateName(name) != nil {
-			t.Fatalf("Should be valid index name: %s", name)
-		}
-	}
-}
-
-func TestValidateNameInvalid(t *testing.T) {
-	names := []string{
-		"", "'", "^", "/", "\\", "A", "*", "a:b", "valid?no", "yüce", "1", "_", "-",
-		"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1",
-	}
-	for _, name := range names {
-		if pilosa.ValidateName(name) == nil {
-			t.Fatalf("Should be invalid index name: %s", name)
-		}
-	}
-}
-
-func TestStringInSlice(t *testing.T) {
-	list := []string{"localhost:10101", "localhost:10102", "localhost:10103"}
-	substr := "localhost:10101"
-	if !pilosa.StringInSlice(substr, list) {
-		t.Fatalf("Expected substring %s in %v", substr, list)
-	}
-	substr = "10101"
-	if pilosa.StringInSlice(substr, list) {
-		t.Fatalf("Expected substring %s not in %v", substr, list)
-	}
-}
-
-func TestContainsSubstring(t *testing.T) {
-	list := []string{"localhost:10101", "localhost:10102", "localhost:10103"}
-	substr := "10101"
-	if !pilosa.ContainsSubstring(substr, list) {
-		t.Fatalf("Expected substring %s contained in %v", substr, list)
-	}
-	substr = "4000"
-	if pilosa.ContainsSubstring(substr, list) {
-		t.Fatalf("Expected substring %s in not contained in %v", substr, list)
-	}
-}
-
 func TestAddressWithDefaults(t *testing.T) {
 	tests := []struct {
 		addr     string

server.go

@@ -659,7 +659,7 @@ func (s *Server) monitorDiagnostics() {
 
 	// Flush the diagnostics metrics at startup, then on each tick interval
 	flush := func() {
-		openFiles, err := CountOpenFiles()
+		openFiles, err := countOpenFiles()
 		if err == nil {
 			s.diagnostics.Set("OpenFiles", openFiles)
 		}
@@ -716,7 +716,7 @@ func (s *Server) monitorRuntime() {
 		// Record the number of go routines.
 		s.Holder.Stats.Gauge("goroutines", float64(runtime.NumGoroutine()), 1.0)
 
-		openFiles, err := CountOpenFiles()
+		openFiles, err := countOpenFiles()
 		// Open File handles.
 		if err == nil {
 			s.Holder.Stats.Gauge("OpenFiles", float64(openFiles), 1.0)
@@ -732,8 +732,8 @@ func (s *Server) monitorRuntime() {
 	}
 }
 
-// CountOpenFiles on operating systems that support lsof.
-func CountOpenFiles() (int, error) {
+// countOpenFiles on operating systems that support lsof.
+func countOpenFiles() (int, error) {
 	switch runtime.GOOS {
 	case "darwin", "linux", "unix", "freebsd":
 		// -b option avoid kernel blocks
@@ -747,9 +747,9 @@ func CountOpenFiles() (int, error) {
 		return len(lines), nil
 	case "windows":
 		// TODO: count open file handles on windows
-		return 0, errors.New("CountOpenFiles() on Windows is not supported")
+		return 0, errors.New("countOpenFiles() on Windows is not supported")
 	default:
-		return 0, errors.New("CountOpenFiles() on this OS is not supported")
+		return 0, errors.New("countOpenFiles() on this OS is not supported")
 	}
 }