diff --git a/v1/internal/meta_client.go b/internal/meta_client.go similarity index 100% rename from v1/internal/meta_client.go rename to internal/meta_client.go diff --git a/v1/coordinator/statement_executor_test.go b/v1/coordinator/statement_executor_test.go index cb69f3baf6..85c148c4e4 100644 --- a/v1/coordinator/statement_executor_test.go +++ b/v1/coordinator/statement_executor_test.go @@ -18,11 +18,11 @@ import ( influxql2 "github.com/influxdata/influxdb/v2/influxql" "github.com/influxdata/influxdb/v2/influxql/control" "github.com/influxdata/influxdb/v2/influxql/query" + "github.com/influxdata/influxdb/v2/internal" "github.com/influxdata/influxdb/v2/models" itesting "github.com/influxdata/influxdb/v2/testing" "github.com/influxdata/influxdb/v2/tsdb" "github.com/influxdata/influxdb/v2/v1/coordinator" - "github.com/influxdata/influxdb/v2/v1/internal" "github.com/influxdata/influxdb/v2/v1/services/meta" "github.com/influxdata/influxql" "go.uber.org/zap/zaptest" diff --git a/v1/internal/flux_controller.go b/v1/internal/flux_controller.go deleted file mode 100644 index aa4cbfd4f2..0000000000 --- a/v1/internal/flux_controller.go +++ /dev/null @@ -1,32 +0,0 @@ -package internal - -import ( - "context" - - "github.com/influxdata/flux" - "github.com/influxdata/flux/memory" - "github.com/prometheus/client_golang/prometheus" -) - -type FluxControllerMock struct { - QueryFn func(ctx context.Context, compiler flux.Compiler) (flux.Query, error) -} - -func NewFluxControllerMock() *FluxControllerMock { - return &FluxControllerMock{ - QueryFn: func(ctx context.Context, compiler flux.Compiler) (query flux.Query, e error) { - p, err := compiler.Compile(ctx) - if err != nil { - return nil, err - } - alloc := &memory.Allocator{} - return p.Start(ctx, alloc) - }, - } -} - -func (m *FluxControllerMock) Query(ctx context.Context, compiler flux.Compiler) (flux.Query, error) { - return m.QueryFn(ctx, compiler) -} - -func (m *FluxControllerMock) PrometheusCollectors() []prometheus.Collector { return nil } diff --git a/v1/internal/testutil/strings.go b/v1/internal/testutil/strings.go deleted file mode 100644 index 01fbf8d8e9..0000000000 --- a/v1/internal/testutil/strings.go +++ /dev/null @@ -1,105 +0,0 @@ -package testutil - -import ( - "math/rand" - "strings" -) - -// MakeSentence returns a string made up of n words. -// MakeSentence uses rand.Int31n and therefore calling rand.Seed will produce -// deterministic results. -func MakeSentence(n int) string { - s := make([]string, n) - for i := 0; i < n; i++ { - s[i] = words[rand.Int31n(int32(len(words)))] - } - return strings.Join(s, " ") -} - -var words = [...]string{ - "lorem", "ipsum", "dolor", "sit", "amet", "consectetuer", "adipiscing", "elit", "integer", "in", "mi", "a", "mauris", - "ornare", "sagittis", "suspendisse", "potenti", "suspendisse", "dapibus", "dignissim", "dolor", "nam", - "sapien", "tellus", "tempus", "et", "tempus", "ac", "tincidunt", "in", "arcu", "duis", "dictum", "proin", "magna", - "nulla", "pellentesque", "non", "commodo", "et", "iaculis", "sit", "amet", "mi", "mauris", "condimentum", "massa", - "ut", "metus", "donec", "viverra", "sapien", "mattis", "rutrum", "tristique", "lacus", "eros", "semper", "tellus", - "et", "molestie", "nisi", "sapien", "eu", "massa", "vestibulum", "ante", "ipsum", "primis", "in", "faucibus", "orci", - "luctus", "et", "ultrices", "posuere", "cubilia", "curae", "fusce", "erat", "tortor", "mollis", "ut", "accumsan", - "ut", "lacinia", "gravida", "libero", "curabitur", "massa", "felis", "accumsan", "feugiat", "convallis", "sit", - "amet", "porta", "vel", "neque", "duis", "et", "ligula", "non", "elit", "ultricies", "rutrum", "suspendisse", - "tempor", "quisque", "posuere", "malesuada", "velit", "sed", "pellentesque", "mi", "a", "purus", "integer", - "imperdiet", "orci", "a", "eleifend", "mollis", "velit", "nulla", "iaculis", "arcu", "eu", "rutrum", "magna", "quam", - "sed", "elit", "nullam", "egestas", "integer", "interdum", "purus", "nec", "mauris", "vestibulum", "ac", "mi", "in", - "nunc", "suscipit", "dapibus", "duis", "consectetuer", "ipsum", "et", "pharetra", "sollicitudin", "metus", - "turpis", "facilisis", "magna", "vitae", "dictum", "ligula", "nulla", "nec", "mi", "nunc", "ante", "urna", "gravida", - "sit", "amet", "congue", "et", "accumsan", "vitae", "magna", "praesent", "luctus", "nullam", "in", "velit", - "praesent", "est", "curabitur", "turpis", "class", "aptent", "taciti", "sociosqu", "ad", "litora", "torquent", - "per", "conubia", "nostra", "per", "inceptos", "hymenaeos", "cras", "consectetuer", "nibh", "in", "lacinia", - "ornare", "turpis", "sem", "tempor", "massa", "sagittis", "feugiat", "mauris", "nibh", "non", "tellus", - "phasellus", "mi", "fusce", "enim", "mauris", "ultrices", "turpis", "eu", "adipiscing", "viverra", "justo", - "libero", "ullamcorper", "massa", "id", "ultrices", "velit", "est", "quis", "tortor", "quisque", "condimentum", - "lacus", "volutpat", "nonummy", "accumsan", "est", "nunc", "imperdiet", "magna", "vulputate", "aliquet", "nisi", - "risus", "at", "est", "aliquam", "imperdiet", "gravida", "tortor", "praesent", "interdum", "accumsan", "ante", - "vivamus", "est", "ligula", "consequat", "sed", "pulvinar", "eu", "consequat", "vitae", "eros", "nulla", "elit", - "nunc", "congue", "eget", "scelerisque", "a", "tempor", "ac", "nisi", "morbi", "facilisis", "pellentesque", - "habitant", "morbi", "tristique", "senectus", "et", "netus", "et", "malesuada", "fames", "ac", "turpis", "egestas", - "in", "hac", "habitasse", "platea", "dictumst", "suspendisse", "vel", "lorem", "ut", "ligula", "tempor", - "consequat", "quisque", "consectetuer", "nisl", "eget", "elit", "proin", "quis", "mauris", "ac", "orci", - "accumsan", "suscipit", "sed", "ipsum", "sed", "vel", "libero", "nec", "elit", "feugiat", "blandit", "vestibulum", - "purus", "nulla", "accumsan", "et", "volutpat", "at", "pellentesque", "vel", "urna", "suspendisse", "nonummy", - "aliquam", "pulvinar", "libero", "donec", "vulputate", "orci", "ornare", "bibendum", "condimentum", "lorem", - "elit", "dignissim", "sapien", "ut", "aliquam", "nibh", "augue", "in", "turpis", "phasellus", "ac", "eros", - "praesent", "luctus", "lorem", "a", "mollis", "lacinia", "leo", "turpis", "commodo", "sem", "in", "lacinia", "mi", - "quam", "et", "quam", "curabitur", "a", "libero", "vel", "tellus", "mattis", "imperdiet", "in", "congue", "neque", "ut", - "scelerisque", "bibendum", "libero", "lacus", "ullamcorper", "sapien", "quis", "aliquet", "massa", "velit", - "vel", "orci", "fusce", "in", "nulla", "quis", "est", "cursus", "gravida", "in", "nibh", "lorem", "ipsum", "dolor", "sit", - "amet", "consectetuer", "adipiscing", "elit", "integer", "fermentum", "pretium", "massa", "morbi", "feugiat", - "iaculis", "nunc", "aenean", "aliquam", "pretium", "orci", "cum", "sociis", "natoque", "penatibus", "et", "magnis", - "dis", "parturient", "montes", "nascetur", "ridiculus", "mus", "vivamus", "quis", "tellus", "vel", "quam", - "varius", "bibendum", "fusce", "est", "metus", "feugiat", "at", "porttitor", "et", "cursus", "quis", "pede", "nam", "ut", - "augue", "nulla", "posuere", "phasellus", "at", "dolor", "a", "enim", "cursus", "vestibulum", "duis", "id", "nisi", - "duis", "semper", "tellus", "ac", "nulla", "vestibulum", "scelerisque", "lobortis", "dolor", "aenean", "a", - "felis", "aliquam", "erat", "volutpat", "donec", "a", "magna", "vitae", "pede", "sagittis", "lacinia", "cras", - "vestibulum", "diam", "ut", "arcu", "mauris", "a", "nunc", "duis", "sollicitudin", "erat", "sit", "amet", "turpis", - "proin", "at", "libero", "eu", "diam", "lobortis", "fermentum", "nunc", "lorem", "turpis", "imperdiet", "id", - "gravida", "eget", "aliquet", "sed", "purus", "ut", "vehicula", "laoreet", "ante", "mauris", "eu", "nunc", "sed", "sit", - "amet", "elit", "nec", "ipsum", "aliquam", "egestas", "donec", "non", "nibh", "cras", "sodales", "pretium", "massa", - "praesent", "hendrerit", "est", "et", "risus", "vivamus", "eget", "pede", "curabitur", "tristique", - "scelerisque", "dui", "nullam", "ullamcorper", "vivamus", "venenatis", "velit", "eget", "enim", "nunc", "eu", - "nunc", "eget", "felis", "malesuada", "fermentum", "quisque", "magna", "mauris", "ligula", "felis", "luctus", "a", - "aliquet", "nec", "vulputate", "eget", "magna", "quisque", "placerat", "diam", "sed", "arcu", "praesent", - "sollicitudin", "aliquam", "non", "sapien", "quisque", "id", "augue", "class", "aptent", "taciti", "sociosqu", - "ad", "litora", "torquent", "per", "conubia", "nostra", "per", "inceptos", "hymenaeos", "etiam", "lacus", "lectus", - "mollis", "quis", "mattis", "nec", "commodo", "facilisis", "nibh", "sed", "sodales", "sapien", "ac", "ante", "duis", - "eget", "lectus", "in", "nibh", "lacinia", "auctor", "fusce", "interdum", "lectus", "non", "dui", "integer", - "accumsan", "quisque", "quam", "curabitur", "scelerisque", "imperdiet", "nisl", "suspendisse", "potenti", - "nam", "massa", "leo", "iaculis", "sed", "accumsan", "id", "ultrices", "nec", "velit", "suspendisse", "potenti", - "mauris", "bibendum", "turpis", "ac", "viverra", "sollicitudin", "metus", "massa", "interdum", "orci", "non", - "imperdiet", "orci", "ante", "at", "ipsum", "etiam", "eget", "magna", "mauris", "at", "tortor", "eu", "lectus", - "tempor", "tincidunt", "phasellus", "justo", "purus", "pharetra", "ut", "ultricies", "nec", "consequat", "vel", - "nisi", "fusce", "vitae", "velit", "at", "libero", "sollicitudin", "sodales", "aenean", "mi", "libero", "ultrices", - "id", "suscipit", "vitae", "dapibus", "eu", "metus", "aenean", "vestibulum", "nibh", "ac", "massa", "vivamus", - "vestibulum", "libero", "vitae", "purus", "in", "hac", "habitasse", "platea", "dictumst", "curabitur", - "blandit", "nunc", "non", "arcu", "ut", "nec", "nibh", "morbi", "quis", "leo", "vel", "magna", "commodo", "rhoncus", - "donec", "congue", "leo", "eu", "lacus", "pellentesque", "at", "erat", "id", "mi", "consequat", "congue", "praesent", - "a", "nisl", "ut", "diam", "interdum", "molestie", "fusce", "suscipit", "rhoncus", "sem", "donec", "pretium", - "aliquam", "molestie", "vivamus", "et", "justo", "at", "augue", "aliquet", "dapibus", "pellentesque", "felis", - "morbi", "semper", "in", "venenatis", "imperdiet", "neque", "donec", "auctor", "molestie", "augue", "nulla", "id", - "arcu", "sit", "amet", "dui", "lacinia", "convallis", "proin", "tincidunt", "proin", "a", "ante", "nunc", "imperdiet", - "augue", "nullam", "sit", "amet", "arcu", "quisque", "laoreet", "viverra", "felis", "lorem", "ipsum", "dolor", "sit", - "amet", "consectetuer", "adipiscing", "elit", "in", "hac", "habitasse", "platea", "dictumst", "pellentesque", - "habitant", "morbi", "tristique", "senectus", "et", "netus", "et", "malesuada", "fames", "ac", "turpis", "egestas", - "class", "aptent", "taciti", "sociosqu", "ad", "litora", "torquent", "per", "conubia", "nostra", "per", "inceptos", - "hymenaeos", "nullam", "nibh", "sapien", "volutpat", "ut", "placerat", "quis", "ornare", "at", "lorem", "class", - "aptent", "taciti", "sociosqu", "ad", "litora", "torquent", "per", "conubia", "nostra", "per", "inceptos", - "hymenaeos", "morbi", "dictum", "massa", "id", "libero", "ut", "neque", "phasellus", "tincidunt", "nibh", "ut", - "tincidunt", "lacinia", "lacus", "nulla", "aliquam", "mi", "a", "interdum", "dui", "augue", "non", "pede", "duis", - "nunc", "magna", "vulputate", "a", "porta", "at", "tincidunt", "a", "nulla", "praesent", "facilisis", - "suspendisse", "sodales", "feugiat", "purus", "cras", "et", "justo", "a", "mauris", "mollis", "imperdiet", "morbi", - "erat", "mi", "ultrices", "eget", "aliquam", "elementum", "iaculis", "id", "velit", "in", "scelerisque", "enim", - "sit", "amet", "turpis", "sed", "aliquam", "odio", "nonummy", "ullamcorper", "mollis", "lacus", "nibh", "tempor", - "dolor", "sit", "amet", "varius", "sem", "neque", "ac", "dui", "nunc", "et", "est", "eu", "massa", "eleifend", "mollis", - "mauris", "aliquet", "orci", "quis", "tellus", "ut", "mattis", "praesent", "mollis", "consectetuer", "quam", - "nulla", "nulla", "nunc", "accumsan", "nunc", "sit", "amet", "scelerisque", "porttitor", "nibh", "pede", "lacinia", - "justo", "tristique", "mattis", "purus", "eros", "non", "velit", "aenean", "sagittis", "commodo", "erat", - "aliquam", "id", "lacus", "morbi", "vulputate", "vestibulum", "elit", -} diff --git a/v1/internal/tsdb_store.go b/v1/internal/tsdb_store.go deleted file mode 100644 index f8b88f07f7..0000000000 --- a/v1/internal/tsdb_store.go +++ /dev/null @@ -1,151 +0,0 @@ -package internal - -import ( - "io" - "time" - - "github.com/influxdata/influxdb/v2/influxql/query" - "github.com/influxdata/influxdb/v2/models" - "github.com/influxdata/influxdb/v2/tsdb" - "github.com/influxdata/influxql" - "go.uber.org/zap" -) - -// TSDBStoreMock is a mockable implementation of tsdb.Store. -type TSDBStoreMock struct { - BackupShardFn func(id uint64, since time.Time, w io.Writer) error - BackupSeriesFileFn func(database string, w io.Writer) error - ExportShardFn func(id uint64, ExportStart time.Time, ExportEnd time.Time, w io.Writer) error - CloseFn func() error - CreateShardFn func(database, policy string, shardID uint64, enabled bool) error - CreateShardSnapshotFn func(id uint64) (string, error) - DatabasesFn func() []string - DeleteDatabaseFn func(name string) error - DeleteMeasurementFn func(database, name string) error - DeleteRetentionPolicyFn func(database, name string) error - DeleteSeriesFn func(database string, sources []influxql.Source, condition influxql.Expr) error - DeleteShardFn func(id uint64) error - DiskSizeFn func() (int64, error) - ExpandSourcesFn func(sources influxql.Sources) (influxql.Sources, error) - ImportShardFn func(id uint64, r io.Reader) error - MeasurementSeriesCountsFn func(database string) (measuments int, series int) - MeasurementsCardinalityFn func(database string) (int64, error) - MeasurementNamesFn func(auth query.Authorizer, database string, cond influxql.Expr) ([][]byte, error) - OpenFn func() error - PathFn func() string - RestoreShardFn func(id uint64, r io.Reader) error - SeriesCardinalityFn func(database string) (int64, error) - SetShardEnabledFn func(shardID uint64, enabled bool) error - ShardFn func(id uint64) *tsdb.Shard - ShardGroupFn func(ids []uint64) tsdb.ShardGroup - ShardIDsFn func() []uint64 - ShardNFn func() int - ShardRelativePathFn func(id uint64) (string, error) - ShardsFn func(ids []uint64) []*tsdb.Shard - StatisticsFn func(tags map[string]string) []models.Statistic - TagKeysFn func(auth query.Authorizer, shardIDs []uint64, cond influxql.Expr) ([]tsdb.TagKeys, error) - TagValuesFn func(auth query.Authorizer, shardIDs []uint64, cond influxql.Expr) ([]tsdb.TagValues, error) - WithLoggerFn func(log *zap.Logger) - WriteToShardFn func(shardID uint64, points []models.Point) error -} - -func (s *TSDBStoreMock) BackupShard(id uint64, since time.Time, w io.Writer) error { - return s.BackupShardFn(id, since, w) -} -func (s *TSDBStoreMock) BackupSeriesFile(database string, w io.Writer) error { - return s.BackupSeriesFileFn(database, w) -} -func (s *TSDBStoreMock) ExportShard(id uint64, ExportStart time.Time, ExportEnd time.Time, w io.Writer) error { - return s.ExportShardFn(id, ExportStart, ExportEnd, w) -} -func (s *TSDBStoreMock) Close() error { return s.CloseFn() } -func (s *TSDBStoreMock) CreateShard(database string, retentionPolicy string, shardID uint64, enabled bool) error { - return s.CreateShardFn(database, retentionPolicy, shardID, enabled) -} -func (s *TSDBStoreMock) CreateShardSnapshot(id uint64) (string, error) { - return s.CreateShardSnapshotFn(id) -} -func (s *TSDBStoreMock) Databases() []string { - return s.DatabasesFn() -} -func (s *TSDBStoreMock) DeleteDatabase(name string) error { - return s.DeleteDatabaseFn(name) -} -func (s *TSDBStoreMock) DeleteMeasurement(database string, name string) error { - return s.DeleteMeasurementFn(database, name) -} -func (s *TSDBStoreMock) DeleteRetentionPolicy(database string, name string) error { - return s.DeleteRetentionPolicyFn(database, name) -} -func (s *TSDBStoreMock) DeleteSeries(database string, sources []influxql.Source, condition influxql.Expr) error { - return s.DeleteSeriesFn(database, sources, condition) -} -func (s *TSDBStoreMock) DeleteShard(shardID uint64) error { - return s.DeleteShardFn(shardID) -} -func (s *TSDBStoreMock) DiskSize() (int64, error) { - return s.DiskSizeFn() -} -func (s *TSDBStoreMock) ExpandSources(sources influxql.Sources) (influxql.Sources, error) { - return s.ExpandSourcesFn(sources) -} -func (s *TSDBStoreMock) ImportShard(id uint64, r io.Reader) error { - return s.ImportShardFn(id, r) -} -func (s *TSDBStoreMock) MeasurementNames(auth query.Authorizer, database string, cond influxql.Expr) ([][]byte, error) { - return s.MeasurementNamesFn(auth, database, cond) -} -func (s *TSDBStoreMock) MeasurementSeriesCounts(database string) (measuments int, series int) { - return s.MeasurementSeriesCountsFn(database) -} -func (s *TSDBStoreMock) MeasurementsCardinality(database string) (int64, error) { - return s.MeasurementsCardinalityFn(database) -} -func (s *TSDBStoreMock) Open() error { - return s.OpenFn() -} -func (s *TSDBStoreMock) Path() string { - return s.PathFn() -} -func (s *TSDBStoreMock) RestoreShard(id uint64, r io.Reader) error { - return s.RestoreShardFn(id, r) -} -func (s *TSDBStoreMock) SeriesCardinality(database string) (int64, error) { - return s.SeriesCardinalityFn(database) -} -func (s *TSDBStoreMock) SetShardEnabled(shardID uint64, enabled bool) error { - return s.SetShardEnabledFn(shardID, enabled) -} -func (s *TSDBStoreMock) Shard(id uint64) *tsdb.Shard { - return s.ShardFn(id) -} -func (s *TSDBStoreMock) ShardGroup(ids []uint64) tsdb.ShardGroup { - return s.ShardGroupFn(ids) -} -func (s *TSDBStoreMock) ShardIDs() []uint64 { - return s.ShardIDsFn() -} -func (s *TSDBStoreMock) ShardN() int { - return s.ShardNFn() -} -func (s *TSDBStoreMock) ShardRelativePath(id uint64) (string, error) { - return s.ShardRelativePathFn(id) -} -func (s *TSDBStoreMock) Shards(ids []uint64) []*tsdb.Shard { - return s.ShardsFn(ids) -} -func (s *TSDBStoreMock) Statistics(tags map[string]string) []models.Statistic { - return s.StatisticsFn(tags) -} -func (s *TSDBStoreMock) TagKeys(auth query.Authorizer, shardIDs []uint64, cond influxql.Expr) ([]tsdb.TagKeys, error) { - return s.TagKeysFn(auth, shardIDs, cond) -} -func (s *TSDBStoreMock) TagValues(auth query.Authorizer, shardIDs []uint64, cond influxql.Expr) ([]tsdb.TagValues, error) { - return s.TagValuesFn(auth, shardIDs, cond) -} -func (s *TSDBStoreMock) WithLogger(log *zap.Logger) { - s.WithLoggerFn(log) -} -func (s *TSDBStoreMock) WriteToShard(shardID uint64, points []models.Point) error { - return s.WriteToShardFn(shardID, points) -} diff --git a/v1/services/precreator/service_test.go b/v1/services/precreator/service_test.go index 20289b784c..412f55d7b3 100644 --- a/v1/services/precreator/service_test.go +++ b/v1/services/precreator/service_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "github.com/influxdata/influxdb/v2/internal" "github.com/influxdata/influxdb/v2/logger" "github.com/influxdata/influxdb/v2/toml" - "github.com/influxdata/influxdb/v2/v1/internal" "github.com/influxdata/influxdb/v2/v1/services/precreator" ) diff --git a/v1/services/retention/service_test.go b/v1/services/retention/service_test.go index 7fdd52f08e..4f940b8b44 100644 --- a/v1/services/retention/service_test.go +++ b/v1/services/retention/service_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" + "github.com/influxdata/influxdb/v2/internal" "github.com/influxdata/influxdb/v2/logger" "github.com/influxdata/influxdb/v2/toml" - "github.com/influxdata/influxdb/v2/v1/internal" "github.com/influxdata/influxdb/v2/v1/services/meta" "github.com/influxdata/influxdb/v2/v1/services/retention" )