From d53a9f8a286b532b290e678966ec88c21ba65cba Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 22 Apr 2020 16:36:49 +0200 Subject: [PATCH 1/5] Added hints support to store protobuf Signed-off-by: Marco Pracucci --- pkg/store/storepb/rpc.pb.go | 241 +++++++++++++++++++++++++++--------- pkg/store/storepb/rpc.proto | 13 ++ scripts/genproto.sh | 11 +- 3 files changed, 199 insertions(+), 66 deletions(-) diff --git a/pkg/store/storepb/rpc.pb.go b/pkg/store/storepb/rpc.pb.go index dc6d835753..273a0f7adf 100644 --- a/pkg/store/storepb/rpc.pb.go +++ b/pkg/store/storepb/rpc.pb.go @@ -12,6 +12,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" prompb "github.com/thanos-io/thanos/pkg/store/storepb/prompb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -340,6 +341,10 @@ type SeriesRequest struct { PartialResponseStrategy PartialResponseStrategy `protobuf:"varint,7,opt,name=partial_response_strategy,json=partialResponseStrategy,proto3,enum=thanos.PartialResponseStrategy" json:"partial_response_strategy,omitempty"` // skip_chunks controls whether sending chunks or not in series responses. SkipChunks bool `protobuf:"varint,8,opt,name=skip_chunks,json=skipChunks,proto3" json:"skip_chunks,omitempty"` + // hints_enabled controls whether sending hints or not in the series responses. Hints + // are store implementation specific and used to carry information about how the series + // have been queried. + HintsEnabled bool `protobuf:"varint,9,opt,name=hints_enabled,json=hintsEnabled,proto3" json:"hints_enabled,omitempty"` } func (m *SeriesRequest) Reset() { *m = SeriesRequest{} } @@ -379,6 +384,7 @@ type SeriesResponse struct { // Types that are valid to be assigned to Result: // *SeriesResponse_Series // *SeriesResponse_Warning + // *SeriesResponse_Hints Result isSeriesResponse_Result `protobuf_oneof:"result"` } @@ -427,9 +433,13 @@ type SeriesResponse_Series struct { type SeriesResponse_Warning struct { Warning string `protobuf:"bytes,2,opt,name=warning,proto3,oneof" json:"warning,omitempty"` } +type SeriesResponse_Hints struct { + Hints *types.Any `protobuf:"bytes,3,opt,name=hints,proto3,oneof" json:"hints,omitempty"` +} func (*SeriesResponse_Series) isSeriesResponse_Result() {} func (*SeriesResponse_Warning) isSeriesResponse_Result() {} +func (*SeriesResponse_Hints) isSeriesResponse_Result() {} func (m *SeriesResponse) GetResult() isSeriesResponse_Result { if m != nil { @@ -452,11 +462,19 @@ func (m *SeriesResponse) GetWarning() string { return "" } +func (m *SeriesResponse) GetHints() *types.Any { + if x, ok := m.GetResult().(*SeriesResponse_Hints); ok { + return x.Hints + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*SeriesResponse) XXX_OneofWrappers() []interface{} { return []interface{}{ (*SeriesResponse_Series)(nil), (*SeriesResponse_Warning)(nil), + (*SeriesResponse_Hints)(nil), } } @@ -635,65 +653,69 @@ func init() { func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) } var fileDescriptor_77a6da22d6a3feb1 = []byte{ - // 927 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0x76, 0x7b, 0xfc, 0x5b, 0xde, 0x98, 0xd9, 0x8e, 0x93, 0x9d, 0x78, 0x25, 0xc7, 0x1a, 0x09, - 0xc9, 0x0a, 0xc8, 0x01, 0x23, 0x40, 0x20, 0x2e, 0xb6, 0xd7, 0xab, 0xb5, 0xd8, 0x38, 0xd0, 0xb6, - 0xd7, 0xfc, 0x1c, 0xcc, 0xd8, 0x69, 0x9c, 0xd1, 0xce, 0x1f, 0xd3, 0x6d, 0x92, 0x5c, 0xe1, 0x05, - 0xb8, 0xf2, 0x0e, 0xbc, 0x05, 0x97, 0x1c, 0xf7, 0x08, 0x17, 0x04, 0xc9, 0x8b, 0xa0, 0xee, 0xe9, - 0x71, 0x66, 0x96, 0x6c, 0x24, 0x94, 0x5b, 0xd7, 0xf7, 0x55, 0x77, 0x55, 0x7d, 0x5d, 0x35, 0x3d, - 0x50, 0x0e, 0x83, 0x65, 0x3b, 0x08, 0x7d, 0xee, 0xe3, 0x02, 0x3f, 0xb5, 0x3c, 0x9f, 0xd5, 0x2b, - 0xfc, 0x22, 0xa0, 0x2c, 0x02, 0xeb, 0xb5, 0x95, 0xbf, 0xf2, 0xe5, 0xf2, 0x50, 0xac, 0x14, 0x8a, - 0x83, 0xd0, 0x77, 0x83, 0xc5, 0x61, 0xc2, 0xd3, 0x7c, 0x0b, 0xb6, 0x66, 0xa1, 0xcd, 0x29, 0xa1, - 0x2c, 0xf0, 0x3d, 0x46, 0xcd, 0x9f, 0x11, 0x3c, 0x50, 0xc8, 0x0f, 0x6b, 0xca, 0x38, 0xee, 0x02, - 0x70, 0xdb, 0xa5, 0x8c, 0x86, 0x36, 0x65, 0x06, 0x6a, 0x6a, 0xad, 0x4a, 0xe7, 0xb1, 0xd8, 0xed, - 0x52, 0x7e, 0x4a, 0xd7, 0x6c, 0xbe, 0xf4, 0x83, 0x8b, 0xf6, 0xc4, 0x76, 0xe9, 0x58, 0xba, 0xf4, - 0x72, 0x97, 0x7f, 0xed, 0x67, 0x48, 0x62, 0x13, 0xde, 0x85, 0x02, 0xa7, 0x9e, 0xe5, 0x71, 0x23, - 0xdb, 0x44, 0xad, 0x32, 0x51, 0x16, 0x36, 0xa0, 0x18, 0xd2, 0xc0, 0xb1, 0x97, 0x96, 0xa1, 0x35, - 0x51, 0x4b, 0x23, 0xb1, 0x69, 0x6e, 0x41, 0x65, 0xe8, 0x7d, 0xef, 0xab, 0x1c, 0xcc, 0x3f, 0x11, - 0x3c, 0x88, 0xec, 0x28, 0x4b, 0xfc, 0x0e, 0x14, 0x1c, 0x6b, 0x41, 0x9d, 0x38, 0xa1, 0xad, 0x76, - 0x24, 0x43, 0xfb, 0xb9, 0x40, 0x55, 0x0a, 0xca, 0x05, 0xef, 0x41, 0xc9, 0xb5, 0xbd, 0xb9, 0x48, - 0x48, 0x26, 0xa0, 0x91, 0xa2, 0x6b, 0x7b, 0x22, 0x63, 0x49, 0x59, 0xe7, 0x11, 0xa5, 0x52, 0x70, - 0xad, 0x73, 0x49, 0x1d, 0x42, 0x99, 0x71, 0x3f, 0xa4, 0x93, 0x8b, 0x80, 0x1a, 0xb9, 0x26, 0x6a, - 0x55, 0x3b, 0x0f, 0xe3, 0x28, 0xe3, 0x98, 0x20, 0x37, 0x3e, 0xf8, 0x43, 0x00, 0x19, 0x70, 0xce, - 0x28, 0x67, 0x46, 0x5e, 0xe6, 0xa5, 0xa7, 0xf2, 0x1a, 0x53, 0xae, 0x52, 0x2b, 0x3b, 0xca, 0x66, - 0xe6, 0xc7, 0x50, 0x8a, 0xc9, 0xff, 0x55, 0x96, 0xf9, 0xab, 0x06, 0x5b, 0x91, 0xe4, 0xf1, 0x55, - 0x25, 0x0b, 0x45, 0x6f, 0x2e, 0x34, 0x9b, 0x2e, 0xf4, 0x23, 0x41, 0xf1, 0xe5, 0x29, 0x0d, 0x99, - 0xa1, 0xc9, 0xb0, 0xb5, 0x54, 0xd8, 0xa3, 0x88, 0x54, 0xd1, 0x37, 0xbe, 0xb8, 0x03, 0x3b, 0xe2, - 0xc8, 0x90, 0x32, 0xdf, 0x59, 0x73, 0xdb, 0xf7, 0xe6, 0x67, 0xb6, 0x77, 0xe2, 0x9f, 0x49, 0xb1, - 0x34, 0xb2, 0xed, 0x5a, 0xe7, 0x64, 0xc3, 0xcd, 0x24, 0x85, 0xdf, 0x05, 0xb0, 0x56, 0xab, 0x90, - 0xae, 0x2c, 0x4e, 0x23, 0x8d, 0xaa, 0x9d, 0x07, 0x71, 0xb4, 0xee, 0x6a, 0x15, 0x92, 0x04, 0x8f, - 0x3f, 0x85, 0xbd, 0xc0, 0x0a, 0xb9, 0x6d, 0x39, 0x22, 0x8a, 0xbc, 0xf9, 0xf9, 0x89, 0xcd, 0xac, - 0x85, 0x43, 0x4f, 0x8c, 0x42, 0x13, 0xb5, 0x4a, 0xe4, 0x91, 0x72, 0x88, 0x3b, 0xe3, 0x89, 0xa2, - 0xf1, 0xb7, 0xb7, 0xec, 0x65, 0x3c, 0xb4, 0x38, 0x5d, 0x5d, 0x18, 0x45, 0x79, 0x9d, 0xfb, 0x71, - 0xe0, 0x2f, 0xd2, 0x67, 0x8c, 0x95, 0xdb, 0x7f, 0x0e, 0x8f, 0x09, 0xbc, 0x0f, 0x15, 0xf6, 0xd2, - 0x0e, 0xe6, 0xcb, 0xd3, 0xb5, 0xf7, 0x92, 0x19, 0x25, 0x99, 0x0a, 0x08, 0xa8, 0x2f, 0x11, 0xf3, - 0x3b, 0xa8, 0xc6, 0x57, 0xa3, 0x3a, 0xb6, 0x05, 0x85, 0xcd, 0x08, 0xa1, 0x56, 0xa5, 0x53, 0xdd, - 0xf4, 0x92, 0x44, 0x9f, 0x65, 0x88, 0xe2, 0x71, 0x1d, 0x8a, 0x67, 0x56, 0xe8, 0xd9, 0xde, 0x2a, - 0x1a, 0x97, 0x67, 0x19, 0x12, 0x03, 0xbd, 0x12, 0x14, 0x42, 0xca, 0xd6, 0x0e, 0x37, 0x7f, 0x43, - 0xf0, 0x50, 0x5e, 0xcf, 0xc8, 0x72, 0x6f, 0x3a, 0xe0, 0x4e, 0xc5, 0xd0, 0x3d, 0x14, 0xcb, 0xde, - 0x4f, 0x31, 0xf3, 0x29, 0xe0, 0x64, 0xb6, 0x4a, 0x94, 0x1a, 0xe4, 0x3d, 0x01, 0xc8, 0x76, 0x2f, - 0x93, 0xc8, 0xc0, 0x75, 0x28, 0xa9, 0x7a, 0x99, 0x91, 0x95, 0xc4, 0xc6, 0x36, 0x7f, 0x47, 0xea, - 0xa0, 0x17, 0x96, 0xb3, 0xbe, 0xa9, 0xbb, 0x06, 0x79, 0x39, 0x15, 0xb2, 0xc6, 0x32, 0x89, 0x8c, - 0xbb, 0xd5, 0xc8, 0xde, 0x43, 0x0d, 0xed, 0x9e, 0x6a, 0x0c, 0x61, 0x3b, 0x55, 0x84, 0x92, 0x63, - 0x17, 0x0a, 0x3f, 0x4a, 0x44, 0xe9, 0xa1, 0xac, 0xbb, 0x04, 0x39, 0x20, 0x50, 0xde, 0x7c, 0x8d, - 0x70, 0x05, 0x8a, 0xd3, 0xd1, 0xe7, 0xa3, 0xe3, 0xd9, 0x48, 0xcf, 0xe0, 0x32, 0xe4, 0xbf, 0x9c, - 0x0e, 0xc8, 0xd7, 0x3a, 0xc2, 0x25, 0xc8, 0x91, 0xe9, 0xf3, 0x81, 0x9e, 0x15, 0x1e, 0xe3, 0xe1, - 0x93, 0x41, 0xbf, 0x4b, 0x74, 0x4d, 0x78, 0x8c, 0x27, 0xc7, 0x64, 0xa0, 0xe7, 0x04, 0x4e, 0x06, - 0xfd, 0xc1, 0xf0, 0xc5, 0x40, 0xcf, 0x1f, 0xb4, 0xe1, 0xd1, 0x1b, 0x4a, 0x12, 0x27, 0xcd, 0xba, - 0x44, 0x1d, 0xdf, 0xed, 0x1d, 0x93, 0x89, 0x8e, 0x0e, 0x7a, 0x90, 0x13, 0xb3, 0x8b, 0x8b, 0xa0, - 0x91, 0xee, 0x2c, 0xe2, 0xfa, 0xc7, 0xd3, 0xd1, 0x44, 0x47, 0x02, 0x1b, 0x4f, 0x8f, 0xf4, 0xac, - 0x58, 0x1c, 0x0d, 0x47, 0xba, 0x26, 0x17, 0xdd, 0xaf, 0xa2, 0x98, 0xd2, 0x6b, 0x40, 0xf4, 0x7c, - 0xe7, 0xa7, 0x2c, 0xe4, 0x65, 0x21, 0xf8, 0x7d, 0xc8, 0x89, 0x6f, 0x3d, 0xde, 0x8e, 0xe5, 0x4d, - 0xbc, 0x04, 0xf5, 0x5a, 0x1a, 0x54, 0xc2, 0x7d, 0x02, 0x85, 0x68, 0x8c, 0xf0, 0x4e, 0x7a, 0xac, - 0xe2, 0x6d, 0xbb, 0xaf, 0xc3, 0xd1, 0xc6, 0xf7, 0x10, 0xee, 0x03, 0xdc, 0x34, 0x26, 0xde, 0x4b, - 0x7d, 0xf9, 0x92, 0xa3, 0x55, 0xaf, 0xdf, 0x46, 0xa9, 0xf8, 0x4f, 0xa1, 0x92, 0xb8, 0x4f, 0x9c, - 0x76, 0x4d, 0x75, 0x6a, 0xfd, 0xf1, 0xad, 0x5c, 0x74, 0x4e, 0x67, 0x04, 0x55, 0xf9, 0xf6, 0x8a, - 0x16, 0x8c, 0xc4, 0xf8, 0x0c, 0x2a, 0x84, 0xba, 0x3e, 0xa7, 0x12, 0xc7, 0x9b, 0xf2, 0x93, 0x4f, - 0x74, 0x7d, 0xe7, 0x35, 0x54, 0x3d, 0xe5, 0x99, 0xde, 0xdb, 0x97, 0xff, 0x34, 0x32, 0x97, 0x57, - 0x0d, 0xf4, 0xea, 0xaa, 0x81, 0xfe, 0xbe, 0x6a, 0xa0, 0x5f, 0xae, 0x1b, 0x99, 0x57, 0xd7, 0x8d, - 0xcc, 0x1f, 0xd7, 0x8d, 0xcc, 0x37, 0x45, 0xf9, 0x76, 0x05, 0x8b, 0x45, 0x41, 0xfe, 0x0b, 0x7c, - 0xf0, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x85, 0xb9, 0xc1, 0x57, 0x08, 0x00, 0x00, + // 984 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4b, 0x6f, 0x23, 0x45, + 0x10, 0x9e, 0xf6, 0xf8, 0x59, 0x4e, 0xc2, 0x6c, 0xe7, 0xb1, 0x13, 0xaf, 0xe4, 0x44, 0x83, 0x90, + 0xac, 0xb0, 0x72, 0xc0, 0x08, 0x10, 0x88, 0x8b, 0x93, 0xf5, 0x2a, 0x11, 0x1b, 0x07, 0xda, 0xc9, + 0x86, 0xc7, 0xc1, 0x1a, 0x27, 0xbd, 0xe3, 0xd1, 0xce, 0x8b, 0xe9, 0x36, 0x89, 0xaf, 0x70, 0x47, + 0xfc, 0x10, 0x7e, 0x03, 0x17, 0x2e, 0x39, 0xee, 0x11, 0x2e, 0x08, 0x92, 0x3f, 0x82, 0xfa, 0x31, + 0x8e, 0x67, 0xc9, 0x46, 0x5a, 0xe5, 0x36, 0xf5, 0x7d, 0xd5, 0x5d, 0x55, 0x5f, 0x75, 0x75, 0x0f, + 0xd4, 0xd2, 0xe4, 0xb4, 0x9d, 0xa4, 0x31, 0x8f, 0x71, 0x99, 0x8f, 0xdd, 0x28, 0x66, 0x8d, 0x3a, + 0x9f, 0x26, 0x94, 0x29, 0xb0, 0xb1, 0xe2, 0xc5, 0x5e, 0x2c, 0x3f, 0xb7, 0xc5, 0x97, 0x46, 0x71, + 0x92, 0xc6, 0x61, 0x32, 0xda, 0x9e, 0xf7, 0x5c, 0xf7, 0xe2, 0xd8, 0x0b, 0xe8, 0xb6, 0xb4, 0x46, + 0x93, 0x17, 0xdb, 0x6e, 0x34, 0x55, 0x94, 0xf3, 0x0e, 0x2c, 0x9e, 0xa4, 0x3e, 0xa7, 0x84, 0xb2, + 0x24, 0x8e, 0x18, 0x75, 0x7e, 0x46, 0xb0, 0xa0, 0x91, 0x1f, 0x26, 0x94, 0x71, 0xdc, 0x05, 0xe0, + 0x7e, 0x48, 0x19, 0x4d, 0x7d, 0xca, 0x6c, 0xb4, 0x69, 0xb6, 0xea, 0x9d, 0x47, 0x62, 0x75, 0x48, + 0xf9, 0x98, 0x4e, 0xd8, 0xf0, 0x34, 0x4e, 0xa6, 0xed, 0x23, 0x3f, 0xa4, 0x03, 0xe9, 0xb2, 0x53, + 0xbc, 0xfc, 0x7b, 0xc3, 0x20, 0x73, 0x8b, 0xf0, 0x1a, 0x94, 0x39, 0x8d, 0xdc, 0x88, 0xdb, 0x85, + 0x4d, 0xd4, 0xaa, 0x11, 0x6d, 0x61, 0x1b, 0x2a, 0x29, 0x4d, 0x02, 0xff, 0xd4, 0xb5, 0xcd, 0x4d, + 0xd4, 0x32, 0x49, 0x66, 0x3a, 0x8b, 0x50, 0xdf, 0x8f, 0x5e, 0xc4, 0x3a, 0x07, 0xe7, 0x2f, 0x04, + 0x0b, 0xca, 0x56, 0x59, 0xe2, 0xf7, 0xa1, 0x1c, 0xb8, 0x23, 0x1a, 0x64, 0x09, 0x2d, 0xb6, 0x95, + 0x42, 0xed, 0x67, 0x02, 0xd5, 0x29, 0x68, 0x17, 0xbc, 0x0e, 0xd5, 0xd0, 0x8f, 0x86, 0x22, 0x21, + 0x99, 0x80, 0x49, 0x2a, 0xa1, 0x1f, 0x89, 0x8c, 0x25, 0xe5, 0x5e, 0x28, 0x4a, 0xa7, 0x10, 0xba, + 0x17, 0x92, 0xda, 0x86, 0x1a, 0xe3, 0x71, 0x4a, 0x8f, 0xa6, 0x09, 0xb5, 0x8b, 0x9b, 0xa8, 0xb5, + 0xd4, 0x79, 0x90, 0x45, 0x19, 0x64, 0x04, 0xb9, 0xf1, 0xc1, 0x1f, 0x03, 0xc8, 0x80, 0x43, 0x46, + 0x39, 0xb3, 0x4b, 0x32, 0x2f, 0x2b, 0x97, 0xd7, 0x80, 0x72, 0x9d, 0x5a, 0x2d, 0xd0, 0x36, 0x73, + 0x3e, 0x85, 0x6a, 0x46, 0xbe, 0x55, 0x59, 0xce, 0xef, 0x26, 0x2c, 0x2a, 0xc9, 0xb3, 0x56, 0xcd, + 0x17, 0x8a, 0xde, 0x5c, 0x68, 0x21, 0x5f, 0xe8, 0x27, 0x82, 0xe2, 0xa7, 0x63, 0x9a, 0x32, 0xdb, + 0x94, 0x61, 0x57, 0x72, 0x61, 0x0f, 0x14, 0xa9, 0xa3, 0xcf, 0x7c, 0x71, 0x07, 0x56, 0xc5, 0x96, + 0x29, 0x65, 0x71, 0x30, 0xe1, 0x7e, 0x1c, 0x0d, 0xcf, 0xfd, 0xe8, 0x2c, 0x3e, 0x97, 0x62, 0x99, + 0x64, 0x39, 0x74, 0x2f, 0xc8, 0x8c, 0x3b, 0x91, 0x14, 0x7e, 0x0c, 0xe0, 0x7a, 0x5e, 0x4a, 0x3d, + 0x97, 0x53, 0xa5, 0xd1, 0x52, 0x67, 0x21, 0x8b, 0xd6, 0xf5, 0xbc, 0x94, 0xcc, 0xf1, 0xf8, 0x73, + 0x58, 0x4f, 0xdc, 0x94, 0xfb, 0x6e, 0x20, 0xa2, 0xc8, 0xce, 0x0f, 0xcf, 0x7c, 0xe6, 0x8e, 0x02, + 0x7a, 0x66, 0x97, 0x37, 0x51, 0xab, 0x4a, 0x1e, 0x6a, 0x87, 0xec, 0x64, 0x3c, 0xd1, 0x34, 0xfe, + 0xfe, 0x96, 0xb5, 0x8c, 0xa7, 0x2e, 0xa7, 0xde, 0xd4, 0xae, 0xc8, 0x76, 0x6e, 0x64, 0x81, 0xbf, + 0xca, 0xef, 0x31, 0xd0, 0x6e, 0xff, 0xdb, 0x3c, 0x23, 0xf0, 0x06, 0xd4, 0xd9, 0x4b, 0x3f, 0x19, + 0x9e, 0x8e, 0x27, 0xd1, 0x4b, 0x66, 0x57, 0x65, 0x2a, 0x20, 0xa0, 0x5d, 0x89, 0xe0, 0x77, 0x61, + 0x71, 0xec, 0x47, 0x9c, 0x0d, 0x69, 0xa4, 0xb2, 0xad, 0x49, 0x97, 0x05, 0x09, 0xf6, 0x14, 0xe6, + 0xfc, 0x82, 0x60, 0x29, 0x6b, 0xa0, 0x3e, 0xd7, 0x2d, 0x28, 0xcf, 0x06, 0x0d, 0xb5, 0xea, 0x9d, + 0xa5, 0xd9, 0x89, 0x93, 0xe8, 0x9e, 0x41, 0x34, 0x8f, 0x1b, 0x50, 0x39, 0x77, 0xd3, 0xc8, 0x8f, + 0x3c, 0x35, 0x54, 0x7b, 0x06, 0xc9, 0x00, 0xfc, 0x18, 0x4a, 0x32, 0x90, 0x3c, 0xd2, 0xa2, 0x9d, + 0x6a, 0xfe, 0xdb, 0xd9, 0xfc, 0xb7, 0xbb, 0xd1, 0x74, 0xcf, 0x20, 0xca, 0x69, 0xa7, 0x0a, 0xe5, + 0x94, 0xb2, 0x49, 0xc0, 0x9d, 0xdf, 0x10, 0x3c, 0x90, 0x2d, 0xef, 0xbb, 0xe1, 0xcd, 0xa9, 0xba, + 0xb3, 0x0b, 0xe8, 0x1e, 0x5d, 0x28, 0xdc, 0xaf, 0x0b, 0xce, 0x53, 0xc0, 0xf3, 0xd9, 0x6a, 0x09, + 0x57, 0xa0, 0x14, 0x09, 0x40, 0x8e, 0x50, 0x8d, 0x28, 0x03, 0x37, 0xa0, 0xaa, 0xd5, 0x61, 0x76, + 0x41, 0x12, 0x33, 0xdb, 0xf9, 0x03, 0xe9, 0x8d, 0x9e, 0xbb, 0xc1, 0xe4, 0xa6, 0xee, 0x15, 0x28, + 0xc9, 0x49, 0x93, 0x35, 0xd6, 0x88, 0x32, 0xee, 0x56, 0xa3, 0x70, 0x0f, 0x35, 0xcc, 0x7b, 0xaa, + 0xb1, 0x0f, 0xcb, 0xb9, 0x22, 0xb4, 0x1c, 0x6b, 0x50, 0xfe, 0x51, 0x22, 0x5a, 0x0f, 0x6d, 0xdd, + 0x25, 0xc8, 0x16, 0x81, 0xda, 0xec, 0x86, 0xc3, 0x75, 0xa8, 0x1c, 0xf7, 0xbf, 0xec, 0x1f, 0x9e, + 0xf4, 0x2d, 0x03, 0xd7, 0xa0, 0xf4, 0xf5, 0x71, 0x8f, 0x7c, 0x6b, 0x21, 0x5c, 0x85, 0x22, 0x39, + 0x7e, 0xd6, 0xb3, 0x0a, 0xc2, 0x63, 0xb0, 0xff, 0xa4, 0xb7, 0xdb, 0x25, 0x96, 0x29, 0x3c, 0x06, + 0x47, 0x87, 0xa4, 0x67, 0x15, 0x05, 0x4e, 0x7a, 0xbb, 0xbd, 0xfd, 0xe7, 0x3d, 0xab, 0xb4, 0xd5, + 0x86, 0x87, 0x6f, 0x28, 0x49, 0xec, 0x74, 0xd2, 0x25, 0x7a, 0xfb, 0xee, 0xce, 0x21, 0x39, 0xb2, + 0xd0, 0xd6, 0x0e, 0x14, 0xc5, 0x7d, 0x80, 0x2b, 0x60, 0x92, 0xee, 0x89, 0xe2, 0x76, 0x0f, 0x8f, + 0xfb, 0x47, 0x16, 0x12, 0xd8, 0xe0, 0xf8, 0xc0, 0x2a, 0x88, 0x8f, 0x83, 0xfd, 0xbe, 0x65, 0xca, + 0x8f, 0xee, 0x37, 0x2a, 0xa6, 0xf4, 0xea, 0x11, 0xab, 0xd4, 0xf9, 0xa9, 0x00, 0x25, 0x59, 0x08, + 0xfe, 0x10, 0x8a, 0xe2, 0xfd, 0xc0, 0xcb, 0x99, 0xbc, 0x73, 0xaf, 0x4b, 0x63, 0x25, 0x0f, 0x6a, + 0xe1, 0x3e, 0x83, 0xb2, 0x1a, 0x3a, 0xbc, 0x9a, 0x1f, 0xc2, 0x6c, 0xd9, 0xda, 0xeb, 0xb0, 0x5a, + 0xf8, 0x01, 0xc2, 0xbb, 0x00, 0x37, 0x07, 0x13, 0xaf, 0xe7, 0x6e, 0xd3, 0xf9, 0xd1, 0x6a, 0x34, + 0x6e, 0xa3, 0x74, 0xfc, 0xa7, 0x50, 0x9f, 0xeb, 0x27, 0xce, 0xbb, 0xe6, 0x4e, 0x6a, 0xe3, 0xd1, + 0xad, 0x9c, 0xda, 0xa7, 0xd3, 0x87, 0x25, 0xf9, 0x9e, 0x8b, 0x23, 0xa8, 0xc4, 0xf8, 0x02, 0xea, + 0x84, 0x86, 0x31, 0xa7, 0x12, 0xc7, 0xb3, 0xf2, 0xe7, 0x9f, 0xfd, 0xc6, 0xea, 0x6b, 0xa8, 0xfe, + 0x3d, 0x30, 0x76, 0xde, 0xbb, 0xfc, 0xb7, 0x69, 0x5c, 0x5e, 0x35, 0xd1, 0xab, 0xab, 0x26, 0xfa, + 0xe7, 0xaa, 0x89, 0x7e, 0xbd, 0x6e, 0x1a, 0xaf, 0xae, 0x9b, 0xc6, 0x9f, 0xd7, 0x4d, 0xe3, 0xbb, + 0x8a, 0x7c, 0x0f, 0x93, 0xd1, 0xa8, 0x2c, 0x2f, 0x9b, 0x8f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, + 0xd8, 0xca, 0x6b, 0xe1, 0xc6, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1226,6 +1248,16 @@ func (m *SeriesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.HintsEnabled { + i-- + if m.HintsEnabled { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x48 + } if m.SkipChunks { i-- if m.SkipChunks { @@ -1368,6 +1400,27 @@ func (m *SeriesResponse_Warning) MarshalToSizedBuffer(dAtA []byte) (int, error) dAtA[i] = 0x12 return len(dAtA) - i, nil } +func (m *SeriesResponse_Hints) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SeriesResponse_Hints) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.Hints != nil { + { + size, err := m.Hints.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintRpc(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + return len(dAtA) - i, nil +} func (m *LabelNamesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1666,6 +1719,9 @@ func (m *SeriesRequest) Size() (n int) { if m.SkipChunks { n += 2 } + if m.HintsEnabled { + n += 2 + } return n } @@ -1703,6 +1759,18 @@ func (m *SeriesResponse_Warning) Size() (n int) { n += 1 + l + sovRpc(uint64(l)) return n } +func (m *SeriesResponse_Hints) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Hints != nil { + l = m.Hints.Size() + n += 1 + l + sovRpc(uint64(l)) + } + return n +} func (m *LabelNamesRequest) Size() (n int) { if m == nil { return 0 @@ -2542,6 +2610,26 @@ func (m *SeriesRequest) Unmarshal(dAtA []byte) error { } } m.SkipChunks = bool(v != 0) + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field HintsEnabled", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.HintsEnabled = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(dAtA[iNdEx:]) @@ -2662,6 +2750,41 @@ func (m *SeriesResponse) Unmarshal(dAtA []byte) error { } m.Result = &SeriesResponse_Warning{string(dAtA[iNdEx:postIndex])} iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hints", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRpc + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRpc + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &types.Any{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Result = &SeriesResponse_Hints{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRpc(dAtA[iNdEx:]) diff --git a/pkg/store/storepb/rpc.proto b/pkg/store/storepb/rpc.proto index 4aba405741..39f9b53855 100644 --- a/pkg/store/storepb/rpc.proto +++ b/pkg/store/storepb/rpc.proto @@ -7,6 +7,7 @@ package thanos; import "types.proto"; import "gogoproto/gogo.proto"; import "prompb/types.proto"; +import "google/protobuf/any.proto"; option go_package = "storepb"; @@ -114,6 +115,11 @@ message SeriesRequest { // skip_chunks controls whether sending chunks or not in series responses. bool skip_chunks = 8; + + // hints_enabled controls whether sending hints or not in the series responses. Hints + // are store implementation specific and used to carry information about how the series + // have been queried. + bool hints_enabled = 9; } enum Aggr { @@ -132,6 +138,13 @@ message SeriesResponse { /// warning is considered an information piece in place of series for warning purposes. /// It is used to warn query customer about suspicious cases or partial response (if enabled). string warning = 2; + + /// hints in an opaque data structure that can be used to carry information about how the series + /// have been queried. The content of this field and whether it's supported depends on the + /// implementation of a specific store. It's also implementation specific if it's allowed that + /// multiple SeriesResponse frames contain hints for a single Series() request and how should they + /// be handled in such case (ie. merged vs keep the first/last one). + google.protobuf.Any hints = 3; } } diff --git a/scripts/genproto.sh b/scripts/genproto.sh index c5660502a7..2cf23474d3 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -29,17 +29,14 @@ DIRS="pkg/store/storepb pkg/store/storepb/prompb" echo "generating code" for dir in ${DIRS}; do pushd ${dir} - ${PROTOC_BIN} --gogofast_out=plugins=grpc:. \ + ${PROTOC_BIN} --gogofast_out=\ +Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\ +Mprompb/types.proto=github.com/thanos-io/thanos/pkg/store/storepb/prompb,\ +plugins=grpc:. \ -I=. \ -I="${GOGOPROTO_PATH}" \ *.proto - sed -i.bak -E 's/import _ \"gogoproto\"//g' *.pb.go - sed -i.bak -E 's/import _ \"google\/protobuf\"//g' *.pb.go - # Hacky hack. - sed -i.bak -E 's/prompb \"prompb\"/prompb \"github.com\/thanos-io\/thanos\/pkg\/store\/storepb\/prompb\"/g' *.pb.go - - rm -f *.bak ${GOIMPORTS_BIN} -w *.pb.go popd done From 2a8a54194b493ec06a51f60f0f006b05ec92521e Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 22 Apr 2020 16:54:14 +0200 Subject: [PATCH 2/5] Updated CHANGELOG Signed-off-by: Marco Pracucci --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fe87b6c0..5ed8fb2e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,15 @@ We use *breaking* word for marking changes that are not backward compatible (rel - [#2501](https://github.com/thanos-io/thanos/pull/2501) Query: gracefully handle additional fields in `SeriesResponse` protobuf message that may be added in the future. +### Added + +- [#2502](https://github.com/thanos-io/thanos/pull/2502) Added `hints_enabled` proto field to `SeriesRequest` and `hints` field to `SeriesResponse`. Hints in an opaque data structure that can be used to carry information about how the series and its content is implementation specific. + ### Changed - [#2505](https://github.com/thanos.io/thanos/pull/2505) Store: remove obsolete `thanos_store_node_info` metric. + ## [v0.12.1](https://github.com/thanos-io/thanos/releases/tag/v0.12.1) - 2020.04.20 ### Fixed From bc5b4905b4c670baa2055b605667564fa6054792 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 22 Apr 2020 18:36:47 +0200 Subject: [PATCH 3/5] Reworded hints doc Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- pkg/store/storepb/rpc.proto | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed8fb2e6d..6109598efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel ### Added -- [#2502](https://github.com/thanos-io/thanos/pull/2502) Added `hints_enabled` proto field to `SeriesRequest` and `hints` field to `SeriesResponse`. Hints in an opaque data structure that can be used to carry information about how the series and its content is implementation specific. +- [#2502](https://github.com/thanos-io/thanos/pull/2502) Added `hints_enabled` proto field to `SeriesRequest` and `hints` field to `SeriesResponse`. Hints in an opaque data structure that can be used to carry additional information from the store and its content is implementation specific. ### Changed diff --git a/pkg/store/storepb/rpc.proto b/pkg/store/storepb/rpc.proto index 39f9b53855..a6fce8f2f1 100644 --- a/pkg/store/storepb/rpc.proto +++ b/pkg/store/storepb/rpc.proto @@ -139,8 +139,8 @@ message SeriesResponse { /// It is used to warn query customer about suspicious cases or partial response (if enabled). string warning = 2; - /// hints in an opaque data structure that can be used to carry information about how the series - /// have been queried. The content of this field and whether it's supported depends on the + /// hints is an opaque data structure that can be used to carry additional information from + /// the store. The content of this field and whether it's supported depends on the /// implementation of a specific store. It's also implementation specific if it's allowed that /// multiple SeriesResponse frames contain hints for a single Series() request and how should they /// be handled in such case (ie. merged vs keep the first/last one). From 6b0f095457aedb2e8704e5e12a471319ff7770f3 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 23 Apr 2020 10:15:17 +0200 Subject: [PATCH 4/5] Removed hints_enabled from SeriesRequest Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- pkg/store/storepb/rpc.pb.go | 162 ++++++++++++++---------------------- pkg/store/storepb/rpc.proto | 5 -- 3 files changed, 63 insertions(+), 106 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6109598efa..1c66e5071f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel ### Added -- [#2502](https://github.com/thanos-io/thanos/pull/2502) Added `hints_enabled` proto field to `SeriesRequest` and `hints` field to `SeriesResponse`. Hints in an opaque data structure that can be used to carry additional information from the store and its content is implementation specific. +- [#2502](https://github.com/thanos-io/thanos/pull/2502) Added `hints` field to `SeriesResponse`. Hints in an opaque data structure that can be used to carry additional information from the store and its content is implementation specific. ### Changed diff --git a/pkg/store/storepb/rpc.pb.go b/pkg/store/storepb/rpc.pb.go index 273a0f7adf..ee79ba2419 100644 --- a/pkg/store/storepb/rpc.pb.go +++ b/pkg/store/storepb/rpc.pb.go @@ -341,10 +341,6 @@ type SeriesRequest struct { PartialResponseStrategy PartialResponseStrategy `protobuf:"varint,7,opt,name=partial_response_strategy,json=partialResponseStrategy,proto3,enum=thanos.PartialResponseStrategy" json:"partial_response_strategy,omitempty"` // skip_chunks controls whether sending chunks or not in series responses. SkipChunks bool `protobuf:"varint,8,opt,name=skip_chunks,json=skipChunks,proto3" json:"skip_chunks,omitempty"` - // hints_enabled controls whether sending hints or not in the series responses. Hints - // are store implementation specific and used to carry information about how the series - // have been queried. - HintsEnabled bool `protobuf:"varint,9,opt,name=hints_enabled,json=hintsEnabled,proto3" json:"hints_enabled,omitempty"` } func (m *SeriesRequest) Reset() { *m = SeriesRequest{} } @@ -653,69 +649,68 @@ func init() { func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) } var fileDescriptor_77a6da22d6a3feb1 = []byte{ - // 984 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4b, 0x6f, 0x23, 0x45, - 0x10, 0x9e, 0xf6, 0xf8, 0x59, 0x4e, 0xc2, 0x6c, 0xe7, 0xb1, 0x13, 0xaf, 0xe4, 0x44, 0x83, 0x90, - 0xac, 0xb0, 0x72, 0xc0, 0x08, 0x10, 0x88, 0x8b, 0x93, 0xf5, 0x2a, 0x11, 0x1b, 0x07, 0xda, 0xc9, - 0x86, 0xc7, 0xc1, 0x1a, 0x27, 0xbd, 0xe3, 0xd1, 0xce, 0x8b, 0xe9, 0x36, 0x89, 0xaf, 0x70, 0x47, - 0xfc, 0x10, 0x7e, 0x03, 0x17, 0x2e, 0x39, 0xee, 0x11, 0x2e, 0x08, 0x92, 0x3f, 0x82, 0xfa, 0x31, - 0x8e, 0x67, 0xc9, 0x46, 0x5a, 0xe5, 0x36, 0xf5, 0x7d, 0xd5, 0x5d, 0x55, 0x5f, 0x75, 0x75, 0x0f, - 0xd4, 0xd2, 0xe4, 0xb4, 0x9d, 0xa4, 0x31, 0x8f, 0x71, 0x99, 0x8f, 0xdd, 0x28, 0x66, 0x8d, 0x3a, - 0x9f, 0x26, 0x94, 0x29, 0xb0, 0xb1, 0xe2, 0xc5, 0x5e, 0x2c, 0x3f, 0xb7, 0xc5, 0x97, 0x46, 0x71, - 0x92, 0xc6, 0x61, 0x32, 0xda, 0x9e, 0xf7, 0x5c, 0xf7, 0xe2, 0xd8, 0x0b, 0xe8, 0xb6, 0xb4, 0x46, - 0x93, 0x17, 0xdb, 0x6e, 0x34, 0x55, 0x94, 0xf3, 0x0e, 0x2c, 0x9e, 0xa4, 0x3e, 0xa7, 0x84, 0xb2, - 0x24, 0x8e, 0x18, 0x75, 0x7e, 0x46, 0xb0, 0xa0, 0x91, 0x1f, 0x26, 0x94, 0x71, 0xdc, 0x05, 0xe0, - 0x7e, 0x48, 0x19, 0x4d, 0x7d, 0xca, 0x6c, 0xb4, 0x69, 0xb6, 0xea, 0x9d, 0x47, 0x62, 0x75, 0x48, - 0xf9, 0x98, 0x4e, 0xd8, 0xf0, 0x34, 0x4e, 0xa6, 0xed, 0x23, 0x3f, 0xa4, 0x03, 0xe9, 0xb2, 0x53, - 0xbc, 0xfc, 0x7b, 0xc3, 0x20, 0x73, 0x8b, 0xf0, 0x1a, 0x94, 0x39, 0x8d, 0xdc, 0x88, 0xdb, 0x85, - 0x4d, 0xd4, 0xaa, 0x11, 0x6d, 0x61, 0x1b, 0x2a, 0x29, 0x4d, 0x02, 0xff, 0xd4, 0xb5, 0xcd, 0x4d, - 0xd4, 0x32, 0x49, 0x66, 0x3a, 0x8b, 0x50, 0xdf, 0x8f, 0x5e, 0xc4, 0x3a, 0x07, 0xe7, 0x2f, 0x04, - 0x0b, 0xca, 0x56, 0x59, 0xe2, 0xf7, 0xa1, 0x1c, 0xb8, 0x23, 0x1a, 0x64, 0x09, 0x2d, 0xb6, 0x95, - 0x42, 0xed, 0x67, 0x02, 0xd5, 0x29, 0x68, 0x17, 0xbc, 0x0e, 0xd5, 0xd0, 0x8f, 0x86, 0x22, 0x21, - 0x99, 0x80, 0x49, 0x2a, 0xa1, 0x1f, 0x89, 0x8c, 0x25, 0xe5, 0x5e, 0x28, 0x4a, 0xa7, 0x10, 0xba, - 0x17, 0x92, 0xda, 0x86, 0x1a, 0xe3, 0x71, 0x4a, 0x8f, 0xa6, 0x09, 0xb5, 0x8b, 0x9b, 0xa8, 0xb5, - 0xd4, 0x79, 0x90, 0x45, 0x19, 0x64, 0x04, 0xb9, 0xf1, 0xc1, 0x1f, 0x03, 0xc8, 0x80, 0x43, 0x46, - 0x39, 0xb3, 0x4b, 0x32, 0x2f, 0x2b, 0x97, 0xd7, 0x80, 0x72, 0x9d, 0x5a, 0x2d, 0xd0, 0x36, 0x73, - 0x3e, 0x85, 0x6a, 0x46, 0xbe, 0x55, 0x59, 0xce, 0xef, 0x26, 0x2c, 0x2a, 0xc9, 0xb3, 0x56, 0xcd, - 0x17, 0x8a, 0xde, 0x5c, 0x68, 0x21, 0x5f, 0xe8, 0x27, 0x82, 0xe2, 0xa7, 0x63, 0x9a, 0x32, 0xdb, - 0x94, 0x61, 0x57, 0x72, 0x61, 0x0f, 0x14, 0xa9, 0xa3, 0xcf, 0x7c, 0x71, 0x07, 0x56, 0xc5, 0x96, - 0x29, 0x65, 0x71, 0x30, 0xe1, 0x7e, 0x1c, 0x0d, 0xcf, 0xfd, 0xe8, 0x2c, 0x3e, 0x97, 0x62, 0x99, - 0x64, 0x39, 0x74, 0x2f, 0xc8, 0x8c, 0x3b, 0x91, 0x14, 0x7e, 0x0c, 0xe0, 0x7a, 0x5e, 0x4a, 0x3d, - 0x97, 0x53, 0xa5, 0xd1, 0x52, 0x67, 0x21, 0x8b, 0xd6, 0xf5, 0xbc, 0x94, 0xcc, 0xf1, 0xf8, 0x73, - 0x58, 0x4f, 0xdc, 0x94, 0xfb, 0x6e, 0x20, 0xa2, 0xc8, 0xce, 0x0f, 0xcf, 0x7c, 0xe6, 0x8e, 0x02, - 0x7a, 0x66, 0x97, 0x37, 0x51, 0xab, 0x4a, 0x1e, 0x6a, 0x87, 0xec, 0x64, 0x3c, 0xd1, 0x34, 0xfe, - 0xfe, 0x96, 0xb5, 0x8c, 0xa7, 0x2e, 0xa7, 0xde, 0xd4, 0xae, 0xc8, 0x76, 0x6e, 0x64, 0x81, 0xbf, - 0xca, 0xef, 0x31, 0xd0, 0x6e, 0xff, 0xdb, 0x3c, 0x23, 0xf0, 0x06, 0xd4, 0xd9, 0x4b, 0x3f, 0x19, - 0x9e, 0x8e, 0x27, 0xd1, 0x4b, 0x66, 0x57, 0x65, 0x2a, 0x20, 0xa0, 0x5d, 0x89, 0xe0, 0x77, 0x61, - 0x71, 0xec, 0x47, 0x9c, 0x0d, 0x69, 0xa4, 0xb2, 0xad, 0x49, 0x97, 0x05, 0x09, 0xf6, 0x14, 0xe6, - 0xfc, 0x82, 0x60, 0x29, 0x6b, 0xa0, 0x3e, 0xd7, 0x2d, 0x28, 0xcf, 0x06, 0x0d, 0xb5, 0xea, 0x9d, - 0xa5, 0xd9, 0x89, 0x93, 0xe8, 0x9e, 0x41, 0x34, 0x8f, 0x1b, 0x50, 0x39, 0x77, 0xd3, 0xc8, 0x8f, - 0x3c, 0x35, 0x54, 0x7b, 0x06, 0xc9, 0x00, 0xfc, 0x18, 0x4a, 0x32, 0x90, 0x3c, 0xd2, 0xa2, 0x9d, - 0x6a, 0xfe, 0xdb, 0xd9, 0xfc, 0xb7, 0xbb, 0xd1, 0x74, 0xcf, 0x20, 0xca, 0x69, 0xa7, 0x0a, 0xe5, - 0x94, 0xb2, 0x49, 0xc0, 0x9d, 0xdf, 0x10, 0x3c, 0x90, 0x2d, 0xef, 0xbb, 0xe1, 0xcd, 0xa9, 0xba, - 0xb3, 0x0b, 0xe8, 0x1e, 0x5d, 0x28, 0xdc, 0xaf, 0x0b, 0xce, 0x53, 0xc0, 0xf3, 0xd9, 0x6a, 0x09, - 0x57, 0xa0, 0x14, 0x09, 0x40, 0x8e, 0x50, 0x8d, 0x28, 0x03, 0x37, 0xa0, 0xaa, 0xd5, 0x61, 0x76, - 0x41, 0x12, 0x33, 0xdb, 0xf9, 0x03, 0xe9, 0x8d, 0x9e, 0xbb, 0xc1, 0xe4, 0xa6, 0xee, 0x15, 0x28, - 0xc9, 0x49, 0x93, 0x35, 0xd6, 0x88, 0x32, 0xee, 0x56, 0xa3, 0x70, 0x0f, 0x35, 0xcc, 0x7b, 0xaa, - 0xb1, 0x0f, 0xcb, 0xb9, 0x22, 0xb4, 0x1c, 0x6b, 0x50, 0xfe, 0x51, 0x22, 0x5a, 0x0f, 0x6d, 0xdd, - 0x25, 0xc8, 0x16, 0x81, 0xda, 0xec, 0x86, 0xc3, 0x75, 0xa8, 0x1c, 0xf7, 0xbf, 0xec, 0x1f, 0x9e, - 0xf4, 0x2d, 0x03, 0xd7, 0xa0, 0xf4, 0xf5, 0x71, 0x8f, 0x7c, 0x6b, 0x21, 0x5c, 0x85, 0x22, 0x39, - 0x7e, 0xd6, 0xb3, 0x0a, 0xc2, 0x63, 0xb0, 0xff, 0xa4, 0xb7, 0xdb, 0x25, 0x96, 0x29, 0x3c, 0x06, - 0x47, 0x87, 0xa4, 0x67, 0x15, 0x05, 0x4e, 0x7a, 0xbb, 0xbd, 0xfd, 0xe7, 0x3d, 0xab, 0xb4, 0xd5, - 0x86, 0x87, 0x6f, 0x28, 0x49, 0xec, 0x74, 0xd2, 0x25, 0x7a, 0xfb, 0xee, 0xce, 0x21, 0x39, 0xb2, - 0xd0, 0xd6, 0x0e, 0x14, 0xc5, 0x7d, 0x80, 0x2b, 0x60, 0x92, 0xee, 0x89, 0xe2, 0x76, 0x0f, 0x8f, - 0xfb, 0x47, 0x16, 0x12, 0xd8, 0xe0, 0xf8, 0xc0, 0x2a, 0x88, 0x8f, 0x83, 0xfd, 0xbe, 0x65, 0xca, - 0x8f, 0xee, 0x37, 0x2a, 0xa6, 0xf4, 0xea, 0x11, 0xab, 0xd4, 0xf9, 0xa9, 0x00, 0x25, 0x59, 0x08, - 0xfe, 0x10, 0x8a, 0xe2, 0xfd, 0xc0, 0xcb, 0x99, 0xbc, 0x73, 0xaf, 0x4b, 0x63, 0x25, 0x0f, 0x6a, - 0xe1, 0x3e, 0x83, 0xb2, 0x1a, 0x3a, 0xbc, 0x9a, 0x1f, 0xc2, 0x6c, 0xd9, 0xda, 0xeb, 0xb0, 0x5a, - 0xf8, 0x01, 0xc2, 0xbb, 0x00, 0x37, 0x07, 0x13, 0xaf, 0xe7, 0x6e, 0xd3, 0xf9, 0xd1, 0x6a, 0x34, - 0x6e, 0xa3, 0x74, 0xfc, 0xa7, 0x50, 0x9f, 0xeb, 0x27, 0xce, 0xbb, 0xe6, 0x4e, 0x6a, 0xe3, 0xd1, - 0xad, 0x9c, 0xda, 0xa7, 0xd3, 0x87, 0x25, 0xf9, 0x9e, 0x8b, 0x23, 0xa8, 0xc4, 0xf8, 0x02, 0xea, - 0x84, 0x86, 0x31, 0xa7, 0x12, 0xc7, 0xb3, 0xf2, 0xe7, 0x9f, 0xfd, 0xc6, 0xea, 0x6b, 0xa8, 0xfe, - 0x3d, 0x30, 0x76, 0xde, 0xbb, 0xfc, 0xb7, 0x69, 0x5c, 0x5e, 0x35, 0xd1, 0xab, 0xab, 0x26, 0xfa, - 0xe7, 0xaa, 0x89, 0x7e, 0xbd, 0x6e, 0x1a, 0xaf, 0xae, 0x9b, 0xc6, 0x9f, 0xd7, 0x4d, 0xe3, 0xbb, - 0x8a, 0x7c, 0x0f, 0x93, 0xd1, 0xa8, 0x2c, 0x2f, 0x9b, 0x8f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, - 0xd8, 0xca, 0x6b, 0xe1, 0xc6, 0x08, 0x00, 0x00, + // 966 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0x23, 0x45, + 0x10, 0x9e, 0xf6, 0xf8, 0x59, 0xde, 0x84, 0xd9, 0xce, 0x63, 0x27, 0x5e, 0xc9, 0x89, 0x46, 0x42, + 0xb2, 0xc2, 0xca, 0x01, 0x23, 0x40, 0x20, 0x2e, 0x4e, 0xd6, 0xab, 0x44, 0x6c, 0x1c, 0x68, 0x27, + 0x1b, 0x1e, 0x07, 0x6b, 0xec, 0xf4, 0x8e, 0x47, 0x3b, 0x2f, 0xa6, 0xdb, 0x24, 0xbe, 0xc2, 0x1d, + 0x71, 0xe5, 0x3f, 0xf0, 0x2f, 0xb8, 0xe4, 0xb8, 0x47, 0xb8, 0x20, 0x48, 0xfe, 0x08, 0xea, 0xc7, + 0x38, 0x9e, 0x25, 0x1b, 0x09, 0xe5, 0x36, 0xf5, 0x7d, 0xd5, 0x5d, 0x55, 0x5f, 0x55, 0x4d, 0x43, + 0x2d, 0x4d, 0xc6, 0xed, 0x24, 0x8d, 0x79, 0x8c, 0xcb, 0x7c, 0xe2, 0x46, 0x31, 0x6b, 0xd4, 0xf9, + 0x2c, 0xa1, 0x4c, 0x81, 0x8d, 0x55, 0x2f, 0xf6, 0x62, 0xf9, 0xb9, 0x23, 0xbe, 0x34, 0x8a, 0x93, + 0x34, 0x0e, 0x93, 0xd1, 0xce, 0xa2, 0xe7, 0x86, 0x17, 0xc7, 0x5e, 0x40, 0x77, 0xa4, 0x35, 0x9a, + 0xbe, 0xdc, 0x71, 0xa3, 0x99, 0xa2, 0x9c, 0x77, 0x60, 0xe9, 0x34, 0xf5, 0x39, 0x25, 0x94, 0x25, + 0x71, 0xc4, 0xa8, 0xf3, 0x13, 0x82, 0x07, 0x1a, 0xf9, 0x7e, 0x4a, 0x19, 0xc7, 0x5d, 0x00, 0xee, + 0x87, 0x94, 0xd1, 0xd4, 0xa7, 0xcc, 0x46, 0x5b, 0x66, 0xab, 0xde, 0x79, 0x2c, 0x4e, 0x87, 0x94, + 0x4f, 0xe8, 0x94, 0x0d, 0xc7, 0x71, 0x32, 0x6b, 0x1f, 0xfb, 0x21, 0x1d, 0x48, 0x97, 0xdd, 0xe2, + 0xe5, 0x5f, 0x9b, 0x06, 0x59, 0x38, 0x84, 0xd7, 0xa1, 0xcc, 0x69, 0xe4, 0x46, 0xdc, 0x2e, 0x6c, + 0xa1, 0x56, 0x8d, 0x68, 0x0b, 0xdb, 0x50, 0x49, 0x69, 0x12, 0xf8, 0x63, 0xd7, 0x36, 0xb7, 0x50, + 0xcb, 0x24, 0x99, 0xe9, 0x2c, 0x41, 0xfd, 0x20, 0x7a, 0x19, 0xeb, 0x1c, 0x9c, 0x3f, 0x11, 0x3c, + 0x50, 0xb6, 0xca, 0x12, 0xbf, 0x07, 0xe5, 0xc0, 0x1d, 0xd1, 0x20, 0x4b, 0x68, 0xa9, 0xad, 0x14, + 0x6a, 0x3f, 0x17, 0xa8, 0x4e, 0x41, 0xbb, 0xe0, 0x0d, 0xa8, 0x86, 0x7e, 0x34, 0x14, 0x09, 0xc9, + 0x04, 0x4c, 0x52, 0x09, 0xfd, 0x48, 0x64, 0x2c, 0x29, 0xf7, 0x42, 0x51, 0x3a, 0x85, 0xd0, 0xbd, + 0x90, 0xd4, 0x0e, 0xd4, 0x18, 0x8f, 0x53, 0x7a, 0x3c, 0x4b, 0xa8, 0x5d, 0xdc, 0x42, 0xad, 0xe5, + 0xce, 0xc3, 0x2c, 0xca, 0x20, 0x23, 0xc8, 0x8d, 0x0f, 0xfe, 0x08, 0x40, 0x06, 0x1c, 0x32, 0xca, + 0x99, 0x5d, 0x92, 0x79, 0x59, 0xb9, 0xbc, 0x06, 0x94, 0xeb, 0xd4, 0x6a, 0x81, 0xb6, 0x99, 0xf3, + 0x09, 0x54, 0x33, 0xf2, 0x7f, 0x95, 0xe5, 0xfc, 0x6a, 0xc2, 0x92, 0x92, 0x3c, 0x6b, 0xd5, 0x62, + 0xa1, 0xe8, 0xed, 0x85, 0x16, 0xf2, 0x85, 0x7e, 0x2c, 0x28, 0x3e, 0x9e, 0xd0, 0x94, 0xd9, 0xa6, + 0x0c, 0xbb, 0x9a, 0x0b, 0x7b, 0xa8, 0x48, 0x1d, 0x7d, 0xee, 0x8b, 0x3b, 0xb0, 0x26, 0xae, 0x4c, + 0x29, 0x8b, 0x83, 0x29, 0xf7, 0xe3, 0x68, 0x78, 0xee, 0x47, 0x67, 0xf1, 0xb9, 0x14, 0xcb, 0x24, + 0x2b, 0xa1, 0x7b, 0x41, 0xe6, 0xdc, 0xa9, 0xa4, 0xf0, 0x13, 0x00, 0xd7, 0xf3, 0x52, 0xea, 0xb9, + 0x9c, 0x2a, 0x8d, 0x96, 0x3b, 0x0f, 0xb2, 0x68, 0x5d, 0xcf, 0x4b, 0xc9, 0x02, 0x8f, 0x3f, 0x83, + 0x8d, 0xc4, 0x4d, 0xb9, 0xef, 0x06, 0x22, 0x8a, 0xec, 0xfc, 0xf0, 0xcc, 0x67, 0xee, 0x28, 0xa0, + 0x67, 0x76, 0x79, 0x0b, 0xb5, 0xaa, 0xe4, 0x91, 0x76, 0xc8, 0x26, 0xe3, 0xa9, 0xa6, 0xf1, 0x77, + 0xb7, 0x9c, 0x65, 0x3c, 0x75, 0x39, 0xf5, 0x66, 0x76, 0x45, 0xb6, 0x73, 0x33, 0x0b, 0xfc, 0x65, + 0xfe, 0x8e, 0x81, 0x76, 0xfb, 0xcf, 0xe5, 0x19, 0x81, 0x37, 0xa1, 0xce, 0x5e, 0xf9, 0xc9, 0x70, + 0x3c, 0x99, 0x46, 0xaf, 0x98, 0x5d, 0x95, 0xa9, 0x80, 0x80, 0xf6, 0x24, 0xe2, 0xfc, 0x8c, 0x60, + 0x39, 0xeb, 0x8d, 0x1e, 0xd9, 0x16, 0x94, 0xe7, 0x3b, 0x84, 0x5a, 0xf5, 0xce, 0xf2, 0x7c, 0x98, + 0x24, 0xba, 0x6f, 0x10, 0xcd, 0xe3, 0x06, 0x54, 0xce, 0xdd, 0x34, 0xf2, 0x23, 0x4f, 0xed, 0xcb, + 0xbe, 0x41, 0x32, 0x00, 0x3f, 0x81, 0xd2, 0xc4, 0x8f, 0x38, 0x93, 0xd3, 0x2a, 0x3a, 0xa5, 0x56, + 0xbb, 0x9d, 0xad, 0x76, 0xbb, 0x1b, 0xcd, 0xf6, 0x0d, 0xa2, 0x9c, 0x76, 0xab, 0x50, 0x4e, 0x29, + 0x9b, 0x06, 0xdc, 0xf9, 0x0d, 0xc1, 0x43, 0xd9, 0xcd, 0xbe, 0x1b, 0xde, 0x0c, 0xcc, 0x9d, 0x02, + 0xa3, 0x7b, 0x08, 0x5c, 0xb8, 0x9f, 0xc0, 0xce, 0x33, 0xc0, 0x8b, 0xd9, 0x6a, 0x09, 0x57, 0xa1, + 0x14, 0x09, 0x40, 0x6e, 0x47, 0x8d, 0x28, 0x03, 0x37, 0xa0, 0xaa, 0xd5, 0x61, 0x76, 0x41, 0x12, + 0x73, 0xdb, 0xf9, 0x1d, 0xe9, 0x8b, 0x5e, 0xb8, 0xc1, 0xf4, 0xa6, 0xee, 0x55, 0x28, 0xc9, 0x25, + 0x92, 0x35, 0xd6, 0x88, 0x32, 0xee, 0x56, 0xa3, 0x70, 0x0f, 0x35, 0xcc, 0x7b, 0xaa, 0x71, 0x00, + 0x2b, 0xb9, 0x22, 0xb4, 0x1c, 0xeb, 0x50, 0xfe, 0x41, 0x22, 0x5a, 0x0f, 0x6d, 0xdd, 0x25, 0xc8, + 0x36, 0x81, 0xda, 0xfc, 0xe7, 0x85, 0xeb, 0x50, 0x39, 0xe9, 0x7f, 0xd1, 0x3f, 0x3a, 0xed, 0x5b, + 0x06, 0xae, 0x41, 0xe9, 0xab, 0x93, 0x1e, 0xf9, 0xc6, 0x42, 0xb8, 0x0a, 0x45, 0x72, 0xf2, 0xbc, + 0x67, 0x15, 0x84, 0xc7, 0xe0, 0xe0, 0x69, 0x6f, 0xaf, 0x4b, 0x2c, 0x53, 0x78, 0x0c, 0x8e, 0x8f, + 0x48, 0xcf, 0x2a, 0x0a, 0x9c, 0xf4, 0xf6, 0x7a, 0x07, 0x2f, 0x7a, 0x56, 0x69, 0xbb, 0x0d, 0x8f, + 0xde, 0x52, 0x92, 0xb8, 0xe9, 0xb4, 0x4b, 0xf4, 0xf5, 0xdd, 0xdd, 0x23, 0x72, 0x6c, 0xa1, 0xed, + 0x5d, 0x28, 0x8a, 0x55, 0xc7, 0x15, 0x30, 0x49, 0xf7, 0x54, 0x71, 0x7b, 0x47, 0x27, 0xfd, 0x63, + 0x0b, 0x09, 0x6c, 0x70, 0x72, 0x68, 0x15, 0xc4, 0xc7, 0xe1, 0x41, 0xdf, 0x32, 0xe5, 0x47, 0xf7, + 0x6b, 0x15, 0x53, 0x7a, 0xf5, 0x88, 0x55, 0xea, 0xfc, 0x58, 0x80, 0x92, 0x2c, 0x04, 0x7f, 0x00, + 0x45, 0xf1, 0x34, 0xe0, 0x95, 0x4c, 0xde, 0x85, 0x87, 0xa3, 0xb1, 0x9a, 0x07, 0xb5, 0x70, 0x9f, + 0x42, 0x59, 0x2d, 0x1d, 0x5e, 0xcb, 0x2f, 0x61, 0x76, 0x6c, 0xfd, 0x4d, 0x58, 0x1d, 0x7c, 0x1f, + 0xe1, 0x3d, 0x80, 0x9b, 0xc1, 0xc4, 0x1b, 0xb9, 0x1f, 0xe5, 0xe2, 0x6a, 0x35, 0x1a, 0xb7, 0x51, + 0x3a, 0xfe, 0x33, 0xa8, 0x2f, 0xf4, 0x13, 0xe7, 0x5d, 0x73, 0x93, 0xda, 0x78, 0x7c, 0x2b, 0xa7, + 0xee, 0xe9, 0xf4, 0x61, 0x59, 0x3e, 0xd5, 0x62, 0x04, 0x95, 0x18, 0x9f, 0x43, 0x9d, 0xd0, 0x30, + 0xe6, 0x54, 0xe2, 0x78, 0x5e, 0xfe, 0xe2, 0x8b, 0xde, 0x58, 0x7b, 0x03, 0xd5, 0x2f, 0xbf, 0xb1, + 0xfb, 0xee, 0xe5, 0x3f, 0x4d, 0xe3, 0xf2, 0xaa, 0x89, 0x5e, 0x5f, 0x35, 0xd1, 0xdf, 0x57, 0x4d, + 0xf4, 0xcb, 0x75, 0xd3, 0x78, 0x7d, 0xdd, 0x34, 0xfe, 0xb8, 0x6e, 0x1a, 0xdf, 0x56, 0xe4, 0x53, + 0x97, 0x8c, 0x46, 0x65, 0xf9, 0xb3, 0xf9, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0xaa, + 0x41, 0xe4, 0xa1, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1248,16 +1243,6 @@ func (m *SeriesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.HintsEnabled { - i-- - if m.HintsEnabled { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x48 - } if m.SkipChunks { i-- if m.SkipChunks { @@ -1719,9 +1704,6 @@ func (m *SeriesRequest) Size() (n int) { if m.SkipChunks { n += 2 } - if m.HintsEnabled { - n += 2 - } return n } @@ -2610,26 +2592,6 @@ func (m *SeriesRequest) Unmarshal(dAtA []byte) error { } } m.SkipChunks = bool(v != 0) - case 9: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field HintsEnabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRpc - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.HintsEnabled = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(dAtA[iNdEx:]) diff --git a/pkg/store/storepb/rpc.proto b/pkg/store/storepb/rpc.proto index a6fce8f2f1..d37492439d 100644 --- a/pkg/store/storepb/rpc.proto +++ b/pkg/store/storepb/rpc.proto @@ -115,11 +115,6 @@ message SeriesRequest { // skip_chunks controls whether sending chunks or not in series responses. bool skip_chunks = 8; - - // hints_enabled controls whether sending hints or not in the series responses. Hints - // are store implementation specific and used to carry information about how the series - // have been queried. - bool hints_enabled = 9; } enum Aggr { From 978fdda2e129386800d0d1435ec3dcb09d650f73 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 23 Apr 2020 13:41:54 +0200 Subject: [PATCH 5/5] Remove spurious newline after rebase Signed-off-by: Marco Pracucci --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c66e5071f..bf19725f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,6 @@ We use *breaking* word for marking changes that are not backward compatible (rel - [#2505](https://github.com/thanos.io/thanos/pull/2505) Store: remove obsolete `thanos_store_node_info` metric. - ## [v0.12.1](https://github.com/thanos-io/thanos/releases/tag/v0.12.1) - 2020.04.20 ### Fixed