From 042a992f1f9ffe786720b39c3be99d3a221781d1 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Thu, 25 May 2023 23:08:22 -0700 Subject: [PATCH] modify hints proto Signed-off-by: Ben Ye --- pkg/rules/rulespb/rpc.pb.go | 22 +- pkg/store/bucket.go | 51 +-- pkg/store/hintspb/custom.go | 13 - pkg/store/hintspb/hints.pb.go | 663 ++++++--------------------- pkg/store/hintspb/hints.proto | 58 +-- pkg/store/storepb/prompb/types.pb.go | 2 - pkg/store/storepb/types.pb.go | 2 +- 7 files changed, 181 insertions(+), 630 deletions(-) diff --git a/pkg/rules/rulespb/rpc.pb.go b/pkg/rules/rulespb/rpc.pb.go index 2089c9b3937..2cbaff2c524 100644 --- a/pkg/rules/rulespb/rpc.pb.go +++ b/pkg/rules/rulespb/rpc.pb.go @@ -36,16 +36,16 @@ var _ = time.Kitchen // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// / AlertState represents state of the alert. Has to match 1:1 Prometheus AlertState: +/// AlertState represents state of the alert. Has to match 1:1 Prometheus AlertState: // // StateInactive is the state of an alert that is neither firing nor pending. -// StateInactive AlertState = iota +//StateInactive AlertState = iota // StatePending is the state of an alert that has been active for less than // the configured threshold duration. -// StatePending +//StatePending // StateFiring is the state of an alert that has been active for longer than // the configured threshold duration. -// StateFiring +//StateFiring type AlertState int32 const ( @@ -229,12 +229,12 @@ func (*RulesResponse) XXX_OneofWrappers() []interface{} { } } -// / RuleGroups is set of rule groups. -// / This and below APIs are meant to be used for unmarshaling and marshsaling rules from/to Prometheus API. -// / That's why json tag has to be customized and matching https://github.com/prometheus/prometheus/blob/c530b4b456cc5f9ec249f771dff187eb7715dc9b/web/api/v1/api.go#L955 -// / NOTE: See rules_custom_test.go for compatibility tests. -// / -// / For rule parsing from YAML configuration other struct is used: https://github.com/prometheus/prometheus/blob/20b1f596f6fb16107ef0c244d240b0ad6da36829/pkg/rulefmt/rulefmt.go#L105 +/// RuleGroups is set of rule groups. +/// This and below APIs are meant to be used for unmarshaling and marshsaling rules from/to Prometheus API. +/// That's why json tag has to be customized and matching https://github.com/prometheus/prometheus/blob/c530b4b456cc5f9ec249f771dff187eb7715dc9b/web/api/v1/api.go#L955 +/// NOTE: See rules_custom_test.go for compatibility tests. +/// +/// For rule parsing from YAML configuration other struct is used: https://github.com/prometheus/prometheus/blob/20b1f596f6fb16107ef0c244d240b0ad6da36829/pkg/rulefmt/rulefmt.go#L105 type RuleGroups struct { Groups []*RuleGroup `protobuf:"bytes,1,rep,name=groups,proto3" json:"groups"` } @@ -272,7 +272,7 @@ func (m *RuleGroups) XXX_DiscardUnknown() { var xxx_messageInfo_RuleGroups proto.InternalMessageInfo -// / RuleGroup has info for rules which are part of a group. +/// RuleGroup has info for rules which are part of a group. type RuleGroup struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` File string `protobuf:"bytes,2,opt,name=file,proto3" json:"file"` diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go index 2aa14c050f6..ad2d162d2eb 100644 --- a/pkg/store/bucket.go +++ b/pkg/store/bucket.go @@ -3189,38 +3189,25 @@ func (s queryStats) merge(o *queryStats) *queryStats { func (s queryStats) toHints() *hintspb.QueryStats { return &hintspb.QueryStats{ - BlocksQueried: int64(s.blocksQueried), - PostingsTouched: int64(s.postingsTouched), - PostingsTouchedSizeSum: int64(s.PostingsTouchedSizeSum), - PostingsToFetch: int64(s.postingsToFetch), - PostingsFetched: int64(s.postingsFetched), - PostingsFetchedSizeSum: int64(s.PostingsFetchedSizeSum), - PostingsFetchCount: int64(s.postingsFetchCount), - PostingsFetchDurationSum: int64(s.PostingsFetchDurationSum), - CachedPostingsCompressions: int64(s.cachedPostingsCompressions), - CachedPostingsCompressionErrors: int64(s.cachedPostingsCompressionErrors), - CachedPostingsOriginalSizeSum: int64(s.CachedPostingsOriginalSizeSum), - CachedPostingsCompressedSizeSum: int64(s.CachedPostingsCompressedSizeSum), - CachedPostingsCompressionTimeSum: int64(s.CachedPostingsCompressionTimeSum), - CachedPostingsDecompressions: int64(s.cachedPostingsDecompressions), - CachedPostingsDecompressionErrors: int64(s.cachedPostingsDecompressionErrors), - CachedPostingsDecompressionTimeSum: int64(s.CachedPostingsDecompressionTimeSum), - SeriesTouched: int64(s.seriesTouched), - SeriesTouchedSizeSum: int64(s.SeriesTouchedSizeSum), - SeriesFetched: int64(s.seriesFetched), - SeriesFetchedSizeSum: int64(s.SeriesFetchedSizeSum), - SeriesFetchCount: int64(s.seriesFetchCount), - SeriesFetchDurationSum: int64(s.SeriesFetchDurationSum), - ChunksTouched: int64(s.chunksTouched), - ChunksTouchedSizeSum: int64(s.ChunksTouchedSizeSum), - ChunksFetched: int64(s.chunksFetched), - ChunksFetchedSizeSum: int64(s.ChunksFetchedSizeSum), - ChunksFetchCount: int64(s.chunksFetchCount), - ChunksFetchDurationSum: int64(s.ChunksFetchDurationSum), - MergedSeriesCount: int64(s.mergedSeriesCount), - MergedChunksCount: int64(s.mergedChunksCount), - GetAllDuration: int64(s.GetAllDuration), - MergeDuration: int64(s.MergeDuration), + BlocksQueried: int64(s.blocksQueried), + PostingsTouched: int64(s.postingsTouched), + PostingsTouchedSizeSum: int64(s.PostingsTouchedSizeSum), + PostingsToFetch: int64(s.postingsToFetch), + PostingsFetched: int64(s.postingsFetched), + PostingsFetchedSizeSum: int64(s.PostingsFetchedSizeSum), + PostingsFetchCount: int64(s.postingsFetchCount), + SeriesTouched: int64(s.seriesTouched), + SeriesTouchedSizeSum: int64(s.SeriesTouchedSizeSum), + SeriesFetched: int64(s.seriesFetched), + SeriesFetchedSizeSum: int64(s.SeriesFetchedSizeSum), + SeriesFetchCount: int64(s.seriesFetchCount), + ChunksTouched: int64(s.chunksTouched), + ChunksTouchedSizeSum: int64(s.ChunksTouchedSizeSum), + ChunksFetched: int64(s.chunksFetched), + ChunksFetchedSizeSum: int64(s.ChunksFetchedSizeSum), + ChunksFetchCount: int64(s.chunksFetchCount), + MergedSeriesCount: int64(s.mergedSeriesCount), + MergedChunksCount: int64(s.mergedChunksCount), } } diff --git a/pkg/store/hintspb/custom.go b/pkg/store/hintspb/custom.go index 9f178ac4a9f..463418f6fea 100644 --- a/pkg/store/hintspb/custom.go +++ b/pkg/store/hintspb/custom.go @@ -25,38 +25,25 @@ func (m *LabelValuesResponseHints) AddQueriedBlock(id ulid.ULID) { func (m *QueryStats) Merge(other *QueryStats) { m.BlocksQueried += other.BlocksQueried - m.MergeDuration += other.MergeDuration - m.GetAllDuration += other.GetAllDuration m.MergedSeriesCount += other.MergedSeriesCount m.MergedChunksCount += other.MergedChunksCount - m.CachedPostingsCompressions += other.CachedPostingsCompressions - m.CachedPostingsCompressionErrors += other.CachedPostingsCompressionErrors - m.CachedPostingsCompressedSizeSum += other.CachedPostingsCompressedSizeSum - m.CachedPostingsCompressionTimeSum += other.CachedPostingsCompressionTimeSum - m.CachedPostingsDecompressions += other.CachedPostingsDecompressions - m.CachedPostingsDecompressionErrors += other.CachedPostingsDecompressionErrors - m.CachedPostingsDecompressionTimeSum += other.CachedPostingsDecompressionTimeSum - m.PostingsFetched += other.PostingsFetched m.PostingsToFetch += other.PostingsToFetch m.PostingsFetchCount += other.PostingsFetchCount m.PostingsFetchedSizeSum += other.PostingsFetchedSizeSum - m.PostingsFetchDurationSum += other.PostingsFetchDurationSum m.PostingsTouched += other.PostingsTouched m.PostingsTouchedSizeSum += other.PostingsTouchedSizeSum m.SeriesFetched += other.SeriesFetched m.SeriesFetchCount += other.SeriesFetchCount m.SeriesFetchedSizeSum += m.SeriesFetchedSizeSum - m.SeriesFetchDurationSum += m.SeriesFetchDurationSum m.SeriesTouched += other.SeriesTouched m.SeriesTouchedSizeSum += other.SeriesTouchedSizeSum m.ChunksFetched += other.ChunksFetched m.ChunksFetchCount += other.ChunksFetchCount m.ChunksFetchedSizeSum += other.ChunksFetchedSizeSum - m.ChunksFetchDurationSum += other.ChunksFetchDurationSum m.ChunksTouched += other.ChunksTouched m.ChunksTouchedSizeSum += other.ChunksTouchedSizeSum } diff --git a/pkg/store/hintspb/hints.pb.go b/pkg/store/hintspb/hints.pb.go index c41a5f0e499..224e360b28a 100644 --- a/pkg/store/hintspb/hints.pb.go +++ b/pkg/store/hintspb/hints.pb.go @@ -300,38 +300,25 @@ func (m *LabelValuesResponseHints) XXX_DiscardUnknown() { var xxx_messageInfo_LabelValuesResponseHints proto.InternalMessageInfo type QueryStats struct { - BlocksQueried int64 `protobuf:"varint,1,opt,name=blocks_queried,json=blocksQueried,proto3" json:"blocks_queried,omitempty"` - PostingsTouched int64 `protobuf:"varint,2,opt,name=postings_touched,json=postingsTouched,proto3" json:"postings_touched,omitempty"` - PostingsTouchedSizeSum int64 `protobuf:"varint,3,opt,name=postings_touched_size_sum,json=postingsTouchedSizeSum,proto3" json:"postings_touched_size_sum,omitempty"` - PostingsToFetch int64 `protobuf:"varint,4,opt,name=postings_to_fetch,json=postingsToFetch,proto3" json:"postings_to_fetch,omitempty"` - PostingsFetched int64 `protobuf:"varint,5,opt,name=postings_fetched,json=postingsFetched,proto3" json:"postings_fetched,omitempty"` - PostingsFetchedSizeSum int64 `protobuf:"varint,6,opt,name=postings_fetched_size_sum,json=postingsFetchedSizeSum,proto3" json:"postings_fetched_size_sum,omitempty"` - PostingsFetchCount int64 `protobuf:"varint,7,opt,name=postings_fetch_count,json=postingsFetchCount,proto3" json:"postings_fetch_count,omitempty"` - PostingsFetchDurationSum int64 `protobuf:"varint,8,opt,name=postings_fetch_duration_sum,json=postingsFetchDurationSum,proto3" json:"postings_fetch_duration_sum,omitempty"` - CachedPostingsCompressions int64 `protobuf:"varint,9,opt,name=cached_postings_compressions,json=cachedPostingsCompressions,proto3" json:"cached_postings_compressions,omitempty"` - CachedPostingsCompressionErrors int64 `protobuf:"varint,10,opt,name=cached_postings_compression_errors,json=cachedPostingsCompressionErrors,proto3" json:"cached_postings_compression_errors,omitempty"` - CachedPostingsOriginalSizeSum int64 `protobuf:"varint,11,opt,name=cached_postings_original_size_sum,json=cachedPostingsOriginalSizeSum,proto3" json:"cached_postings_original_size_sum,omitempty"` - CachedPostingsCompressedSizeSum int64 `protobuf:"varint,12,opt,name=cached_postings_compressed_size_sum,json=cachedPostingsCompressedSizeSum,proto3" json:"cached_postings_compressed_size_sum,omitempty"` - CachedPostingsCompressionTimeSum int64 `protobuf:"varint,13,opt,name=cached_postings_compression_time_sum,json=cachedPostingsCompressionTimeSum,proto3" json:"cached_postings_compression_time_sum,omitempty"` - CachedPostingsDecompressions int64 `protobuf:"varint,14,opt,name=cached_postings_decompressions,json=cachedPostingsDecompressions,proto3" json:"cached_postings_decompressions,omitempty"` - CachedPostingsDecompressionErrors int64 `protobuf:"varint,15,opt,name=cached_postings_decompression_errors,json=cachedPostingsDecompressionErrors,proto3" json:"cached_postings_decompression_errors,omitempty"` - CachedPostingsDecompressionTimeSum int64 `protobuf:"varint,16,opt,name=cached_postings_decompression_time_sum,json=cachedPostingsDecompressionTimeSum,proto3" json:"cached_postings_decompression_time_sum,omitempty"` - SeriesTouched int64 `protobuf:"varint,17,opt,name=series_touched,json=seriesTouched,proto3" json:"series_touched,omitempty"` - SeriesTouchedSizeSum int64 `protobuf:"varint,18,opt,name=series_touched_size_sum,json=seriesTouchedSizeSum,proto3" json:"series_touched_size_sum,omitempty"` - SeriesFetched int64 `protobuf:"varint,19,opt,name=series_fetched,json=seriesFetched,proto3" json:"series_fetched,omitempty"` - SeriesFetchedSizeSum int64 `protobuf:"varint,20,opt,name=series_fetched_size_sum,json=seriesFetchedSizeSum,proto3" json:"series_fetched_size_sum,omitempty"` - SeriesFetchCount int64 `protobuf:"varint,21,opt,name=series_fetch_count,json=seriesFetchCount,proto3" json:"series_fetch_count,omitempty"` - SeriesFetchDurationSum int64 `protobuf:"varint,22,opt,name=series_fetch_duration_sum,json=seriesFetchDurationSum,proto3" json:"series_fetch_duration_sum,omitempty"` - ChunksTouched int64 `protobuf:"varint,23,opt,name=chunks_touched,json=chunksTouched,proto3" json:"chunks_touched,omitempty"` - ChunksTouchedSizeSum int64 `protobuf:"varint,24,opt,name=chunks_touched_size_sum,json=chunksTouchedSizeSum,proto3" json:"chunks_touched_size_sum,omitempty"` - ChunksFetched int64 `protobuf:"varint,25,opt,name=chunks_fetched,json=chunksFetched,proto3" json:"chunks_fetched,omitempty"` - ChunksFetchedSizeSum int64 `protobuf:"varint,26,opt,name=chunks_fetched_size_sum,json=chunksFetchedSizeSum,proto3" json:"chunks_fetched_size_sum,omitempty"` - ChunksFetchCount int64 `protobuf:"varint,27,opt,name=chunks_fetch_count,json=chunksFetchCount,proto3" json:"chunks_fetch_count,omitempty"` - ChunksFetchDurationSum int64 `protobuf:"varint,28,opt,name=chunks_fetch_duration_sum,json=chunksFetchDurationSum,proto3" json:"chunks_fetch_duration_sum,omitempty"` - MergedSeriesCount int64 `protobuf:"varint,29,opt,name=merged_series_count,json=mergedSeriesCount,proto3" json:"merged_series_count,omitempty"` - MergedChunksCount int64 `protobuf:"varint,30,opt,name=merged_chunks_count,json=mergedChunksCount,proto3" json:"merged_chunks_count,omitempty"` - GetAllDuration int64 `protobuf:"varint,31,opt,name=get_all_duration,json=getAllDuration,proto3" json:"get_all_duration,omitempty"` - MergeDuration int64 `protobuf:"varint,32,opt,name=merge_duration,json=mergeDuration,proto3" json:"merge_duration,omitempty"` + BlocksQueried int64 `protobuf:"varint,1,opt,name=blocks_queried,json=blocksQueried,proto3" json:"blocks_queried,omitempty"` + MergedSeriesCount int64 `protobuf:"varint,2,opt,name=merged_series_count,json=mergedSeriesCount,proto3" json:"merged_series_count,omitempty"` + MergedChunksCount int64 `protobuf:"varint,3,opt,name=merged_chunks_count,json=mergedChunksCount,proto3" json:"merged_chunks_count,omitempty"` + PostingsTouched int64 `protobuf:"varint,4,opt,name=postings_touched,json=postingsTouched,proto3" json:"postings_touched,omitempty"` + PostingsTouchedSizeSum int64 `protobuf:"varint,5,opt,name=postings_touched_size_sum,json=postingsTouchedSizeSum,proto3" json:"postings_touched_size_sum,omitempty"` + PostingsToFetch int64 `protobuf:"varint,6,opt,name=postings_to_fetch,json=postingsToFetch,proto3" json:"postings_to_fetch,omitempty"` + PostingsFetched int64 `protobuf:"varint,7,opt,name=postings_fetched,json=postingsFetched,proto3" json:"postings_fetched,omitempty"` + PostingsFetchedSizeSum int64 `protobuf:"varint,8,opt,name=postings_fetched_size_sum,json=postingsFetchedSizeSum,proto3" json:"postings_fetched_size_sum,omitempty"` + PostingsFetchCount int64 `protobuf:"varint,9,opt,name=postings_fetch_count,json=postingsFetchCount,proto3" json:"postings_fetch_count,omitempty"` + SeriesTouched int64 `protobuf:"varint,10,opt,name=series_touched,json=seriesTouched,proto3" json:"series_touched,omitempty"` + SeriesTouchedSizeSum int64 `protobuf:"varint,11,opt,name=series_touched_size_sum,json=seriesTouchedSizeSum,proto3" json:"series_touched_size_sum,omitempty"` + SeriesFetched int64 `protobuf:"varint,12,opt,name=series_fetched,json=seriesFetched,proto3" json:"series_fetched,omitempty"` + SeriesFetchedSizeSum int64 `protobuf:"varint,13,opt,name=series_fetched_size_sum,json=seriesFetchedSizeSum,proto3" json:"series_fetched_size_sum,omitempty"` + SeriesFetchCount int64 `protobuf:"varint,14,opt,name=series_fetch_count,json=seriesFetchCount,proto3" json:"series_fetch_count,omitempty"` + ChunksTouched int64 `protobuf:"varint,15,opt,name=chunks_touched,json=chunksTouched,proto3" json:"chunks_touched,omitempty"` + ChunksTouchedSizeSum int64 `protobuf:"varint,16,opt,name=chunks_touched_size_sum,json=chunksTouchedSizeSum,proto3" json:"chunks_touched_size_sum,omitempty"` + ChunksFetched int64 `protobuf:"varint,17,opt,name=chunks_fetched,json=chunksFetched,proto3" json:"chunks_fetched,omitempty"` + ChunksFetchedSizeSum int64 `protobuf:"varint,18,opt,name=chunks_fetched_size_sum,json=chunksFetchedSizeSum,proto3" json:"chunks_fetched_size_sum,omitempty"` + ChunksFetchCount int64 `protobuf:"varint,19,opt,name=chunks_fetch_count,json=chunksFetchCount,proto3" json:"chunks_fetch_count,omitempty"` } func (m *QueryStats) Reset() { *m = QueryStats{} } @@ -381,62 +368,47 @@ func init() { func init() { proto.RegisterFile("store/hintspb/hints.proto", fileDescriptor_b82aa23c4c11e83f) } var fileDescriptor_b82aa23c4c11e83f = []byte{ - // 873 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0x26, 0xfd, 0xf9, 0x42, 0xb6, 0xce, 0xc4, 0x24, 0x1b, 0x37, 0xdd, 0xb8, 0x06, 0x23, - 0x83, 0x2a, 0x07, 0x15, 0x71, 0x28, 0x08, 0x89, 0x26, 0xa1, 0xaa, 0x44, 0x69, 0xa9, 0x5d, 0x15, - 0x09, 0x90, 0x56, 0xeb, 0xf5, 0x60, 0xaf, 0xba, 0xbb, 0xe3, 0xec, 0xcc, 0x1e, 0xda, 0x3b, 0x57, - 0xc4, 0x9f, 0x95, 0x63, 0x8f, 0x9c, 0x10, 0x24, 0x7f, 0x05, 0x37, 0xb4, 0x6f, 0x66, 0xbc, 0x33, - 0x1b, 0xc5, 0x27, 0x5f, 0x92, 0xe8, 0xcd, 0xf7, 0x7d, 0xef, 0x7b, 0xdf, 0xd3, 0x53, 0x16, 0xf6, - 0xb8, 0x60, 0x39, 0x3d, 0x9c, 0xc5, 0x99, 0xe0, 0xf3, 0xb1, 0xfc, 0x3d, 0x98, 0xe7, 0x4c, 0x30, - 0x72, 0x53, 0x15, 0xdb, 0xad, 0x29, 0x9b, 0x32, 0xac, 0x1d, 0x96, 0x7f, 0xc9, 0xe7, 0xb6, 0x62, - 0xe2, 0xcf, 0xf9, 0xf8, 0x50, 0xbc, 0x9d, 0x53, 0xc5, 0xec, 0xfe, 0xee, 0x00, 0x19, 0xd1, 0x3c, - 0xa6, 0x7c, 0x48, 0x4f, 0x0b, 0xca, 0xc5, 0xd3, 0x52, 0x89, 0x3c, 0x06, 0x77, 0x9c, 0xb0, 0xe8, - 0x4d, 0x90, 0x86, 0x22, 0x9a, 0xd1, 0x9c, 0x7b, 0x4e, 0x67, 0xbd, 0xbf, 0xf1, 0xb0, 0x35, 0x10, - 0xb3, 0x30, 0x63, 0x7c, 0xf0, 0x2c, 0x1c, 0xd3, 0xe4, 0x07, 0xf9, 0x78, 0x74, 0xed, 0xec, 0xef, - 0x83, 0xc6, 0x70, 0x13, 0x19, 0xaa, 0xc6, 0xc9, 0x03, 0x20, 0x34, 0x0b, 0xc7, 0x09, 0x0d, 0x4e, - 0x0b, 0x9a, 0xbf, 0x0d, 0xb8, 0x08, 0x05, 0xf7, 0xd6, 0x3a, 0x4e, 0xff, 0xd6, 0xb0, 0x29, 0x5f, - 0x5e, 0x96, 0x0f, 0xa3, 0xb2, 0xde, 0xfd, 0xc3, 0x81, 0x6d, 0xed, 0x83, 0xcf, 0x59, 0xc6, 0xa9, - 0x34, 0xf2, 0x35, 0xb8, 0x25, 0x3d, 0xa6, 0x93, 0x00, 0xe5, 0xb5, 0x11, 0x77, 0xa0, 0x46, 0x1e, - 0x1c, 0x95, 0x65, 0x6d, 0x41, 0x61, 0xb1, 0xc6, 0xc9, 0x57, 0xb0, 0x51, 0xef, 0xbd, 0xf1, 0x70, - 0x7b, 0xc1, 0xac, 0xda, 0x23, 0xdd, 0x19, 0xc2, 0x69, 0x65, 0x68, 0x17, 0xae, 0xa3, 0x0a, 0x71, - 0x61, 0x2d, 0x9e, 0x78, 0x4e, 0xc7, 0xe9, 0xdf, 0x1e, 0xae, 0xc5, 0x93, 0xee, 0x2f, 0xb0, 0x83, - 0xc3, 0x3f, 0x0f, 0xd3, 0x95, 0x87, 0xd6, 0x7d, 0x0d, 0xbb, 0xa6, 0xf8, 0xaa, 0x92, 0xe8, 0xfe, - 0xaa, 0x74, 0x5f, 0x87, 0x49, 0xb1, 0x7a, 0xd7, 0x3f, 0x81, 0x67, 0xa9, 0xaf, 0xcc, 0xf6, 0x7f, - 0x9b, 0x00, 0xd5, 0x96, 0x48, 0x4f, 0x59, 0xe5, 0x81, 0x82, 0xe1, 0x5a, 0xd6, 0x95, 0x1d, 0xfe, - 0x52, 0x16, 0xc9, 0xa7, 0xd0, 0x9c, 0x33, 0x2e, 0xe2, 0x6c, 0xca, 0x03, 0xc1, 0x8a, 0x68, 0x46, - 0x27, 0xb8, 0xfb, 0xf5, 0xe1, 0x1d, 0x5d, 0x7f, 0x25, 0xcb, 0xe4, 0x11, 0xec, 0xd5, 0xa1, 0x01, - 0x8f, 0xdf, 0xd1, 0x80, 0x17, 0xa9, 0xb7, 0x8e, 0x9c, 0x9d, 0x1a, 0x67, 0x14, 0xbf, 0xa3, 0xa3, - 0x22, 0x25, 0x9f, 0xc1, 0x96, 0x41, 0x0d, 0x7e, 0xa3, 0x22, 0x9a, 0x79, 0xd7, 0xea, 0x6d, 0x9e, - 0x94, 0x65, 0xcb, 0x11, 0x02, 0xe9, 0xc4, 0xbb, 0x6e, 0x43, 0x9f, 0xc8, 0xb2, 0xe5, 0x48, 0x41, - 0x2b, 0x47, 0x37, 0x6c, 0x47, 0x8a, 0xa3, 0x1d, 0x7d, 0x0e, 0x2d, 0x9b, 0x1a, 0x44, 0xac, 0xc8, - 0x84, 0x77, 0x13, 0x59, 0xc4, 0x62, 0x1d, 0x97, 0x2f, 0xe4, 0x1b, 0xb8, 0x5b, 0x63, 0x4c, 0x8a, - 0x3c, 0x14, 0x31, 0xcb, 0xb0, 0xdd, 0x2d, 0x24, 0x7a, 0x16, 0xf1, 0x44, 0x01, 0xca, 0x86, 0xdf, - 0xc2, 0x7e, 0x14, 0xa2, 0xc3, 0x85, 0x4a, 0xc4, 0xd2, 0x79, 0x4e, 0x39, 0x8f, 0x59, 0xc6, 0xbd, - 0xdb, 0xc8, 0x6f, 0x4b, 0xcc, 0x8f, 0x0a, 0x72, 0x6c, 0x20, 0xc8, 0xf7, 0xd0, 0x5d, 0xa2, 0x10, - 0xd0, 0x3c, 0x67, 0x39, 0xf7, 0x00, 0x75, 0x0e, 0xae, 0xd4, 0xf9, 0x0e, 0x61, 0xe4, 0x29, 0xdc, - 0xaf, 0x8b, 0xb1, 0x3c, 0x9e, 0xc6, 0x59, 0x98, 0x54, 0x11, 0x6e, 0xa0, 0xd6, 0x3d, 0x5b, 0xeb, - 0x85, 0x82, 0xe9, 0x24, 0x9f, 0xc1, 0x47, 0x57, 0xd9, 0x32, 0xd7, 0xf1, 0xc1, 0x32, 0x5f, 0xd5, - 0x5e, 0x9e, 0xc3, 0xc7, 0xcb, 0x86, 0x14, 0x71, 0x2a, 0xe5, 0x36, 0x51, 0xae, 0x73, 0xe5, 0x98, - 0xaf, 0xe2, 0x14, 0xf5, 0x4e, 0xc0, 0xaf, 0xeb, 0x4d, 0xa8, 0x15, 0xbc, 0x8b, 0x4a, 0xfb, 0xb6, - 0xd2, 0x89, 0x85, 0x21, 0x2f, 0x2e, 0xbb, 0xb2, 0x54, 0x74, 0xf8, 0x77, 0x50, 0xeb, 0xfe, 0x12, - 0x2d, 0x15, 0xff, 0x10, 0x3e, 0x59, 0x2e, 0xb8, 0x18, 0xb4, 0x89, 0x92, 0xdd, 0x25, 0x92, 0x7a, - 0xd4, 0x1e, 0xb8, 0x1c, 0xff, 0x2b, 0x2c, 0x0e, 0x79, 0x4b, 0x5e, 0xbc, 0xac, 0xea, 0x33, 0xfe, - 0x12, 0x76, 0x6d, 0x58, 0xb5, 0x23, 0x82, 0xf8, 0x96, 0x85, 0xd7, 0x8b, 0xa9, 0xd4, 0xf5, 0x51, - 0x6e, 0x9b, 0xea, 0xfa, 0x24, 0x2b, 0xf5, 0x4b, 0x07, 0xd9, 0x32, 0xd5, 0x6b, 0xe7, 0xf8, 0x00, - 0x88, 0x49, 0x53, 0xc7, 0xf8, 0x21, 0x32, 0x9a, 0x06, 0x43, 0x9e, 0xe2, 0x23, 0xd8, 0xb3, 0xd0, - 0xd6, 0x21, 0xee, 0xc8, 0xbb, 0x37, 0x48, 0xe6, 0x19, 0xf6, 0xc0, 0x8d, 0x66, 0x45, 0xf6, 0xa6, - 0x0a, 0x69, 0x57, 0x8e, 0x21, 0xab, 0x46, 0x48, 0x36, 0xac, 0x1a, 0xc3, 0x93, 0x63, 0x58, 0x78, - 0x23, 0x24, 0x45, 0xd3, 0x21, 0xed, 0x99, 0xea, 0x46, 0x48, 0x36, 0xac, 0x52, 0x6f, 0x9b, 0xea, - 0x97, 0x43, 0x32, 0x69, 0x2a, 0xa4, 0xbb, 0x32, 0x24, 0x83, 0xb1, 0x08, 0xc9, 0x42, 0x5b, 0x21, - 0xed, 0xcb, 0x90, 0x0c, 0x92, 0x19, 0xd2, 0x00, 0xb6, 0x53, 0x9a, 0x4f, 0x4b, 0x5f, 0x32, 0x66, - 0xd9, 0xe9, 0x1e, 0x92, 0xb6, 0xe4, 0x93, 0xfc, 0x00, 0x91, 0xad, 0x2a, 0xbc, 0xea, 0x28, 0xf1, - 0xbe, 0x89, 0x3f, 0xc6, 0x17, 0x89, 0xef, 0x43, 0x73, 0x4a, 0x45, 0x10, 0x26, 0xc9, 0xc2, 0x95, - 0x77, 0x80, 0x60, 0x77, 0x4a, 0xc5, 0xe3, 0x24, 0xd1, 0x66, 0xca, 0x40, 0x91, 0x5e, 0xe1, 0x3a, - 0x32, 0x50, 0xac, 0x6a, 0xd8, 0x51, 0xef, 0xec, 0x5f, 0xbf, 0x71, 0x76, 0xee, 0x3b, 0xef, 0xcf, - 0x7d, 0xe7, 0x9f, 0x73, 0xdf, 0xf9, 0xf3, 0xc2, 0x6f, 0xbc, 0xbf, 0xf0, 0x1b, 0x7f, 0x5d, 0xf8, - 0x8d, 0x9f, 0xf5, 0x17, 0xdf, 0xf8, 0x06, 0x7e, 0xc7, 0x7d, 0xf1, 0x7f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x1d, 0x41, 0x3e, 0x80, 0x1e, 0x0a, 0x00, 0x00, + // 627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4b, 0x6f, 0xd3, 0x40, + 0x18, 0x8c, 0x9b, 0x3e, 0xbf, 0x50, 0x37, 0xdd, 0x44, 0xad, 0xdb, 0x83, 0xa9, 0x22, 0x55, 0x2a, + 0xa8, 0x72, 0x51, 0x11, 0x07, 0xe0, 0x44, 0x2b, 0x55, 0x1c, 0x00, 0xa9, 0x0e, 0x2a, 0x12, 0x20, + 0x59, 0x7e, 0x2c, 0xb1, 0xd5, 0xc4, 0x76, 0xbc, 0xeb, 0x43, 0x7b, 0xe7, 0x8a, 0xe0, 0x5f, 0xe5, + 0xd8, 0x23, 0x27, 0x04, 0xc9, 0x1f, 0x41, 0xde, 0x47, 0xbd, 0x9b, 0x5e, 0x73, 0x69, 0xa3, 0xf9, + 0x66, 0x66, 0x67, 0xbe, 0x5d, 0xc9, 0xb0, 0x47, 0x68, 0x56, 0xe0, 0x93, 0x38, 0x49, 0x29, 0xc9, + 0x03, 0xfe, 0xdf, 0xc9, 0x8b, 0x8c, 0x66, 0x68, 0x4d, 0x80, 0xfb, 0xdd, 0x41, 0x36, 0xc8, 0x18, + 0x76, 0x52, 0xfd, 0xe2, 0xe3, 0x7d, 0xa1, 0x64, 0x7f, 0xf3, 0xe0, 0x84, 0xde, 0xe4, 0x58, 0x28, + 0x7b, 0xdf, 0x0d, 0x40, 0x7d, 0x5c, 0x24, 0x98, 0xb8, 0x78, 0x5c, 0x62, 0x42, 0xdf, 0x56, 0x4e, + 0xe8, 0x0d, 0x98, 0xc1, 0x30, 0x0b, 0xaf, 0xbd, 0x91, 0x4f, 0xc3, 0x18, 0x17, 0xc4, 0x32, 0x0e, + 0x9a, 0x47, 0xad, 0xd3, 0xae, 0x43, 0x63, 0x3f, 0xcd, 0x88, 0xf3, 0xce, 0x0f, 0xf0, 0xf0, 0x3d, + 0x1f, 0x9e, 0x2d, 0x4f, 0xfe, 0x3c, 0x6e, 0xb8, 0x9b, 0x4c, 0x21, 0x30, 0x82, 0x8e, 0x01, 0xe1, + 0xd4, 0x0f, 0x86, 0xd8, 0x1b, 0x97, 0xb8, 0xb8, 0xf1, 0x08, 0xf5, 0x29, 0xb1, 0x96, 0x0e, 0x8c, + 0xa3, 0x75, 0xb7, 0xcd, 0x27, 0x97, 0xd5, 0xa0, 0x5f, 0xe1, 0xbd, 0x1f, 0x06, 0x74, 0x64, 0x0e, + 0x92, 0x67, 0x29, 0xc1, 0x3c, 0xc8, 0x6b, 0x30, 0x2b, 0x79, 0x82, 0x23, 0x8f, 0xd9, 0xcb, 0x20, + 0xa6, 0x23, 0x2a, 0x3b, 0x67, 0x15, 0x2c, 0x23, 0x08, 0x2e, 0xc3, 0x08, 0x7a, 0x05, 0xad, 0xf9, + 0xb3, 0x5b, 0xa7, 0x9d, 0x7b, 0x65, 0x7d, 0x3c, 0x93, 0x1b, 0x2e, 0x8c, 0xeb, 0x40, 0xbb, 0xb0, + 0xc2, 0x5c, 0x90, 0x09, 0x4b, 0x49, 0x64, 0x19, 0x07, 0xc6, 0xd1, 0x86, 0xbb, 0x94, 0x44, 0xbd, + 0x2f, 0xb0, 0xc3, 0xca, 0x7f, 0xf0, 0x47, 0x0b, 0x5f, 0x5a, 0xef, 0x0a, 0x76, 0x55, 0xf3, 0x45, + 0x6d, 0xa2, 0xf7, 0x55, 0xf8, 0x5e, 0xf9, 0xc3, 0x72, 0xf1, 0xa9, 0x3f, 0x81, 0xa5, 0xb9, 0x2f, + 0x2c, 0xf6, 0xaf, 0x35, 0x80, 0xfa, 0x96, 0xd0, 0xa1, 0x88, 0x4a, 0x3c, 0x41, 0x63, 0xd7, 0xd2, + 0x14, 0x71, 0xc8, 0x25, 0x07, 0x91, 0x03, 0x9d, 0x11, 0x2e, 0x06, 0x38, 0xf2, 0x08, 0x7b, 0x51, + 0x5e, 0x98, 0x95, 0x29, 0x65, 0xd7, 0xdf, 0x74, 0xb7, 0xf9, 0x88, 0xbf, 0xb5, 0xf3, 0x6a, 0xa0, + 0xf0, 0xc3, 0xb8, 0x4c, 0xaf, 0x25, 0xbf, 0xa9, 0xf2, 0xcf, 0xd9, 0x84, 0xf3, 0x9f, 0x40, 0x3b, + 0xcf, 0x08, 0x4d, 0xd2, 0x01, 0xf1, 0x68, 0x56, 0x86, 0x31, 0x8e, 0xac, 0x65, 0x46, 0xde, 0x92, + 0xf8, 0x47, 0x0e, 0xa3, 0x97, 0xb0, 0x37, 0x4f, 0xf5, 0x48, 0x72, 0x8b, 0x3d, 0x52, 0x8e, 0xac, + 0x15, 0xa6, 0xd9, 0x99, 0xd3, 0xf4, 0x93, 0x5b, 0xdc, 0x2f, 0x47, 0xe8, 0x29, 0x6c, 0x2b, 0x52, + 0xef, 0x1b, 0xa6, 0x61, 0x6c, 0xad, 0xce, 0x1f, 0x73, 0x51, 0xc1, 0x5a, 0x22, 0x46, 0xc4, 0x91, + 0xb5, 0xa6, 0x53, 0x2f, 0x38, 0xac, 0x25, 0x12, 0xd4, 0x3a, 0xd1, 0xba, 0x9e, 0x48, 0x68, 0x64, + 0xa2, 0x67, 0xd0, 0xd5, 0xa5, 0x62, 0x51, 0x1b, 0x4c, 0x85, 0x34, 0x15, 0xdf, 0xd4, 0x21, 0x98, + 0xe2, 0x0a, 0xe4, 0x9e, 0x80, 0x5f, 0x18, 0x47, 0xe5, 0x96, 0x5e, 0xc0, 0xae, 0x4e, 0xab, 0x13, + 0xb5, 0x18, 0xbf, 0xab, 0xf1, 0x65, 0x9e, 0xda, 0x5d, 0x76, 0x7e, 0xa4, 0xba, 0xcb, 0xc6, 0xb5, + 0xfb, 0x83, 0xbe, 0x9b, 0xaa, 0xfb, 0x5c, 0xdb, 0x63, 0x40, 0xaa, 0x4c, 0x74, 0x35, 0x99, 0xa2, + 0xad, 0x28, 0xee, 0x9b, 0x8a, 0xc7, 0x23, 0x9b, 0x6e, 0xf1, 0x2c, 0x1c, 0x55, 0x9a, 0xea, 0xb4, + 0x3a, 0x4b, 0x9b, 0x67, 0xd1, 0xf8, 0x4a, 0x53, 0x21, 0x93, 0x4d, 0xb7, 0x55, 0x77, 0xa5, 0xa9, + 0x4e, 0xab, 0xdd, 0x91, 0xea, 0xfe, 0xb0, 0xa9, 0x2a, 0x13, 0x4d, 0x3b, 0xbc, 0xa9, 0xa2, 0x60, + 0x4d, 0xcf, 0x0e, 0x27, 0xff, 0xec, 0xc6, 0x64, 0x6a, 0x1b, 0x77, 0x53, 0xdb, 0xf8, 0x3b, 0xb5, + 0x8d, 0x9f, 0x33, 0xbb, 0x71, 0x37, 0xb3, 0x1b, 0xbf, 0x67, 0x76, 0xe3, 0xb3, 0xfc, 0x12, 0x05, + 0xab, 0xec, 0xfb, 0xf2, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xb5, 0x3c, 0x87, 0xb6, + 0x06, 0x00, 0x00, } func (m *SeriesRequestHints) Marshal() (dAtA []byte, err error) { @@ -733,193 +705,102 @@ func (m *QueryStats) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.MergeDuration != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.MergeDuration)) - i-- - dAtA[i] = 0x2 - i-- - dAtA[i] = 0x80 - } - if m.GetAllDuration != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.GetAllDuration)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf8 - } - if m.MergedChunksCount != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.MergedChunksCount)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf0 - } - if m.MergedSeriesCount != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.MergedSeriesCount)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe8 - } - if m.ChunksFetchDurationSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.ChunksFetchDurationSum)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xe0 - } if m.ChunksFetchCount != 0 { i = encodeVarintHints(dAtA, i, uint64(m.ChunksFetchCount)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xd8 + dAtA[i] = 0x98 } if m.ChunksFetchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.ChunksFetchedSizeSum)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xd0 + dAtA[i] = 0x90 } if m.ChunksFetched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.ChunksFetched)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xc8 + dAtA[i] = 0x88 } if m.ChunksTouchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.ChunksTouchedSizeSum)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xc0 + dAtA[i] = 0x80 } if m.ChunksTouched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.ChunksTouched)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb8 - } - if m.SeriesFetchDurationSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.SeriesFetchDurationSum)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xb0 + dAtA[i] = 0x78 } if m.SeriesFetchCount != 0 { i = encodeVarintHints(dAtA, i, uint64(m.SeriesFetchCount)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa8 + dAtA[i] = 0x70 } if m.SeriesFetchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.SeriesFetchedSizeSum)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xa0 + dAtA[i] = 0x68 } if m.SeriesFetched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.SeriesFetched)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x98 + dAtA[i] = 0x60 } if m.SeriesTouchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.SeriesTouchedSizeSum)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x90 + dAtA[i] = 0x58 } if m.SeriesTouched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.SeriesTouched)) i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x88 - } - if m.CachedPostingsDecompressionTimeSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsDecompressionTimeSum)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x80 - } - if m.CachedPostingsDecompressionErrors != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsDecompressionErrors)) - i-- - dAtA[i] = 0x78 - } - if m.CachedPostingsDecompressions != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsDecompressions)) - i-- - dAtA[i] = 0x70 - } - if m.CachedPostingsCompressionTimeSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsCompressionTimeSum)) - i-- - dAtA[i] = 0x68 - } - if m.CachedPostingsCompressedSizeSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsCompressedSizeSum)) - i-- - dAtA[i] = 0x60 - } - if m.CachedPostingsOriginalSizeSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsOriginalSizeSum)) - i-- - dAtA[i] = 0x58 - } - if m.CachedPostingsCompressionErrors != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsCompressionErrors)) - i-- dAtA[i] = 0x50 } - if m.CachedPostingsCompressions != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.CachedPostingsCompressions)) - i-- - dAtA[i] = 0x48 - } - if m.PostingsFetchDurationSum != 0 { - i = encodeVarintHints(dAtA, i, uint64(m.PostingsFetchDurationSum)) - i-- - dAtA[i] = 0x40 - } if m.PostingsFetchCount != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsFetchCount)) i-- - dAtA[i] = 0x38 + dAtA[i] = 0x48 } if m.PostingsFetchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsFetchedSizeSum)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x40 } if m.PostingsFetched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsFetched)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x38 } if m.PostingsToFetch != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsToFetch)) i-- - dAtA[i] = 0x20 + dAtA[i] = 0x30 } if m.PostingsTouchedSizeSum != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsTouchedSizeSum)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x28 } if m.PostingsTouched != 0 { i = encodeVarintHints(dAtA, i, uint64(m.PostingsTouched)) i-- + dAtA[i] = 0x20 + } + if m.MergedChunksCount != 0 { + i = encodeVarintHints(dAtA, i, uint64(m.MergedChunksCount)) + i-- + dAtA[i] = 0x18 + } + if m.MergedSeriesCount != 0 { + i = encodeVarintHints(dAtA, i, uint64(m.MergedSeriesCount)) + i-- dAtA[i] = 0x10 } if m.BlocksQueried != 0 { @@ -1060,6 +941,12 @@ func (m *QueryStats) Size() (n int) { if m.BlocksQueried != 0 { n += 1 + sovHints(uint64(m.BlocksQueried)) } + if m.MergedSeriesCount != 0 { + n += 1 + sovHints(uint64(m.MergedSeriesCount)) + } + if m.MergedChunksCount != 0 { + n += 1 + sovHints(uint64(m.MergedChunksCount)) + } if m.PostingsTouched != 0 { n += 1 + sovHints(uint64(m.PostingsTouched)) } @@ -1078,53 +965,23 @@ func (m *QueryStats) Size() (n int) { if m.PostingsFetchCount != 0 { n += 1 + sovHints(uint64(m.PostingsFetchCount)) } - if m.PostingsFetchDurationSum != 0 { - n += 1 + sovHints(uint64(m.PostingsFetchDurationSum)) - } - if m.CachedPostingsCompressions != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsCompressions)) - } - if m.CachedPostingsCompressionErrors != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsCompressionErrors)) - } - if m.CachedPostingsOriginalSizeSum != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsOriginalSizeSum)) - } - if m.CachedPostingsCompressedSizeSum != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsCompressedSizeSum)) - } - if m.CachedPostingsCompressionTimeSum != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsCompressionTimeSum)) - } - if m.CachedPostingsDecompressions != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsDecompressions)) - } - if m.CachedPostingsDecompressionErrors != 0 { - n += 1 + sovHints(uint64(m.CachedPostingsDecompressionErrors)) - } - if m.CachedPostingsDecompressionTimeSum != 0 { - n += 2 + sovHints(uint64(m.CachedPostingsDecompressionTimeSum)) - } if m.SeriesTouched != 0 { - n += 2 + sovHints(uint64(m.SeriesTouched)) + n += 1 + sovHints(uint64(m.SeriesTouched)) } if m.SeriesTouchedSizeSum != 0 { - n += 2 + sovHints(uint64(m.SeriesTouchedSizeSum)) + n += 1 + sovHints(uint64(m.SeriesTouchedSizeSum)) } if m.SeriesFetched != 0 { - n += 2 + sovHints(uint64(m.SeriesFetched)) + n += 1 + sovHints(uint64(m.SeriesFetched)) } if m.SeriesFetchedSizeSum != 0 { - n += 2 + sovHints(uint64(m.SeriesFetchedSizeSum)) + n += 1 + sovHints(uint64(m.SeriesFetchedSizeSum)) } if m.SeriesFetchCount != 0 { - n += 2 + sovHints(uint64(m.SeriesFetchCount)) - } - if m.SeriesFetchDurationSum != 0 { - n += 2 + sovHints(uint64(m.SeriesFetchDurationSum)) + n += 1 + sovHints(uint64(m.SeriesFetchCount)) } if m.ChunksTouched != 0 { - n += 2 + sovHints(uint64(m.ChunksTouched)) + n += 1 + sovHints(uint64(m.ChunksTouched)) } if m.ChunksTouchedSizeSum != 0 { n += 2 + sovHints(uint64(m.ChunksTouchedSizeSum)) @@ -1138,21 +995,6 @@ func (m *QueryStats) Size() (n int) { if m.ChunksFetchCount != 0 { n += 2 + sovHints(uint64(m.ChunksFetchCount)) } - if m.ChunksFetchDurationSum != 0 { - n += 2 + sovHints(uint64(m.ChunksFetchDurationSum)) - } - if m.MergedSeriesCount != 0 { - n += 2 + sovHints(uint64(m.MergedSeriesCount)) - } - if m.MergedChunksCount != 0 { - n += 2 + sovHints(uint64(m.MergedChunksCount)) - } - if m.GetAllDuration != 0 { - n += 2 + sovHints(uint64(m.GetAllDuration)) - } - if m.MergeDuration != 0 { - n += 2 + sovHints(uint64(m.MergeDuration)) - } return n } @@ -1854,9 +1696,9 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsTouched", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MergedSeriesCount", wireType) } - m.PostingsTouched = 0 + m.MergedSeriesCount = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1866,16 +1708,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsTouched |= int64(b&0x7F) << shift + m.MergedSeriesCount |= int64(b&0x7F) << shift if b < 0x80 { break } } case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsTouchedSizeSum", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MergedChunksCount", wireType) } - m.PostingsTouchedSizeSum = 0 + m.MergedChunksCount = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1885,16 +1727,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsTouchedSizeSum |= int64(b&0x7F) << shift + m.MergedChunksCount |= int64(b&0x7F) << shift if b < 0x80 { break } } case 4: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsToFetch", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsTouched", wireType) } - m.PostingsToFetch = 0 + m.PostingsTouched = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1904,16 +1746,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsToFetch |= int64(b&0x7F) << shift + m.PostingsTouched |= int64(b&0x7F) << shift if b < 0x80 { break } } case 5: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetched", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsTouchedSizeSum", wireType) } - m.PostingsFetched = 0 + m.PostingsTouchedSizeSum = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1923,16 +1765,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsFetched |= int64(b&0x7F) << shift + m.PostingsTouchedSizeSum |= int64(b&0x7F) << shift if b < 0x80 { break } } case 6: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetchedSizeSum", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsToFetch", wireType) } - m.PostingsFetchedSizeSum = 0 + m.PostingsToFetch = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1942,16 +1784,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsFetchedSizeSum |= int64(b&0x7F) << shift + m.PostingsToFetch |= int64(b&0x7F) << shift if b < 0x80 { break } } case 7: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetchCount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetched", wireType) } - m.PostingsFetchCount = 0 + m.PostingsFetched = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1961,16 +1803,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsFetchCount |= int64(b&0x7F) << shift + m.PostingsFetched |= int64(b&0x7F) << shift if b < 0x80 { break } } case 8: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetchDurationSum", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetchedSizeSum", wireType) } - m.PostingsFetchDurationSum = 0 + m.PostingsFetchedSizeSum = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1980,16 +1822,16 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PostingsFetchDurationSum |= int64(b&0x7F) << shift + m.PostingsFetchedSizeSum |= int64(b&0x7F) << shift if b < 0x80 { break } } case 9: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsCompressions", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PostingsFetchCount", wireType) } - m.CachedPostingsCompressions = 0 + m.PostingsFetchCount = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowHints @@ -1999,145 +1841,12 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.CachedPostingsCompressions |= int64(b&0x7F) << shift + m.PostingsFetchCount |= int64(b&0x7F) << shift if b < 0x80 { break } } case 10: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsCompressionErrors", wireType) - } - m.CachedPostingsCompressionErrors = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsCompressionErrors |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 11: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsOriginalSizeSum", wireType) - } - m.CachedPostingsOriginalSizeSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsOriginalSizeSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 12: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsCompressedSizeSum", wireType) - } - m.CachedPostingsCompressedSizeSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsCompressedSizeSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsCompressionTimeSum", wireType) - } - m.CachedPostingsCompressionTimeSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsCompressionTimeSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsDecompressions", wireType) - } - m.CachedPostingsDecompressions = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsDecompressions |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 15: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsDecompressionErrors", wireType) - } - m.CachedPostingsDecompressionErrors = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsDecompressionErrors |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 16: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CachedPostingsDecompressionTimeSum", wireType) - } - m.CachedPostingsDecompressionTimeSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.CachedPostingsDecompressionTimeSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 17: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SeriesTouched", wireType) } @@ -2156,7 +1865,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 18: + case 11: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SeriesTouchedSizeSum", wireType) } @@ -2175,7 +1884,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 19: + case 12: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SeriesFetched", wireType) } @@ -2194,7 +1903,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 20: + case 13: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SeriesFetchedSizeSum", wireType) } @@ -2213,7 +1922,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 21: + case 14: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SeriesFetchCount", wireType) } @@ -2232,26 +1941,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 22: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SeriesFetchDurationSum", wireType) - } - m.SeriesFetchDurationSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.SeriesFetchDurationSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 23: + case 15: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChunksTouched", wireType) } @@ -2270,7 +1960,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 24: + case 16: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChunksTouchedSizeSum", wireType) } @@ -2289,7 +1979,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 25: + case 17: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChunksFetched", wireType) } @@ -2308,7 +1998,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 26: + case 18: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChunksFetchedSizeSum", wireType) } @@ -2327,7 +2017,7 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 27: + case 19: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ChunksFetchCount", wireType) } @@ -2346,101 +2036,6 @@ func (m *QueryStats) Unmarshal(dAtA []byte) error { break } } - case 28: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ChunksFetchDurationSum", wireType) - } - m.ChunksFetchDurationSum = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ChunksFetchDurationSum |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 29: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MergedSeriesCount", wireType) - } - m.MergedSeriesCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MergedSeriesCount |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 30: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MergedChunksCount", wireType) - } - m.MergedChunksCount = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MergedChunksCount |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 31: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GetAllDuration", wireType) - } - m.GetAllDuration = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.GetAllDuration |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 32: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MergeDuration", wireType) - } - m.MergeDuration = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHints - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MergeDuration |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipHints(dAtA[iNdEx:]) diff --git a/pkg/store/hintspb/hints.proto b/pkg/store/hintspb/hints.proto index b17b6ac85f8..4d058b5f968 100644 --- a/pkg/store/hintspb/hints.proto +++ b/pkg/store/hintspb/hints.proto @@ -66,41 +66,25 @@ message LabelValuesResponseHints { message QueryStats { int64 blocks_queried = 1; - - int64 postings_touched = 2; - int64 postings_touched_size_sum = 3; - int64 postings_to_fetch = 4; - int64 postings_fetched = 5; - int64 postings_fetched_size_sum = 6; - int64 postings_fetch_count = 7; - int64 postings_fetch_duration_sum = 8; - - int64 cached_postings_compressions = 9; - int64 cached_postings_compression_errors = 10; - int64 cached_postings_original_size_sum = 11; - int64 cached_postings_compressed_size_sum = 12; - int64 cached_postings_compression_time_sum = 13; - int64 cached_postings_decompressions = 14; - int64 cached_postings_decompression_errors = 15; - int64 cached_postings_decompression_time_sum = 16; - - int64 series_touched = 17; - int64 series_touched_size_sum = 18; - int64 series_fetched = 19; - int64 series_fetched_size_sum = 20; - int64 series_fetch_count = 21; - int64 series_fetch_duration_sum = 22; - - int64 chunks_touched = 23; - int64 chunks_touched_size_sum = 24; - int64 chunks_fetched = 25; - int64 chunks_fetched_size_sum = 26; - int64 chunks_fetch_count = 27; - int64 chunks_fetch_duration_sum = 28; - - int64 merged_series_count = 29; - int64 merged_chunks_count = 30; - - int64 get_all_duration = 31; - int64 merge_duration = 32; + int64 merged_series_count = 2; + int64 merged_chunks_count = 3; + + int64 postings_touched = 4; + int64 postings_touched_size_sum = 5; + int64 postings_to_fetch = 6; + int64 postings_fetched = 7; + int64 postings_fetched_size_sum = 8; + int64 postings_fetch_count = 9; + + int64 series_touched = 10; + int64 series_touched_size_sum = 11; + int64 series_fetched = 12; + int64 series_fetched_size_sum = 13; + int64 series_fetch_count = 14; + + int64 chunks_touched = 15; + int64 chunks_touched_size_sum = 16; + int64 chunks_fetched = 17; + int64 chunks_fetched_size_sum = 18; + int64 chunks_fetch_count = 19; } \ No newline at end of file diff --git a/pkg/store/storepb/prompb/types.pb.go b/pkg/store/storepb/prompb/types.pb.go index f5332f345ba..43c59f60f14 100644 --- a/pkg/store/storepb/prompb/types.pb.go +++ b/pkg/store/storepb/prompb/types.pb.go @@ -347,7 +347,6 @@ func (m *Exemplar) GetTimestamp() int64 { // integer histogram as well as a float histogram. type Histogram struct { // Types that are valid to be assigned to Count: - // // *Histogram_CountInt // *Histogram_CountFloat Count isHistogram_Count `protobuf_oneof:"count"` @@ -362,7 +361,6 @@ type Histogram struct { Schema int32 `protobuf:"zigzag32,4,opt,name=schema,proto3" json:"schema,omitempty"` ZeroThreshold float64 `protobuf:"fixed64,5,opt,name=zero_threshold,json=zeroThreshold,proto3" json:"zero_threshold,omitempty"` // Types that are valid to be assigned to ZeroCount: - // // *Histogram_ZeroCountInt // *Histogram_ZeroCountFloat ZeroCount isHistogram_ZeroCount `protobuf_oneof:"zero_count"` diff --git a/pkg/store/storepb/types.pb.go b/pkg/store/storepb/types.pb.go index a87a135ba0a..bb5bf72e4bc 100644 --- a/pkg/store/storepb/types.pb.go +++ b/pkg/store/storepb/types.pb.go @@ -26,7 +26,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// / PartialResponseStrategy controls partial response handling. +/// PartialResponseStrategy controls partial response handling. type PartialResponseStrategy int32 const (