From 7013910158a9b2689afe051742ac19249d54436d Mon Sep 17 00:00:00 2001 From: kcrodgers24 Date: Mon, 14 Feb 2022 09:15:23 -0800 Subject: [PATCH] give each test its own InMemSchemator --- disco/disco.go | 6 ++++++ holder.go | 2 +- holder_internal_test.go | 2 +- index.go | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/disco/disco.go b/disco/disco.go index 7f4519f13..6ec6641a0 100644 --- a/disco/disco.go +++ b/disco/disco.go @@ -312,6 +312,12 @@ type inMemSchemator struct { schema Schema } +func NewInMemSchemator() *inMemSchemator { + return &inMemSchemator{ + schema: make(Schema), + } +} + // Schema is an in-memory implementation of the Schemator Schema method. func (s *inMemSchemator) Schema(ctx context.Context) (Schema, error) { s.mu.RLock() diff --git a/holder.go b/holder.go index db9aa0cd2..e98c4e4bc 100644 --- a/holder.go +++ b/holder.go @@ -215,7 +215,7 @@ func DefaultHolderConfig() *HolderConfig { OpenIDAllocator: func(string, bool) (*idAllocator, error) { return &idAllocator{}, nil }, TranslationSyncer: NopTranslationSyncer, Serializer: GobSerializer, - Schemator: disco.InMemSchemator, + Schemator: disco.NewInMemSchemator(), Sharder: disco.InMemSharder, CacheFlushInterval: defaultCacheFlushInterval, StatsClient: stats.NopStatsClient, diff --git a/holder_internal_test.go b/holder_internal_test.go index e18704ac8..c9e164f27 100644 --- a/holder_internal_test.go +++ b/holder_internal_test.go @@ -10,7 +10,7 @@ func mustHolderConfig() *HolderConfig { cfg := DefaultHolderConfig() cfg.StorageConfig.FsyncEnabled = false cfg.RBFConfig.FsyncEnabled = false - cfg.Schemator = disco.InMemSchemator + cfg.Schemator = disco.NewInMemSchemator() cfg.Sharder = disco.InMemSharder return cfg } diff --git a/index.go b/index.go index 11c924c08..0901f1a36 100644 --- a/index.go +++ b/index.go @@ -77,7 +77,7 @@ func NewIndex(holder *Holder, path, name string) (*Index, error) { holder: holder, trackExistence: true, - Schemator: disco.InMemSchemator, + Schemator: disco.NewInMemSchemator(), serializer: NopSerializer, translateStores: make(map[int]TranslateStore),