Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[query] - Include FetchQuery in InspectSeries arguments #2685

Merged
merged 6 commits into from
Oct 1, 2020
Merged

[query] - Include FetchQuery in InspectSeries arguments #2685

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a40164
include query in InspectSeries arguments
rallen090 Oct 1, 2020
313bbcb
include query options in InspectSeries arguments
rallen090 Oct 1, 2020
ae1380a
include query options in InspectSeries arguments 2
rallen090 Oct 1, 2020
f9ba502
include query options in InspectSeries arguments 3
rallen090 Oct 1, 2020
95f67e7
Merge branch 'master' into ra/inspect-series-include-query
rallen090 Oct 1, 2020
611c631
Merge branch 'master' into ra/inspect-series-include-query
rallen090 Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/query/storage/m3/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (s *m3storage) FetchProm(
options *storage.FetchOptions,
) (storage.PromResult, error) {
queryOptions := storage.FetchOptionsToM3Options(options, query)
accumulator, err := s.fetchCompressed(ctx, query, options, queryOptions)
accumulator, _, err := s.fetchCompressed(ctx, query, options, queryOptions)
if err != nil {
return storage.PromResult{}, err
}
Expand Down Expand Up @@ -193,7 +193,7 @@ func (s *m3storage) FetchCompressed(
options *storage.FetchOptions,
) (consolidators.SeriesFetchResult, Cleanup, error) {
queryOptions := storage.FetchOptionsToM3Options(options, query)
accumulator, err := s.fetchCompressed(ctx, query, options, queryOptions)
accumulator, m3query, err := s.fetchCompressed(ctx, query, options, queryOptions)
if err != nil {
return consolidators.SeriesFetchResult{
Metadata: block.NewResultMetadata(),
Expand All @@ -210,7 +210,7 @@ func (s *m3storage) FetchCompressed(
_, span, sampled := xcontext.StartSampledTraceSpan(ctx,
tracepoint.FetchCompressedInspectSeries)
iters := result.SeriesIterators()
if err := processor.InspectSeries(ctx, iters); err != nil {
if err := processor.InspectSeries(ctx, m3query, queryOptions, iters); err != nil {
s.logger.Error("error inspecting series", zap.Error(err))
}
if sampled {
Expand Down Expand Up @@ -239,23 +239,23 @@ func (s *m3storage) fetchCompressed(
query *storage.FetchQuery,
options *storage.FetchOptions,
queryOptions index.QueryOptions,
) (consolidators.MultiFetchResult, error) {
) (consolidators.MultiFetchResult, index.Query, error) {
if err := options.BlockType.Validate(); err != nil {
// This is an invariant error; should not be able to get to here.
return nil, instrument.InvariantErrorf("invalid block type on "+
return nil, index.Query{}, instrument.InvariantErrorf("invalid block type on "+
"fetch, got: %v with error %v", options.BlockType, err)
}

// Check if the query was interrupted.
select {
case <-ctx.Done():
return nil, ctx.Err()
return nil, index.Query{}, ctx.Err()
default:
}

m3query, err := storage.FetchQueryToM3Query(query, options)
if err != nil {
return nil, err
return nil, index.Query{}, err
}

// NB(r): Since we don't use a single index we fan out to each
Expand All @@ -271,7 +271,7 @@ func (s *m3storage) fetchCompressed(
options.RestrictQueryOptions,
)
if err != nil {
return nil, err
return nil, index.Query{}, err
}

if s.logger.Core().Enabled(zapcore.DebugLevel) {
Expand Down Expand Up @@ -300,12 +300,12 @@ func (s *m3storage) fetchCompressed(

var wg sync.WaitGroup
if len(namespaces) == 0 {
return nil, errNoNamespacesConfigured
return nil, index.Query{}, errNoNamespacesConfigured
}

pools, err := namespaces[0].Session().IteratorPools()
if err != nil {
return nil, fmt.Errorf("unable to retrieve iterator pools: %v", err)
return nil, index.Query{}, fmt.Errorf("unable to retrieve iterator pools: %v", err)
}

matchOpts := s.opts.SeriesConsolidationMatchOptions()
Expand Down Expand Up @@ -346,11 +346,11 @@ func (s *m3storage) fetchCompressed(
// Check if the query was interrupted.
select {
case <-ctx.Done():
return nil, ctx.Err()
return nil, m3query, ctx.Err()
default:
}

return result, err
return result, m3query, err
}

func (s *m3storage) SearchSeries(
Expand Down
10 changes: 8 additions & 2 deletions src/query/ts/m3db/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

"github.com/m3db/m3/src/dbnode/client"
"github.com/m3db/m3/src/dbnode/encoding"
"github.com/m3db/m3/src/dbnode/storage/index"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/query/block"
"github.com/m3db/m3/src/query/models"
Expand Down Expand Up @@ -103,8 +104,13 @@ type Options interface {

// SeriesIteratorProcessor optionally defines methods to process series iterators.
type SeriesIteratorProcessor interface {
// InspectSeries inspects SeriesIterator slices.
InspectSeries(ctx context.Context, seriesIterators []encoding.SeriesIterator) error
// InspectSeries inspects SeriesIterator slices for a given query.
InspectSeries(
ctx context.Context,
query index.Query,
queryOpts index.QueryOptions,
seriesIterators []encoding.SeriesIterator,
) error
}

// IteratorBatchingFn determines how the iterator is split into batches.
Expand Down