From 81c0d78ad4fc1a3400f9e716ad165b5670872fa6 Mon Sep 17 00:00:00 2001 From: Callum Styan Date: Sun, 19 Nov 2023 19:05:30 -0800 Subject: [PATCH] remove formats we've decided not to 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 | 838 ++----------------- prompb/remote.proto | 36 - prompb/types.pb.go | 1352 ++----------------------------- prompb/types.proto | 37 - storage/remote/codec.go | 70 -- storage/remote/queue_manager.go | 333 -------- storage/remote/write_handler.go | 88 -- 7 files changed, 136 insertions(+), 2618 deletions(-) diff --git a/prompb/remote.pb.go b/prompb/remote.pb.go index 0e997627de..cc1fcb9040 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{8, 0} + return fileDescriptor_eefc82927d57d89b, []int{5, 0} } type WriteRequest struct { @@ -118,63 +118,6 @@ func (m *WriteRequest) GetMetadata() []MetricMetadata { return nil } -type MinimizedWriteRequestPacking struct { - Timeseries []MinimizedTimeSeriesPacking `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 *MinimizedWriteRequestPacking) Reset() { *m = MinimizedWriteRequestPacking{} } -func (m *MinimizedWriteRequestPacking) String() string { return proto.CompactTextString(m) } -func (*MinimizedWriteRequestPacking) ProtoMessage() {} -func (*MinimizedWriteRequestPacking) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{1} -} -func (m *MinimizedWriteRequestPacking) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedWriteRequestPacking) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedWriteRequestPacking.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 *MinimizedWriteRequestPacking) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedWriteRequestPacking.Merge(m, src) -} -func (m *MinimizedWriteRequestPacking) XXX_Size() int { - return m.Size() -} -func (m *MinimizedWriteRequestPacking) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedWriteRequestPacking.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedWriteRequestPacking proto.InternalMessageInfo - -func (m *MinimizedWriteRequestPacking) GetTimeseries() []MinimizedTimeSeriesPacking { - if m != nil { - return m.Timeseries - } - return nil -} - -func (m *MinimizedWriteRequestPacking) GetSymbols() string { - if m != nil { - return m.Symbols - } - return "" -} - type MinimizedWriteRequest struct { Timeseries []MinimizedTimeSeries `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 @@ -189,7 +132,7 @@ func (m *MinimizedWriteRequest) Reset() { *m = MinimizedWriteRequest{} } func (m *MinimizedWriteRequest) String() string { return proto.CompactTextString(m) } func (*MinimizedWriteRequest) ProtoMessage() {} func (*MinimizedWriteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{2} + return fileDescriptor_eefc82927d57d89b, []int{1} } func (m *MinimizedWriteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -246,7 +189,7 @@ func (m *MinimizedWriteRequestBytes) Reset() { *m = MinimizedWriteReques func (m *MinimizedWriteRequestBytes) String() string { return proto.CompactTextString(m) } func (*MinimizedWriteRequestBytes) ProtoMessage() {} func (*MinimizedWriteRequestBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{3} + return fileDescriptor_eefc82927d57d89b, []int{2} } func (m *MinimizedWriteRequestBytes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -303,7 +246,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{4} + return fileDescriptor_eefc82927d57d89b, []int{3} } func (m *MinimizedWriteRequestLen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -360,7 +303,7 @@ func (m *MinimizedWriteRequestLenBytes) Reset() { *m = MinimizedWriteReq func (m *MinimizedWriteRequestLenBytes) String() string { return proto.CompactTextString(m) } func (*MinimizedWriteRequestLenBytes) ProtoMessage() {} func (*MinimizedWriteRequestLenBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{5} + return fileDescriptor_eefc82927d57d89b, []int{4} } func (m *MinimizedWriteRequestLenBytes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -403,120 +346,6 @@ func (m *MinimizedWriteRequestLenBytes) GetSymbols() []byte { return nil } -type MinimizedWriteRequestFixed32 struct { - Timeseries []MinimizedTimeSeriesFixed32 `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 *MinimizedWriteRequestFixed32) Reset() { *m = MinimizedWriteRequestFixed32{} } -func (m *MinimizedWriteRequestFixed32) String() string { return proto.CompactTextString(m) } -func (*MinimizedWriteRequestFixed32) ProtoMessage() {} -func (*MinimizedWriteRequestFixed32) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{6} -} -func (m *MinimizedWriteRequestFixed32) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedWriteRequestFixed32) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedWriteRequestFixed32.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 *MinimizedWriteRequestFixed32) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedWriteRequestFixed32.Merge(m, src) -} -func (m *MinimizedWriteRequestFixed32) XXX_Size() int { - return m.Size() -} -func (m *MinimizedWriteRequestFixed32) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedWriteRequestFixed32.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedWriteRequestFixed32 proto.InternalMessageInfo - -func (m *MinimizedWriteRequestFixed32) GetTimeseries() []MinimizedTimeSeriesFixed32 { - if m != nil { - return m.Timeseries - } - return nil -} - -func (m *MinimizedWriteRequestFixed32) GetSymbols() string { - if m != nil { - return m.Symbols - } - return "" -} - -type MinimizedWriteRequestFixed64 struct { - Timeseries []MinimizedTimeSeriesFixed64 `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 *MinimizedWriteRequestFixed64) Reset() { *m = MinimizedWriteRequestFixed64{} } -func (m *MinimizedWriteRequestFixed64) String() string { return proto.CompactTextString(m) } -func (*MinimizedWriteRequestFixed64) ProtoMessage() {} -func (*MinimizedWriteRequestFixed64) Descriptor() ([]byte, []int) { - return fileDescriptor_eefc82927d57d89b, []int{7} -} -func (m *MinimizedWriteRequestFixed64) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedWriteRequestFixed64) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedWriteRequestFixed64.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 *MinimizedWriteRequestFixed64) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedWriteRequestFixed64.Merge(m, src) -} -func (m *MinimizedWriteRequestFixed64) XXX_Size() int { - return m.Size() -} -func (m *MinimizedWriteRequestFixed64) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedWriteRequestFixed64.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedWriteRequestFixed64 proto.InternalMessageInfo - -func (m *MinimizedWriteRequestFixed64) GetTimeseries() []MinimizedTimeSeriesFixed64 { - if m != nil { - return m.Timeseries - } - return nil -} - -func (m *MinimizedWriteRequestFixed64) GetSymbols() string { - if m != nil { - return m.Symbols - } - return "" -} - // ReadRequest represents a remote read request. type ReadRequest struct { Queries []*Query `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"` @@ -535,7 +364,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{8} + return fileDescriptor_eefc82927d57d89b, []int{5} } func (m *ReadRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -591,7 +420,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{9} + return fileDescriptor_eefc82927d57d89b, []int{6} } func (m *ReadResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -641,7 +470,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{10} + return fileDescriptor_eefc82927d57d89b, []int{7} } func (m *Query) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -710,7 +539,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{11} + return fileDescriptor_eefc82927d57d89b, []int{8} } func (m *QueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -763,7 +592,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{12} + return fileDescriptor_eefc82927d57d89b, []int{9} } func (m *ChunkedReadResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -809,13 +638,10 @@ func (m *ChunkedReadResponse) GetQueryIndex() int64 { func init() { proto.RegisterEnum("prometheus.ReadRequest_ResponseType", ReadRequest_ResponseType_name, ReadRequest_ResponseType_value) proto.RegisterType((*WriteRequest)(nil), "prometheus.WriteRequest") - proto.RegisterType((*MinimizedWriteRequestPacking)(nil), "prometheus.MinimizedWriteRequestPacking") 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((*MinimizedWriteRequestFixed32)(nil), "prometheus.MinimizedWriteRequestFixed32") - proto.RegisterType((*MinimizedWriteRequestFixed64)(nil), "prometheus.MinimizedWriteRequestFixed64") proto.RegisterType((*ReadRequest)(nil), "prometheus.ReadRequest") proto.RegisterType((*ReadResponse)(nil), "prometheus.ReadResponse") proto.RegisterType((*Query)(nil), "prometheus.Query") @@ -826,49 +652,46 @@ func init() { func init() { proto.RegisterFile("remote.proto", fileDescriptor_eefc82927d57d89b) } var fileDescriptor_eefc82927d57d89b = []byte{ - // 669 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x5f, 0x4f, 0x13, 0x4d, - 0x14, 0xc6, 0x19, 0x5a, 0x68, 0xdf, 0xb3, 0x7d, 0x49, 0xdf, 0x01, 0x5e, 0xd6, 0x46, 0x81, 0x6c, - 0x8c, 0x36, 0xc1, 0xd4, 0x08, 0x0d, 0x57, 0x5c, 0x08, 0x58, 0x83, 0xd8, 0x55, 0x9c, 0xd6, 0x68, - 0x8c, 0xc9, 0x66, 0xbb, 0x7b, 0x42, 0x37, 0xb0, 0x7f, 0xd8, 0x99, 0x26, 0xd4, 0x6b, 0xaf, 0xbc, - 0x30, 0xc6, 0xf8, 0x89, 0xbc, 0xe2, 0xca, 0xf8, 0x09, 0x8c, 0xe1, 0x93, 0x98, 0xfd, 0x07, 0x53, - 0x5d, 0x2c, 0xe9, 0xdd, 0xee, 0x39, 0xcf, 0xf3, 0xec, 0x6f, 0xce, 0xcc, 0xee, 0x42, 0x25, 0x44, - 0xd7, 0x17, 0xd8, 0x08, 0x42, 0x5f, 0xf8, 0x14, 0x82, 0xd0, 0x77, 0x51, 0xf4, 0x71, 0xc0, 0x6b, - 0x8a, 0x18, 0x06, 0xc8, 0x93, 0x46, 0x6d, 0xe1, 0xd0, 0x3f, 0xf4, 0xe3, 0xcb, 0xfb, 0xd1, 0x55, - 0x52, 0xd5, 0x3e, 0x11, 0xa8, 0xbc, 0x0a, 0x1d, 0x81, 0x0c, 0x4f, 0x06, 0xc8, 0x05, 0xdd, 0x02, - 0x10, 0x8e, 0x8b, 0x1c, 0x43, 0x07, 0xb9, 0x4a, 0x56, 0x0b, 0x75, 0x65, 0xfd, 0xff, 0xc6, 0x65, - 0x68, 0xa3, 0xeb, 0xb8, 0xd8, 0x89, 0xbb, 0x3b, 0xc5, 0xb3, 0x1f, 0x2b, 0x53, 0x4c, 0xd2, 0xd3, - 0x2d, 0x28, 0xbb, 0x28, 0x4c, 0xdb, 0x14, 0xa6, 0x5a, 0x88, 0xbd, 0x35, 0xd9, 0xab, 0xa3, 0x08, - 0x1d, 0x4b, 0x4f, 0x15, 0xa9, 0xff, 0xc2, 0xb1, 0x5f, 0x2c, 0x4f, 0x57, 0x0b, 0xda, 0x67, 0x02, - 0x37, 0x75, 0xc7, 0x73, 0x5c, 0xe7, 0x1d, 0xda, 0x32, 0xdb, 0x81, 0x69, 0x1d, 0x39, 0xde, 0x21, - 0x6d, 0xe7, 0x20, 0xde, 0x19, 0x79, 0x4c, 0xe6, 0xbe, 0x64, 0x4d, 0xbd, 0x39, 0xc8, 0x2a, 0x94, - 0xf8, 0xd0, 0xed, 0xf9, 0xc7, 0x5c, 0x2d, 0xae, 0x92, 0xfa, 0x3f, 0x2c, 0xbb, 0x4d, 0x70, 0xf6, - 0x8b, 0xe5, 0x42, 0xb5, 0xa8, 0xbd, 0x27, 0xb0, 0x98, 0x0b, 0x45, 0x5b, 0x39, 0x34, 0x2b, 0x63, - 0x68, 0x26, 0xc6, 0xf8, 0x48, 0xa0, 0x96, 0x8b, 0xb1, 0x33, 0x14, 0xc8, 0xe9, 0x7e, 0x0e, 0xcb, - 0xed, 0x71, 0x2c, 0x91, 0x73, 0x62, 0xa0, 0x0f, 0x04, 0xd4, 0x5c, 0xa0, 0x36, 0x7a, 0x74, 0x2f, - 0x07, 0x47, 0x1b, 0x83, 0xd3, 0x46, 0x6f, 0x3c, 0x4c, 0x25, 0x1f, 0xe6, 0x0b, 0x81, 0x5b, 0x57, - 0xc1, 0x24, 0x03, 0xd2, 0x73, 0x88, 0xee, 0x5e, 0x83, 0xe8, 0x7a, 0x33, 0xba, 0x02, 0xeb, 0xca, - 0x03, 0xfd, 0xd8, 0x39, 0x45, 0x7b, 0x63, 0x7d, 0xa2, 0x03, 0x9d, 0x7a, 0x27, 0xde, 0xb8, 0xbf, - 0x43, 0x6d, 0x36, 0x27, 0x87, 0xda, 0x6c, 0x4e, 0x0c, 0xf5, 0x8d, 0x80, 0xc2, 0xd0, 0xb4, 0xb3, - 0x77, 0x6b, 0x0d, 0x4a, 0x27, 0x03, 0x19, 0xe0, 0x3f, 0x19, 0xe0, 0xc5, 0x00, 0xc3, 0x21, 0xcb, - 0x14, 0xf4, 0x2d, 0x2c, 0x99, 0x96, 0x85, 0x81, 0x40, 0xdb, 0x08, 0x91, 0x07, 0xbe, 0xc7, 0xd1, - 0x88, 0xbf, 0x80, 0xea, 0xf4, 0x6a, 0xa1, 0x3e, 0x37, 0xfa, 0x26, 0x48, 0x8f, 0x69, 0xb0, 0x54, - 0xdd, 0x1d, 0x06, 0xc8, 0x16, 0xb3, 0x10, 0xb9, 0xca, 0xb5, 0x26, 0x54, 0xe4, 0x02, 0x55, 0xa0, - 0xd4, 0xd9, 0xd6, 0x0f, 0xda, 0xad, 0x4e, 0x75, 0x8a, 0x2e, 0xc1, 0x7c, 0xa7, 0xcb, 0x5a, 0xdb, - 0x7a, 0xeb, 0x91, 0xf1, 0xfa, 0x39, 0x33, 0x76, 0xf7, 0x5e, 0x3e, 0x7b, 0xda, 0xa9, 0x12, 0x6d, - 0x3b, 0x72, 0x99, 0x17, 0x51, 0xf4, 0x01, 0x94, 0x42, 0xe4, 0x83, 0x63, 0x91, 0x2d, 0x68, 0xe9, - 0xcf, 0x05, 0xc5, 0x7d, 0x96, 0xe9, 0xb4, 0xaf, 0x04, 0x66, 0xe2, 0x06, 0xbd, 0x07, 0x94, 0x0b, - 0x33, 0x14, 0x46, 0x3c, 0x57, 0x61, 0xba, 0x81, 0xe1, 0x46, 0x39, 0xa4, 0x5e, 0x60, 0xd5, 0xb8, - 0xd3, 0xcd, 0x1a, 0x3a, 0xa7, 0x75, 0xa8, 0xa2, 0x67, 0x8f, 0x6a, 0xa7, 0x63, 0xed, 0x1c, 0x7a, - 0xb6, 0xac, 0x6c, 0x42, 0xd9, 0x35, 0x85, 0xd5, 0xc7, 0x90, 0xa7, 0x1f, 0x6d, 0x55, 0xa6, 0x6a, - 0x9b, 0x3d, 0x3c, 0xd6, 0x13, 0x01, 0xbb, 0x50, 0xd2, 0x35, 0x98, 0xe9, 0x3b, 0x9e, 0x48, 0xf6, - 0x53, 0x59, 0x5f, 0xfc, 0x7d, 0xb8, 0x7b, 0x51, 0x93, 0x25, 0x1a, 0xad, 0x05, 0x8a, 0xb4, 0x38, - 0xba, 0x79, 0xfd, 0x9f, 0x8c, 0x7c, 0x8a, 0xb4, 0x53, 0x98, 0xdf, 0xed, 0x0f, 0xbc, 0xa3, 0x68, - 0x73, 0xa4, 0xa9, 0x3e, 0x84, 0x39, 0x2b, 0x29, 0x1b, 0x23, 0x91, 0x37, 0xe4, 0xc8, 0xd4, 0x98, - 0xa6, 0xfe, 0x6b, 0xc9, 0xb7, 0x74, 0x05, 0x94, 0xe8, 0x18, 0x0d, 0x0d, 0xc7, 0xb3, 0xf1, 0x34, - 0x9d, 0x13, 0xc4, 0xa5, 0x27, 0x51, 0x65, 0x67, 0xe1, 0xec, 0x7c, 0x99, 0x7c, 0x3f, 0x5f, 0x26, - 0x3f, 0xcf, 0x97, 0xc9, 0x9b, 0xd9, 0x28, 0x37, 0xe8, 0xf5, 0x66, 0xe3, 0x9f, 0xe8, 0xc6, 0xaf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x56, 0x04, 0x75, 0x83, 0x07, 0x00, 0x00, + // 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, } func (m *WriteRequest) Marshal() (dAtA []byte, err error) { @@ -926,54 +749,6 @@ func (m *WriteRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MinimizedWriteRequestPacking) 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 *MinimizedWriteRequestPacking) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedWriteRequestPacking) 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 *MinimizedWriteRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1166,102 +941,6 @@ func (m *MinimizedWriteRequestLenBytes) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *MinimizedWriteRequestFixed32) 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 *MinimizedWriteRequestFixed32) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedWriteRequestFixed32) 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 *MinimizedWriteRequestFixed64) 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 *MinimizedWriteRequestFixed64) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedWriteRequestFixed64) 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) @@ -1547,28 +1226,6 @@ func (m *WriteRequest) Size() (n int) { return n } -func (m *MinimizedWriteRequestPacking) 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 *MinimizedWriteRequest) Size() (n int) { if m == nil { return 0 @@ -1657,50 +1314,6 @@ func (m *MinimizedWriteRequestLenBytes) Size() (n int) { return n } -func (m *MinimizedWriteRequestFixed32) 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 *MinimizedWriteRequestFixed64) 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 @@ -1936,123 +1549,6 @@ func (m *WriteRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedWriteRequestPacking) 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: MinimizedWriteRequestPacking: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedWriteRequestPacking: 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, MinimizedTimeSeriesPacking{}) - 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 *MinimizedWriteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2525,240 +2021,6 @@ func (m *MinimizedWriteRequestLenBytes) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedWriteRequestFixed32) 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: MinimizedWriteRequestFixed32: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedWriteRequestFixed32: 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, MinimizedTimeSeriesFixed32{}) - 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 *MinimizedWriteRequestFixed64) 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: MinimizedWriteRequestFixed64: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedWriteRequestFixed64: 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, MinimizedTimeSeriesFixed64{}) - 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 *ReadRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/prompb/remote.proto b/prompb/remote.proto index 5fb7ec5b33..a6eaf59ad7 100644 --- a/prompb/remote.proto +++ b/prompb/remote.proto @@ -27,18 +27,6 @@ message WriteRequest { repeated prometheus.MetricMetadata metadata = 3 [(gogoproto.nullable) = false]; } -message MinimizedWriteRequestPacking { - repeated MinimizedTimeSeriesPacking 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 MinimizedWriteRequest { repeated MinimizedTimeSeries timeseries = 1 [(gogoproto.nullable) = false]; // Cortex uses this field to determine the source of the write request. @@ -87,30 +75,6 @@ message MinimizedWriteRequestLenBytes { bytes symbols = 4; } -message MinimizedWriteRequestFixed32 { - repeated MinimizedTimeSeriesFixed32 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 MinimizedWriteRequestFixed64 { - repeated MinimizedTimeSeriesFixed64 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; -} - // 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 3b41ad92f5..97b8d0d4ab 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{15, 0} + return fileDescriptor_d938547f84707355, []int{12, 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{17, 0} + return fileDescriptor_d938547f84707355, []int{14, 0} } type MetricMetadata struct { @@ -808,232 +808,6 @@ func (m *MinimizedTimeSeries) GetHistograms() []Histogram { return nil } -// based on an experiment by marco -type MinimizedTimeSeriesFixed32 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). - 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 - 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 *MinimizedTimeSeriesFixed32) Reset() { *m = MinimizedTimeSeriesFixed32{} } -func (m *MinimizedTimeSeriesFixed32) String() string { return proto.CompactTextString(m) } -func (*MinimizedTimeSeriesFixed32) ProtoMessage() {} -func (*MinimizedTimeSeriesFixed32) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{7} -} -func (m *MinimizedTimeSeriesFixed32) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedTimeSeriesFixed32) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedTimeSeriesFixed32.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 *MinimizedTimeSeriesFixed32) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedTimeSeriesFixed32.Merge(m, src) -} -func (m *MinimizedTimeSeriesFixed32) XXX_Size() int { - return m.Size() -} -func (m *MinimizedTimeSeriesFixed32) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedTimeSeriesFixed32.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedTimeSeriesFixed32 proto.InternalMessageInfo - -func (m *MinimizedTimeSeriesFixed32) GetLabelSymbols() []uint32 { - if m != nil { - return m.LabelSymbols - } - return nil -} - -func (m *MinimizedTimeSeriesFixed32) GetSamples() []Sample { - if m != nil { - return m.Samples - } - return nil -} - -func (m *MinimizedTimeSeriesFixed32) GetExemplars() []Exemplar { - if m != nil { - return m.Exemplars - } - return nil -} - -func (m *MinimizedTimeSeriesFixed32) GetHistograms() []Histogram { - if m != nil { - return m.Histograms - } - return nil -} - -// based on an experiment by marco -type MinimizedTimeSeriesFixed64 struct { - // Sorted list of label name-value pair references. usespackref64 - LabelSymbols []uint64 `protobuf:"fixed64,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 - 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 *MinimizedTimeSeriesFixed64) Reset() { *m = MinimizedTimeSeriesFixed64{} } -func (m *MinimizedTimeSeriesFixed64) String() string { return proto.CompactTextString(m) } -func (*MinimizedTimeSeriesFixed64) ProtoMessage() {} -func (*MinimizedTimeSeriesFixed64) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{8} -} -func (m *MinimizedTimeSeriesFixed64) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedTimeSeriesFixed64) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedTimeSeriesFixed64.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 *MinimizedTimeSeriesFixed64) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedTimeSeriesFixed64.Merge(m, src) -} -func (m *MinimizedTimeSeriesFixed64) XXX_Size() int { - return m.Size() -} -func (m *MinimizedTimeSeriesFixed64) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedTimeSeriesFixed64.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedTimeSeriesFixed64 proto.InternalMessageInfo - -func (m *MinimizedTimeSeriesFixed64) GetLabelSymbols() []uint64 { - if m != nil { - return m.LabelSymbols - } - return nil -} - -func (m *MinimizedTimeSeriesFixed64) GetSamples() []Sample { - if m != nil { - return m.Samples - } - return nil -} - -func (m *MinimizedTimeSeriesFixed64) GetExemplars() []Exemplar { - if m != nil { - return m.Exemplars - } - return nil -} - -func (m *MinimizedTimeSeriesFixed64) GetHistograms() []Histogram { - if m != nil { - return m.Histograms - } - return nil -} - -// based on an experiment by marco -type MinimizedTimeSeriesPacking struct { - // Sorted list of label name-value pair references. uses packref - 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 - 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 *MinimizedTimeSeriesPacking) Reset() { *m = MinimizedTimeSeriesPacking{} } -func (m *MinimizedTimeSeriesPacking) String() string { return proto.CompactTextString(m) } -func (*MinimizedTimeSeriesPacking) ProtoMessage() {} -func (*MinimizedTimeSeriesPacking) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{9} -} -func (m *MinimizedTimeSeriesPacking) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MinimizedTimeSeriesPacking) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MinimizedTimeSeriesPacking.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 *MinimizedTimeSeriesPacking) XXX_Merge(src proto.Message) { - xxx_messageInfo_MinimizedTimeSeriesPacking.Merge(m, src) -} -func (m *MinimizedTimeSeriesPacking) XXX_Size() int { - return m.Size() -} -func (m *MinimizedTimeSeriesPacking) XXX_DiscardUnknown() { - xxx_messageInfo_MinimizedTimeSeriesPacking.DiscardUnknown(m) -} - -var xxx_messageInfo_MinimizedTimeSeriesPacking proto.InternalMessageInfo - -func (m *MinimizedTimeSeriesPacking) GetLabelSymbols() []uint32 { - if m != nil { - return m.LabelSymbols - } - return nil -} - -func (m *MinimizedTimeSeriesPacking) GetSamples() []Sample { - if m != nil { - return m.Samples - } - return nil -} - -func (m *MinimizedTimeSeriesPacking) GetExemplars() []Exemplar { - if m != nil { - return m.Exemplars - } - return nil -} - -func (m *MinimizedTimeSeriesPacking) GetHistograms() []Histogram { - if m != nil { - return m.Histograms - } - 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, @@ -1053,7 +827,7 @@ func (m *MinimizedTimeSeriesBytes) Reset() { *m = MinimizedTimeSeriesByt func (m *MinimizedTimeSeriesBytes) String() string { return proto.CompactTextString(m) } func (*MinimizedTimeSeriesBytes) ProtoMessage() {} func (*MinimizedTimeSeriesBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{10} + return fileDescriptor_d938547f84707355, []int{7} } func (m *MinimizedTimeSeriesBytes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1128,7 +902,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{11} + return fileDescriptor_d938547f84707355, []int{8} } func (m *MinimizedTimeSeriesLen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1203,7 +977,7 @@ func (m *MinimizedTimeSeriesLenBytes) Reset() { *m = MinimizedTimeSeries func (m *MinimizedTimeSeriesLenBytes) String() string { return proto.CompactTextString(m) } func (*MinimizedTimeSeriesLenBytes) ProtoMessage() {} func (*MinimizedTimeSeriesLenBytes) Descriptor() ([]byte, []int) { - return fileDescriptor_d938547f84707355, []int{12} + return fileDescriptor_d938547f84707355, []int{9} } func (m *MinimizedTimeSeriesLenBytes) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1272,7 +1046,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{13} + return fileDescriptor_d938547f84707355, []int{10} } func (m *Label) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1326,7 +1100,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{14} + return fileDescriptor_d938547f84707355, []int{11} } func (m *Labels) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1376,7 +1150,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{15} + return fileDescriptor_d938547f84707355, []int{12} } func (m *LabelMatcher) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1443,7 +1217,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{16} + return fileDescriptor_d938547f84707355, []int{13} } func (m *ReadHints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1537,7 +1311,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{17} + return fileDescriptor_d938547f84707355, []int{14} } func (m *Chunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1609,7 +1383,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{18} + return fileDescriptor_d938547f84707355, []int{15} } func (m *ChunkedSeries) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1664,9 +1438,6 @@ func init() { proto.RegisterType((*BucketSpan)(nil), "prometheus.BucketSpan") proto.RegisterType((*TimeSeries)(nil), "prometheus.TimeSeries") proto.RegisterType((*MinimizedTimeSeries)(nil), "prometheus.MinimizedTimeSeries") - proto.RegisterType((*MinimizedTimeSeriesFixed32)(nil), "prometheus.MinimizedTimeSeriesFixed32") - proto.RegisterType((*MinimizedTimeSeriesFixed64)(nil), "prometheus.MinimizedTimeSeriesFixed64") - proto.RegisterType((*MinimizedTimeSeriesPacking)(nil), "prometheus.MinimizedTimeSeriesPacking") proto.RegisterType((*MinimizedTimeSeriesBytes)(nil), "prometheus.MinimizedTimeSeriesBytes") proto.RegisterType((*MinimizedTimeSeriesLen)(nil), "prometheus.MinimizedTimeSeriesLen") proto.RegisterType((*MinimizedTimeSeriesLenBytes)(nil), "prometheus.MinimizedTimeSeriesLenBytes") @@ -1681,84 +1452,81 @@ func init() { func init() { proto.RegisterFile("types.proto", fileDescriptor_d938547f84707355) } var fileDescriptor_d938547f84707355 = []byte{ - // 1220 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xdd, 0x6e, 0x1b, 0xc5, - 0x17, 0xcf, 0x78, 0xed, 0xb5, 0xf7, 0xc4, 0x76, 0x37, 0xd3, 0xb4, 0xff, 0xfd, 0x07, 0x9a, 0x86, - 0x45, 0x05, 0x83, 0x90, 0xab, 0xa6, 0x15, 0xa2, 0xa2, 0x42, 0x4a, 0x52, 0xa7, 0xa9, 0xc8, 0xda, - 0x74, 0xec, 0x08, 0xca, 0x8d, 0x35, 0xb6, 0x27, 0xf6, 0xaa, 0xde, 0x0f, 0x76, 0xc6, 0x55, 0xdc, - 0xf7, 0xe0, 0x8e, 0x97, 0xe0, 0x2d, 0x2a, 0x71, 0x03, 0x2f, 0x80, 0x50, 0xaf, 0x2a, 0x10, 0x37, - 0x3c, 0x01, 0x9a, 0xd9, 0x5d, 0xef, 0xba, 0x31, 0x12, 0xe5, 0x2e, 0xb9, 0x9b, 0x39, 0x9f, 0xbf, - 0xdf, 0x9c, 0x99, 0xdd, 0x73, 0x60, 0x5d, 0xcc, 0x43, 0xc6, 0x9b, 0x61, 0x14, 0x88, 0x00, 0x43, - 0x18, 0x05, 0x1e, 0x13, 0x13, 0x36, 0xe3, 0x5b, 0x9b, 0xe3, 0x60, 0x1c, 0x28, 0xf1, 0x6d, 0xb9, - 0x8a, 0x2d, 0xec, 0x1f, 0x0a, 0x50, 0x77, 0x98, 0x88, 0xdc, 0xa1, 0xc3, 0x04, 0x1d, 0x51, 0x41, - 0xf1, 0x7d, 0x28, 0xca, 0x18, 0x16, 0xda, 0x41, 0x8d, 0xfa, 0xee, 0xad, 0x66, 0x16, 0xa3, 0xb9, - 0x6c, 0x99, 0x6c, 0x7b, 0xf3, 0x90, 0x11, 0xe5, 0x82, 0x3f, 0x01, 0xec, 0x29, 0x59, 0xff, 0x94, - 0x7a, 0xee, 0x74, 0xde, 0xf7, 0xa9, 0xc7, 0xac, 0xc2, 0x0e, 0x6a, 0x18, 0xc4, 0x8c, 0x35, 0x87, - 0x4a, 0xd1, 0xa6, 0x1e, 0xc3, 0x18, 0x8a, 0x13, 0x36, 0x0d, 0xad, 0xa2, 0xd2, 0xab, 0xb5, 0x94, - 0xcd, 0x7c, 0x57, 0x58, 0xa5, 0x58, 0x26, 0xd7, 0xf6, 0x1c, 0x20, 0xcb, 0x84, 0xd7, 0xa1, 0x7c, - 0xd2, 0xfe, 0xb2, 0xdd, 0xf9, 0xba, 0x6d, 0xae, 0xc9, 0xcd, 0x41, 0xe7, 0xa4, 0xdd, 0x6b, 0x11, - 0x13, 0x61, 0x03, 0x4a, 0x8f, 0xf6, 0x4e, 0x1e, 0xb5, 0xcc, 0x02, 0xae, 0x81, 0x71, 0xf4, 0xb8, - 0xdb, 0xeb, 0x3c, 0x22, 0x7b, 0x8e, 0xa9, 0x61, 0x0c, 0x75, 0xa5, 0xc9, 0x64, 0x45, 0xe9, 0xda, - 0x3d, 0x71, 0x9c, 0x3d, 0xf2, 0xd4, 0x2c, 0xe1, 0x0a, 0x14, 0x1f, 0xb7, 0x0f, 0x3b, 0xa6, 0x8e, - 0xab, 0x50, 0xe9, 0xf6, 0xf6, 0x7a, 0xad, 0x6e, 0xab, 0x67, 0x96, 0xed, 0x07, 0xa0, 0x77, 0xa9, - 0x17, 0x4e, 0x19, 0xde, 0x84, 0xd2, 0x73, 0x3a, 0x9d, 0xc5, 0xc7, 0x82, 0x48, 0xbc, 0xc1, 0xef, - 0x82, 0x21, 0x5c, 0x8f, 0x71, 0x41, 0xbd, 0x50, 0xf1, 0xd4, 0x48, 0x26, 0xb0, 0x03, 0xa8, 0xb4, - 0xce, 0x98, 0x17, 0x4e, 0x69, 0x84, 0x6f, 0x83, 0x3e, 0xa5, 0x03, 0x36, 0xe5, 0x16, 0xda, 0xd1, - 0x1a, 0xeb, 0xbb, 0x1b, 0xf9, 0x73, 0x3d, 0x96, 0x9a, 0xfd, 0xe2, 0xcb, 0x5f, 0x6f, 0xae, 0x91, - 0xc4, 0x2c, 0x4b, 0x58, 0xf8, 0xc7, 0x84, 0xda, 0x9b, 0x09, 0x7f, 0x2a, 0x81, 0x71, 0xe4, 0x72, - 0x11, 0x8c, 0x23, 0xea, 0xe1, 0x1b, 0x60, 0x0c, 0x83, 0x99, 0x2f, 0xfa, 0xae, 0x2f, 0x14, 0xec, - 0xe2, 0xd1, 0x1a, 0xa9, 0x28, 0xd1, 0x63, 0x5f, 0xe0, 0xf7, 0x60, 0x3d, 0x56, 0x9f, 0x4e, 0x03, - 0x2a, 0xe2, 0x34, 0x47, 0x6b, 0x04, 0x94, 0xf0, 0x50, 0xca, 0xb0, 0x09, 0x1a, 0x9f, 0x79, 0x2a, - 0x0f, 0x22, 0x72, 0x89, 0xaf, 0x83, 0xce, 0x87, 0x13, 0xe6, 0x51, 0x55, 0xb5, 0x0d, 0x92, 0xec, - 0xf0, 0x2d, 0xa8, 0xbf, 0x60, 0x51, 0xd0, 0x17, 0x93, 0x88, 0xf1, 0x49, 0x30, 0x1d, 0xa9, 0x0a, - 0x22, 0x52, 0x93, 0xd2, 0x5e, 0x2a, 0xc4, 0x1f, 0x24, 0x66, 0x19, 0x2e, 0x5d, 0xe1, 0x42, 0xa4, - 0x2a, 0xe5, 0x07, 0x29, 0xb6, 0x8f, 0xc1, 0xcc, 0xd9, 0xc5, 0x00, 0xcb, 0x0a, 0x20, 0x22, 0xf5, - 0x85, 0x65, 0x0c, 0xf2, 0x00, 0xea, 0x3e, 0x1b, 0x53, 0xe1, 0x3e, 0x67, 0x7d, 0x1e, 0x52, 0x9f, - 0x5b, 0x15, 0x75, 0xc2, 0xd7, 0xf3, 0x27, 0xbc, 0x3f, 0x1b, 0x3e, 0x63, 0xa2, 0x1b, 0x52, 0x3f, - 0x39, 0xe6, 0x5a, 0xea, 0x23, 0x65, 0x1c, 0x7f, 0x08, 0x57, 0x16, 0x41, 0x46, 0x6c, 0x2a, 0x28, - 0xb7, 0x8c, 0x1d, 0xad, 0x81, 0xc9, 0x22, 0xf6, 0x43, 0x25, 0x5d, 0x32, 0x54, 0xe8, 0xb8, 0x05, - 0x3b, 0x5a, 0x03, 0x65, 0x86, 0x0a, 0x1a, 0x97, 0xb0, 0xc2, 0x80, 0xbb, 0x39, 0x58, 0xeb, 0xff, - 0x06, 0x56, 0xea, 0xb3, 0x80, 0xb5, 0x08, 0x92, 0xc0, 0xaa, 0xc6, 0xb0, 0x52, 0x71, 0x06, 0x6b, - 0x61, 0x98, 0xc0, 0xaa, 0xc5, 0xb0, 0x52, 0x71, 0x02, 0xeb, 0x0b, 0x80, 0x88, 0x71, 0x26, 0xfa, - 0x13, 0x79, 0xfa, 0x75, 0xf5, 0xc6, 0x6f, 0xe6, 0x21, 0x2d, 0xee, 0x4f, 0x93, 0x48, 0xbb, 0x23, - 0xd7, 0x17, 0xc4, 0x88, 0xd2, 0xe5, 0xf2, 0x05, 0xbc, 0xf2, 0xe6, 0x05, 0xbc, 0x07, 0xc6, 0xc2, - 0x6b, 0xf9, 0xa5, 0x96, 0x41, 0x7b, 0xda, 0xea, 0x9a, 0x08, 0xeb, 0x50, 0x68, 0x77, 0xcc, 0x42, - 0xf6, 0x5a, 0xb5, 0xfd, 0x32, 0x94, 0x14, 0xe6, 0xfd, 0x2a, 0x40, 0x56, 0x76, 0xfb, 0x01, 0x40, - 0x76, 0x3e, 0xf2, 0xe6, 0x05, 0xa7, 0xa7, 0x9c, 0xc5, 0x57, 0x79, 0x83, 0x24, 0x3b, 0x29, 0x9f, - 0x32, 0x7f, 0x2c, 0x26, 0xea, 0x06, 0xd7, 0x48, 0xb2, 0xb3, 0x5f, 0x23, 0x80, 0x9e, 0xeb, 0xb1, - 0x2e, 0x8b, 0x5c, 0xc6, 0xdf, 0xfe, 0xfd, 0xed, 0x42, 0x99, 0xab, 0xa7, 0xcf, 0xad, 0x82, 0xf2, - 0xc0, 0x79, 0x8f, 0xf8, 0xab, 0x90, 0xb8, 0xa4, 0x86, 0xf8, 0x33, 0x30, 0x58, 0xf2, 0xe0, 0xb9, - 0xa5, 0x29, 0xaf, 0xcd, 0xbc, 0x57, 0xfa, 0x35, 0x48, 0xfc, 0x32, 0x63, 0xfc, 0x39, 0xc0, 0x24, - 0x3d, 0x78, 0x6e, 0x15, 0x95, 0xeb, 0xb5, 0x95, 0x65, 0x49, 0x7c, 0x73, 0xe6, 0xf6, 0x1f, 0x08, - 0xae, 0x3a, 0xae, 0xef, 0x7a, 0xee, 0x0b, 0x36, 0xca, 0x71, 0xfe, 0x08, 0x6a, 0x8a, 0x4c, 0x9f, - 0xcf, 0xbd, 0x41, 0x90, 0x50, 0xaf, 0x25, 0x01, 0xaa, 0x4a, 0xd5, 0x8d, 0x35, 0x17, 0x89, 0xed, - 0x5f, 0x08, 0xb6, 0x56, 0xb0, 0x3d, 0x74, 0xcf, 0xd8, 0xe8, 0xee, 0xee, 0x6a, 0xd2, 0xe5, 0xcb, - 0x4c, 0xfa, 0xd3, 0x7b, 0xab, 0x49, 0xeb, 0x97, 0x94, 0xf4, 0x57, 0x74, 0xf8, 0xcc, 0xf5, 0xc7, - 0x97, 0xb4, 0xd2, 0xbf, 0x23, 0xb0, 0x56, 0x90, 0xde, 0x9f, 0x0b, 0xc6, 0xf1, 0xfb, 0xe7, 0x29, - 0xa3, 0x46, 0xf5, 0xe2, 0x92, 0x7d, 0x8d, 0xe0, 0xfa, 0x0a, 0xb2, 0xc7, 0xcc, 0x5f, 0x45, 0x55, - 0x6b, 0x94, 0x2f, 0x2e, 0xd5, 0x3f, 0x11, 0xbc, 0xb3, 0x9a, 0xea, 0xe5, 0x2c, 0xed, 0x1d, 0x28, - 0xa9, 0xdf, 0xaa, 0x6c, 0xe9, 0xd5, 0x18, 0x80, 0xe2, 0x96, 0x5e, 0xae, 0x97, 0x9b, 0x5b, 0x23, - 0x69, 0x6e, 0xed, 0xfb, 0xa0, 0x1f, 0xc7, 0x3f, 0xdf, 0xb7, 0xfd, 0x5b, 0xdb, 0xdf, 0x23, 0xa8, - 0x2a, 0xb9, 0x43, 0xc5, 0x70, 0xc2, 0x22, 0x7c, 0x67, 0x69, 0x8a, 0xb9, 0x71, 0xce, 0x3f, 0xb1, - 0x6b, 0xe6, 0xa6, 0x97, 0x14, 0x68, 0x61, 0x15, 0x50, 0x2d, 0x0f, 0xb4, 0x01, 0x45, 0x35, 0x8b, - 0xe8, 0x50, 0x68, 0x3d, 0x89, 0x9b, 0x9b, 0x76, 0xeb, 0x49, 0xdc, 0xdc, 0x10, 0x39, 0x7f, 0x48, - 0x01, 0x69, 0x99, 0x9a, 0xfd, 0x23, 0x92, 0x1d, 0x11, 0x1d, 0xc9, 0x86, 0x88, 0xe3, 0xff, 0x41, - 0x99, 0x0b, 0x16, 0xf6, 0xbd, 0xb8, 0xba, 0x1a, 0xd1, 0xe5, 0xd6, 0xe1, 0x32, 0xf5, 0xe9, 0xcc, - 0x1f, 0xa6, 0xa9, 0xe5, 0x1a, 0xff, 0x1f, 0x2a, 0x5c, 0xd0, 0x48, 0x48, 0xeb, 0xb8, 0xd3, 0x2f, - 0xab, 0xbd, 0xc3, 0xf1, 0x35, 0xd0, 0x99, 0x3f, 0xea, 0xab, 0xa2, 0x48, 0x45, 0x89, 0xf9, 0x23, - 0x87, 0xe3, 0x2d, 0xa8, 0x8c, 0xa3, 0x60, 0x16, 0xba, 0xfe, 0xd8, 0x2a, 0xed, 0x68, 0x0d, 0x83, - 0x2c, 0xf6, 0xb8, 0x0e, 0x85, 0xc1, 0x5c, 0x75, 0xdb, 0x15, 0x52, 0x18, 0xcc, 0x65, 0xf4, 0x88, - 0xfa, 0x63, 0x26, 0x83, 0x94, 0xe3, 0xe8, 0x6a, 0xef, 0x70, 0xfb, 0x17, 0x04, 0xa5, 0x83, 0xc9, - 0xcc, 0x7f, 0x86, 0xb7, 0x61, 0xdd, 0x73, 0xfd, 0xbe, 0xec, 0xef, 0x32, 0xcc, 0x86, 0xe7, 0xfa, - 0xf2, 0xfe, 0x3a, 0x5c, 0xe9, 0xe9, 0xd9, 0x42, 0x9f, 0x0c, 0x40, 0x1e, 0x3d, 0x4b, 0xf4, 0xcd, - 0xa4, 0x08, 0x9a, 0x2a, 0xc2, 0x56, 0xbe, 0x08, 0x2a, 0x41, 0xb3, 0xe5, 0x0f, 0x83, 0x91, 0xeb, - 0x8f, 0xb3, 0x0a, 0xc8, 0xc1, 0x52, 0xb1, 0xaa, 0x12, 0xb5, 0xb6, 0x1f, 0x42, 0x25, 0xb5, 0x3a, - 0xd7, 0x51, 0x7e, 0xd3, 0x91, 0x73, 0xdf, 0xd2, 0xb0, 0x57, 0xc0, 0x57, 0xe1, 0xca, 0xe1, 0x71, - 0x67, 0xaf, 0xd7, 0xcf, 0x4d, 0x80, 0xf6, 0x77, 0x50, 0x53, 0x19, 0xd9, 0xe8, 0xbf, 0xf6, 0x83, - 0xb7, 0x41, 0x1f, 0xca, 0x08, 0xe9, 0xcb, 0xdb, 0x38, 0xc7, 0x26, 0x75, 0x88, 0xcd, 0xf6, 0x37, - 0x5f, 0xbe, 0xda, 0x46, 0x3f, 0xbf, 0xda, 0x46, 0xbf, 0xbd, 0xda, 0x46, 0xdf, 0xea, 0xd2, 0x3a, - 0x1c, 0x0c, 0x74, 0x35, 0x77, 0xdf, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x40, 0xa1, 0x78, - 0xa8, 0x0f, 0x00, 0x00, + // 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, } func (m *MetricMetadata) Marshal() (dAtA []byte, err error) { @@ -2319,240 +2087,6 @@ func (m *MinimizedTimeSeries) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MinimizedTimeSeriesFixed32) 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 *MinimizedTimeSeriesFixed32) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedTimeSeriesFixed32) 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 { - for iNdEx := len(m.LabelSymbols) - 1; iNdEx >= 0; iNdEx-- { - i -= 4 - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.LabelSymbols[iNdEx])) - } - i = encodeVarintTypes(dAtA, i, uint64(len(m.LabelSymbols)*4)) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MinimizedTimeSeriesFixed64) 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 *MinimizedTimeSeriesFixed64) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedTimeSeriesFixed64) 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 { - for iNdEx := len(m.LabelSymbols) - 1; iNdEx >= 0; iNdEx-- { - i -= 8 - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.LabelSymbols[iNdEx])) - } - i = encodeVarintTypes(dAtA, i, uint64(len(m.LabelSymbols)*8)) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MinimizedTimeSeriesPacking) 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 *MinimizedTimeSeriesPacking) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MinimizedTimeSeriesPacking) 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 { - for iNdEx := len(m.LabelSymbols) - 1; iNdEx >= 0; iNdEx-- { - i -= 4 - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.LabelSymbols[iNdEx])) - } - i = encodeVarintTypes(dAtA, i, uint64(len(m.LabelSymbols)*4)) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *MinimizedTimeSeriesBytes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3360,105 +2894,6 @@ func (m *MinimizedTimeSeries) Size() (n int) { return n } -func (m *MinimizedTimeSeriesFixed32) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.LabelSymbols) > 0 { - n += 1 + sovTypes(uint64(len(m.LabelSymbols)*4)) + len(m.LabelSymbols)*4 - } - 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 *MinimizedTimeSeriesFixed64) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.LabelSymbols) > 0 { - n += 1 + sovTypes(uint64(len(m.LabelSymbols)*8)) + len(m.LabelSymbols)*8 - } - 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 *MinimizedTimeSeriesPacking) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.LabelSymbols) > 0 { - n += 1 + sovTypes(uint64(len(m.LabelSymbols)*4)) + len(m.LabelSymbols)*4 - } - 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 *MinimizedTimeSeriesBytes) Size() (n int) { if m == nil { return 0 @@ -5108,621 +4543,6 @@ func (m *MinimizedTimeSeries) Unmarshal(dAtA []byte) error { } return nil } -func (m *MinimizedTimeSeriesFixed32) 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: MinimizedTimeSeriesFixed32: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedTimeSeriesFixed32: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType == 5 { - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.LabelSymbols = append(m.LabelSymbols, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - elementCount = packedLen / 4 - if elementCount != 0 && len(m.LabelSymbols) == 0 { - m.LabelSymbols = make([]uint32, 0, elementCount) - } - for iNdEx < postIndex { - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.LabelSymbols = append(m.LabelSymbols, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field LabelSymbols", wireType) - } - 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 *MinimizedTimeSeriesFixed64) 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: MinimizedTimeSeriesFixed64: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedTimeSeriesFixed64: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType == 1 { - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.LabelSymbols = append(m.LabelSymbols, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - elementCount = packedLen / 8 - if elementCount != 0 && len(m.LabelSymbols) == 0 { - m.LabelSymbols = make([]uint64, 0, elementCount) - } - for iNdEx < postIndex { - var v uint64 - if (iNdEx + 8) > l { - return io.ErrUnexpectedEOF - } - v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) - iNdEx += 8 - m.LabelSymbols = append(m.LabelSymbols, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field LabelSymbols", wireType) - } - 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 *MinimizedTimeSeriesPacking) 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: MinimizedTimeSeriesPacking: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MinimizedTimeSeriesPacking: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType == 5 { - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.LabelSymbols = append(m.LabelSymbols, v) - } else if wireType == 2 { - var packedLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - packedLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if packedLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + packedLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var elementCount int - elementCount = packedLen / 4 - if elementCount != 0 && len(m.LabelSymbols) == 0 { - m.LabelSymbols = make([]uint32, 0, elementCount) - } - for iNdEx < postIndex { - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.LabelSymbols = append(m.LabelSymbols, v) - } - } else { - return fmt.Errorf("proto: wrong wireType = %d for field LabelSymbols", wireType) - } - 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 *MinimizedTimeSeriesBytes) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/prompb/types.proto b/prompb/types.proto index 162fc930a4..dacdcd9f0a 100644 --- a/prompb/types.proto +++ b/prompb/types.proto @@ -144,43 +144,6 @@ message MinimizedTimeSeries { // TODO: add metadata } -// based on an experiment by marco -message MinimizedTimeSeriesFixed32 { - // 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). - repeated fixed32 label_symbols = 1 [(gogoproto.nullable) = false]; - - // 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]; -} - -// based on an experiment by marco -message MinimizedTimeSeriesFixed64 { - // Sorted list of label name-value pair references. usespackref64 - repeated fixed64 label_symbols = 1 [(gogoproto.nullable) = false]; - - // 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]; -} - -// based on an experiment by marco -message MinimizedTimeSeriesPacking { - // Sorted list of label name-value pair references. uses packref - repeated fixed32 label_symbols = 1 [(gogoproto.nullable) = false]; - - // 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]; -} - 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, diff --git a/storage/remote/codec.go b/storage/remote/codec.go index 8b29604794..c782ced6fc 100644 --- a/storage/remote/codec.go +++ b/storage/remote/codec.go @@ -1091,44 +1091,6 @@ func DecodeMinimizedWriteRequest(r io.Reader) (*prompb.MinimizedWriteRequest, er return &req, nil } -func DecodeMinimizedWriteRequestFixed64(r io.Reader) (*prompb.MinimizedWriteRequestFixed64, 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.MinimizedWriteRequestFixed64 - if err := proto.Unmarshal(reqBuf, &req); err != nil { - return nil, err - } - - return &req, nil -} - -func DecodeMinimizedWriteRequestFixed32(r io.Reader) (*prompb.MinimizedWriteRequestFixed32, 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.MinimizedWriteRequestFixed32 - if err := proto.Unmarshal(reqBuf, &req); err != nil { - return nil, err - } - - return &req, nil -} - func DecodeMinimizedWriteRequestBytes(r io.Reader) (*prompb.MinimizedWriteRequestBytes, error) { compressed, err := io.ReadAll(r) if err != nil { @@ -1215,38 +1177,6 @@ func MinimizedWriteRequestToWriteRequest(redReq *prompb.MinimizedWriteRequest) ( return req, nil } -// helper for tests -func min64WriteRequestToWriteRequest(redReq *prompb.MinimizedWriteRequestFixed64) (*prompb.WriteRequest, error) { - req := &prompb.WriteRequest{ - Timeseries: make([]prompb.TimeSeries, len(redReq.Timeseries)), - //Metadata: redReq.Metadata, - } - - for i, rts := range redReq.Timeseries { - - Uint64RefToLabels(redReq.Symbols, rts.LabelSymbols).Range(func(l labels.Label) { - req.Timeseries[i].Labels = append(req.Timeseries[i].Labels, prompb.Label{ - Name: l.Name, - Value: l.Value, - }) - }) - - // TODO handle exemplars - exemplars := make([]prompb.Exemplar, len(rts.Exemplars)) - for j, e := range rts.Exemplars { - exemplars[j].Value = e.Value - exemplars[j].Timestamp = e.Timestamp - exemplars[j].Labels = e.Labels - } - - req.Timeseries[i].Samples = rts.Samples - req.Timeseries[i].Exemplars = exemplars - req.Timeseries[i].Histograms = rts.Histograms - - } - return req, nil -} - // for use with minimized remote write proto format func packRef(offset, length int) uint32 { return uint32((offset&0xFFFFF)<<12 | (length & 0xFFF)) diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index 3304395a45..5ef01a2d91 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -1390,16 +1390,6 @@ func (s *shards) runShard(ctx context.Context, shardID int, queue *queue) { pendingMinimizedData[i].Samples = []prompb.Sample{{}} } - pendingMin64Data := make([]prompb.MinimizedTimeSeriesFixed64, max) - for i := range pendingMin64Data { - pendingMin64Data[i].Samples = []prompb.Sample{{}} - } - - pendingMin32Data := make([]prompb.MinimizedTimeSeriesFixed32, max) - for i := range pendingMin32Data { - pendingMin32Data[i].Samples = []prompb.Sample{{}} - } - pendingMinBytesData := make([]prompb.MinimizedTimeSeriesBytes, max) for i := range pendingMinBytesData { pendingMinBytesData[i].Samples = []prompb.Sample{{}} @@ -1459,16 +1449,6 @@ 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 Min64Fixed: - nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesFixed64(&symbolTable, batch, pendingMin64Data, s.qm.sendExemplars, s.qm.sendNativeHistograms) - n := nPendingSamples + nPendingExemplars + nPendingHistograms - s.sendMin64Samples(ctx, pendingMin64Data[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) - symbolTable.clear() - case Min32Fixed: - nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesFixed32(&symbolTable, batch, pendingMin32Data, s.qm.sendExemplars, s.qm.sendNativeHistograms) - n := nPendingSamples + nPendingExemplars + nPendingHistograms - s.sendMin32Samples(ctx, pendingMin32Data[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) - symbolTable.clear() case MinBytes: nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesBytes(&symbolTable, batch, pendingMinBytesData, s.qm.sendExemplars, s.qm.sendNativeHistograms) n := nPendingSamples + nPendingExemplars + nPendingHistograms @@ -1508,13 +1488,6 @@ func (s *shards) runShard(ctx context.Context, shardID int, queue *queue) { "exemplars", nPendingExemplars, "shard", shardNum, "histograms", nPendingHistograms) s.sendMinSamples(ctx, pendingMinimizedData[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, &pBufRaw, &buf) symbolTable.clear() - case Min64Fixed: - nPendingSamples, nPendingExemplars, nPendingHistograms := populateMinimizedTimeSeriesFixed64(&symbolTable, batch, pendingMin64Data, s.qm.sendExemplars, s.qm.sendNativeHistograms) - n := nPendingSamples + nPendingExemplars + nPendingHistograms - level.Debug(s.qm.logger).Log("msg", "runShard timer ticked, sending buffered data", "samples", nPendingSamples, - "exemplars", nPendingExemplars, "shard", shardNum, "histograms", nPendingHistograms) - s.sendMin64Samples(ctx, pendingMin64Data[:n], symbolTable.LabelsString(), nPendingSamples, nPendingExemplars, nPendingHistograms, pBuf, &buf) - symbolTable.clear() } } queue.ReturnForReuse(batch) @@ -1587,30 +1560,6 @@ func (s *shards) sendMinSamples(ctx context.Context, samples []prompb.MinimizedT s.updateMetrics(ctx, err, sampleCount, exemplarCount, histogramCount, time.Since(begin)) } -func (s *shards) sendMin64Samples(ctx context.Context, samples []prompb.MinimizedTimeSeriesFixed64, 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 := buildMinimizedWriteRequestFixed64(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) sendMin32Samples(ctx context.Context, samples []prompb.MinimizedTimeSeriesFixed32, 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 := buildMinimizedWriteRequestFixed32(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) sendMinLenSamples(ctx context.Context, samples []prompb.MinimizedTimeSeriesLen, labels []byte, sampleCount, exemplarCount, histogramCount int, pBuf *proto.Buffer, buf *[]byte) { begin := time.Now() // Build the ReducedWriteRequest with no metadata. @@ -1771,100 +1720,6 @@ func populateMinimizedTimeSeries(symbolTable *rwSymbolTable, batch []timeSeries, return nPendingSamples, nPendingExemplars, nPendingHistograms } -func populateMinimizedTimeSeriesFixed64(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesFixed64, 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 = labelsToUint64Slice(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: - // TODO intern exemplars and histograms for the new formats - pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.Exemplar{ - Labels: labelsToLabelsProto(d.exemplarLabels, nil), - 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 populateMinimizedTimeSeriesFixed32(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesFixed32, 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 = labelsToUint32Slice(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: - // // TODO(npazosmendez) optimize? - // 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 populateMinimizedTimeSeriesBytes(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesBytes, sendExemplars, sendNativeHistograms bool) (int, int, int) { var nPendingSamples, nPendingExemplars, nPendingHistograms int for nPending, d := range batch { @@ -1914,56 +1769,6 @@ func populateMinimizedTimeSeriesBytes(symbolTable *rwSymbolTable, batch []timeSe return nPendingSamples, nPendingExemplars, nPendingHistograms } -func populateMinimizedTimeSeriesPacking(symbolTable *rwSymbolTable, batch []timeSeries, pendingData []prompb.MinimizedTimeSeriesPacking, 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 = labelsToUint32Packed(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: - // // TODO(npazosmendez) optimize? - // 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 { @@ -2302,98 +2107,6 @@ func buildMinimizedWriteRequest(samples []prompb.MinimizedTimeSeries, labels str return compressed, highest, nil } -func buildMinimizedWriteRequestFixed64(samples []prompb.MinimizedTimeSeriesFixed64, 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.MinimizedWriteRequestFixed64{ - 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 buildMinimizedWriteRequestFixed32(samples []prompb.MinimizedTimeSeriesFixed32, 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.MinimizedWriteRequestFixed32{ - 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 buildMinimizedWriteRequestLen(samples []prompb.MinimizedTimeSeriesLen, labels []byte, pBuf *proto.Buffer, buf *[]byte) ([]byte, int64, error) { var highest int64 for _, ts := range samples { @@ -2531,49 +2244,3 @@ func buildMinimizedWriteRequestBytes(samples []prompb.MinimizedTimeSeriesBytes, } return compressed, highest, nil } - -func buildMinimizedWriteRequestPacking(samples []prompb.MinimizedTimeSeriesPacking, 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.MinimizedWriteRequestPacking{ - 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 97f67d9a01..024fe19d17 100644 --- a/storage/remote/write_handler.go +++ b/storage/remote/write_handler.go @@ -74,8 +74,6 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { var err error var req *prompb.WriteRequest var reqMin *prompb.MinimizedWriteRequest - var reqMin64Fixed *prompb.MinimizedWriteRequestFixed64 - var reqMin32Fixed *prompb.MinimizedWriteRequestFixed32 var reqMinBytes *prompb.MinimizedWriteRequestBytes var reqMinLen *prompb.MinimizedWriteRequestLen var reqMinLenBytes *prompb.MinimizedWriteRequestLenBytes @@ -86,10 +84,6 @@ func (h *writeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { req, err = DecodeWriteRequest(r.Body) case Min32Optimized: reqMin, err = DecodeMinimizedWriteRequest(r.Body) - case Min64Fixed: - reqMin64Fixed, err = DecodeMinimizedWriteRequestFixed64(r.Body) - case Min32Fixed: - reqMin32Fixed, err = DecodeMinimizedWriteRequestFixed32(r.Body) case MinBytes: reqMinBytes, err = DecodeMinimizedWriteRequestBytes(r.Body) case MinLen: @@ -110,10 +104,6 @@ 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 Min64Fixed: - err = h.writeMin64(r.Context(), reqMin64Fixed) - case Min32Fixed: - err = h.writeMin32(r.Context(), reqMin32Fixed) case MinBytes: err = h.writeMinBytes(r.Context(), reqMinBytes) case MinLen: @@ -353,84 +343,6 @@ func (h *writeHandler) writeMin(ctx context.Context, req *prompb.MinimizedWriteR return nil } -func (h *writeHandler) writeMin64(ctx context.Context, req *prompb.MinimizedWriteRequestFixed64) (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 := Uint64RefToLabels(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) writeMin32(ctx context.Context, req *prompb.MinimizedWriteRequestFixed32) (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 := Uint32RefToLabels(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) writeMinBytes(ctx context.Context, req *prompb.MinimizedWriteRequestBytes) (err error) { outOfOrderExemplarErrs := 0