diff --git a/carbonapi_v2_pb/carbonapi_v2_pb.pb.go b/carbonapi_v2_pb/carbonapi_v2_pb.pb.go index 28e0d8d..8c92713 100644 --- a/carbonapi_v2_pb/carbonapi_v2_pb.pb.go +++ b/carbonapi_v2_pb/carbonapi_v2_pb.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.12.4 -// source: carbonapi_v2_pb.proto +// protoc-gen-go v1.28.0 +// protoc v3.19.4 +// source: carbonapi_v2_pb/carbonapi_v2_pb.proto package carbonapi_v2_pb @@ -36,7 +36,7 @@ type FetchResponse struct { func (x *FetchResponse) Reset() { *x = FetchResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[0] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -49,7 +49,7 @@ func (x *FetchResponse) String() string { func (*FetchResponse) ProtoMessage() {} func (x *FetchResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[0] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -62,7 +62,7 @@ func (x *FetchResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use FetchResponse.ProtoReflect.Descriptor instead. func (*FetchResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{0} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{0} } func (x *FetchResponse) GetName() string { @@ -118,7 +118,7 @@ type MultiFetchResponse struct { func (x *MultiFetchResponse) Reset() { *x = MultiFetchResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[1] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +131,7 @@ func (x *MultiFetchResponse) String() string { func (*MultiFetchResponse) ProtoMessage() {} func (x *MultiFetchResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[1] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +144,7 @@ func (x *MultiFetchResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiFetchResponse.ProtoReflect.Descriptor instead. func (*MultiFetchResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{1} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{1} } func (x *MultiFetchResponse) GetMetrics() []*FetchResponse { @@ -166,7 +166,7 @@ type GlobMatch struct { func (x *GlobMatch) Reset() { *x = GlobMatch{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[2] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -179,7 +179,7 @@ func (x *GlobMatch) String() string { func (*GlobMatch) ProtoMessage() {} func (x *GlobMatch) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[2] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -192,7 +192,7 @@ func (x *GlobMatch) ProtoReflect() protoreflect.Message { // Deprecated: Use GlobMatch.ProtoReflect.Descriptor instead. func (*GlobMatch) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{2} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{2} } func (x *GlobMatch) GetPath() string { @@ -221,7 +221,7 @@ type GlobResponse struct { func (x *GlobResponse) Reset() { *x = GlobResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[3] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -234,7 +234,7 @@ func (x *GlobResponse) String() string { func (*GlobResponse) ProtoMessage() {} func (x *GlobResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[3] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -247,7 +247,7 @@ func (x *GlobResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GlobResponse.ProtoReflect.Descriptor instead. func (*GlobResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{3} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{3} } func (x *GlobResponse) GetName() string { @@ -276,7 +276,7 @@ type Retention struct { func (x *Retention) Reset() { *x = Retention{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[4] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -289,7 +289,7 @@ func (x *Retention) String() string { func (*Retention) ProtoMessage() {} func (x *Retention) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[4] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -302,7 +302,7 @@ func (x *Retention) ProtoReflect() protoreflect.Message { // Deprecated: Use Retention.ProtoReflect.Descriptor instead. func (*Retention) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{4} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{4} } func (x *Retention) GetSecondsPerPoint() int32 { @@ -334,7 +334,7 @@ type InfoResponse struct { func (x *InfoResponse) Reset() { *x = InfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[5] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -347,7 +347,7 @@ func (x *InfoResponse) String() string { func (*InfoResponse) ProtoMessage() {} func (x *InfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[5] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -360,7 +360,7 @@ func (x *InfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoResponse.ProtoReflect.Descriptor instead. func (*InfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{5} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{5} } func (x *InfoResponse) GetName() string { @@ -410,7 +410,7 @@ type ServerInfoResponse struct { func (x *ServerInfoResponse) Reset() { *x = ServerInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[6] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -423,7 +423,7 @@ func (x *ServerInfoResponse) String() string { func (*ServerInfoResponse) ProtoMessage() {} func (x *ServerInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[6] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -436,7 +436,7 @@ func (x *ServerInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ServerInfoResponse.ProtoReflect.Descriptor instead. func (*ServerInfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{6} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{6} } func (x *ServerInfoResponse) GetServer() string { @@ -464,7 +464,7 @@ type ZipperInfoResponse struct { func (x *ZipperInfoResponse) Reset() { *x = ZipperInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[7] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -477,7 +477,7 @@ func (x *ZipperInfoResponse) String() string { func (*ZipperInfoResponse) ProtoMessage() {} func (x *ZipperInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[7] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -490,7 +490,7 @@ func (x *ZipperInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ZipperInfoResponse.ProtoReflect.Descriptor instead. func (*ZipperInfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{7} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{7} } func (x *ZipperInfoResponse) GetResponses() []*ServerInfoResponse { @@ -511,7 +511,7 @@ type ListMetricsResponse struct { func (x *ListMetricsResponse) Reset() { *x = ListMetricsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[8] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -524,7 +524,7 @@ func (x *ListMetricsResponse) String() string { func (*ListMetricsResponse) ProtoMessage() {} func (x *ListMetricsResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[8] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -537,7 +537,7 @@ func (x *ListMetricsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMetricsResponse.ProtoReflect.Descriptor instead. func (*ListMetricsResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{8} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{8} } func (x *ListMetricsResponse) GetMetrics() []string { @@ -563,7 +563,7 @@ type MetricDetails struct { func (x *MetricDetails) Reset() { *x = MetricDetails{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[9] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -576,7 +576,7 @@ func (x *MetricDetails) String() string { func (*MetricDetails) ProtoMessage() {} func (x *MetricDetails) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[9] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -589,7 +589,7 @@ func (x *MetricDetails) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricDetails.ProtoReflect.Descriptor instead. func (*MetricDetails) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{9} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{9} } func (x *MetricDetails) GetSize() int64 { @@ -633,7 +633,7 @@ type MetricDetailsResponse struct { func (x *MetricDetailsResponse) Reset() { *x = MetricDetailsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v2_pb_proto_msgTypes[10] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -646,7 +646,7 @@ func (x *MetricDetailsResponse) String() string { func (*MetricDetailsResponse) ProtoMessage() {} func (x *MetricDetailsResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v2_pb_proto_msgTypes[10] + mi := &file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -659,7 +659,7 @@ func (x *MetricDetailsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricDetailsResponse.ProtoReflect.Descriptor instead. func (*MetricDetailsResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v2_pb_proto_rawDescGZIP(), []int{10} + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP(), []int{10} } func (x *MetricDetailsResponse) GetMetrics() map[string]*MetricDetails { @@ -683,10 +683,11 @@ func (x *MetricDetailsResponse) GetTotalSpace() uint64 { return 0 } -var File_carbonapi_v2_pb_proto protoreflect.FileDescriptor +var File_carbonapi_v2_pb_carbonapi_v2_pb_proto protoreflect.FileDescriptor -var file_carbonapi_v2_pb_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x32, 0x5f, 0x70, +var file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDesc = []byte{ + 0x0a, 0x25, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x32, 0x5f, 0x70, + 0x62, 0x2f, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x32, 0x5f, 0x70, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x32, 0x5f, 0x70, 0x62, 0x22, 0xad, 0x01, 0x0a, 0x0d, 0x46, 0x65, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, @@ -778,19 +779,19 @@ var file_carbonapi_v2_pb_proto_rawDesc = []byte{ } var ( - file_carbonapi_v2_pb_proto_rawDescOnce sync.Once - file_carbonapi_v2_pb_proto_rawDescData = file_carbonapi_v2_pb_proto_rawDesc + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescOnce sync.Once + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescData = file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDesc ) -func file_carbonapi_v2_pb_proto_rawDescGZIP() []byte { - file_carbonapi_v2_pb_proto_rawDescOnce.Do(func() { - file_carbonapi_v2_pb_proto_rawDescData = protoimpl.X.CompressGZIP(file_carbonapi_v2_pb_proto_rawDescData) +func file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescGZIP() []byte { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescOnce.Do(func() { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescData = protoimpl.X.CompressGZIP(file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescData) }) - return file_carbonapi_v2_pb_proto_rawDescData + return file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDescData } -var file_carbonapi_v2_pb_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_carbonapi_v2_pb_proto_goTypes = []interface{}{ +var file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_carbonapi_v2_pb_carbonapi_v2_pb_proto_goTypes = []interface{}{ (*FetchResponse)(nil), // 0: carbonapi_v2_pb.FetchResponse (*MultiFetchResponse)(nil), // 1: carbonapi_v2_pb.MultiFetchResponse (*GlobMatch)(nil), // 2: carbonapi_v2_pb.GlobMatch @@ -804,7 +805,7 @@ var file_carbonapi_v2_pb_proto_goTypes = []interface{}{ (*MetricDetailsResponse)(nil), // 10: carbonapi_v2_pb.MetricDetailsResponse nil, // 11: carbonapi_v2_pb.MetricDetailsResponse.MetricsEntry } -var file_carbonapi_v2_pb_proto_depIdxs = []int32{ +var file_carbonapi_v2_pb_carbonapi_v2_pb_proto_depIdxs = []int32{ 0, // 0: carbonapi_v2_pb.MultiFetchResponse.metrics:type_name -> carbonapi_v2_pb.FetchResponse 2, // 1: carbonapi_v2_pb.GlobResponse.matches:type_name -> carbonapi_v2_pb.GlobMatch 4, // 2: carbonapi_v2_pb.InfoResponse.retentions:type_name -> carbonapi_v2_pb.Retention @@ -819,13 +820,13 @@ var file_carbonapi_v2_pb_proto_depIdxs = []int32{ 0, // [0:7] is the sub-list for field type_name } -func init() { file_carbonapi_v2_pb_proto_init() } -func file_carbonapi_v2_pb_proto_init() { - if File_carbonapi_v2_pb_proto != nil { +func init() { file_carbonapi_v2_pb_carbonapi_v2_pb_proto_init() } +func file_carbonapi_v2_pb_carbonapi_v2_pb_proto_init() { + if File_carbonapi_v2_pb_carbonapi_v2_pb_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_carbonapi_v2_pb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FetchResponse); i { case 0: return &v.state @@ -837,7 +838,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiFetchResponse); i { case 0: return &v.state @@ -849,7 +850,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GlobMatch); i { case 0: return &v.state @@ -861,7 +862,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GlobResponse); i { case 0: return &v.state @@ -873,7 +874,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Retention); i { case 0: return &v.state @@ -885,7 +886,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InfoResponse); i { case 0: return &v.state @@ -897,7 +898,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ServerInfoResponse); i { case 0: return &v.state @@ -909,7 +910,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ZipperInfoResponse); i { case 0: return &v.state @@ -921,7 +922,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListMetricsResponse); i { case 0: return &v.state @@ -933,7 +934,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricDetails); i { case 0: return &v.state @@ -945,7 +946,7 @@ func file_carbonapi_v2_pb_proto_init() { return nil } } - file_carbonapi_v2_pb_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricDetailsResponse); i { case 0: return &v.state @@ -962,18 +963,18 @@ func file_carbonapi_v2_pb_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_carbonapi_v2_pb_proto_rawDesc, + RawDescriptor: file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDesc, NumEnums: 0, NumMessages: 12, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_carbonapi_v2_pb_proto_goTypes, - DependencyIndexes: file_carbonapi_v2_pb_proto_depIdxs, - MessageInfos: file_carbonapi_v2_pb_proto_msgTypes, + GoTypes: file_carbonapi_v2_pb_carbonapi_v2_pb_proto_goTypes, + DependencyIndexes: file_carbonapi_v2_pb_carbonapi_v2_pb_proto_depIdxs, + MessageInfos: file_carbonapi_v2_pb_carbonapi_v2_pb_proto_msgTypes, }.Build() - File_carbonapi_v2_pb_proto = out.File - file_carbonapi_v2_pb_proto_rawDesc = nil - file_carbonapi_v2_pb_proto_goTypes = nil - file_carbonapi_v2_pb_proto_depIdxs = nil + File_carbonapi_v2_pb_carbonapi_v2_pb_proto = out.File + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_rawDesc = nil + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_goTypes = nil + file_carbonapi_v2_pb_carbonapi_v2_pb_proto_depIdxs = nil } diff --git a/carbonapi_v2_pb/carbonapi_v2_pb_vtproto.pb.go b/carbonapi_v2_pb/carbonapi_v2_pb_vtproto.pb.go index f93ff1c..e039408 100644 --- a/carbonapi_v2_pb/carbonapi_v2_pb_vtproto.pb.go +++ b/carbonapi_v2_pb/carbonapi_v2_pb_vtproto.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-vtproto. DO NOT EDIT. -// protoc-gen-go-vtproto version: v0.0.0-20210524170403-d462593d1bfb -// source: carbonapi_v2_pb.proto +// protoc-gen-go-vtproto version: v0.3.0 +// source: carbonapi_v2_pb/carbonapi_v2_pb.proto package carbonapi_v2_pb @@ -20,6 +20,232 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +func (this *FetchResponse) EqualVT(that *FetchResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if this.StartTime != that.StartTime { + return false + } + if this.StopTime != that.StopTime { + return false + } + if this.StepTime != that.StepTime { + return false + } + if len(this.Values) != len(that.Values) { + return false + } + for i := range this.Values { + if this.Values[i] != that.Values[i] { + return false + } + } + if len(this.IsAbsent) != len(that.IsAbsent) { + return false + } + for i := range this.IsAbsent { + if this.IsAbsent[i] != that.IsAbsent[i] { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiFetchResponse) EqualVT(that *MultiFetchResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *GlobMatch) EqualVT(that *GlobMatch) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Path != that.Path { + return false + } + if this.IsLeaf != that.IsLeaf { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *GlobResponse) EqualVT(that *GlobResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if len(this.Matches) != len(that.Matches) { + return false + } + for i := range this.Matches { + if !this.Matches[i].EqualVT(that.Matches[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *Retention) EqualVT(that *Retention) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.SecondsPerPoint != that.SecondsPerPoint { + return false + } + if this.NumberOfPoints != that.NumberOfPoints { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *InfoResponse) EqualVT(that *InfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if this.AggregationMethod != that.AggregationMethod { + return false + } + if this.MaxRetention != that.MaxRetention { + return false + } + if this.XFilesFactor != that.XFilesFactor { + return false + } + if len(this.Retentions) != len(that.Retentions) { + return false + } + for i := range this.Retentions { + if !this.Retentions[i].EqualVT(that.Retentions[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *ServerInfoResponse) EqualVT(that *ServerInfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Server != that.Server { + return false + } + if !this.Info.EqualVT(that.Info) { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *ZipperInfoResponse) EqualVT(that *ZipperInfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Responses) != len(that.Responses) { + return false + } + for i := range this.Responses { + if !this.Responses[i].EqualVT(that.Responses[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *ListMetricsResponse) EqualVT(that *ListMetricsResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if this.Metrics[i] != that.Metrics[i] { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricDetails) EqualVT(that *MetricDetails) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Size != that.Size { + return false + } + if this.ModTime != that.ModTime { + return false + } + if this.ATime != that.ATime { + return false + } + if this.RdTime != that.RdTime { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricDetailsResponse) EqualVT(that *MetricDetailsResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + if this.FreeSpace != that.FreeSpace { + return false + } + if this.TotalSpace != that.TotalSpace { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + func (m *FetchResponse) MarshalVT() (dAtA []byte, err error) { if m == nil { return nil, nil @@ -130,14 +356,12 @@ func (m *MultiFetchResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Metrics) > 0 { for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -227,14 +451,12 @@ func (m *GlobResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Matches) > 0 { for iNdEx := len(m.Matches) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Matches[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Matches[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 } @@ -324,14 +546,12 @@ func (m *InfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Retentions) > 0 { for iNdEx := len(m.Retentions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Retentions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Retentions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x2a } @@ -395,14 +615,12 @@ func (m *ServerInfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { copy(dAtA[i:], m.unknownFields) } if m.Info != nil { - { - size, err := m.Info.MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Info.MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 } @@ -448,14 +666,12 @@ func (m *ZipperInfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Responses) > 0 { for iNdEx := len(m.Responses) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Responses[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Responses[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -602,14 +818,12 @@ func (m *MetricDetailsResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) for k := range m.Metrics { v := m.Metrics[k] baseI := i - { - size, err := v.MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := v.MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 i -= len(k) diff --git a/carbonapi_v3_pb/carbonapi_v3_pb.pb.go b/carbonapi_v3_pb/carbonapi_v3_pb.pb.go index 0a86f13..954d086 100644 --- a/carbonapi_v3_pb/carbonapi_v3_pb.pb.go +++ b/carbonapi_v3_pb/carbonapi_v3_pb.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.12.4 -// source: carbonapi_v3_pb.proto +// protoc-gen-go v1.28.0 +// protoc v3.19.4 +// source: carbonapi_v3_pb/carbonapi_v3_pb.proto package carbonapi_v3_pb @@ -32,7 +32,7 @@ type FilteringFunction struct { func (x *FilteringFunction) Reset() { *x = FilteringFunction{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[0] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *FilteringFunction) String() string { func (*FilteringFunction) ProtoMessage() {} func (x *FilteringFunction) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[0] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *FilteringFunction) ProtoReflect() protoreflect.Message { // Deprecated: Use FilteringFunction.ProtoReflect.Descriptor instead. func (*FilteringFunction) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{0} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{0} } func (x *FilteringFunction) GetName() string { @@ -85,7 +85,7 @@ type CapabilityRequest struct { func (x *CapabilityRequest) Reset() { *x = CapabilityRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[1] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -98,7 +98,7 @@ func (x *CapabilityRequest) String() string { func (*CapabilityRequest) ProtoMessage() {} func (x *CapabilityRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[1] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -111,7 +111,7 @@ func (x *CapabilityRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CapabilityRequest.ProtoReflect.Descriptor instead. func (*CapabilityRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{1} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{1} } // Storage capability information @@ -134,7 +134,7 @@ type CapabilityResponse struct { func (x *CapabilityResponse) Reset() { *x = CapabilityResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[2] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -147,7 +147,7 @@ func (x *CapabilityResponse) String() string { func (*CapabilityResponse) ProtoMessage() {} func (x *CapabilityResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[2] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -160,7 +160,7 @@ func (x *CapabilityResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use CapabilityResponse.ProtoReflect.Descriptor instead. func (*CapabilityResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{2} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{2} } func (x *CapabilityResponse) GetSupportedProtocols() []string { @@ -224,7 +224,7 @@ type FetchRequest struct { func (x *FetchRequest) Reset() { *x = FetchRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[3] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -237,7 +237,7 @@ func (x *FetchRequest) String() string { func (*FetchRequest) ProtoMessage() {} func (x *FetchRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[3] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -250,7 +250,7 @@ func (x *FetchRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use FetchRequest.ProtoReflect.Descriptor instead. func (*FetchRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{3} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{3} } func (x *FetchRequest) GetName() string { @@ -313,7 +313,7 @@ type MultiFetchRequest struct { func (x *MultiFetchRequest) Reset() { *x = MultiFetchRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[4] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -326,7 +326,7 @@ func (x *MultiFetchRequest) String() string { func (*MultiFetchRequest) ProtoMessage() {} func (x *MultiFetchRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[4] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -339,7 +339,7 @@ func (x *MultiFetchRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiFetchRequest.ProtoReflect.Descriptor instead. func (*MultiFetchRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{4} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{4} } func (x *MultiFetchRequest) GetMetrics() []*FetchRequest { @@ -373,7 +373,7 @@ type FetchResponse struct { func (x *FetchResponse) Reset() { *x = FetchResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[5] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -386,7 +386,7 @@ func (x *FetchResponse) String() string { func (*FetchResponse) ProtoMessage() {} func (x *FetchResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[5] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -399,7 +399,7 @@ func (x *FetchResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use FetchResponse.ProtoReflect.Descriptor instead. func (*FetchResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{5} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{5} } func (x *FetchResponse) GetName() string { @@ -497,7 +497,7 @@ type MultiFetchResponse struct { func (x *MultiFetchResponse) Reset() { *x = MultiFetchResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[6] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -510,7 +510,7 @@ func (x *MultiFetchResponse) String() string { func (*MultiFetchResponse) ProtoMessage() {} func (x *MultiFetchResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[6] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -523,7 +523,7 @@ func (x *MultiFetchResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiFetchResponse.ProtoReflect.Descriptor instead. func (*MultiFetchResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{6} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{6} } func (x *MultiFetchResponse) GetMetrics() []*FetchResponse { @@ -547,7 +547,7 @@ type MultiGlobRequest struct { func (x *MultiGlobRequest) Reset() { *x = MultiGlobRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[7] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -560,7 +560,7 @@ func (x *MultiGlobRequest) String() string { func (*MultiGlobRequest) ProtoMessage() {} func (x *MultiGlobRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[7] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -573,7 +573,7 @@ func (x *MultiGlobRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiGlobRequest.ProtoReflect.Descriptor instead. func (*MultiGlobRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{7} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{7} } func (x *MultiGlobRequest) GetMetrics() []string { @@ -609,7 +609,7 @@ type GlobMatch struct { func (x *GlobMatch) Reset() { *x = GlobMatch{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[8] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -622,7 +622,7 @@ func (x *GlobMatch) String() string { func (*GlobMatch) ProtoMessage() {} func (x *GlobMatch) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[8] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -635,7 +635,7 @@ func (x *GlobMatch) ProtoReflect() protoreflect.Message { // Deprecated: Use GlobMatch.ProtoReflect.Descriptor instead. func (*GlobMatch) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{8} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{8} } func (x *GlobMatch) GetPath() string { @@ -665,7 +665,7 @@ type GlobResponse struct { func (x *GlobResponse) Reset() { *x = GlobResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[9] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -678,7 +678,7 @@ func (x *GlobResponse) String() string { func (*GlobResponse) ProtoMessage() {} func (x *GlobResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[9] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -691,7 +691,7 @@ func (x *GlobResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GlobResponse.ProtoReflect.Descriptor instead. func (*GlobResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{9} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{9} } func (x *GlobResponse) GetName() string { @@ -719,7 +719,7 @@ type MultiGlobResponse struct { func (x *MultiGlobResponse) Reset() { *x = MultiGlobResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[10] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -732,7 +732,7 @@ func (x *MultiGlobResponse) String() string { func (*MultiGlobResponse) ProtoMessage() {} func (x *MultiGlobResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[10] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -745,7 +745,7 @@ func (x *MultiGlobResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiGlobResponse.ProtoReflect.Descriptor instead. func (*MultiGlobResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{10} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{10} } func (x *MultiGlobResponse) GetMetrics() []*GlobResponse { @@ -767,7 +767,7 @@ type MetricsInfoRequest struct { func (x *MetricsInfoRequest) Reset() { *x = MetricsInfoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[11] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -780,7 +780,7 @@ func (x *MetricsInfoRequest) String() string { func (*MetricsInfoRequest) ProtoMessage() {} func (x *MetricsInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[11] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -793,7 +793,7 @@ func (x *MetricsInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricsInfoRequest.ProtoReflect.Descriptor instead. func (*MetricsInfoRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{11} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{11} } func (x *MetricsInfoRequest) GetName() string { @@ -814,7 +814,7 @@ type MultiMetricsInfoRequest struct { func (x *MultiMetricsInfoRequest) Reset() { *x = MultiMetricsInfoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[12] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -827,7 +827,7 @@ func (x *MultiMetricsInfoRequest) String() string { func (*MultiMetricsInfoRequest) ProtoMessage() {} func (x *MultiMetricsInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[12] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -840,7 +840,7 @@ func (x *MultiMetricsInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiMetricsInfoRequest.ProtoReflect.Descriptor instead. func (*MultiMetricsInfoRequest) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{12} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{12} } func (x *MultiMetricsInfoRequest) GetNames() []string { @@ -862,7 +862,7 @@ type Retention struct { func (x *Retention) Reset() { *x = Retention{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[13] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -875,7 +875,7 @@ func (x *Retention) String() string { func (*Retention) ProtoMessage() {} func (x *Retention) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[13] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -888,7 +888,7 @@ func (x *Retention) ProtoReflect() protoreflect.Message { // Deprecated: Use Retention.ProtoReflect.Descriptor instead. func (*Retention) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{13} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{13} } func (x *Retention) GetSecondsPerPoint() int64 { @@ -920,7 +920,7 @@ type MetricsInfoResponse struct { func (x *MetricsInfoResponse) Reset() { *x = MetricsInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[14] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -933,7 +933,7 @@ func (x *MetricsInfoResponse) String() string { func (*MetricsInfoResponse) ProtoMessage() {} func (x *MetricsInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[14] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -946,7 +946,7 @@ func (x *MetricsInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricsInfoResponse.ProtoReflect.Descriptor instead. func (*MetricsInfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{14} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{14} } func (x *MetricsInfoResponse) GetName() string { @@ -995,7 +995,7 @@ type MultiMetricsInfoResponse struct { func (x *MultiMetricsInfoResponse) Reset() { *x = MultiMetricsInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[15] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1008,7 +1008,7 @@ func (x *MultiMetricsInfoResponse) String() string { func (*MultiMetricsInfoResponse) ProtoMessage() {} func (x *MultiMetricsInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[15] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1021,7 +1021,7 @@ func (x *MultiMetricsInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiMetricsInfoResponse.ProtoReflect.Descriptor instead. func (*MultiMetricsInfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{15} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{15} } func (x *MultiMetricsInfoResponse) GetMetrics() []*MetricsInfoResponse { @@ -1043,7 +1043,7 @@ type ZipperInfoResponse struct { func (x *ZipperInfoResponse) Reset() { *x = ZipperInfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[16] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1056,7 +1056,7 @@ func (x *ZipperInfoResponse) String() string { func (*ZipperInfoResponse) ProtoMessage() {} func (x *ZipperInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[16] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1069,7 +1069,7 @@ func (x *ZipperInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ZipperInfoResponse.ProtoReflect.Descriptor instead. func (*ZipperInfoResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{16} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{16} } func (x *ZipperInfoResponse) GetInfo() map[string]*MultiMetricsInfoResponse { @@ -1091,7 +1091,7 @@ type ListMetricsResponse struct { func (x *ListMetricsResponse) Reset() { *x = ListMetricsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[17] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1104,7 +1104,7 @@ func (x *ListMetricsResponse) String() string { func (*ListMetricsResponse) ProtoMessage() {} func (x *ListMetricsResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[17] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1117,7 +1117,7 @@ func (x *ListMetricsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListMetricsResponse.ProtoReflect.Descriptor instead. func (*ListMetricsResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{17} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{17} } func (x *ListMetricsResponse) GetMetrics() []string { @@ -1143,7 +1143,7 @@ type MetricDetails struct { func (x *MetricDetails) Reset() { *x = MetricDetails{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[18] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1156,7 +1156,7 @@ func (x *MetricDetails) String() string { func (*MetricDetails) ProtoMessage() {} func (x *MetricDetails) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[18] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1169,7 +1169,7 @@ func (x *MetricDetails) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricDetails.ProtoReflect.Descriptor instead. func (*MetricDetails) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{18} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{18} } func (x *MetricDetails) GetSize() int64 { @@ -1220,7 +1220,7 @@ type MetricDetailsResponse struct { func (x *MetricDetailsResponse) Reset() { *x = MetricDetailsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[19] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1233,7 +1233,7 @@ func (x *MetricDetailsResponse) String() string { func (*MetricDetailsResponse) ProtoMessage() {} func (x *MetricDetailsResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[19] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1246,7 +1246,7 @@ func (x *MetricDetailsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MetricDetailsResponse.ProtoReflect.Descriptor instead. func (*MetricDetailsResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{19} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{19} } func (x *MetricDetailsResponse) GetMetrics() map[string]*MetricDetails { @@ -1281,7 +1281,7 @@ type MultiDetailsResponse struct { func (x *MultiDetailsResponse) Reset() { *x = MultiDetailsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_carbonapi_v3_pb_proto_msgTypes[20] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1294,7 +1294,7 @@ func (x *MultiDetailsResponse) String() string { func (*MultiDetailsResponse) ProtoMessage() {} func (x *MultiDetailsResponse) ProtoReflect() protoreflect.Message { - mi := &file_carbonapi_v3_pb_proto_msgTypes[20] + mi := &file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1307,7 +1307,7 @@ func (x *MultiDetailsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MultiDetailsResponse.ProtoReflect.Descriptor instead. func (*MultiDetailsResponse) Descriptor() ([]byte, []int) { - return file_carbonapi_v3_pb_proto_rawDescGZIP(), []int{20} + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP(), []int{20} } func (x *MultiDetailsResponse) GetMetrics() map[string]*MetricDetailsResponse { @@ -1317,10 +1317,11 @@ func (x *MultiDetailsResponse) GetMetrics() map[string]*MetricDetailsResponse { return nil } -var File_carbonapi_v3_pb_proto protoreflect.FileDescriptor +var File_carbonapi_v3_pb_carbonapi_v3_pb_proto protoreflect.FileDescriptor -var file_carbonapi_v3_pb_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x33, 0x5f, 0x70, +var file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDesc = []byte{ + 0x0a, 0x25, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x33, 0x5f, 0x70, + 0x62, 0x2f, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x33, 0x5f, 0x70, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x63, 0x61, 0x72, 0x62, 0x6f, 0x6e, 0x61, 0x70, 0x69, 0x5f, 0x76, 0x33, 0x5f, 0x70, 0x62, 0x22, 0x45, 0x0a, 0x11, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, @@ -1517,19 +1518,19 @@ var file_carbonapi_v3_pb_proto_rawDesc = []byte{ } var ( - file_carbonapi_v3_pb_proto_rawDescOnce sync.Once - file_carbonapi_v3_pb_proto_rawDescData = file_carbonapi_v3_pb_proto_rawDesc + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescOnce sync.Once + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescData = file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDesc ) -func file_carbonapi_v3_pb_proto_rawDescGZIP() []byte { - file_carbonapi_v3_pb_proto_rawDescOnce.Do(func() { - file_carbonapi_v3_pb_proto_rawDescData = protoimpl.X.CompressGZIP(file_carbonapi_v3_pb_proto_rawDescData) +func file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescGZIP() []byte { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescOnce.Do(func() { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescData = protoimpl.X.CompressGZIP(file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescData) }) - return file_carbonapi_v3_pb_proto_rawDescData + return file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDescData } -var file_carbonapi_v3_pb_proto_msgTypes = make([]protoimpl.MessageInfo, 24) -var file_carbonapi_v3_pb_proto_goTypes = []interface{}{ +var file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes = make([]protoimpl.MessageInfo, 24) +var file_carbonapi_v3_pb_carbonapi_v3_pb_proto_goTypes = []interface{}{ (*FilteringFunction)(nil), // 0: carbonapi_v3_pb.FilteringFunction (*CapabilityRequest)(nil), // 1: carbonapi_v3_pb.CapabilityRequest (*CapabilityResponse)(nil), // 2: carbonapi_v3_pb.CapabilityResponse @@ -1555,7 +1556,7 @@ var file_carbonapi_v3_pb_proto_goTypes = []interface{}{ nil, // 22: carbonapi_v3_pb.MetricDetailsResponse.MetricsEntry nil, // 23: carbonapi_v3_pb.MultiDetailsResponse.MetricsEntry } -var file_carbonapi_v3_pb_proto_depIdxs = []int32{ +var file_carbonapi_v3_pb_carbonapi_v3_pb_proto_depIdxs = []int32{ 0, // 0: carbonapi_v3_pb.FetchRequest.filterFunctions:type_name -> carbonapi_v3_pb.FilteringFunction 3, // 1: carbonapi_v3_pb.MultiFetchRequest.metrics:type_name -> carbonapi_v3_pb.FetchRequest 5, // 2: carbonapi_v3_pb.MultiFetchResponse.metrics:type_name -> carbonapi_v3_pb.FetchResponse @@ -1576,13 +1577,13 @@ var file_carbonapi_v3_pb_proto_depIdxs = []int32{ 0, // [0:13] is the sub-list for field type_name } -func init() { file_carbonapi_v3_pb_proto_init() } -func file_carbonapi_v3_pb_proto_init() { - if File_carbonapi_v3_pb_proto != nil { +func init() { file_carbonapi_v3_pb_carbonapi_v3_pb_proto_init() } +func file_carbonapi_v3_pb_carbonapi_v3_pb_proto_init() { + if File_carbonapi_v3_pb_carbonapi_v3_pb_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_carbonapi_v3_pb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FilteringFunction); i { case 0: return &v.state @@ -1594,7 +1595,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CapabilityRequest); i { case 0: return &v.state @@ -1606,7 +1607,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CapabilityResponse); i { case 0: return &v.state @@ -1618,7 +1619,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FetchRequest); i { case 0: return &v.state @@ -1630,7 +1631,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiFetchRequest); i { case 0: return &v.state @@ -1642,7 +1643,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FetchResponse); i { case 0: return &v.state @@ -1654,7 +1655,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiFetchResponse); i { case 0: return &v.state @@ -1666,7 +1667,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiGlobRequest); i { case 0: return &v.state @@ -1678,7 +1679,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GlobMatch); i { case 0: return &v.state @@ -1690,7 +1691,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GlobResponse); i { case 0: return &v.state @@ -1702,7 +1703,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiGlobResponse); i { case 0: return &v.state @@ -1714,7 +1715,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricsInfoRequest); i { case 0: return &v.state @@ -1726,7 +1727,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiMetricsInfoRequest); i { case 0: return &v.state @@ -1738,7 +1739,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Retention); i { case 0: return &v.state @@ -1750,7 +1751,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricsInfoResponse); i { case 0: return &v.state @@ -1762,7 +1763,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiMetricsInfoResponse); i { case 0: return &v.state @@ -1774,7 +1775,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ZipperInfoResponse); i { case 0: return &v.state @@ -1786,7 +1787,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListMetricsResponse); i { case 0: return &v.state @@ -1798,7 +1799,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricDetails); i { case 0: return &v.state @@ -1810,7 +1811,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MetricDetailsResponse); i { case 0: return &v.state @@ -1822,7 +1823,7 @@ func file_carbonapi_v3_pb_proto_init() { return nil } } - file_carbonapi_v3_pb_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MultiDetailsResponse); i { case 0: return &v.state @@ -1839,18 +1840,18 @@ func file_carbonapi_v3_pb_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_carbonapi_v3_pb_proto_rawDesc, + RawDescriptor: file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDesc, NumEnums: 0, NumMessages: 24, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_carbonapi_v3_pb_proto_goTypes, - DependencyIndexes: file_carbonapi_v3_pb_proto_depIdxs, - MessageInfos: file_carbonapi_v3_pb_proto_msgTypes, + GoTypes: file_carbonapi_v3_pb_carbonapi_v3_pb_proto_goTypes, + DependencyIndexes: file_carbonapi_v3_pb_carbonapi_v3_pb_proto_depIdxs, + MessageInfos: file_carbonapi_v3_pb_carbonapi_v3_pb_proto_msgTypes, }.Build() - File_carbonapi_v3_pb_proto = out.File - file_carbonapi_v3_pb_proto_rawDesc = nil - file_carbonapi_v3_pb_proto_goTypes = nil - file_carbonapi_v3_pb_proto_depIdxs = nil + File_carbonapi_v3_pb_carbonapi_v3_pb_proto = out.File + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_rawDesc = nil + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_goTypes = nil + file_carbonapi_v3_pb_carbonapi_v3_pb_proto_depIdxs = nil } diff --git a/carbonapi_v3_pb/carbonapi_v3_pb_vtproto.pb.go b/carbonapi_v3_pb/carbonapi_v3_pb_vtproto.pb.go index 56a315f..0a85858 100644 --- a/carbonapi_v3_pb/carbonapi_v3_pb_vtproto.pb.go +++ b/carbonapi_v3_pb/carbonapi_v3_pb_vtproto.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-vtproto. DO NOT EDIT. -// protoc-gen-go-vtproto version: v0.0.0-20210524170403-d462593d1bfb -// source: carbonapi_v3_pb.proto +// protoc-gen-go-vtproto version: v0.3.0 +// source: carbonapi_v3_pb/carbonapi_v3_pb.proto package carbonapi_v3_pb @@ -20,6 +20,454 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +func (this *FilteringFunction) EqualVT(that *FilteringFunction) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if len(this.Arguments) != len(that.Arguments) { + return false + } + for i := range this.Arguments { + if this.Arguments[i] != that.Arguments[i] { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *CapabilityRequest) EqualVT(that *CapabilityRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *CapabilityResponse) EqualVT(that *CapabilityResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.SupportedProtocols) != len(that.SupportedProtocols) { + return false + } + for i := range this.SupportedProtocols { + if this.SupportedProtocols[i] != that.SupportedProtocols[i] { + return false + } + } + if this.Name != that.Name { + return false + } + if this.HighPrecisionTimestamps != that.HighPrecisionTimestamps { + return false + } + if this.SupportFilteringFunctions != that.SupportFilteringFunctions { + return false + } + if this.LikeSplittedRequests != that.LikeSplittedRequests { + return false + } + if this.SupportStreaming != that.SupportStreaming { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *FetchRequest) EqualVT(that *FetchRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if this.StartTime != that.StartTime { + return false + } + if this.StopTime != that.StopTime { + return false + } + if this.HighPrecisionTimestamps != that.HighPrecisionTimestamps { + return false + } + if this.PathExpression != that.PathExpression { + return false + } + if len(this.FilterFunctions) != len(that.FilterFunctions) { + return false + } + for i := range this.FilterFunctions { + if !this.FilterFunctions[i].EqualVT(that.FilterFunctions[i]) { + return false + } + } + if this.MaxDataPoints != that.MaxDataPoints { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiFetchRequest) EqualVT(that *MultiFetchRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *FetchResponse) EqualVT(that *FetchResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if this.PathExpression != that.PathExpression { + return false + } + if this.ConsolidationFunc != that.ConsolidationFunc { + return false + } + if this.StartTime != that.StartTime { + return false + } + if this.StopTime != that.StopTime { + return false + } + if this.StepTime != that.StepTime { + return false + } + if this.XFilesFactor != that.XFilesFactor { + return false + } + if this.HighPrecisionTimestamps != that.HighPrecisionTimestamps { + return false + } + if len(this.Values) != len(that.Values) { + return false + } + for i := range this.Values { + if this.Values[i] != that.Values[i] { + return false + } + } + if len(this.AppliedFunctions) != len(that.AppliedFunctions) { + return false + } + for i := range this.AppliedFunctions { + if this.AppliedFunctions[i] != that.AppliedFunctions[i] { + return false + } + } + if this.RequestStartTime != that.RequestStartTime { + return false + } + if this.RequestStopTime != that.RequestStopTime { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiFetchResponse) EqualVT(that *MultiFetchResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiGlobRequest) EqualVT(that *MultiGlobRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if this.Metrics[i] != that.Metrics[i] { + return false + } + } + if this.StartTime != that.StartTime { + return false + } + if this.StopTime != that.StopTime { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *GlobMatch) EqualVT(that *GlobMatch) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Path != that.Path { + return false + } + if this.IsLeaf != that.IsLeaf { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *GlobResponse) EqualVT(that *GlobResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if len(this.Matches) != len(that.Matches) { + return false + } + for i := range this.Matches { + if !this.Matches[i].EqualVT(that.Matches[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiGlobResponse) EqualVT(that *MultiGlobResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricsInfoRequest) EqualVT(that *MetricsInfoRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiMetricsInfoRequest) EqualVT(that *MultiMetricsInfoRequest) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Names) != len(that.Names) { + return false + } + for i := range this.Names { + if this.Names[i] != that.Names[i] { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *Retention) EqualVT(that *Retention) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.SecondsPerPoint != that.SecondsPerPoint { + return false + } + if this.NumberOfPoints != that.NumberOfPoints { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricsInfoResponse) EqualVT(that *MetricsInfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Name != that.Name { + return false + } + if this.ConsolidationFunc != that.ConsolidationFunc { + return false + } + if this.MaxRetention != that.MaxRetention { + return false + } + if this.XFilesFactor != that.XFilesFactor { + return false + } + if len(this.Retentions) != len(that.Retentions) { + return false + } + for i := range this.Retentions { + if !this.Retentions[i].EqualVT(that.Retentions[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiMetricsInfoResponse) EqualVT(that *MultiMetricsInfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *ZipperInfoResponse) EqualVT(that *ZipperInfoResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Info) != len(that.Info) { + return false + } + for i := range this.Info { + if !this.Info[i].EqualVT(that.Info[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *ListMetricsResponse) EqualVT(that *ListMetricsResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if this.Metrics[i] != that.Metrics[i] { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricDetails) EqualVT(that *MetricDetails) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if this.Size != that.Size { + return false + } + if this.ModTime != that.ModTime { + return false + } + if this.ATime != that.ATime { + return false + } + if this.RdTime != that.RdTime { + return false + } + if this.RealSize != that.RealSize { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MetricDetailsResponse) EqualVT(that *MetricDetailsResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + if this.FreeSpace != that.FreeSpace { + return false + } + if this.TotalSpace != that.TotalSpace { + return false + } + return string(this.unknownFields) == string(that.unknownFields) +} + +func (this *MultiDetailsResponse) EqualVT(that *MultiDetailsResponse) bool { + if this == nil { + return that == nil || fmt.Sprintf("%v", that) == "" + } else if that == nil { + return fmt.Sprintf("%v", this) == "" + } + if len(this.Metrics) != len(that.Metrics) { + return false + } + for i := range this.Metrics { + if !this.Metrics[i].EqualVT(that.Metrics[i]) { + return false + } + } + return string(this.unknownFields) == string(that.unknownFields) +} + func (m *FilteringFunction) MarshalVT() (dAtA []byte, err error) { if m == nil { return nil, nil @@ -228,14 +676,12 @@ func (m *FetchRequest) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.FilterFunctions) > 0 { for iNdEx := len(m.FilterFunctions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FilterFunctions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.FilterFunctions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x32 } @@ -309,14 +755,12 @@ func (m *MultiFetchRequest) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Metrics) > 0 { for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -470,14 +914,12 @@ func (m *MultiFetchResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Metrics) > 0 { for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -619,14 +1061,12 @@ func (m *GlobResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Matches) > 0 { for iNdEx := len(m.Matches) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Matches[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Matches[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 } @@ -673,14 +1113,12 @@ func (m *MultiGlobResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Metrics) > 0 { for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -845,14 +1283,12 @@ func (m *MetricsInfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { } if len(m.Retentions) > 0 { for iNdEx := len(m.Retentions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Retentions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Retentions[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x2a } @@ -917,14 +1353,12 @@ func (m *MultiMetricsInfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, err } if len(m.Metrics) > 0 { for iNdEx := len(m.Metrics) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := m.Metrics[iNdEx].MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0xa } @@ -966,14 +1400,12 @@ func (m *ZipperInfoResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) { for k := range m.Info { v := m.Info[k] baseI := i - { - size, err := v.MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := v.MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 i -= len(k) @@ -1133,14 +1565,12 @@ func (m *MetricDetailsResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) for k := range m.Metrics { v := m.Metrics[k] baseI := i - { - size, err := v.MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := v.MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 i -= len(k) @@ -1190,14 +1620,12 @@ func (m *MultiDetailsResponse) MarshalToSizedBufferVT(dAtA []byte) (int, error) for k := range m.Metrics { v := m.Metrics[k] baseI := i - { - size, err := v.MarshalToSizedBufferVT(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarint(dAtA, i, uint64(size)) + size, err := v.MarshalToSizedBufferVT(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarint(dAtA, i, uint64(size)) i-- dAtA[i] = 0x12 i -= len(k) diff --git a/go.mod b/go.mod index 7b4ad3a..397b824 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/go-graphite/protocol go 1.16 -require google.golang.org/protobuf v1.26.0 +require google.golang.org/protobuf v1.28.0 diff --git a/go.sum b/go.sum index 20a6257..ca2cb93 100644 --- a/go.sum +++ b/go.sum @@ -6,3 +6,5 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/regen.sh b/regen.sh new file mode 100755 index 0000000..73bae20 --- /dev/null +++ b/regen.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +if [[ -z ${GOBIN} ]]; then + echo "GOBIN is not set, please update it if script doesn't work" + GOBIN="${HOME}/go/bin" +fi +echo "Will use ${GOBIN} as path for go and vt proto generators" + +for proto in carbonapi_v2_pb carbonapi_v3_pb; do + echo "Generating files for ${proto}" + protoc --go_out=paths=source_relative:. --plugin protoc-gen-go="${GOBIN}/protoc-gen-go" --go-vtproto_out=paths=source_relative:. --plugin protoc-gen-go-vtproto="${GOBIN}/protoc-gen-go-vtproto" --go-vtproto_opt=features=marshal+unmarshal+size+equal+pool "${proto}"/${proto}.proto +done diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go index 8fb1d9e..179d6e8 100644 --- a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go +++ b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go @@ -744,9 +744,6 @@ func (d decoder) skipValue() error { // Skip items. This will not validate whether skipped values are // of the same type or not, same behavior as C++ // TextFormat::Parser::AllowUnknownField(true) version 3.8.0. - if err := d.skipValue(); err != nil { - return err - } } } } diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go index a427f8b..9c61112 100644 --- a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go +++ b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go @@ -21,10 +21,11 @@ import ( type Number int32 const ( - MinValidNumber Number = 1 - FirstReservedNumber Number = 19000 - LastReservedNumber Number = 19999 - MaxValidNumber Number = 1<<29 - 1 + MinValidNumber Number = 1 + FirstReservedNumber Number = 19000 + LastReservedNumber Number = 19999 + MaxValidNumber Number = 1<<29 - 1 + DefaultRecursionLimit = 10000 ) // IsValid reports whether the field number is semantically valid. @@ -55,6 +56,7 @@ const ( errCodeOverflow errCodeReserved errCodeEndGroup + errCodeRecursionDepth ) var ( @@ -112,6 +114,10 @@ func ConsumeField(b []byte) (Number, Type, int) { // When parsing a group, the length includes the end group marker and // the end group is verified to match the starting field number. func ConsumeFieldValue(num Number, typ Type, b []byte) (n int) { + return consumeFieldValueD(num, typ, b, DefaultRecursionLimit) +} + +func consumeFieldValueD(num Number, typ Type, b []byte, depth int) (n int) { switch typ { case VarintType: _, n = ConsumeVarint(b) @@ -126,6 +132,9 @@ func ConsumeFieldValue(num Number, typ Type, b []byte) (n int) { _, n = ConsumeBytes(b) return n case StartGroupType: + if depth < 0 { + return errCodeRecursionDepth + } n0 := len(b) for { num2, typ2, n := ConsumeTag(b) @@ -140,7 +149,7 @@ func ConsumeFieldValue(num Number, typ Type, b []byte) (n int) { return n0 - len(b) } - n = ConsumeFieldValue(num2, typ2, b) + n = consumeFieldValueD(num2, typ2, b, depth-1) if n < 0 { return n // forward error code } diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go b/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go index eb10ea1..3780377 100644 --- a/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go +++ b/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go @@ -381,7 +381,7 @@ func (d *Decoder) currentOpenKind() (Kind, byte) { case '[': return ListOpen, ']' } - panic(fmt.Sprintf("Decoder: openStack contains invalid byte %s", string(openCh))) + panic(fmt.Sprintf("Decoder: openStack contains invalid byte %c", openCh)) } func (d *Decoder) pushOpenStack(ch byte) { diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go b/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go index aa66bdd..da289cc 100644 --- a/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go +++ b/vendor/google.golang.org/protobuf/internal/encoding/text/encode.go @@ -263,3 +263,8 @@ func (e *Encoder) Snapshot() encoderState { func (e *Encoder) Reset(es encoderState) { e.encoderState = es } + +// AppendString appends the escaped form of the input string to b. +func AppendString(b []byte, s string) []byte { + return appendString(b, s, false) +} diff --git a/vendor/google.golang.org/protobuf/internal/errors/is_go112.go b/vendor/google.golang.org/protobuf/internal/errors/is_go112.go index f90e909..fbcd349 100644 --- a/vendor/google.golang.org/protobuf/internal/errors/is_go112.go +++ b/vendor/google.golang.org/protobuf/internal/errors/is_go112.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !go1.13 // +build !go1.13 package errors diff --git a/vendor/google.golang.org/protobuf/internal/errors/is_go113.go b/vendor/google.golang.org/protobuf/internal/errors/is_go113.go index dc05f41..5e72f1c 100644 --- a/vendor/google.golang.org/protobuf/internal/errors/is_go113.go +++ b/vendor/google.golang.org/protobuf/internal/errors/is_go113.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build go1.13 // +build go1.13 package errors diff --git a/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go b/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go index a72995f..bda8e8c 100644 --- a/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go +++ b/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !protolegacy // +build !protolegacy package flags diff --git a/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go b/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go index 772e2f0..6d8d9bd 100644 --- a/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go +++ b/vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build protolegacy // +build protolegacy package flags diff --git a/vendor/google.golang.org/protobuf/internal/impl/codec_map_go111.go b/vendor/google.golang.org/protobuf/internal/impl/codec_map_go111.go index 2706bb6..4b15493 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/codec_map_go111.go +++ b/vendor/google.golang.org/protobuf/internal/impl/codec_map_go111.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !go1.12 // +build !go1.12 package impl diff --git a/vendor/google.golang.org/protobuf/internal/impl/codec_map_go112.go b/vendor/google.golang.org/protobuf/internal/impl/codec_map_go112.go index 1533ef6..0b31b66 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/codec_map_go112.go +++ b/vendor/google.golang.org/protobuf/internal/impl/codec_map_go112.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build go1.12 // +build go1.12 package impl diff --git a/vendor/google.golang.org/protobuf/internal/impl/codec_reflect.go b/vendor/google.golang.org/protobuf/internal/impl/codec_reflect.go index 90705e3..145c577 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/codec_reflect.go +++ b/vendor/google.golang.org/protobuf/internal/impl/codec_reflect.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build purego || appengine // +build purego appengine package impl diff --git a/vendor/google.golang.org/protobuf/internal/impl/codec_unsafe.go b/vendor/google.golang.org/protobuf/internal/impl/codec_unsafe.go index e118af1..757642e 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/codec_unsafe.go +++ b/vendor/google.golang.org/protobuf/internal/impl/codec_unsafe.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !purego && !appengine // +build !purego,!appengine package impl diff --git a/vendor/google.golang.org/protobuf/internal/impl/decode.go b/vendor/google.golang.org/protobuf/internal/impl/decode.go index 949dc49..c65b032 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/decode.go +++ b/vendor/google.golang.org/protobuf/internal/impl/decode.go @@ -18,6 +18,7 @@ import ( ) var errDecode = errors.New("cannot parse invalid wire-format data") +var errRecursionDepth = errors.New("exceeded maximum recursion depth") type unmarshalOptions struct { flags protoiface.UnmarshalInputFlags @@ -25,6 +26,7 @@ type unmarshalOptions struct { FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) } + depth int } func (o unmarshalOptions) Options() proto.UnmarshalOptions { @@ -44,6 +46,7 @@ func (o unmarshalOptions) IsDefault() bool { var lazyUnmarshalOptions = unmarshalOptions{ resolver: preg.GlobalTypes, + depth: protowire.DefaultRecursionLimit, } type unmarshalOutput struct { @@ -62,6 +65,7 @@ func (mi *MessageInfo) unmarshal(in piface.UnmarshalInput) (piface.UnmarshalOutp out, err := mi.unmarshalPointer(in.Buf, p, 0, unmarshalOptions{ flags: in.Flags, resolver: in.Resolver, + depth: in.Depth, }) var flags piface.UnmarshalOutputFlags if out.initialized { @@ -82,6 +86,10 @@ var errUnknown = errors.New("unknown") func (mi *MessageInfo) unmarshalPointer(b []byte, p pointer, groupTag protowire.Number, opts unmarshalOptions) (out unmarshalOutput, err error) { mi.init() + opts.depth-- + if opts.depth < 0 { + return out, errRecursionDepth + } if flags.ProtoLegacy && mi.isMessageSet { return unmarshalMessageSet(mi, b, p, opts) } diff --git a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go index 3759b01..029feee 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go +++ b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go @@ -440,6 +440,13 @@ func legacyMerge(in piface.MergeInput) piface.MergeOutput { if !ok { return piface.MergeOutput{} } + if !in.Source.IsValid() { + // Legacy Marshal methods may not function on nil messages. + // Check for a typed nil source only after we confirm that + // legacy Marshal/Unmarshal methods are present, for + // consistency. + return piface.MergeOutput{Flags: piface.MergeComplete} + } b, err := marshaler.Marshal() if err != nil { return piface.MergeOutput{} diff --git a/vendor/google.golang.org/protobuf/internal/impl/pointer_reflect.go b/vendor/google.golang.org/protobuf/internal/impl/pointer_reflect.go index 9e3ed82..4c491bd 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/pointer_reflect.go +++ b/vendor/google.golang.org/protobuf/internal/impl/pointer_reflect.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build purego || appengine // +build purego appengine package impl diff --git a/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go b/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go index 9ecf23a..ee0e057 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go +++ b/vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !purego && !appengine // +build !purego,!appengine package impl diff --git a/vendor/google.golang.org/protobuf/internal/strs/strings_pure.go b/vendor/google.golang.org/protobuf/internal/strs/strings_pure.go index 85e074c..a1f6f33 100644 --- a/vendor/google.golang.org/protobuf/internal/strs/strings_pure.go +++ b/vendor/google.golang.org/protobuf/internal/strs/strings_pure.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build purego || appengine // +build purego appengine package strs diff --git a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go index 2160c70..56a8a4e 100644 --- a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go +++ b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !purego && !appengine // +build !purego,!appengine package strs diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go index 5879131..3d40d52 100644 --- a/vendor/google.golang.org/protobuf/internal/version/version.go +++ b/vendor/google.golang.org/protobuf/internal/version/version.go @@ -52,7 +52,7 @@ import ( // 10. Send out the CL for review and submit it. const ( Major = 1 - Minor = 26 + Minor = 28 Patch = 0 PreRelease = "" ) diff --git a/vendor/google.golang.org/protobuf/proto/decode.go b/vendor/google.golang.org/protobuf/proto/decode.go index 49f9b8c..11bf717 100644 --- a/vendor/google.golang.org/protobuf/proto/decode.go +++ b/vendor/google.golang.org/protobuf/proto/decode.go @@ -42,18 +42,25 @@ type UnmarshalOptions struct { FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) } + + // RecursionLimit limits how deeply messages may be nested. + // If zero, a default limit is applied. + RecursionLimit int } // Unmarshal parses the wire-format message in b and places the result in m. // The provided message must be mutable (e.g., a non-nil pointer to a message). func Unmarshal(b []byte, m Message) error { - _, err := UnmarshalOptions{}.unmarshal(b, m.ProtoReflect()) + _, err := UnmarshalOptions{RecursionLimit: protowire.DefaultRecursionLimit}.unmarshal(b, m.ProtoReflect()) return err } // Unmarshal parses the wire-format message in b and places the result in m. // The provided message must be mutable (e.g., a non-nil pointer to a message). func (o UnmarshalOptions) Unmarshal(b []byte, m Message) error { + if o.RecursionLimit == 0 { + o.RecursionLimit = protowire.DefaultRecursionLimit + } _, err := o.unmarshal(b, m.ProtoReflect()) return err } @@ -63,6 +70,9 @@ func (o UnmarshalOptions) Unmarshal(b []byte, m Message) error { // This method permits fine-grained control over the unmarshaler. // Most users should use Unmarshal instead. func (o UnmarshalOptions) UnmarshalState(in protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) { + if o.RecursionLimit == 0 { + o.RecursionLimit = protowire.DefaultRecursionLimit + } return o.unmarshal(in.Buf, in.Message) } @@ -86,12 +96,17 @@ func (o UnmarshalOptions) unmarshal(b []byte, m protoreflect.Message) (out proto Message: m, Buf: b, Resolver: o.Resolver, + Depth: o.RecursionLimit, } if o.DiscardUnknown { in.Flags |= protoiface.UnmarshalDiscardUnknown } out, err = methods.Unmarshal(in) } else { + o.RecursionLimit-- + if o.RecursionLimit < 0 { + return out, errors.New("exceeded max recursion depth") + } err = o.unmarshalMessageSlow(b, m) } if err != nil { diff --git a/vendor/google.golang.org/protobuf/proto/proto_methods.go b/vendor/google.golang.org/protobuf/proto/proto_methods.go index d8dd604..465e057 100644 --- a/vendor/google.golang.org/protobuf/proto/proto_methods.go +++ b/vendor/google.golang.org/protobuf/proto/proto_methods.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // The protoreflect build tag disables use of fast-path methods. +//go:build !protoreflect // +build !protoreflect package proto diff --git a/vendor/google.golang.org/protobuf/proto/proto_reflect.go b/vendor/google.golang.org/protobuf/proto/proto_reflect.go index b103d43..494d6ce 100644 --- a/vendor/google.golang.org/protobuf/proto/proto_reflect.go +++ b/vendor/google.golang.org/protobuf/proto/proto_reflect.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. // The protoreflect build tag disables use of fast-path methods. +//go:build protoreflect // +build protoreflect package proto diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/methods.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/methods.go index 6be5d16..d5d5af6 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoreflect/methods.go +++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/methods.go @@ -53,6 +53,7 @@ type ( FindExtensionByName(field FullName) (ExtensionType, error) FindExtensionByNumber(message FullName, field FieldNumber) (ExtensionType, error) } + Depth int } unmarshalOutput = struct { pragma.NoUnkeyedLiterals diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_pure.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_pure.go index 918e685..7ced876 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_pure.go +++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_pure.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build purego || appengine // +build purego appengine package protoreflect diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go index 5a34147..eb7764c 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go +++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go @@ -41,6 +41,31 @@ import ( // Converting to/from a Value and a concrete Go value panics on type mismatch. // For example, ValueOf("hello").Int() panics because this attempts to // retrieve an int64 from a string. +// +// List, Map, and Message Values are called "composite" values. +// +// A composite Value may alias (reference) memory at some location, +// such that changes to the Value updates the that location. +// A composite value acquired with a Mutable method, such as Message.Mutable, +// always references the source object. +// +// For example: +// // Append a 0 to a "repeated int32" field. +// // Since the Value returned by Mutable is guaranteed to alias +// // the source message, modifying the Value modifies the message. +// message.Mutable(fieldDesc).(List).Append(protoreflect.ValueOfInt32(0)) +// +// // Assign [0] to a "repeated int32" field by creating a new Value, +// // modifying it, and assigning it. +// list := message.NewField(fieldDesc).(List) +// list.Append(protoreflect.ValueOfInt32(0)) +// message.Set(fieldDesc, list) +// // ERROR: Since it is not defined whether Set aliases the source, +// // appending to the List here may or may not modify the message. +// list.Append(protoreflect.ValueOfInt32(0)) +// +// Some operations, such as Message.Get, may return an "empty, read-only" +// composite Value. Modifying an empty, read-only value panics. type Value value // The protoreflect API uses a custom Value union type instead of interface{} diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go index c45debd..702ddf2 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go +++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_unsafe.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build !purego && !appengine // +build !purego,!appengine package protoreflect diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go index 66dcbcd..59f024c 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go +++ b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go @@ -94,7 +94,8 @@ type Files struct { // Note that enum values are in the top-level since that are in the same // scope as the parent enum. descsByName map[protoreflect.FullName]interface{} - filesByPath map[string]protoreflect.FileDescriptor + filesByPath map[string][]protoreflect.FileDescriptor + numFiles int } type packageDescriptor struct { @@ -117,17 +118,16 @@ func (r *Files) RegisterFile(file protoreflect.FileDescriptor) error { r.descsByName = map[protoreflect.FullName]interface{}{ "": &packageDescriptor{}, } - r.filesByPath = make(map[string]protoreflect.FileDescriptor) + r.filesByPath = make(map[string][]protoreflect.FileDescriptor) } path := file.Path() - if prev := r.filesByPath[path]; prev != nil { + if prev := r.filesByPath[path]; len(prev) > 0 { r.checkGenProtoConflict(path) err := errors.New("file %q is already registered", file.Path()) - err = amendErrorWithCaller(err, prev, file) - if r == GlobalFiles && ignoreConflict(file, err) { - err = nil + err = amendErrorWithCaller(err, prev[0], file) + if !(r == GlobalFiles && ignoreConflict(file, err)) { + return err } - return err } for name := file.Package(); name != ""; name = name.Parent() { @@ -168,7 +168,8 @@ func (r *Files) RegisterFile(file protoreflect.FileDescriptor) error { rangeTopLevelDescriptors(file, func(d protoreflect.Descriptor) { r.descsByName[d.FullName()] = d }) - r.filesByPath[path] = file + r.filesByPath[path] = append(r.filesByPath[path], file) + r.numFiles++ return nil } @@ -308,6 +309,7 @@ func (s *nameSuffix) Pop() (name protoreflect.Name) { // FindFileByPath looks up a file by the path. // // This returns (nil, NotFound) if not found. +// This returns an error if multiple files have the same path. func (r *Files) FindFileByPath(path string) (protoreflect.FileDescriptor, error) { if r == nil { return nil, NotFound @@ -316,13 +318,19 @@ func (r *Files) FindFileByPath(path string) (protoreflect.FileDescriptor, error) globalMutex.RLock() defer globalMutex.RUnlock() } - if fd, ok := r.filesByPath[path]; ok { - return fd, nil + fds := r.filesByPath[path] + switch len(fds) { + case 0: + return nil, NotFound + case 1: + return fds[0], nil + default: + return nil, errors.New("multiple files named %q", path) } - return nil, NotFound } -// NumFiles reports the number of registered files. +// NumFiles reports the number of registered files, +// including duplicate files with the same name. func (r *Files) NumFiles() int { if r == nil { return 0 @@ -331,10 +339,11 @@ func (r *Files) NumFiles() int { globalMutex.RLock() defer globalMutex.RUnlock() } - return len(r.filesByPath) + return r.numFiles } // RangeFiles iterates over all registered files while f returns true. +// If multiple files have the same name, RangeFiles iterates over all of them. // The iteration order is undefined. func (r *Files) RangeFiles(f func(protoreflect.FileDescriptor) bool) { if r == nil { @@ -344,9 +353,11 @@ func (r *Files) RangeFiles(f func(protoreflect.FileDescriptor) bool) { globalMutex.RLock() defer globalMutex.RUnlock() } - for _, file := range r.filesByPath { - if !f(file) { - return + for _, files := range r.filesByPath { + for _, file := range files { + if !f(file) { + return + } } } } diff --git a/vendor/google.golang.org/protobuf/runtime/protoiface/methods.go b/vendor/google.golang.org/protobuf/runtime/protoiface/methods.go index 32c04f6..44cf467 100644 --- a/vendor/google.golang.org/protobuf/runtime/protoiface/methods.go +++ b/vendor/google.golang.org/protobuf/runtime/protoiface/methods.go @@ -103,6 +103,7 @@ type UnmarshalInput = struct { FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) } + Depth int } // UnmarshalOutput is output from the Unmarshal method. diff --git a/vendor/modules.txt b/vendor/modules.txt index 7b3ed31..6cf3db4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# google.golang.org/protobuf v1.26.0 +# google.golang.org/protobuf v1.28.0 ## explicit google.golang.org/protobuf/encoding/prototext google.golang.org/protobuf/encoding/protowire