diff --git a/boltdb/translate_test.go b/boltdb/translate_test.go index 90977ca82..eb720de18 100644 --- a/boltdb/translate_test.go +++ b/boltdb/translate_test.go @@ -26,6 +26,7 @@ import ( "github.com/pilosa/pilosa/v2" "github.com/pilosa/pilosa/v2/boltdb" + "github.com/pilosa/pilosa/v2/topology" ) //var vv = pilosa.VV @@ -540,7 +541,7 @@ func MustNewTranslateStore() *boltdb.TranslateStore { panic(err) } - s := boltdb.NewTranslateStore("I", "F", 0, pilosa.DefaultPartitionN) + s := boltdb.NewTranslateStore("I", "F", 0, topology.DefaultPartitionN) s.Path = f.Name() return s } @@ -653,7 +654,7 @@ func TestCryptoHashPerKey(t *testing.T) { } // done with setup - sum, err := s.ComputeTranslatorSummaryCols(0, pilosa.NewTopology(&pilosa.Jmphasher{}, pilosa.DefaultPartitionN, 1, nil)) + sum, err := s.ComputeTranslatorSummaryCols(0, pilosa.NewTopology(&pilosa.Jmphasher{}, topology.DefaultPartitionN, 1, nil)) if err != nil { panic(err) } diff --git a/cluster.go b/cluster.go index 405b65901..b6e7e17e4 100644 --- a/cluster.go +++ b/cluster.go @@ -42,9 +42,6 @@ import ( ) const ( - // DefaultPartitionN is the default number of partitions in a cluster. - DefaultPartitionN = 256 - // ClusterState represents the state returned in the /status endpoint. ClusterStateStarting = "STARTING" ClusterStateDegraded = "DEGRADED" // cluster is running but we've lost some # of hosts >0 but < replicaN @@ -138,7 +135,7 @@ type cluster struct { // nolint: maligned func newCluster() *cluster { return &cluster{ Hasher: &Jmphasher{}, - partitionN: DefaultPartitionN, + partitionN: topology.DefaultPartitionN, ReplicaN: 1, joiningLeavingNodes: make(chan nodeAction, 10), // buffered channel diff --git a/cmd/pilosa-fsck/fsck.go b/cmd/pilosa-fsck/fsck.go index 34ed071f8..cef5583cd 100644 --- a/cmd/pilosa-fsck/fsck.go +++ b/cmd/pilosa-fsck/fsck.go @@ -464,7 +464,7 @@ func (cfg *FsckConfig) RepairTranslationStores(ats *pilosa.AllTranslatorSummary) if err != nil { return errors.Wrap(err, fmt.Sprintf("RepairTranslationStores() os.RemoveAll(e.StorePath='%v')", e.StorePath)) } - store, err := boltdb.OpenTranslateStore(e.StorePath, e.Index, e.Field, e.PartitionID, pilosa.DefaultPartitionN) + store, err := boltdb.OpenTranslateStore(e.StorePath, e.Index, e.Field, e.PartitionID, topology.DefaultPartitionN) if err != nil { return errors.Wrap(err, fmt.Sprintf("RepairTranslationStores() create empty boldtdb: boltdb.OpenTranslateStore e.StorePath='%v'", e.StorePath)) } @@ -600,7 +600,7 @@ func (cfg *FsckConfig) readOneDir(dir string) (idx2frag map[string]*pilosa.Index } jmphasher := &pilosa.Jmphasher{} - partitionN := pilosa.DefaultPartitionN + partitionN := topology.DefaultPartitionN replicaN := cfg.ReplicaN topo, err := loadTopology(dir, jmphasher, partitionN, replicaN) if err != nil { @@ -937,7 +937,7 @@ func (cfg *FsckConfig) analyzeThisIndex( # %v # ======================================================== `, - cfg.Fix, index, nDir, cfg.ReplicaN, humanize.Comma(totalBytes), humanize.Comma(totalFiles), humanize.Comma(int64(nDir*pilosa.DefaultPartitionN)), humanize.Comma(int64(keyCount)), humanize.Comma(int64(idCount)), actionTaken, fragUpdate) + cfg.Fix, index, nDir, cfg.ReplicaN, humanize.Comma(totalBytes), humanize.Comma(totalFiles), humanize.Comma(int64(nDir*topology.DefaultPartitionN)), humanize.Comma(int64(keyCount)), humanize.Comma(int64(idCount)), actionTaken, fragUpdate) return } diff --git a/holder.go b/holder.go index f5145ba31..b1da8d82c 100644 --- a/holder.go +++ b/holder.go @@ -220,7 +220,7 @@ type HolderConfig struct { func DefaultHolderConfig() *HolderConfig { return &HolderConfig{ - PartitionN: DefaultPartitionN, + PartitionN: topology.DefaultPartitionN, OpenTranslateStore: OpenInMemTranslateStore, OpenTranslateReader: nil, OpenTransactionStore: OpenInMemTransactionStore, diff --git a/http/client_test.go b/http/client_test.go index b1b154647..1c8ed525c 100644 --- a/http/client_test.go +++ b/http/client_test.go @@ -33,6 +33,7 @@ import ( "github.com/pilosa/pilosa/v2/pql" "github.com/pilosa/pilosa/v2/server" "github.com/pilosa/pilosa/v2/test" + "github.com/pilosa/pilosa/v2/topology" "github.com/pkg/errors" ) @@ -297,7 +298,7 @@ func TestClient_Export(t *testing.T) { bw := bufio.NewWriter(buf) // Send export request for every partition. - for i := 0; i < pilosa.DefaultPartitionN; i++ { + for i := 0; i < topology.DefaultPartitionN; i++ { if err := c.ExportCSV(context.Background(), "keyed", "unkeyedf", uint64(i), bw); err != nil { t.Fatal(err) } @@ -338,7 +339,7 @@ func TestClient_Export(t *testing.T) { bw := bufio.NewWriter(buf) // Send export request. - for i := 0; i < pilosa.DefaultPartitionN; i++ { + for i := 0; i < topology.DefaultPartitionN; i++ { if err := c.ExportCSV(context.Background(), "keyed", "keyedf", uint64(i), bw); err != nil { t.Fatal(err) } diff --git a/translator_test.go b/translator_test.go index b1f42d518..d8b637b1e 100644 --- a/translator_test.go +++ b/translator_test.go @@ -30,12 +30,13 @@ import ( "github.com/pilosa/pilosa/v2/mock" "github.com/pilosa/pilosa/v2/server" "github.com/pilosa/pilosa/v2/test" + "github.com/pilosa/pilosa/v2/topology" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) func TestInMemTranslateStore_TranslateKey(t *testing.T) { - s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, pilosa.DefaultPartitionN) + s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, topology.DefaultPartitionN) // Ensure initial key translates to ID 1. if id, err := s.TranslateKey("foo", true); err != nil { @@ -60,7 +61,7 @@ func TestInMemTranslateStore_TranslateKey(t *testing.T) { } func TestInMemTranslateStore_TranslateID(t *testing.T) { - s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, pilosa.DefaultPartitionN) + s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, topology.DefaultPartitionN) // Setup initial keys. if _, err := s.TranslateKey("foo", true); err != nil { @@ -425,7 +426,7 @@ func TestTranslation_KeyNotFound(t *testing.T) { } func TestInMemTranslateStore_ReadKey(t *testing.T) { - s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, pilosa.DefaultPartitionN) + s := pilosa.NewInMemTranslateStore("IDX", "FLD", 0, topology.DefaultPartitionN) id, err := s.TranslateKey("foo", false) if err != pilosa.ErrTranslatingKeyNotFound { diff --git a/utils_internal_test.go b/utils_internal_test.go index 4b5820351..959d0736b 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -285,7 +285,7 @@ func (t *ClusterCluster) addCluster(i int, saveTopology bool) (*cluster, error) c.ReplicaN = 1 c.Hasher = NewTestModHasher() c.Path = path - c.partitionN = DefaultPartitionN + c.partitionN = topology.DefaultPartitionN c.Topology = NewTopology(c.Hasher, c.partitionN, c.ReplicaN, c) c.holder = h c.Node = node