From 4bdb73780c8e47d98e69ca74181d51520449f2b5 Mon Sep 17 00:00:00 2001 From: Callum Styan Date: Mon, 20 Nov 2023 16:19:42 -0800 Subject: [PATCH] remove more format types we probably won't use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Callum Styan Signed-off-by: Nicolás Pazos --- prompb/remote.pb.go | 583 ++---------------- prompb/remote.proto | 24 - prompb/types.pb.go | 917 +++-------------------------- prompb/types.proto | 31 +- scripts/remotewrite11-bench/run.sh | 6 - storage/remote/codec.go | 38 -- storage/remote/queue_manager.go | 240 +------- storage/remote/write_handler.go | 87 --- 8 files changed, 133 insertions(+), 1793 deletions(-) diff --git a/prompb/remote.pb.go b/prompb/remote.pb.go index cc1fcb904..2fb98f773 100644 --- a/prompb/remote.pb.go +++ b/prompb/remote.pb.go @@ -60,7 +60,7 @@ func (x ReadRequest_ResponseType) String() string { } func (ReadRequest_ResponseType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{5, 0} + return fileDescriptor_eefc82927d57d89b, []int{3, 0} } type WriteRequest struct { @@ -175,63 +175,6 @@ func (m *MinimizedWriteRequest) GetSymbols() string { return "" } -type MinimizedWriteRequestBytes struct { - Timeseries []MinimizedTimeSeriesBytes `protobuf:"bytes,1,rep,name=timeseries,proto3" json:"timeseries"` - // The symbols table. All symbols are concatenated strings. To read the symbols table, it's required - // to know the offset:length range of the actual symbol to read from this string. - Symbols string `protobuf:"bytes,4,opt,name=symbols,proto3" json:"symbols,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *MinimizedWriteRequestBytes) Reset() { *m = MinimizedWriteRequestBytes{} } -func (m *MinimizedWriteRequestBytes) String() string { return proto.CompactTextString(m) } -func (*MinimizedWriteRequestBytes) ProtoMessage() {} -func (*MinimizedWriteRequestBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{2} -} -func (m *MinimizedWriteRequestBytes) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedWriteRequestBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedWriteRequestBytes.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MinimizedWriteRequestBytes) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedWriteRequestBytes.Merge(m, src) -} -func (m *MinimizedWriteRequestBytes) XXX_Size() int { - return m.Size() -} -func (m *MinimizedWriteRequestBytes) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedWriteRequestBytes.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedWriteRequestBytes proto.InternalMessageInfo - -func (m *MinimizedWriteRequestBytes) GetTimeseries() []MinimizedTimeSeriesBytes { - if m != nil { - return m.Timeseries - } - return nil -} - -func (m *MinimizedWriteRequestBytes) GetSymbols() string { - if m != nil { - return m.Symbols - } - return "" -} - type MinimizedWriteRequestLen struct { Timeseries []MinimizedTimeSeriesLen `protobuf:"bytes,1,rep,name=timeseries,proto3" json:"timeseries"` // The symbols table. All symbols are concatenated strings prepended with a varint of their length. @@ -246,7 +189,7 @@ func (m *MinimizedWriteRequestLen) Reset() { *m = MinimizedWriteRequestL func (m *MinimizedWriteRequestLen) String() string { return proto.CompactTextString(m) } func (*MinimizedWriteRequestLen) ProtoMessage() {} func (*MinimizedWriteRequestLen) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{3} + return fileDescriptor_eefc82927d57d89b, []int{2} } func (m *MinimizedWriteRequestLen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,63 +232,6 @@ func (m *MinimizedWriteRequestLen) GetSymbols() []byte { return nil } -type MinimizedWriteRequestLenBytes struct { - Timeseries []MinimizedTimeSeriesLenBytes `protobuf:"bytes,1,rep,name=timeseries,proto3" json:"timeseries"` - // The symbols table. All symbols are concatenated strings prepended with a varint of their length. - // To read the symbols table, it's required to know the offset of the actual symbol to read from this string. - Symbols []byte `protobuf:"bytes,4,opt,name=symbols,proto3" json:"symbols,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *MinimizedWriteRequestLenBytes) Reset() { *m = MinimizedWriteRequestLenBytes{} } -func (m *MinimizedWriteRequestLenBytes) String() string { return proto.CompactTextString(m) } -func (*MinimizedWriteRequestLenBytes) ProtoMessage() {} -func (*MinimizedWriteRequestLenBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{4} -} -func (m *MinimizedWriteRequestLenBytes) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedWriteRequestLenBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedWriteRequestLenBytes.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MinimizedWriteRequestLenBytes) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedWriteRequestLenBytes.Merge(m, src) -} -func (m *MinimizedWriteRequestLenBytes) XXX_Size() int { - return m.Size() -} -func (m *MinimizedWriteRequestLenBytes) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedWriteRequestLenBytes.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedWriteRequestLenBytes proto.InternalMessageInfo - -func (m *MinimizedWriteRequestLenBytes) GetTimeseries() []MinimizedTimeSeriesLenBytes { - if m != nil { - return m.Timeseries - } - return nil -} - -func (m *MinimizedWriteRequestLenBytes) GetSymbols() []byte { - if m != nil { - return m.Symbols - } - return nil -} - // ReadRequest represents a remote read request. type ReadRequest struct { Queries []*Query `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"` @@ -364,7 +250,7 @@ func (m *ReadRequest) Reset() { *m = ReadRequest{} } func (m *ReadRequest) String() string { return proto.CompactTextString(m) } func (*ReadRequest) ProtoMessage() {} func (*ReadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{5} + return fileDescriptor_eefc82927d57d89b, []int{3} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -420,7 +306,7 @@ func (m *ReadResponse) Reset() { *m = ReadResponse{} } func (m *ReadResponse) String() string { return proto.CompactTextString(m) } func (*ReadResponse) ProtoMessage() {} func (*ReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{6} + return fileDescriptor_eefc82927d57d89b, []int{4} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +356,7 @@ func (m *Query) Reset() { *m = Query{} } func (m *Query) String() string { return proto.CompactTextString(m) } func (*Query) ProtoMessage() {} func (*Query) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{7} + return fileDescriptor_eefc82927d57d89b, []int{5} } func (m *Query) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -539,7 +425,7 @@ func (m *QueryResult) Reset() { *m = QueryResult{} } func (m *QueryResult) String() string { return proto.CompactTextString(m) } func (*QueryResult) ProtoMessage() {} func (*QueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{8} + return fileDescriptor_eefc82927d57d89b, []int{6} } func (m *QueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -592,7 +478,7 @@ func (m *ChunkedReadResponse) Reset() { *m = ChunkedReadResponse{} } func (m *ChunkedReadResponse) String() string { return proto.CompactTextString(m) } func (*ChunkedReadResponse) ProtoMessage() {} func (*ChunkedReadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{9} + return fileDescriptor_eefc82927d57d89b, []int{7} } func (m *ChunkedReadResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -639,9 +525,7 @@ func init() { proto.RegisterEnum("prometheus.ReadRequest_ResponseType", ReadRequest_ResponseType_name, ReadRequest_ResponseType_value) proto.RegisterType((*WriteRequest)(nil), "prometheus.WriteRequest") proto.RegisterType((*MinimizedWriteRequest)(nil), "prometheus.MinimizedWriteRequest") - proto.RegisterType((*MinimizedWriteRequestBytes)(nil), "prometheus.MinimizedWriteRequestBytes") proto.RegisterType((*MinimizedWriteRequestLen)(nil), "prometheus.MinimizedWriteRequestLen") - proto.RegisterType((*MinimizedWriteRequestLenBytes)(nil), "prometheus.MinimizedWriteRequestLenBytes") proto.RegisterType((*ReadRequest)(nil), "prometheus.ReadRequest") proto.RegisterType((*ReadResponse)(nil), "prometheus.ReadResponse") proto.RegisterType((*Query)(nil), "prometheus.Query") @@ -652,46 +536,43 @@ func init() { func init() { proto.RegisterFile("remote.proto", fileDescriptor_eefc82927d57d89b) } var fileDescriptor_eefc82927d57d89b = []byte{ - // 612 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0x86, 0x3b, 0x4d, 0xda, 0x84, 0xe3, 0x50, 0x99, 0x69, 0x4b, 0x4d, 0x24, 0xda, 0xca, 0x42, - 0x22, 0x52, 0x51, 0x10, 0xa5, 0x62, 0xd5, 0x05, 0x6d, 0x89, 0x54, 0x4a, 0xcc, 0x65, 0x12, 0x04, - 0x42, 0x48, 0x96, 0x63, 0x1f, 0x35, 0x16, 0xf5, 0xa5, 0x9e, 0xb1, 0x54, 0xb3, 0x66, 0xc5, 0x02, - 0xb1, 0xe0, 0x89, 0x58, 0x75, 0x85, 0x78, 0x02, 0x84, 0xfa, 0x24, 0xc8, 0xb7, 0x32, 0x01, 0x97, - 0x46, 0xec, 0xec, 0x73, 0xfe, 0xff, 0xf7, 0x37, 0x67, 0xc6, 0x03, 0xad, 0x08, 0xbd, 0x40, 0x60, - 0x37, 0x8c, 0x02, 0x11, 0x50, 0x08, 0xa3, 0xc0, 0x43, 0x31, 0xc6, 0x98, 0xb7, 0x15, 0x91, 0x84, - 0xc8, 0xf3, 0x46, 0x7b, 0xe9, 0x30, 0x38, 0x0c, 0xb2, 0xc7, 0xbb, 0xe9, 0x53, 0x5e, 0xd5, 0x3f, - 0x13, 0x68, 0xbd, 0x8a, 0x5c, 0x81, 0x0c, 0x8f, 0x63, 0xe4, 0x82, 0x6e, 0x03, 0x08, 0xd7, 0x43, - 0x8e, 0x91, 0x8b, 0x5c, 0x23, 0xeb, 0xb5, 0x8e, 0xb2, 0x79, 0xbd, 0xfb, 0x3b, 0xb4, 0x3b, 0x74, - 0x3d, 0x1c, 0x64, 0xdd, 0xdd, 0xfa, 0xe9, 0x8f, 0xb5, 0x19, 0x26, 0xe9, 0xe9, 0x36, 0x34, 0x3d, - 0x14, 0x96, 0x63, 0x09, 0x4b, 0xab, 0x65, 0xde, 0xb6, 0xec, 0x35, 0x50, 0x44, 0xae, 0x6d, 0x14, - 0x8a, 0xc2, 0x7f, 0xee, 0x38, 0xa8, 0x37, 0x67, 0xd5, 0x9a, 0xfe, 0x81, 0xc0, 0xb2, 0xe1, 0xfa, - 0xae, 0xe7, 0xbe, 0x47, 0x67, 0x82, 0xad, 0x57, 0xc1, 0xb6, 0x36, 0x91, 0x5f, 0xda, 0xfe, 0x09, - 0xa9, 0x41, 0x83, 0x27, 0xde, 0x28, 0x38, 0xe2, 0x5a, 0x7d, 0x9d, 0x74, 0xae, 0xb0, 0xf2, 0x35, - 0x07, 0x38, 0xa8, 0x37, 0x6b, 0x6a, 0x5d, 0xff, 0x44, 0xa0, 0x5d, 0x89, 0xb1, 0x9b, 0x08, 0xe4, - 0xf4, 0xa0, 0x82, 0xe5, 0xd6, 0x65, 0x2c, 0xa9, 0xf3, 0xbf, 0x81, 0x3e, 0x12, 0xd0, 0x2a, 0x81, - 0xfa, 0xe8, 0xd3, 0xfd, 0x0a, 0x1c, 0xfd, 0x12, 0x9c, 0x3e, 0xfa, 0x97, 0xc3, 0xb4, 0xaa, 0x61, - 0xbe, 0x10, 0xb8, 0x79, 0x11, 0x4c, 0x3e, 0x20, 0xa3, 0x82, 0xe8, 0xf6, 0x14, 0x44, 0xd3, 0xcd, - 0xe8, 0x02, 0xac, 0x6f, 0x04, 0x14, 0x86, 0x96, 0x53, 0x9e, 0x98, 0x0d, 0x68, 0x1c, 0xc7, 0x32, - 0xc1, 0x35, 0x99, 0xe0, 0x45, 0x8c, 0x51, 0xc2, 0x4a, 0x05, 0x7d, 0x0b, 0x2b, 0x96, 0x6d, 0x63, - 0x28, 0xd0, 0x31, 0x23, 0xe4, 0x61, 0xe0, 0x73, 0x34, 0xb3, 0x5f, 0x48, 0x9b, 0x5d, 0xaf, 0x75, - 0x16, 0x26, 0xf7, 0x57, 0xfa, 0x4c, 0x97, 0x15, 0xea, 0x61, 0x12, 0x22, 0x5b, 0x2e, 0x43, 0xe4, - 0x2a, 0xd7, 0xb7, 0xa0, 0x25, 0x17, 0xa8, 0x02, 0x8d, 0xc1, 0x8e, 0xf1, 0xbc, 0xdf, 0x1b, 0xa8, - 0x33, 0x74, 0x05, 0x16, 0x07, 0x43, 0xd6, 0xdb, 0x31, 0x7a, 0x8f, 0xcc, 0xd7, 0xcf, 0x98, 0xb9, - 0xb7, 0xff, 0xf2, 0xe9, 0x93, 0x81, 0x4a, 0xf4, 0x9d, 0xd4, 0x65, 0x9d, 0x47, 0xd1, 0x7b, 0xd0, - 0x88, 0x90, 0xc7, 0x47, 0xa2, 0x5c, 0xd0, 0xca, 0xdf, 0x0b, 0xca, 0xfa, 0xac, 0xd4, 0xe9, 0x5f, - 0x09, 0xcc, 0x65, 0x0d, 0x7a, 0x07, 0x28, 0x17, 0x56, 0x24, 0xcc, 0x6c, 0xae, 0xc2, 0xf2, 0x42, - 0xd3, 0x4b, 0x73, 0x48, 0xa7, 0xc6, 0xd4, 0xac, 0x33, 0x2c, 0x1b, 0x06, 0xa7, 0x1d, 0x50, 0xd1, - 0x77, 0x26, 0xb5, 0xb3, 0x99, 0x76, 0x01, 0x7d, 0x47, 0x56, 0x6e, 0x41, 0xd3, 0xb3, 0x84, 0x3d, - 0xc6, 0x88, 0x17, 0x7f, 0xbd, 0x26, 0x53, 0xf5, 0xad, 0x11, 0x1e, 0x19, 0xb9, 0x80, 0x9d, 0x2b, - 0xe9, 0x06, 0xcc, 0x8d, 0x5d, 0x5f, 0xe4, 0xfb, 0xa9, 0x6c, 0x2e, 0xff, 0x39, 0xdc, 0xfd, 0xb4, - 0xc9, 0x72, 0x8d, 0xde, 0x03, 0x45, 0x5a, 0x1c, 0x7d, 0x30, 0xfd, 0x2d, 0x25, 0x9f, 0x22, 0xfd, - 0x04, 0x16, 0xf7, 0xc6, 0xb1, 0xff, 0x2e, 0xdd, 0x1c, 0x69, 0xaa, 0x0f, 0x61, 0xc1, 0xce, 0xcb, - 0xe6, 0x44, 0xe4, 0x0d, 0x39, 0xb2, 0x30, 0x16, 0xa9, 0x57, 0x6d, 0xf9, 0x95, 0xae, 0x81, 0x92, - 0x1e, 0xa3, 0xc4, 0x74, 0x7d, 0x07, 0x4f, 0x8a, 0x39, 0x41, 0x56, 0x7a, 0x9c, 0x56, 0x76, 0x97, - 0x4e, 0xcf, 0x56, 0xc9, 0xf7, 0xb3, 0x55, 0xf2, 0xf3, 0x6c, 0x95, 0xbc, 0x99, 0x4f, 0x73, 0xc3, - 0xd1, 0x68, 0x3e, 0xbb, 0x85, 0xef, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xc8, 0x2e, 0x1e, - 0xc4, 0x05, 0x00, 0x00, + // 568 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4b, 0x6f, 0xd3, 0x40, + 0x10, 0xee, 0xd6, 0x69, 0x13, 0xc6, 0xa1, 0x32, 0xdb, 0x96, 0x9a, 0x1e, 0x9a, 0xc8, 0xe2, 0x10, + 0xa9, 0x28, 0x88, 0x50, 0x71, 0xea, 0x81, 0xb4, 0x44, 0x0a, 0x25, 0xe6, 0xb1, 0x09, 0x02, 0x21, + 0x24, 0xcb, 0xb1, 0x47, 0x8d, 0x45, 0xfc, 0xa8, 0x77, 0x2d, 0x35, 0x9c, 0x39, 0x71, 0xe2, 0x37, + 0x71, 0xea, 0x09, 0xf1, 0x0b, 0x10, 0xca, 0x2f, 0x41, 0x7e, 0x85, 0x0d, 0x44, 0x94, 0xdb, 0xee, + 0x7c, 0x8f, 0xfd, 0x76, 0x76, 0x6c, 0xa8, 0xc7, 0xe8, 0x87, 0x02, 0xdb, 0x51, 0x1c, 0x8a, 0x90, + 0x42, 0x14, 0x87, 0x3e, 0x8a, 0x09, 0x26, 0x7c, 0x5f, 0x15, 0xb3, 0x08, 0x79, 0x0e, 0xec, 0xef, + 0x9c, 0x87, 0xe7, 0x61, 0xb6, 0xbc, 0x9f, 0xae, 0xf2, 0xaa, 0xf1, 0x85, 0x40, 0xfd, 0x4d, 0xec, + 0x09, 0x64, 0x78, 0x91, 0x20, 0x17, 0xf4, 0x18, 0x40, 0x78, 0x3e, 0x72, 0x8c, 0x3d, 0xe4, 0x3a, + 0x69, 0x2a, 0x2d, 0xb5, 0x73, 0xbb, 0xfd, 0xdb, 0xb4, 0x3d, 0xf2, 0x7c, 0x1c, 0x66, 0xe8, 0x49, + 0xe5, 0xea, 0x47, 0x63, 0x8d, 0x49, 0x7c, 0x7a, 0x0c, 0x35, 0x1f, 0x85, 0xed, 0xda, 0xc2, 0xd6, + 0x95, 0x4c, 0xbb, 0x2f, 0x6b, 0x4d, 0x14, 0xb1, 0xe7, 0x98, 0x05, 0xa3, 0xd0, 0x2f, 0x14, 0x67, + 0x95, 0xda, 0xba, 0xa6, 0x18, 0x9f, 0x08, 0xec, 0x9a, 0x5e, 0xe0, 0xf9, 0xde, 0x47, 0x74, 0x97, + 0xb2, 0xf5, 0x56, 0x64, 0x6b, 0x2c, 0xf9, 0x97, 0xb2, 0x7f, 0x86, 0xd4, 0xa1, 0xca, 0x67, 0xfe, + 0x38, 0x9c, 0x72, 0xbd, 0xd2, 0x24, 0xad, 0x1b, 0xac, 0xdc, 0xe6, 0x01, 0xce, 0x2a, 0x35, 0x45, + 0xab, 0x18, 0x9f, 0x09, 0xe8, 0x2b, 0x63, 0x0c, 0x30, 0xa0, 0xfd, 0x15, 0x49, 0x8c, 0x6b, 0x92, + 0x0c, 0x30, 0xb8, 0x3e, 0x4c, 0x7d, 0x75, 0x98, 0x6f, 0x04, 0x54, 0x86, 0xb6, 0x5b, 0x76, 0xe2, + 0x10, 0xaa, 0x17, 0x89, 0x7c, 0xf8, 0x2d, 0xf9, 0xf0, 0x57, 0x09, 0xc6, 0x33, 0x56, 0x32, 0xe8, + 0x7b, 0xd8, 0xb3, 0x1d, 0x07, 0x23, 0x81, 0xae, 0x15, 0x23, 0x8f, 0xc2, 0x80, 0xa3, 0x95, 0x8d, + 0x86, 0xbe, 0xde, 0x54, 0x5a, 0x5b, 0x9d, 0xbb, 0xb2, 0x58, 0x3a, 0xa6, 0xcd, 0x0a, 0xf6, 0x68, + 0x16, 0x21, 0xdb, 0x2d, 0x4d, 0xe4, 0x2a, 0x37, 0x8e, 0xa0, 0x2e, 0x17, 0xa8, 0x0a, 0xd5, 0x61, + 0xd7, 0x7c, 0x39, 0xe8, 0x0d, 0xb5, 0x35, 0xba, 0x07, 0xdb, 0xc3, 0x11, 0xeb, 0x75, 0xcd, 0xde, + 0x13, 0xeb, 0xed, 0x0b, 0x66, 0x9d, 0xf6, 0x5f, 0x3f, 0x7f, 0x36, 0xd4, 0x88, 0xd1, 0x4d, 0x55, + 0xf6, 0xc2, 0x8a, 0x3e, 0x80, 0x6a, 0x8c, 0x3c, 0x99, 0x8a, 0xf2, 0x42, 0x7b, 0x7f, 0x5f, 0x28, + 0xc3, 0x59, 0xc9, 0x33, 0xbe, 0x12, 0xd8, 0xc8, 0x00, 0x7a, 0x0f, 0x28, 0x17, 0x76, 0x2c, 0xac, + 0xac, 0xaf, 0xc2, 0xf6, 0x23, 0xcb, 0x4f, 0x7d, 0x48, 0x4b, 0x61, 0x5a, 0x86, 0x8c, 0x4a, 0xc0, + 0xe4, 0xb4, 0x05, 0x1a, 0x06, 0xee, 0x32, 0x77, 0x3d, 0xe3, 0x6e, 0x61, 0xe0, 0xca, 0xcc, 0x23, + 0xa8, 0xf9, 0xb6, 0x70, 0x26, 0x18, 0xf3, 0x62, 0x9a, 0x75, 0x39, 0xd5, 0xc0, 0x1e, 0xe3, 0xd4, + 0xcc, 0x09, 0x6c, 0xc1, 0xa4, 0x87, 0xb0, 0x31, 0xf1, 0x02, 0x91, 0xbf, 0xa7, 0xda, 0xd9, 0xfd, + 0xb3, 0xb9, 0xfd, 0x14, 0x64, 0x39, 0xc7, 0xe8, 0x81, 0x2a, 0x5d, 0x8e, 0x3e, 0xfa, 0xff, 0xaf, + 0x4f, 0x9e, 0x22, 0xe3, 0x12, 0xb6, 0x4f, 0x27, 0x49, 0xf0, 0x21, 0x7d, 0x1c, 0xa9, 0xab, 0x8f, + 0x61, 0xcb, 0xc9, 0xcb, 0xd6, 0x92, 0xe5, 0x1d, 0xd9, 0xb2, 0x10, 0x16, 0xae, 0x37, 0x1d, 0x79, + 0x4b, 0x1b, 0xa0, 0xa6, 0x63, 0x34, 0xb3, 0xbc, 0xc0, 0xc5, 0xcb, 0xa2, 0x4f, 0x90, 0x95, 0x9e, + 0xa6, 0x95, 0x93, 0x9d, 0xab, 0xf9, 0x01, 0xf9, 0x3e, 0x3f, 0x20, 0x3f, 0xe7, 0x07, 0xe4, 0xdd, + 0x66, 0xea, 0x1b, 0x8d, 0xc7, 0x9b, 0xd9, 0xdf, 0xe5, 0xe1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xf1, 0x65, 0x72, 0x0c, 0x9c, 0x04, 0x00, 0x00, } func (m *WriteRequest) Marshal() (dAtA []byte, err error) { @@ -797,54 +678,6 @@ func (m *MinimizedWriteRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MinimizedWriteRequestBytes) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MinimizedWriteRequestBytes) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedWriteRequestBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Symbols) > 0 { - i -= len(m.Symbols) - copy(dAtA[i:], m.Symbols) - i = encodeVarintRemote(dAtA, i, uint64(len(m.Symbols))) - i-- - dAtA[i] = 0x22 - } - if len(m.Timeseries) > 0 { - for iNdEx := len(m.Timeseries) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Timeseries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintRemote(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *MinimizedWriteRequestLen) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -893,54 +726,6 @@ func (m *MinimizedWriteRequestLen) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *MinimizedWriteRequestLenBytes) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MinimizedWriteRequestLenBytes) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedWriteRequestLenBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Symbols) > 0 { - i -= len(m.Symbols) - copy(dAtA[i:], m.Symbols) - i = encodeVarintRemote(dAtA, i, uint64(len(m.Symbols))) - i-- - dAtA[i] = 0x22 - } - if len(m.Timeseries) > 0 { - for iNdEx := len(m.Timeseries) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Timeseries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintRemote(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *ReadRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1248,28 +1033,6 @@ func (m *MinimizedWriteRequest) Size() (n int) { return n } -func (m *MinimizedWriteRequestBytes) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Timeseries) > 0 { - for _, e := range m.Timeseries { - l = e.Size() - n += 1 + l + sovRemote(uint64(l)) - } - } - l = len(m.Symbols) - if l > 0 { - n += 1 + l + sovRemote(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *MinimizedWriteRequestLen) Size() (n int) { if m == nil { return 0 @@ -1292,28 +1055,6 @@ func (m *MinimizedWriteRequestLen) Size() (n int) { return n } -func (m *MinimizedWriteRequestLenBytes) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Timeseries) > 0 { - for _, e := range m.Timeseries { - l = e.Size() - n += 1 + l + sovRemote(uint64(l)) - } - } - l = len(m.Symbols) - if l > 0 { - n += 1 + l + sovRemote(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *ReadRequest) Size() (n int) { if m == nil { return 0 @@ -1666,123 +1407,6 @@ func (m *MinimizedWriteRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedWriteRequestBytes) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MinimizedWriteRequestBytes: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedWriteRequestBytes: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Timeseries", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthRemote - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthRemote - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Timeseries = append(m.Timeseries, MinimizedTimeSeriesBytes{}) - if err := m.Timeseries[len(m.Timeseries)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Symbols", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthRemote - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthRemote - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Symbols = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipRemote(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthRemote - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *MinimizedWriteRequestLen) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1902,125 +1526,6 @@ func (m *MinimizedWriteRequestLen) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedWriteRequestLenBytes) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MinimizedWriteRequestLenBytes: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedWriteRequestLenBytes: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Timeseries", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthRemote - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthRemote - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Timeseries = append(m.Timeseries, MinimizedTimeSeriesLenBytes{}) - if err := m.Timeseries[len(m.Timeseries)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Symbols", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowRemote - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthRemote - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthRemote - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Symbols = append(m.Symbols[:0], dAtA[iNdEx:postIndex]...) - if m.Symbols == nil { - m.Symbols = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipRemote(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthRemote - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ReadRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/prompb/remote.proto b/prompb/remote.proto index a6eaf59ad..7b3747e33 100644 --- a/prompb/remote.proto +++ b/prompb/remote.proto @@ -39,18 +39,6 @@ message MinimizedWriteRequest { string symbols = 4; } -message MinimizedWriteRequestBytes { - repeated MinimizedTimeSeriesBytes timeseries = 1 [(gogoproto.nullable) = false]; - // Cortex uses this field to determine the source of the write request. - // We reserve it to avoid any compatibility issues. - reserved 2; - // Metadata (3) has moved to be part of the TimeSeries type - reserved 3; - // The symbols table. All symbols are concatenated strings. To read the symbols table, it's required - // to know the offset:length range of the actual symbol to read from this string. - string symbols = 4; -} - message MinimizedWriteRequestLen { repeated MinimizedTimeSeriesLen timeseries = 1 [(gogoproto.nullable) = false]; // Cortex uses this field to determine the source of the write request. @@ -63,18 +51,6 @@ message MinimizedWriteRequestLen { bytes symbols = 4; } -message MinimizedWriteRequestLenBytes { - repeated MinimizedTimeSeriesLenBytes timeseries = 1 [(gogoproto.nullable) = false]; - // Cortex uses this field to determine the source of the write request. - // We reserve it to avoid any compatibility issues. - reserved 2; - // Metadata (3) has moved to be part of the TimeSeries type - reserved 3; - // The symbols table. All symbols are concatenated strings prepended with a varint of their length. - // To read the symbols table, it's required to know the offset of the actual symbol to read from this string. - bytes symbols = 4; -} - // ReadRequest represents a remote read request. message ReadRequest { repeated Query queries = 1; diff --git a/prompb/types.pb.go b/prompb/types.pb.go index 97b8d0d4a..f1e220ce7 100644 --- a/prompb/types.pb.go +++ b/prompb/types.pb.go @@ -127,7 +127,7 @@ func (x LabelMatcher_Type) String() string { } func (LabelMatcher_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{12, 0} + return fileDescriptor_d938547f84707355, []int{10, 0} } // We require this to match chunkenc.Encoding. @@ -159,7 +159,7 @@ func (x Chunk_Encoding) String() string { } func (Chunk_Encoding) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{14, 0} + return fileDescriptor_d938547f84707355, []int{12, 0} } type MetricMetadata struct { @@ -736,6 +736,7 @@ func (m *TimeSeries) GetHistograms() []Histogram { type MinimizedTimeSeries struct { // Sorted list of label name-value pair references. This list's len is always multiple of 4, // packing tuples of (label name offset, label name length, label value offset, label value length). + // Offsets point to the symbol table in the higher level MinimizedWriteRequestLen. LabelSymbols []uint32 `protobuf:"varint,1,rep,packed,name=label_symbols,json=labelSymbols,proto3" json:"label_symbols,omitempty"` // Sorted by time, oldest sample first. // TODO: support references for other types @@ -808,85 +809,10 @@ func (m *MinimizedTimeSeries) GetHistograms() []Histogram { return nil } -type MinimizedTimeSeriesBytes struct { - // Sorted list of label name-value pair references, encoded as varints. This - // list's real len is always multiple of 4, packing tuples of (label name offset, - // label name length, label value offset, label value length). - LabelSymbols []byte `protobuf:"bytes,1,opt,name=label_symbols,json=labelSymbols,proto3" json:"label_symbols,omitempty"` - // Sorted by time, oldest sample first. - // TODO: support references for other types - Samples []Sample `protobuf:"bytes,2,rep,name=samples,proto3" json:"samples"` - Exemplars []Exemplar `protobuf:"bytes,3,rep,name=exemplars,proto3" json:"exemplars"` - Histograms []Histogram `protobuf:"bytes,4,rep,name=histograms,proto3" json:"histograms"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *MinimizedTimeSeriesBytes) Reset() { *m = MinimizedTimeSeriesBytes{} } -func (m *MinimizedTimeSeriesBytes) String() string { return proto.CompactTextString(m) } -func (*MinimizedTimeSeriesBytes) ProtoMessage() {} -func (*MinimizedTimeSeriesBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{7} -} -func (m *MinimizedTimeSeriesBytes) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedTimeSeriesBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedTimeSeriesBytes.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MinimizedTimeSeriesBytes) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedTimeSeriesBytes.Merge(m, src) -} -func (m *MinimizedTimeSeriesBytes) XXX_Size() int { - return m.Size() -} -func (m *MinimizedTimeSeriesBytes) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedTimeSeriesBytes.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedTimeSeriesBytes proto.InternalMessageInfo - -func (m *MinimizedTimeSeriesBytes) GetLabelSymbols() []byte { - if m != nil { - return m.LabelSymbols - } - return nil -} - -func (m *MinimizedTimeSeriesBytes) GetSamples() []Sample { - if m != nil { - return m.Samples - } - return nil -} - -func (m *MinimizedTimeSeriesBytes) GetExemplars() []Exemplar { - if m != nil { - return m.Exemplars - } - return nil -} - -func (m *MinimizedTimeSeriesBytes) GetHistograms() []Histogram { - if m != nil { - return m.Histograms - } - return nil -} - type MinimizedTimeSeriesLen struct { - // Sorted list of label name-value pair references, encoded as varints. This + // Sorted list of label name-value pair references, encoded as 32bit uint. This // list's real len is always multiple of 2, label name offset/label value offset. + // Offsets point to the symbol table in the higher level MinimizedWriteRequestLen. LabelSymbols []uint32 `protobuf:"fixed32,1,rep,packed,name=label_symbols,json=labelSymbols,proto3" json:"label_symbols,omitempty"` // Sorted by time, oldest sample first. // TODO: support references for other types @@ -902,7 +828,7 @@ func (m *MinimizedTimeSeriesLen) Reset() { *m = MinimizedTimeSeriesLen{} func (m *MinimizedTimeSeriesLen) String() string { return proto.CompactTextString(m) } func (*MinimizedTimeSeriesLen) ProtoMessage() {} func (*MinimizedTimeSeriesLen) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{8} + return fileDescriptor_d938547f84707355, []int{7} } func (m *MinimizedTimeSeriesLen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -959,81 +885,6 @@ func (m *MinimizedTimeSeriesLen) GetHistograms() []Histogram { return nil } -type MinimizedTimeSeriesLenBytes struct { - // Sorted list of label name-value pair references, encoded as varints. This - // list's real len is always multiple of 2, label name offset/label value offset. - LabelSymbols []byte `protobuf:"bytes,1,opt,name=label_symbols,json=labelSymbols,proto3" json:"label_symbols,omitempty"` - // Sorted by time, oldest sample first. - // TODO: support references for other types - Samples []Sample `protobuf:"bytes,2,rep,name=samples,proto3" json:"samples"` - Exemplars []Exemplar `protobuf:"bytes,3,rep,name=exemplars,proto3" json:"exemplars"` - Histograms []Histogram `protobuf:"bytes,4,rep,name=histograms,proto3" json:"histograms"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *MinimizedTimeSeriesLenBytes) Reset() { *m = MinimizedTimeSeriesLenBytes{} } -func (m *MinimizedTimeSeriesLenBytes) String() string { return proto.CompactTextString(m) } -func (*MinimizedTimeSeriesLenBytes) ProtoMessage() {} -func (*MinimizedTimeSeriesLenBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{9} -} -func (m *MinimizedTimeSeriesLenBytes) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedTimeSeriesLenBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedTimeSeriesLenBytes.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MinimizedTimeSeriesLenBytes) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedTimeSeriesLenBytes.Merge(m, src) -} -func (m *MinimizedTimeSeriesLenBytes) XXX_Size() int { - return m.Size() -} -func (m *MinimizedTimeSeriesLenBytes) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedTimeSeriesLenBytes.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedTimeSeriesLenBytes proto.InternalMessageInfo - -func (m *MinimizedTimeSeriesLenBytes) GetLabelSymbols() []byte { - if m != nil { - return m.LabelSymbols - } - return nil -} - -func (m *MinimizedTimeSeriesLenBytes) GetSamples() []Sample { - if m != nil { - return m.Samples - } - return nil -} - -func (m *MinimizedTimeSeriesLenBytes) GetExemplars() []Exemplar { - if m != nil { - return m.Exemplars - } - return nil -} - -func (m *MinimizedTimeSeriesLenBytes) GetHistograms() []Histogram { - if m != nil { - return m.Histograms - } - return nil -} - type Label struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` @@ -1046,7 +897,7 @@ func (m *Label) Reset() { *m = Label{} } func (m *Label) String() string { return proto.CompactTextString(m) } func (*Label) ProtoMessage() {} func (*Label) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{10} + return fileDescriptor_d938547f84707355, []int{8} } func (m *Label) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1100,7 +951,7 @@ func (m *Labels) Reset() { *m = Labels{} } func (m *Labels) String() string { return proto.CompactTextString(m) } func (*Labels) ProtoMessage() {} func (*Labels) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{11} + return fileDescriptor_d938547f84707355, []int{9} } func (m *Labels) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1150,7 +1001,7 @@ func (m *LabelMatcher) Reset() { *m = LabelMatcher{} } func (m *LabelMatcher) String() string { return proto.CompactTextString(m) } func (*LabelMatcher) ProtoMessage() {} func (*LabelMatcher) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{12} + return fileDescriptor_d938547f84707355, []int{10} } func (m *LabelMatcher) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1217,7 +1068,7 @@ func (m *ReadHints) Reset() { *m = ReadHints{} } func (m *ReadHints) String() string { return proto.CompactTextString(m) } func (*ReadHints) ProtoMessage() {} func (*ReadHints) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{13} + return fileDescriptor_d938547f84707355, []int{11} } func (m *ReadHints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1311,7 +1162,7 @@ func (m *Chunk) Reset() { *m = Chunk{} } func (m *Chunk) String() string { return proto.CompactTextString(m) } func (*Chunk) ProtoMessage() {} func (*Chunk) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{14} + return fileDescriptor_d938547f84707355, []int{12} } func (m *Chunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1383,7 +1234,7 @@ func (m *ChunkedSeries) Reset() { *m = ChunkedSeries{} } func (m *ChunkedSeries) String() string { return proto.CompactTextString(m) } func (*ChunkedSeries) ProtoMessage() {} func (*ChunkedSeries) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{15} + return fileDescriptor_d938547f84707355, []int{13} } func (m *ChunkedSeries) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1438,9 +1289,7 @@ func init() { proto.RegisterType((*BucketSpan)(nil), "prometheus.BucketSpan") proto.RegisterType((*TimeSeries)(nil), "prometheus.TimeSeries") proto.RegisterType((*MinimizedTimeSeries)(nil), "prometheus.MinimizedTimeSeries") - proto.RegisterType((*MinimizedTimeSeriesBytes)(nil), "prometheus.MinimizedTimeSeriesBytes") proto.RegisterType((*MinimizedTimeSeriesLen)(nil), "prometheus.MinimizedTimeSeriesLen") - proto.RegisterType((*MinimizedTimeSeriesLenBytes)(nil), "prometheus.MinimizedTimeSeriesLenBytes") proto.RegisterType((*Label)(nil), "prometheus.Label") proto.RegisterType((*Labels)(nil), "prometheus.Labels") proto.RegisterType((*LabelMatcher)(nil), "prometheus.LabelMatcher") @@ -1452,81 +1301,79 @@ func init() { func init() { proto.RegisterFile("types.proto", fileDescriptor_d938547f84707355) } var fileDescriptor_d938547f84707355 = []byte{ - // 1181 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xdd, 0x8e, 0xdb, 0xc4, - 0x17, 0xdf, 0xb1, 0x13, 0x27, 0x3e, 0x9b, 0xa4, 0xde, 0xe9, 0xb6, 0x7f, 0xff, 0x0b, 0xdd, 0x06, - 0xa3, 0x42, 0x40, 0x28, 0x55, 0x0b, 0x17, 0x54, 0x54, 0x48, 0x9b, 0x6d, 0xb6, 0x5b, 0xb1, 0x4e, - 0xd4, 0x49, 0x56, 0x50, 0x6e, 0xa2, 0x49, 0x32, 0x9b, 0x58, 0x8d, 0x3f, 0xf0, 0x4c, 0xaa, 0xa6, - 0xef, 0xc1, 0x1d, 0x2f, 0xc1, 0x5b, 0x54, 0xe2, 0x06, 0x5e, 0x00, 0xa1, 0x5e, 0x55, 0x20, 0xde, - 0x01, 0xcd, 0xd8, 0x8e, 0x9d, 0x6e, 0x90, 0x28, 0x77, 0xe5, 0x6e, 0xce, 0xef, 0x7c, 0xfd, 0xce, - 0x1c, 0xcf, 0xcc, 0x31, 0xec, 0x8a, 0x55, 0xc4, 0x78, 0x3b, 0x8a, 0x43, 0x11, 0x62, 0x88, 0xe2, - 0xd0, 0x67, 0x62, 0xce, 0x96, 0xfc, 0xda, 0xfe, 0x2c, 0x9c, 0x85, 0x0a, 0xbe, 0x25, 0x57, 0x89, - 0x85, 0xf3, 0x83, 0x06, 0x0d, 0x97, 0x89, 0xd8, 0x9b, 0xb8, 0x4c, 0xd0, 0x29, 0x15, 0x14, 0xdf, - 0x85, 0x92, 0x8c, 0x61, 0xa3, 0x26, 0x6a, 0x35, 0xee, 0xdc, 0x6c, 0xe7, 0x31, 0xda, 0x9b, 0x96, - 0xa9, 0x38, 0x5c, 0x45, 0x8c, 0x28, 0x17, 0xfc, 0x09, 0x60, 0x5f, 0x61, 0xa3, 0x73, 0xea, 0x7b, - 0x8b, 0xd5, 0x28, 0xa0, 0x3e, 0xb3, 0xb5, 0x26, 0x6a, 0x99, 0xc4, 0x4a, 0x34, 0xc7, 0x4a, 0xd1, - 0xa3, 0x3e, 0xc3, 0x18, 0x4a, 0x73, 0xb6, 0x88, 0xec, 0x92, 0xd2, 0xab, 0xb5, 0xc4, 0x96, 0x81, - 0x27, 0xec, 0x72, 0x82, 0xc9, 0xb5, 0xb3, 0x02, 0xc8, 0x33, 0xe1, 0x5d, 0xa8, 0x9c, 0xf5, 0xbe, - 0xea, 0xf5, 0xbf, 0xee, 0x59, 0x3b, 0x52, 0x38, 0xea, 0x9f, 0xf5, 0x86, 0x5d, 0x62, 0x21, 0x6c, - 0x42, 0xf9, 0xc1, 0xe1, 0xd9, 0x83, 0xae, 0xa5, 0xe1, 0x3a, 0x98, 0x27, 0x0f, 0x07, 0xc3, 0xfe, - 0x03, 0x72, 0xe8, 0x5a, 0x3a, 0xc6, 0xd0, 0x50, 0x9a, 0x1c, 0x2b, 0x49, 0xd7, 0xc1, 0x99, 0xeb, - 0x1e, 0x92, 0xc7, 0x56, 0x19, 0x57, 0xa1, 0xf4, 0xb0, 0x77, 0xdc, 0xb7, 0x0c, 0x5c, 0x83, 0xea, - 0x60, 0x78, 0x38, 0xec, 0x0e, 0xba, 0x43, 0xab, 0xe2, 0xdc, 0x03, 0x63, 0x40, 0xfd, 0x68, 0xc1, - 0xf0, 0x3e, 0x94, 0x9f, 0xd2, 0xc5, 0x32, 0xd9, 0x16, 0x44, 0x12, 0x01, 0xbf, 0x0b, 0xa6, 0xf0, - 0x7c, 0xc6, 0x05, 0xf5, 0x23, 0x55, 0xa7, 0x4e, 0x72, 0xc0, 0x09, 0xa1, 0xda, 0x7d, 0xc6, 0xfc, - 0x68, 0x41, 0x63, 0x7c, 0x0b, 0x8c, 0x05, 0x1d, 0xb3, 0x05, 0xb7, 0x51, 0x53, 0x6f, 0xed, 0xde, - 0xd9, 0x2b, 0xee, 0xeb, 0xa9, 0xd4, 0x74, 0x4a, 0x2f, 0x7e, 0xbd, 0xb1, 0x43, 0x52, 0xb3, 0x3c, - 0xa1, 0xf6, 0xb7, 0x09, 0xf5, 0xd7, 0x13, 0xfe, 0x54, 0x06, 0xf3, 0xc4, 0xe3, 0x22, 0x9c, 0xc5, - 0xd4, 0xc7, 0xd7, 0xc1, 0x9c, 0x84, 0xcb, 0x40, 0x8c, 0xbc, 0x40, 0x28, 0xda, 0xa5, 0x93, 0x1d, - 0x52, 0x55, 0xd0, 0xc3, 0x40, 0xe0, 0xf7, 0x60, 0x37, 0x51, 0x9f, 0x2f, 0x42, 0x2a, 0x92, 0x34, - 0x27, 0x3b, 0x04, 0x14, 0x78, 0x2c, 0x31, 0x6c, 0x81, 0xce, 0x97, 0xbe, 0xca, 0x83, 0x88, 0x5c, - 0xe2, 0xab, 0x60, 0xf0, 0xc9, 0x9c, 0xf9, 0x54, 0x75, 0x6d, 0x8f, 0xa4, 0x12, 0xbe, 0x09, 0x8d, - 0xe7, 0x2c, 0x0e, 0x47, 0x62, 0x1e, 0x33, 0x3e, 0x0f, 0x17, 0x53, 0xd5, 0x41, 0x44, 0xea, 0x12, - 0x1d, 0x66, 0x20, 0xfe, 0x20, 0x35, 0xcb, 0x79, 0x19, 0x8a, 0x17, 0x22, 0x35, 0x89, 0x1f, 0x65, - 0xdc, 0x3e, 0x06, 0xab, 0x60, 0x97, 0x10, 0xac, 0x28, 0x82, 0x88, 0x34, 0xd6, 0x96, 0x09, 0xc9, - 0x23, 0x68, 0x04, 0x6c, 0x46, 0x85, 0xf7, 0x94, 0x8d, 0x78, 0x44, 0x03, 0x6e, 0x57, 0xd5, 0x0e, - 0x5f, 0x2d, 0xee, 0x70, 0x67, 0x39, 0x79, 0xc2, 0xc4, 0x20, 0xa2, 0x41, 0xba, 0xcd, 0xf5, 0xcc, - 0x47, 0x62, 0x1c, 0x7f, 0x08, 0x97, 0xd6, 0x41, 0xa6, 0x6c, 0x21, 0x28, 0xb7, 0xcd, 0xa6, 0xde, - 0xc2, 0x64, 0x1d, 0xfb, 0xbe, 0x42, 0x37, 0x0c, 0x15, 0x3b, 0x6e, 0x43, 0x53, 0x6f, 0xa1, 0xdc, - 0x50, 0x51, 0xe3, 0x92, 0x56, 0x14, 0x72, 0xaf, 0x40, 0x6b, 0xf7, 0x9f, 0xd0, 0xca, 0x7c, 0xd6, - 0xb4, 0xd6, 0x41, 0x52, 0x5a, 0xb5, 0x84, 0x56, 0x06, 0xe7, 0xb4, 0xd6, 0x86, 0x29, 0xad, 0x7a, - 0x42, 0x2b, 0x83, 0x53, 0x5a, 0x5f, 0x02, 0xc4, 0x8c, 0x33, 0x31, 0x9a, 0xcb, 0xdd, 0x6f, 0xa8, - 0x33, 0x7e, 0xa3, 0x48, 0x69, 0xfd, 0xfd, 0xb4, 0x89, 0xb4, 0x3b, 0xf1, 0x02, 0x41, 0xcc, 0x38, - 0x5b, 0x6e, 0x7e, 0x80, 0x97, 0x5e, 0xff, 0x00, 0x3f, 0x03, 0x73, 0xed, 0xb5, 0x79, 0x52, 0x2b, - 0xa0, 0x3f, 0xee, 0x0e, 0x2c, 0x84, 0x0d, 0xd0, 0x7a, 0x7d, 0x4b, 0xcb, 0x4f, 0xab, 0xde, 0xa9, - 0x40, 0x59, 0x71, 0xee, 0xd4, 0x00, 0xf2, 0xb6, 0x3b, 0xf7, 0x00, 0xf2, 0xfd, 0x91, 0x5f, 0x5e, - 0x78, 0x7e, 0xce, 0x59, 0xf2, 0x29, 0xef, 0x91, 0x54, 0x92, 0xf8, 0x82, 0x05, 0x33, 0x31, 0x57, - 0x5f, 0x70, 0x9d, 0xa4, 0x92, 0xf3, 0x0a, 0x01, 0x0c, 0x3d, 0x9f, 0x0d, 0x58, 0xec, 0x31, 0xfe, - 0xe6, 0xe7, 0xef, 0x0e, 0x54, 0xb8, 0x3a, 0xfa, 0xdc, 0xd6, 0x94, 0x07, 0x2e, 0x7a, 0x24, 0xb7, - 0x42, 0xea, 0x92, 0x19, 0xe2, 0xcf, 0xc1, 0x64, 0xe9, 0x81, 0xe7, 0xb6, 0xae, 0xbc, 0xf6, 0x8b, - 0x5e, 0xd9, 0x6d, 0x90, 0xfa, 0xe5, 0xc6, 0xf8, 0x0b, 0x80, 0x79, 0xb6, 0xf1, 0xdc, 0x2e, 0x29, - 0xd7, 0x2b, 0x5b, 0xdb, 0x92, 0xfa, 0x16, 0xcc, 0x9d, 0x3f, 0x10, 0x5c, 0x76, 0xbd, 0xc0, 0xf3, - 0xbd, 0xe7, 0x6c, 0x5a, 0xa8, 0xf9, 0x23, 0xa8, 0xab, 0x62, 0x46, 0x7c, 0xe5, 0x8f, 0xc3, 0xb4, - 0xf4, 0x7a, 0x1a, 0xa0, 0xa6, 0x54, 0x83, 0x44, 0xf3, 0x36, 0x55, 0xfb, 0x3b, 0x02, 0x7b, 0x4b, - 0xb5, 0x9d, 0x95, 0x60, 0x1c, 0xbf, 0x7f, 0xb1, 0x64, 0xd4, 0xaa, 0xbd, 0xbd, 0xc5, 0xbe, 0x42, - 0x70, 0x75, 0x4b, 0xb1, 0xa7, 0x2c, 0xd8, 0x56, 0xaa, 0xde, 0xaa, 0xbc, 0xbd, 0xa5, 0xfe, 0x89, - 0xe0, 0x9d, 0xed, 0xa5, 0xfe, 0x37, 0x5b, 0x7b, 0x1b, 0xca, 0xea, 0xde, 0x91, 0x33, 0x8f, 0x9a, - 0x93, 0x50, 0x32, 0xf3, 0xc8, 0xf5, 0xe6, 0xeb, 0x6f, 0xa6, 0xaf, 0xbf, 0x73, 0x17, 0x8c, 0xd3, - 0xe4, 0x76, 0x7a, 0xd3, 0xeb, 0xcc, 0xf9, 0x1e, 0x41, 0x4d, 0xe1, 0x2e, 0x15, 0x93, 0x39, 0x8b, - 0xf1, 0xed, 0x8d, 0x31, 0xef, 0xfa, 0x05, 0xff, 0xd4, 0xae, 0x5d, 0x18, 0xef, 0x32, 0xa2, 0xda, - 0x36, 0xa2, 0x7a, 0x91, 0x68, 0x0b, 0x4a, 0x6a, 0x58, 0x33, 0x40, 0xeb, 0x3e, 0x4a, 0x6e, 0xff, - 0x5e, 0xf7, 0x51, 0x72, 0xfb, 0x13, 0x39, 0xa0, 0x49, 0x80, 0x74, 0x2d, 0xdd, 0xf9, 0x11, 0xc9, - 0x27, 0x83, 0x4e, 0xe5, 0x8b, 0xc1, 0xf1, 0xff, 0xa0, 0xc2, 0x05, 0x8b, 0x46, 0x7e, 0xd2, 0x5d, - 0x9d, 0x18, 0x52, 0x74, 0xb9, 0x4c, 0x7d, 0xbe, 0x0c, 0x26, 0x59, 0x6a, 0xb9, 0xc6, 0xff, 0x87, - 0x2a, 0x17, 0x34, 0x16, 0xd2, 0x3a, 0x19, 0x85, 0x2a, 0x4a, 0x76, 0x39, 0xbe, 0x02, 0x06, 0x0b, - 0xa6, 0x23, 0xd5, 0x14, 0xa9, 0x28, 0xb3, 0x60, 0xea, 0x72, 0x7c, 0x0d, 0xaa, 0xb3, 0x38, 0x5c, - 0x46, 0x5e, 0x30, 0xb3, 0xcb, 0x4d, 0xbd, 0x65, 0x92, 0xb5, 0x8c, 0x1b, 0xa0, 0x8d, 0x57, 0x6a, - 0x1c, 0xa9, 0x12, 0x6d, 0xbc, 0x92, 0xd1, 0x63, 0x1a, 0xcc, 0x98, 0x0c, 0x52, 0x49, 0xa2, 0x2b, - 0xd9, 0xe5, 0xce, 0x2f, 0x08, 0xca, 0x47, 0xf3, 0x65, 0xf0, 0x04, 0x1f, 0xc0, 0xae, 0xef, 0x05, - 0x23, 0xf9, 0x00, 0xe6, 0x9c, 0x4d, 0xdf, 0x0b, 0xe4, 0xf7, 0xeb, 0x72, 0xa5, 0xa7, 0xcf, 0xd6, - 0xfa, 0x74, 0x42, 0xf4, 0xe9, 0xb3, 0x54, 0xdf, 0x4e, 0x9b, 0xa0, 0xab, 0x26, 0x5c, 0x2b, 0x36, - 0x41, 0x25, 0x68, 0x77, 0x83, 0x49, 0x38, 0xf5, 0x82, 0x59, 0xde, 0x01, 0x39, 0x79, 0xab, 0xaa, - 0x6a, 0x44, 0xad, 0x9d, 0xfb, 0x50, 0xcd, 0xac, 0x2e, 0x3c, 0xb9, 0xdf, 0xf4, 0xe5, 0x60, 0xbc, - 0x31, 0x0d, 0x6b, 0xf8, 0x32, 0x5c, 0x3a, 0x3e, 0xed, 0x1f, 0x0e, 0x47, 0x85, 0x11, 0xd9, 0xf9, - 0x0e, 0xea, 0x2a, 0x23, 0x9b, 0xfe, 0xdb, 0x07, 0xf3, 0x16, 0x18, 0x13, 0x19, 0x21, 0x3b, 0x79, - 0x7b, 0x17, 0xaa, 0xc9, 0x1c, 0x12, 0xb3, 0xce, 0xfe, 0x8b, 0x97, 0x07, 0xe8, 0xe7, 0x97, 0x07, - 0xe8, 0xb7, 0x97, 0x07, 0xe8, 0x5b, 0x43, 0x5a, 0x47, 0xe3, 0xb1, 0xa1, 0x7e, 0x4c, 0x3e, 0xfd, - 0x2b, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xbc, 0xe2, 0xdc, 0xc9, 0x0c, 0x00, 0x00, + // 1150 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcb, 0x6e, 0xdb, 0x46, + 0x17, 0x36, 0x49, 0x89, 0x12, 0x8f, 0x2e, 0xa1, 0x27, 0x8e, 0x7f, 0xfe, 0x46, 0xe3, 0xa8, 0x2c, + 0xd2, 0xaa, 0x45, 0x21, 0x23, 0x6e, 0x17, 0x0d, 0x1a, 0x14, 0xb0, 0x1d, 0xf9, 0x82, 0x9a, 0x12, + 0x32, 0x92, 0xd1, 0xa6, 0x1b, 0x61, 0x24, 0x8d, 0x25, 0x22, 0xbc, 0x95, 0x33, 0x0a, 0xac, 0xbc, + 0x47, 0x77, 0x7d, 0x89, 0xbe, 0x45, 0x80, 0x6e, 0xda, 0x17, 0x28, 0x0a, 0xaf, 0x02, 0xf4, 0x25, + 0x8a, 0x19, 0x92, 0x22, 0x15, 0xbb, 0x40, 0xd3, 0x5d, 0x76, 0x73, 0xbe, 0x73, 0xfb, 0xce, 0xcc, + 0x99, 0x39, 0x03, 0x35, 0xbe, 0x8c, 0x28, 0xeb, 0x44, 0x71, 0xc8, 0x43, 0x04, 0x51, 0x1c, 0xfa, + 0x94, 0xcf, 0xe9, 0x82, 0xed, 0x6c, 0xcd, 0xc2, 0x59, 0x28, 0xe1, 0x3d, 0xb1, 0x4a, 0x2c, 0xec, + 0x9f, 0x55, 0x68, 0x3a, 0x94, 0xc7, 0xee, 0xc4, 0xa1, 0x9c, 0x4c, 0x09, 0x27, 0xe8, 0x31, 0x94, + 0x44, 0x0c, 0x4b, 0x69, 0x29, 0xed, 0xe6, 0xfe, 0xc3, 0x4e, 0x1e, 0xa3, 0xb3, 0x6e, 0x99, 0x8a, + 0xc3, 0x65, 0x44, 0xb1, 0x74, 0x41, 0x9f, 0x03, 0xf2, 0x25, 0x36, 0xba, 0x24, 0xbe, 0xeb, 0x2d, + 0x47, 0x01, 0xf1, 0xa9, 0xa5, 0xb6, 0x94, 0xb6, 0x81, 0xcd, 0x44, 0x73, 0x2c, 0x15, 0x3d, 0xe2, + 0x53, 0x84, 0xa0, 0x34, 0xa7, 0x5e, 0x64, 0x95, 0xa4, 0x5e, 0xae, 0x05, 0xb6, 0x08, 0x5c, 0x6e, + 0x95, 0x13, 0x4c, 0xac, 0xed, 0x25, 0x40, 0x9e, 0x09, 0xd5, 0xa0, 0x72, 0xd1, 0xfb, 0xb6, 0xd7, + 0xff, 0xae, 0x67, 0x6e, 0x08, 0xe1, 0xa8, 0x7f, 0xd1, 0x1b, 0x76, 0xb1, 0xa9, 0x20, 0x03, 0xca, + 0x27, 0x07, 0x17, 0x27, 0x5d, 0x53, 0x45, 0x0d, 0x30, 0x4e, 0xcf, 0x06, 0xc3, 0xfe, 0x09, 0x3e, + 0x70, 0x4c, 0x0d, 0x21, 0x68, 0x4a, 0x4d, 0x8e, 0x95, 0x84, 0xeb, 0xe0, 0xc2, 0x71, 0x0e, 0xf0, + 0x73, 0xb3, 0x8c, 0xaa, 0x50, 0x3a, 0xeb, 0x1d, 0xf7, 0x4d, 0x1d, 0xd5, 0xa1, 0x3a, 0x18, 0x1e, + 0x0c, 0xbb, 0x83, 0xee, 0xd0, 0xac, 0xd8, 0x4f, 0x40, 0x1f, 0x10, 0x3f, 0xf2, 0x28, 0xda, 0x82, + 0xf2, 0x4b, 0xe2, 0x2d, 0x92, 0x6d, 0x51, 0x70, 0x22, 0xa0, 0x0f, 0xc0, 0xe0, 0xae, 0x4f, 0x19, + 0x27, 0x7e, 0x24, 0xeb, 0xd4, 0x70, 0x0e, 0xd8, 0x21, 0x54, 0xbb, 0x57, 0xd4, 0x8f, 0x3c, 0x12, + 0xa3, 0x3d, 0xd0, 0x3d, 0x32, 0xa6, 0x1e, 0xb3, 0x94, 0x96, 0xd6, 0xae, 0xed, 0x6f, 0x16, 0xf7, + 0xf5, 0x5c, 0x68, 0x0e, 0x4b, 0xaf, 0xff, 0x78, 0xb0, 0x81, 0x53, 0xb3, 0x3c, 0xa1, 0xfa, 0x8f, + 0x09, 0xb5, 0xb7, 0x13, 0xfe, 0x5a, 0x06, 0xe3, 0xd4, 0x65, 0x3c, 0x9c, 0xc5, 0xc4, 0x47, 0xf7, + 0xc1, 0x98, 0x84, 0x8b, 0x80, 0x8f, 0xdc, 0x80, 0x4b, 0xda, 0xa5, 0xd3, 0x0d, 0x5c, 0x95, 0xd0, + 0x59, 0xc0, 0xd1, 0x87, 0x50, 0x4b, 0xd4, 0x97, 0x5e, 0x48, 0x78, 0x92, 0xe6, 0x74, 0x03, 0x83, + 0x04, 0x8f, 0x05, 0x86, 0x4c, 0xd0, 0xd8, 0xc2, 0x97, 0x79, 0x14, 0x2c, 0x96, 0x68, 0x1b, 0x74, + 0x36, 0x99, 0x53, 0x9f, 0xc8, 0x53, 0xdb, 0xc4, 0xa9, 0x84, 0x1e, 0x42, 0xf3, 0x15, 0x8d, 0xc3, + 0x11, 0x9f, 0xc7, 0x94, 0xcd, 0x43, 0x6f, 0x2a, 0x4f, 0x50, 0xc1, 0x0d, 0x81, 0x0e, 0x33, 0x10, + 0x7d, 0x9c, 0x9a, 0xe5, 0xbc, 0x74, 0xc9, 0x4b, 0xc1, 0x75, 0x81, 0x1f, 0x65, 0xdc, 0x3e, 0x03, + 0xb3, 0x60, 0x97, 0x10, 0xac, 0x48, 0x82, 0x0a, 0x6e, 0xae, 0x2c, 0x13, 0x92, 0x47, 0xd0, 0x0c, + 0xe8, 0x8c, 0x70, 0xf7, 0x25, 0x1d, 0xb1, 0x88, 0x04, 0xcc, 0xaa, 0xca, 0x1d, 0xde, 0x2e, 0xee, + 0xf0, 0xe1, 0x62, 0xf2, 0x82, 0xf2, 0x41, 0x44, 0x82, 0x74, 0x9b, 0x1b, 0x99, 0x8f, 0xc0, 0x18, + 0xfa, 0x04, 0xee, 0xac, 0x82, 0x4c, 0xa9, 0xc7, 0x09, 0xb3, 0x8c, 0x96, 0xd6, 0x46, 0x78, 0x15, + 0xfb, 0xa9, 0x44, 0xd7, 0x0c, 0x25, 0x3b, 0x66, 0x41, 0x4b, 0x6b, 0x2b, 0xb9, 0xa1, 0xa4, 0xc6, + 0x04, 0xad, 0x28, 0x64, 0x6e, 0x81, 0x56, 0xed, 0xdf, 0xd0, 0xca, 0x7c, 0x56, 0xb4, 0x56, 0x41, + 0x52, 0x5a, 0xf5, 0x84, 0x56, 0x06, 0xe7, 0xb4, 0x56, 0x86, 0x29, 0xad, 0x46, 0x42, 0x2b, 0x83, + 0x53, 0x5a, 0xdf, 0x00, 0xc4, 0x94, 0x51, 0x3e, 0x9a, 0x8b, 0xdd, 0x6f, 0xca, 0x3b, 0xfe, 0xa0, + 0x48, 0x69, 0xd5, 0x3f, 0x1d, 0x2c, 0xec, 0x4e, 0xdd, 0x80, 0x63, 0x23, 0xce, 0x96, 0xeb, 0x0d, + 0x78, 0xe7, 0xed, 0x06, 0xfc, 0x12, 0x8c, 0x95, 0xd7, 0xfa, 0x4d, 0xad, 0x80, 0xf6, 0xbc, 0x3b, + 0x30, 0x15, 0xa4, 0x83, 0xda, 0xeb, 0x9b, 0x6a, 0x7e, 0x5b, 0xb5, 0xc3, 0x0a, 0x94, 0x25, 0xe7, + 0xc3, 0x3a, 0x40, 0x7e, 0xec, 0xf6, 0x13, 0x80, 0x7c, 0x7f, 0x44, 0xe7, 0x85, 0x97, 0x97, 0x8c, + 0x26, 0xad, 0xbc, 0x89, 0x53, 0x49, 0xe0, 0x1e, 0x0d, 0x66, 0x7c, 0x2e, 0x3b, 0xb8, 0x81, 0x53, + 0xc9, 0x7e, 0xa3, 0x00, 0x0c, 0x5d, 0x9f, 0x0e, 0x68, 0xec, 0x52, 0xf6, 0xee, 0xf7, 0x6f, 0x1f, + 0x2a, 0x4c, 0x5e, 0x7d, 0x66, 0xa9, 0xd2, 0x03, 0x15, 0x3d, 0x92, 0x57, 0x21, 0x75, 0xc9, 0x0c, + 0xd1, 0x57, 0x60, 0xd0, 0xf4, 0xc2, 0x33, 0x4b, 0x93, 0x5e, 0x5b, 0x45, 0xaf, 0xec, 0x35, 0x48, + 0xfd, 0x72, 0x63, 0xf4, 0x35, 0xc0, 0x3c, 0xdb, 0x78, 0x66, 0x95, 0xa4, 0xeb, 0xbd, 0x5b, 0x8f, + 0x25, 0xf5, 0x2d, 0x98, 0xdb, 0x7f, 0x29, 0x70, 0xd7, 0x71, 0x03, 0xd7, 0x77, 0x5f, 0xd1, 0x69, + 0xa1, 0xe6, 0x4f, 0xa1, 0x21, 0x8b, 0x19, 0xb1, 0xa5, 0x3f, 0x0e, 0xd3, 0xd2, 0x1b, 0x69, 0x80, + 0xba, 0x54, 0x0d, 0x12, 0xcd, 0xfb, 0x54, 0xed, 0x1b, 0x05, 0xb6, 0x6f, 0xa9, 0xf6, 0x9c, 0x06, + 0xe8, 0xa3, 0xdb, 0x0a, 0xae, 0xbc, 0xbf, 0xa5, 0x3e, 0x82, 0xb2, 0x6c, 0x4d, 0x31, 0x16, 0xe5, + 0x28, 0x55, 0x92, 0xb1, 0x28, 0xd6, 0xeb, 0x03, 0xc2, 0x48, 0x07, 0x84, 0xfd, 0x18, 0xf4, 0xf3, + 0xa4, 0x81, 0xdf, 0xb5, 0xe3, 0xed, 0x9f, 0x14, 0xa8, 0x4b, 0xdc, 0x21, 0x7c, 0x32, 0xa7, 0x31, + 0x7a, 0xb4, 0xf6, 0x13, 0xb8, 0x7f, 0xc3, 0x3f, 0xb5, 0xeb, 0x14, 0x7e, 0x00, 0x19, 0x51, 0xf5, + 0x36, 0xa2, 0x5a, 0x91, 0x68, 0x1b, 0x4a, 0x72, 0x9e, 0xeb, 0xa0, 0x76, 0x9f, 0x25, 0x0f, 0x44, + 0xaf, 0xfb, 0x2c, 0x79, 0x20, 0xb0, 0x98, 0xe1, 0x02, 0xc0, 0x5d, 0x53, 0xb3, 0x7f, 0x51, 0xc4, + 0xab, 0x42, 0xa6, 0xe2, 0x51, 0x61, 0xe8, 0x7f, 0x50, 0x61, 0x9c, 0x46, 0x23, 0x9f, 0x49, 0x5e, + 0x1a, 0xd6, 0x85, 0xe8, 0x30, 0x91, 0xfa, 0x72, 0x11, 0x4c, 0xb2, 0xd4, 0x62, 0x8d, 0xfe, 0x0f, + 0x55, 0xc6, 0x49, 0xcc, 0x85, 0x75, 0x32, 0x2d, 0x2b, 0x52, 0x76, 0x18, 0xba, 0x07, 0x3a, 0x0d, + 0xa6, 0x23, 0x79, 0x28, 0x42, 0x51, 0xa6, 0xc1, 0xd4, 0x61, 0x68, 0x07, 0xaa, 0xb3, 0x38, 0x5c, + 0x44, 0x6e, 0x30, 0xb3, 0xca, 0x2d, 0xad, 0x6d, 0xe0, 0x95, 0x8c, 0x9a, 0xa0, 0x8e, 0x97, 0x72, + 0x62, 0x55, 0xb1, 0x3a, 0x5e, 0x8a, 0xe8, 0x31, 0x09, 0x66, 0x54, 0x04, 0xa9, 0x24, 0xd1, 0xa5, + 0xec, 0x30, 0xfb, 0x77, 0x05, 0xca, 0x47, 0xf3, 0x45, 0xf0, 0x02, 0xed, 0x42, 0xcd, 0x77, 0x83, + 0x91, 0x78, 0x23, 0x73, 0xce, 0x86, 0xef, 0x06, 0xa2, 0x75, 0x1d, 0x26, 0xf5, 0xe4, 0x6a, 0xa5, + 0x4f, 0x3f, 0x11, 0x3e, 0xb9, 0x4a, 0xf5, 0x9d, 0xf4, 0x10, 0x34, 0x79, 0x08, 0x3b, 0xc5, 0x43, + 0x90, 0x09, 0x3a, 0xdd, 0x60, 0x12, 0x4e, 0xdd, 0x60, 0x96, 0x9f, 0x80, 0xf8, 0x9c, 0xc9, 0xaa, + 0xea, 0x58, 0xae, 0xed, 0xa7, 0x50, 0xcd, 0xac, 0x6e, 0xbc, 0xca, 0xdf, 0xf7, 0xc5, 0xdf, 0x69, + 0xed, 0xc3, 0xa4, 0xa2, 0xbb, 0x70, 0xe7, 0xf8, 0xbc, 0x7f, 0x30, 0x1c, 0x15, 0x7e, 0x51, 0xf6, + 0x8f, 0xd0, 0x90, 0x19, 0xe9, 0xf4, 0xbf, 0xbe, 0xa9, 0x7b, 0xa0, 0x4f, 0x44, 0x84, 0xec, 0xe6, + 0x6d, 0xde, 0xa8, 0x26, 0x73, 0x48, 0xcc, 0x0e, 0xb7, 0x5e, 0x5f, 0xef, 0x2a, 0xbf, 0x5d, 0xef, + 0x2a, 0x7f, 0x5e, 0xef, 0x2a, 0x3f, 0xe8, 0xc2, 0x3a, 0x1a, 0x8f, 0x75, 0xf9, 0x77, 0xfd, 0xe2, + 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0xa1, 0xff, 0x4a, 0xec, 0x0a, 0x00, 0x00, } func (m *MetricMetadata) Marshal() (dAtA []byte, err error) { @@ -2087,82 +1934,6 @@ func (m *MinimizedTimeSeries) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MinimizedTimeSeriesBytes) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MinimizedTimeSeriesBytes) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedTimeSeriesBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Histograms) > 0 { - for iNdEx := len(m.Histograms) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Histograms[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - if len(m.Exemplars) > 0 { - for iNdEx := len(m.Exemplars) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Exemplars[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.Samples) > 0 { - for iNdEx := len(m.Samples) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Samples[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.LabelSymbols) > 0 { - i -= len(m.LabelSymbols) - copy(dAtA[i:], m.LabelSymbols) - i = encodeVarintTypes(dAtA, i, uint64(len(m.LabelSymbols))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *MinimizedTimeSeriesLen) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2241,82 +2012,6 @@ func (m *MinimizedTimeSeriesLen) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *MinimizedTimeSeriesLenBytes) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MinimizedTimeSeriesLenBytes) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedTimeSeriesLenBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Histograms) > 0 { - for iNdEx := len(m.Histograms) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Histograms[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - } - if len(m.Exemplars) > 0 { - for iNdEx := len(m.Exemplars) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Exemplars[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.Samples) > 0 { - for iNdEx := len(m.Samples) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Samples[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.LabelSymbols) > 0 { - i -= len(m.LabelSymbols) - copy(dAtA[i:], m.LabelSymbols) - i = encodeVarintTypes(dAtA, i, uint64(len(m.LabelSymbols))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *Label) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2894,40 +2589,6 @@ func (m *MinimizedTimeSeries) Size() (n int) { return n } -func (m *MinimizedTimeSeriesBytes) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.LabelSymbols) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - if len(m.Samples) > 0 { - for _, e := range m.Samples { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if len(m.Exemplars) > 0 { - for _, e := range m.Exemplars { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if len(m.Histograms) > 0 { - for _, e := range m.Histograms { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *MinimizedTimeSeriesLen) Size() (n int) { if m == nil { return 0 @@ -2961,40 +2622,6 @@ func (m *MinimizedTimeSeriesLen) Size() (n int) { return n } -func (m *MinimizedTimeSeriesLenBytes) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.LabelSymbols) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - if len(m.Samples) > 0 { - for _, e := range m.Samples { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if len(m.Exemplars) > 0 { - for _, e := range m.Exemplars { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if len(m.Histograms) > 0 { - for _, e := range m.Histograms { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *Label) Size() (n int) { if m == nil { return 0 @@ -4543,193 +4170,6 @@ func (m *MinimizedTimeSeries) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedTimeSeriesBytes) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MinimizedTimeSeriesBytes: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedTimeSeriesBytes: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LabelSymbols", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LabelSymbols = append(m.LabelSymbols[:0], dAtA[iNdEx:postIndex]...) - if m.LabelSymbols == nil { - m.LabelSymbols = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Samples", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Samples = append(m.Samples, Sample{}) - if err := m.Samples[len(m.Samples)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Exemplars", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Exemplars = append(m.Exemplars, Exemplar{}) - if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Histograms", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Histograms = append(m.Histograms, Histogram{}) - if err := m.Histograms[len(m.Histograms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *MinimizedTimeSeriesLen) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4935,193 +4375,6 @@ func (m *MinimizedTimeSeriesLen) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedTimeSeriesLenBytes) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MinimizedTimeSeriesLenBytes: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedTimeSeriesLenBytes: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LabelSymbols", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.LabelSymbols = append(m.LabelSymbols[:0], dAtA[iNdEx:postIndex]...) - if m.LabelSymbols == nil { - m.LabelSymbols = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Samples", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Samples = append(m.Samples, Sample{}) - if err := m.Samples[len(m.Samples)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Exemplars", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Exemplars = append(m.Exemplars, Exemplar{}) - if err := m.Exemplars[len(m.Exemplars)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Histograms", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Histograms = append(m.Histograms, Histogram{}) - if err := m.Histograms[len(m.Histograms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *Label) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/prompb/types.proto b/prompb/types.proto index dacdcd9f0..5cc053630 100644 --- a/prompb/types.proto +++ b/prompb/types.proto @@ -134,6 +134,7 @@ message TimeSeries { message MinimizedTimeSeries { // Sorted list of label name-value pair references. This list's len is always multiple of 4, // packing tuples of (label name offset, label name length, label value offset, label value length). + // Offsets point to the symbol table in the higher level MinimizedWriteRequestLen. repeated uint32 label_symbols = 1 [(gogoproto.nullable) = false]; // Sorted by time, oldest sample first. @@ -144,23 +145,10 @@ message MinimizedTimeSeries { // TODO: add metadata } -message MinimizedTimeSeriesBytes { - // Sorted list of label name-value pair references, encoded as varints. This - // list's real len is always multiple of 4, packing tuples of (label name offset, - // label name length, label value offset, label value length). - bytes label_symbols = 1; - - // Sorted by time, oldest sample first. - // TODO: support references for other types - repeated Sample samples = 2 [(gogoproto.nullable) = false]; - repeated Exemplar exemplars = 3 [(gogoproto.nullable) = false]; - repeated Histogram histograms = 4 [(gogoproto.nullable) = false]; - // TODO: add metadata -} - message MinimizedTimeSeriesLen { - // Sorted list of label name-value pair references, encoded as varints. This + // Sorted list of label name-value pair references, encoded as 32bit uint. This // list's real len is always multiple of 2, label name offset/label value offset. + // Offsets point to the symbol table in the higher level MinimizedWriteRequestLen. repeated fixed32 label_symbols = 1; // Sorted by time, oldest sample first. @@ -171,19 +159,6 @@ message MinimizedTimeSeriesLen { // TODO: add metadata } -message MinimizedTimeSeriesLenBytes{ - // Sorted list of label name-value pair references, encoded as varints. This - // list's real len is always multiple of 2, label name offset/label value offset. - bytes label_symbols = 1; - - // Sorted by time, oldest sample first. - // TODO: support references for other types - repeated Sample samples = 2 [(gogoproto.nullable) = false]; - repeated Exemplar exemplars = 3 [(gogoproto.nullable) = false]; - repeated Histogram histograms = 4 [(gogoproto.nullable) = false]; - // TODO: add metadata -} - message Label { string name = 1; string value = 2; diff --git a/scripts/remotewrite11-bench/run.sh b/scripts/remotewrite11-bench/run.sh index 77d987865..174421c06 100755 --- a/scripts/remotewrite11-bench/run.sh +++ b/scripts/remotewrite11-bench/run.sh @@ -8,13 +8,7 @@ declare -a INSTANCES # (sender,receiver) pairs to run: (sender_name; sender_flags; receiver_name; receiver_flags) INSTANCES+=('sender-v1;;receiver-v1;') INSTANCES+=('sender-v11-min32-optimized-varint;--remote-write-format 1;receiver-v11-min32-optimized-varint;--remote-write-format 1') -INSTANCES+=('sender-v11-min64-fixed;--remote-write-format 2;receiver-v11-min64-fixed;--remote-write-format 2') -INSTANCES+=('sender-v11-min32-fixed;--remote-write-format 3;receiver-v11-min32-fixed;--remote-write-format 3') -INSTANCES+=('sender-v11-min-bytes;--remote-write-format 4;receiver-v11-min-bytes;--remote-write-format 4') INSTANCES+=('sender-v11-min-len;--remote-write-format 5;receiver-v11-min-len;--remote-write-format 5') -INSTANCES+=('sender-v11-min-len-bytes;--remote-write-format 6;receiver-v11-min-len-bytes;--remote-write-format 6') - - # ~~~~~~~~~~~~~ diff --git a/storage/remote/codec.go b/storage/remote/codec.go index c782ced6f..9f4a0bb7c 100644 --- a/storage/remote/codec.go +++ b/storage/remote/codec.go @@ -1091,25 +1091,6 @@ func DecodeMinimizedWriteRequest(r io.Reader) (*prompb.MinimizedWriteRequest, er return &req, nil } -func DecodeMinimizedWriteRequestBytes(r io.Reader) (*prompb.MinimizedWriteRequestBytes, error) { - compressed, err := io.ReadAll(r) - if err != nil { - return nil, err - } - - reqBuf, err := snappy.Decode(nil, compressed) - if err != nil { - return nil, err - } - - var req prompb.MinimizedWriteRequestBytes - if err := proto.Unmarshal(reqBuf, &req); err != nil { - return nil, err - } - - return &req, nil -} - func DecodeMinimizedWriteRequestLen(r io.Reader) (*prompb.MinimizedWriteRequestLen, error) { compressed, err := io.ReadAll(r) if err != nil { @@ -1129,25 +1110,6 @@ func DecodeMinimizedWriteRequestLen(r io.Reader) (*prompb.MinimizedWriteRequestL return &req, nil } -func DecodeMinimizedWriteRequestLenBytes(r io.Reader) (*prompb.MinimizedWriteRequestLenBytes, error) { - compressed, err := io.ReadAll(r) - if err != nil { - return nil, err - } - - reqBuf, err := snappy.Decode(nil, compressed) - if err != nil { - return nil, err - } - - var req prompb.MinimizedWriteRequestLenBytes - if err := proto.Unmarshal(reqBuf, &req); err != nil { - return nil, err - } - - return &req, nil -} - func MinimizedWriteRequestToWriteRequest(redReq *prompb.MinimizedWriteRequest) (*prompb.WriteRequest, error) { req := &prompb.WriteRequest{ Timeseries: make([]prompb.TimeSeries, len(redReq.Timeseries)), diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index 5ef01a2d9..9937aa3af 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -395,11 +395,7 @@ type RemoteWriteFormat int64 const ( Base1 RemoteWriteFormat = iota // original map based format Min32Optimized // two 32bit varint plus marshalling optimization - Min64Fixed // a single fixed64 bit value, first 32 are offset and 2nd 32 are - Min32Fixed - MinBytes // two 32bit fixed, similar to optimized but not varints + no manual marshalling optimization - MinLen // symbols are now just offsets, and we encode lengths as varints in the large symbols string (which is also now a byte slice) - MinLenBytes // the previous two combined + MinLen // symbols are now just offsets, and we encode lengths as varints in the large symbols string (which is also now a byte slice) ) // QueueManager manages a queue of samples to be sent to the Storage @@ -1390,21 +1386,11 @@ func (s *shards) runShard(ctx context.Context, shardID int, queue *queue) { pendingMinimizedData[i].Samples = []prompb.Sample{{}} } - pendingMinBytesData := make([]prompb.MinimizedTimeSeriesBytes, max) - for i := range pendingMinBytesData { - pendingMinBytesData[i].Samples = []prompb.Sample{{}} - } - pendingMinLenData := make([]prompb.MinimizedTimeSeriesLen, max) for i := range pendingMinLenData { pendingMinLenData[i].Samples = []prompb.Sample{{}} } - pendingMinLenBytesData := make([]prompb.MinimizedTimeSeriesLenBytes, max) - for i := range pendingMinLenData { - pendingMinLenBytesData[i].Samples = []prompb.Sample{{}} - } - timer := time.NewTimer(time.Duration(s.qm.cfg.BatchSendDeadline)) stop := func() { if !timer.Stop() { @@ -1449,21 +1435,11 @@ func (s *shards) runShard(ctx context.Context, shardID int, queue *queue) { n := nPendingSamples + nPendingExemplars + nPendingHistograms s.sendMinSamples(ctx, pendingMinimizedData[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, &pBufRaw, &buf) symbolTable.clear() - case MinBytes: - nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesBytes(&symbolTable, batch, pendingMinBytesData, s.qm.sendExemplars, s.qm.sendNativeHistograms) - n := nPendingSamples + nPendingExemplars + nPendingHistograms - s.sendMinBytes(ctx, pendingMinBytesData[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) - symbolTable.clear() case MinLen: nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesLen(&symbolTable, batch, pendingMinLenData, s.qm.sendExemplars, s.qm.sendNativeHistograms) n := nPendingSamples + nPendingExemplars + nPendingHistograms s.sendMinLenSamples(ctx, pendingMinLenData[:n], symbolTable.LabelsData(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) symbolTable.clear() - case MinLenBytes: - nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesLenBytes(&symbolTable, batch, pendingMinLenBytesData, s.qm.sendExemplars, s.qm.sendNativeHistograms) - n := nPendingSamples + nPendingExemplars + nPendingHistograms - s.sendMinLenBytesSamples(ctx, pendingMinLenBytesData[:n], symbolTable.LabelsData(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) - symbolTable.clear() } queue.ReturnForReuse(batch) @@ -1572,30 +1548,6 @@ func (s *shards) sendMinLenSamples(ctx context.Context, samples []prompb.Minimiz s.updateMetrics(ctx, err, sampleCount, exemplarCount, histogramCount, time.Since(begin)) } -func (s *shards) sendMinLenBytesSamples(ctx context.Context, samples []prompb.MinimizedTimeSeriesLenBytes, labels []byte, sampleCount, exemplarCount, histogramCount int, pBuf *proto.Buffer, buf *[]byte) { - begin := time.Now() - // Build the ReducedWriteRequest with no metadata. - // Failing to build the write request is non-recoverable, since it will - // only error if marshaling the proto to bytes fails. - req, highest, err := buildMinimizedWriteRequestLenBytes(samples, labels, pBuf, buf) - if err == nil { - err = s.sendSamplesWithBackoff(ctx, req, sampleCount, exemplarCount, histogramCount, highest) - } - s.updateMetrics(ctx, err, sampleCount, exemplarCount, histogramCount, time.Since(begin)) -} - -func (s *shards) sendMinBytes(ctx context.Context, samples []prompb.MinimizedTimeSeriesBytes, labels string, sampleCount, exemplarCount, histogramCount int, pBuf *proto.Buffer, buf *[]byte) { - begin := time.Now() - // Build the ReducedWriteRequest with no metadata. - // Failing to build the write request is non-recoverable, since it will - // only error if marshaling the proto to bytes fails. - req, highest, err := buildMinimizedWriteRequestBytes(samples, labels, pBuf, buf) - if err == nil { - err = s.sendSamplesWithBackoff(ctx, req, sampleCount, exemplarCount, histogramCount, highest) - } - s.updateMetrics(ctx, err, sampleCount, exemplarCount, histogramCount, time.Since(begin)) -} - func (s *shards) updateMetrics(ctx context.Context, err error, sampleCount, exemplarCount, histogramCount int, duration time.Duration) { if err != nil { level.Error(s.qm.logger).Log("msg", "non-recoverable error", "count", sampleCount, "exemplarCount", exemplarCount, "err", err) @@ -1720,55 +1672,6 @@ func populateMinimizedTimeSeries(symbolTable *rwSymbolTable, batch []timeSeries, return nPendingSamples, nPendingExemplars, nPendingHistograms } -func populateMinimizedTimeSeriesBytes(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesBytes, sendExemplars, sendNativeHistograms bool) (int, int, int) { - var nPendingSamples, nPendingExemplars, nPendingHistograms int - for nPending, d := range batch { - pendingData[nPending].Samples = pendingData[nPending].Samples[:0] - if sendExemplars { - pendingData[nPending].Exemplars = pendingData[nPending].Exemplars[:0] - } - if sendNativeHistograms { - pendingData[nPending].Histograms = pendingData[nPending].Histograms[:0] - } - - // Number of pending samples is limited by the fact that sendSamples (via sendSamplesWithBackoff) - // retries endlessly, so once we reach max samples, if we can never send to the endpoint we'll - // stop reading from the queue. This makes it safe to reference pendingSamples by index. - // pendingData[nPending].Labels = labelsToLabelsProto(d.seriesLabels, pendingData[nPending].Labels) - - pendingData[nPending].LabelSymbols = labelsToByteSlice(d.seriesLabels, symbolTable, pendingData[nPending].LabelSymbols) - switch d.sType { - case tSample: - pendingData[nPending].Samples = append(pendingData[nPending].Samples, prompb.Sample{ - Value: d.value, - Timestamp: d.timestamp, - }) - nPendingSamples++ - // TODO: handle all types - //case tExemplar: - // l := make([]prompb.LabelRef, 0, d.exemplarLabels.Len()) - // d.exemplarLabels.Range(func(el labels.Label) { - // nRef := pool.intern(el.Name) - // vRef := pool.intern(el.Value) - // l = append(l, prompb.LabelRef{NameRef: nRef, ValueRef: vRef}) - // }) - // pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.ExemplarRef{ - // Labels: l, - // Value: d.value, - // Timestamp: d.timestamp, - // }) - // nPendingExemplars++ - case tHistogram: - pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, HistogramToHistogramProto(d.timestamp, d.histogram)) - nPendingHistograms++ - case tFloatHistogram: - pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, FloatHistogramToHistogramProto(d.timestamp, d.floatHistogram)) - nPendingHistograms++ - } - } - return nPendingSamples, nPendingExemplars, nPendingHistograms -} - func populateMinimizedTimeSeriesLen(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesLen, sendExemplars, sendNativeHistograms bool) (int, int, int) { var nPendingSamples, nPendingExemplars, nPendingHistograms int for nPending, d := range batch { @@ -1818,55 +1721,6 @@ func populateMinimizedTimeSeriesLen(symbolTable *rwSymbolTable, batch []timeSeri return nPendingSamples, nPendingExemplars, nPendingHistograms } -func populateMinimizedTimeSeriesLenBytes(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesLenBytes, sendExemplars, sendNativeHistograms bool) (int, int, int) { - var nPendingSamples, nPendingExemplars, nPendingHistograms int - for nPending, d := range batch { - pendingData[nPending].Samples = pendingData[nPending].Samples[:0] - if sendExemplars { - pendingData[nPending].Exemplars = pendingData[nPending].Exemplars[:0] - } - if sendNativeHistograms { - pendingData[nPending].Histograms = pendingData[nPending].Histograms[:0] - } - - // Number of pending samples is limited by the fact that sendSamples (via sendSamplesWithBackoff) - // retries endlessly, so once we reach max samples, if we can never send to the endpoint we'll - // stop reading from the queue. This makes it safe to reference pendingSamples by index. - // pendingData[nPending].Labels = labelsToLabelsProto(d.seriesLabels, pendingData[nPending].Labels) - - pendingData[nPending].LabelSymbols = labelsToByteSlice(d.seriesLabels, symbolTable, pendingData[nPending].LabelSymbols) - switch d.sType { - case tSample: - pendingData[nPending].Samples = append(pendingData[nPending].Samples, prompb.Sample{ - Value: d.value, - Timestamp: d.timestamp, - }) - nPendingSamples++ - // TODO: handle all types - //case tExemplar: - // l := make([]prompb.LabelRef, 0, d.exemplarLabels.Len()) - // d.exemplarLabels.Range(func(el labels.Label) { - // nRef := pool.intern(el.Name) - // vRef := pool.intern(el.Value) - // l = append(l, prompb.LabelRef{NameRef: nRef, ValueRef: vRef}) - // }) - // pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.ExemplarRef{ - // Labels: l, - // Value: d.value, - // Timestamp: d.timestamp, - // }) - // nPendingExemplars++ - case tHistogram: - pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, HistogramToHistogramProto(d.timestamp, d.histogram)) - nPendingHistograms++ - case tFloatHistogram: - pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, FloatHistogramToHistogramProto(d.timestamp, d.floatHistogram)) - nPendingHistograms++ - } - } - return nPendingSamples, nPendingExemplars, nPendingHistograms -} - func sendWriteRequestWithBackoff(ctx context.Context, cfg config.QueueConfig, l log.Logger, attempt func(int) error, onRetry func()) error { backoff := cfg.MinBackoff sleepDuration := model.Duration(0) @@ -2152,95 +2006,3 @@ func buildMinimizedWriteRequestLen(samples []prompb.MinimizedTimeSeriesLen, labe } return compressed, highest, nil } - -func buildMinimizedWriteRequestLenBytes(samples []prompb.MinimizedTimeSeriesLenBytes, labels []byte, pBuf *proto.Buffer, buf *[]byte) ([]byte, int64, error) { - var highest int64 - for _, ts := range samples { - // At the moment we only ever append a TimeSeries with a single sample or exemplar in it. - if len(ts.Samples) > 0 && ts.Samples[0].Timestamp > highest { - highest = ts.Samples[0].Timestamp - } - if len(ts.Exemplars) > 0 && ts.Exemplars[0].Timestamp > highest { - highest = ts.Exemplars[0].Timestamp - } - if len(ts.Histograms) > 0 && ts.Histograms[0].Timestamp > highest { - highest = ts.Histograms[0].Timestamp - } - } - - req := &prompb.MinimizedWriteRequestLenBytes{ - Symbols: labels, - Timeseries: samples, - } - - if pBuf == nil { - pBuf = proto.NewBuffer(nil) // For convenience in tests. Not efficient. - } else { - pBuf.Reset() - } - err := pBuf.Marshal(req) - if err != nil { - return nil, 0, err - } - - // snappy uses len() to see if it needs to allocate a new slice. Make the - // buffer as long as possible. - if buf != nil { - *buf = (*buf)[0:cap(*buf)] - } else { - buf = &[]byte{} - } - - compressed := snappy.Encode(*buf, pBuf.Bytes()) - if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); buf != nil && n > len(*buf) { - // grow the buffer for the next time - *buf = make([]byte, n) - } - return compressed, highest, nil -} - -func buildMinimizedWriteRequestBytes(samples []prompb.MinimizedTimeSeriesBytes, labels string, pBuf *proto.Buffer, buf *[]byte) ([]byte, int64, error) { - var highest int64 - for _, ts := range samples { - // At the moment we only ever append a TimeSeries with a single sample or exemplar in it. - if len(ts.Samples) > 0 && ts.Samples[0].Timestamp > highest { - highest = ts.Samples[0].Timestamp - } - if len(ts.Exemplars) > 0 && ts.Exemplars[0].Timestamp > highest { - highest = ts.Exemplars[0].Timestamp - } - if len(ts.Histograms) > 0 && ts.Histograms[0].Timestamp > highest { - highest = ts.Histograms[0].Timestamp - } - } - - req := &prompb.MinimizedWriteRequestBytes{ - Symbols: labels, - Timeseries: samples, - } - - if pBuf == nil { - pBuf = proto.NewBuffer(nil) // For convenience in tests. Not efficient. - } else { - pBuf.Reset() - } - err := pBuf.Marshal(req) - if err != nil { - return nil, 0, err - } - - // snappy uses len() to see if it needs to allocate a new slice. Make the - // buffer as long as possible. - if buf != nil { - *buf = (*buf)[0:cap(*buf)] - } else { - buf = &[]byte{} - } - - compressed := snappy.Encode(*buf, pBuf.Bytes()) - if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); buf != nil && n > len(*buf) { - // grow the buffer for the next time - *buf = make([]byte, n) - } - return compressed, highest, nil -} diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go index 024fe19d1..e8ff9c7e6 100644 --- a/storage/remote/write_handler.go +++ b/storage/remote/write_handler.go @@ -74,9 +74,7 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { var err error var req *prompb.WriteRequest var reqMin *prompb.MinimizedWriteRequest - var reqMinBytes *prompb.MinimizedWriteRequestBytes var reqMinLen *prompb.MinimizedWriteRequestLen - var reqMinLenBytes *prompb.MinimizedWriteRequestLenBytes // TODO: this should eventually be done via content negotiation/looking at the header switch h.rwFormat { @@ -84,12 +82,8 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { req, err = DecodeWriteRequest(r.Body) case Min32Optimized: reqMin, err = DecodeMinimizedWriteRequest(r.Body) - case MinBytes: - reqMinBytes, err = DecodeMinimizedWriteRequestBytes(r.Body) case MinLen: reqMinLen, err = DecodeMinimizedWriteRequestLen(r.Body) - case MinLenBytes: - reqMinLenBytes, err = DecodeMinimizedWriteRequestLenBytes(r.Body) } if err != nil { @@ -104,12 +98,8 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { err = h.write(r.Context(), req) case Min32Optimized: err = h.writeMin(r.Context(), reqMin) - case MinBytes: - err = h.writeMinBytes(r.Context(), reqMinBytes) case MinLen: err = h.writeMinLen(r.Context(), reqMinLen) - case MinLenBytes: - err = h.writeMinLenBytes(r.Context(), reqMinLenBytes) } switch { @@ -343,44 +333,6 @@ func (h *writeHandler) writeMin(ctx context.Context, req *prompb.MinimizedWriteR return nil } -func (h *writeHandler) writeMinBytes(ctx context.Context, req *prompb.MinimizedWriteRequestBytes) (err error) { - outOfOrderExemplarErrs := 0 - - app := h.appendable.Appender(ctx) - defer func() { - if err != nil { - _ = app.Rollback() - return - } - err = app.Commit() - }() - - for _, ts := range req.Timeseries { - ls := ByteSliceToLabels(req.Symbols, ts.LabelSymbols) - err := h.appendSamples(app, ts.Samples, ls) - if err != nil { - return err - } - - for _, ep := range ts.Exemplars { - e := exemplarProtoToExemplar(ep) - //e := exemplarRefProtoToExemplar(req.StringSymbolTable, ep) - h.appendExemplar(app, e, ls, &outOfOrderExemplarErrs) - } - - err = h.appendHistograms(app, ts.Histograms, ls) - if err != nil { - return err - } - } - - if outOfOrderExemplarErrs > 0 { - _ = level.Warn(h.logger).Log("msg", "Error on ingesting out-of-order exemplars", "num_dropped", outOfOrderExemplarErrs) - } - - return nil -} - func (h *writeHandler) writeMinLen(ctx context.Context, req *prompb.MinimizedWriteRequestLen) (err error) { outOfOrderExemplarErrs := 0 @@ -419,42 +371,3 @@ func (h *writeHandler) writeMinLen(ctx context.Context, req *prompb.MinimizedWri return nil } - -func (h *writeHandler) writeMinLenBytes(ctx context.Context, req *prompb.MinimizedWriteRequestLenBytes) (err error) { - outOfOrderExemplarErrs := 0 - - app := h.appendable.Appender(ctx) - defer func() { - if err != nil { - _ = app.Rollback() - return - } - err = app.Commit() - }() - - for _, ts := range req.Timeseries { - ls := ByteSliceToLabelsSymbolsByte(req.Symbols, ts.LabelSymbols) - - err := h.appendSamples(app, ts.Samples, ls) - if err != nil { - return err - } - - for _, ep := range ts.Exemplars { - e := exemplarProtoToExemplar(ep) - //e := exemplarRefProtoToExemplar(req.StringSymbolTable, ep) - h.appendExemplar(app, e, ls, &outOfOrderExemplarErrs) - } - - err = h.appendHistograms(app, ts.Histograms, ls) - if err != nil { - return err - } - } - - if outOfOrderExemplarErrs > 0 { - _ = level.Warn(h.logger).Log("msg", "Error on ingesting out-of-order exemplars", "num_dropped", outOfOrderExemplarErrs) - } - - return nil -}