From bd44db960ce2288da3c60642eb332ec6e88555e9 Mon Sep 17 00:00:00 2001 From: Sven Rebhan Date: Mon, 9 Sep 2024 16:10:56 +0200 Subject: [PATCH] chore: Update generated files due to new protobuf dependency --- .../internal/format/binary/tools_binary.pb.go | 4 +-- .../backup_util/internal/backup_util.pb.go | 4 +-- pkg/tracing/wire/binary.pb.go | 33 +++++++++--------- query/internal/internal.pb.go | 4 +-- services/meta/internal/meta.pb.go | 8 ++--- services/storage/source.pb.go | 4 +-- storage/reads/datatypes/predicate.pb.go | 5 ++- storage/reads/datatypes/storage_common.pb.go | 34 +++++++++---------- tsdb/internal/fieldsindex.pb.go | 4 +-- 9 files changed, 48 insertions(+), 52 deletions(-) diff --git a/cmd/influx_tools/internal/format/binary/tools_binary.pb.go b/cmd/influx_tools/internal/format/binary/tools_binary.pb.go index 4440211dbbf..ebe75ce4ef2 100644 --- a/cmd/influx_tools/internal/format/binary/tools_binary.pb.go +++ b/cmd/influx_tools/internal/format/binary/tools_binary.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: tools_binary.proto package binary diff --git a/cmd/influxd/backup_util/internal/backup_util.pb.go b/cmd/influxd/backup_util/internal/backup_util.pb.go index 0f146a2d2f9..af522ae11de 100644 --- a/cmd/influxd/backup_util/internal/backup_util.pb.go +++ b/cmd/influxd/backup_util/internal/backup_util.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: internal/backup_util.proto package backup_util diff --git a/pkg/tracing/wire/binary.pb.go b/pkg/tracing/wire/binary.pb.go index 06fcb9e8d69..5a5c5883cda 100644 --- a/pkg/tracing/wire/binary.pb.go +++ b/pkg/tracing/wire/binary.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: binary.proto package wire import ( + timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -139,12 +139,12 @@ type Span struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Context *SpanContext `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"` - ParentSpanID uint64 `protobuf:"varint,2,opt,name=ParentSpanID,proto3" json:"ParentSpanID,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Start *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=Start,proto3" json:"Start,omitempty"` - Labels []string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty"` - Fields []*Field `protobuf:"bytes,6,rep,name=fields,proto3" json:"fields,omitempty"` + Context *SpanContext `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"` + ParentSpanID uint64 `protobuf:"varint,2,opt,name=ParentSpanID,proto3" json:"ParentSpanID,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Start *timestamp.Timestamp `protobuf:"bytes,4,opt,name=Start,proto3" json:"Start,omitempty"` + Labels []string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty"` + Fields []*Field `protobuf:"bytes,6,rep,name=fields,proto3" json:"fields,omitempty"` } func (x *Span) Reset() { @@ -200,7 +200,7 @@ func (x *Span) GetName() string { return "" } -func (x *Span) GetStart() *timestamppb.Timestamp { +func (x *Span) GetStart() *timestamp.Timestamp { if x != nil { return x.Start } @@ -276,7 +276,6 @@ type Field struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` FieldType FieldType `protobuf:"varint,2,opt,name=FieldType,proto3,enum=wire.FieldType" json:"FieldType,omitempty"` // Types that are assignable to Value: - // // *Field_NumericVal // *Field_StringVal Value isField_Value `protobuf_oneof:"value"` @@ -429,12 +428,12 @@ func file_binary_proto_rawDescGZIP() []byte { var file_binary_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_binary_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_binary_proto_goTypes = []interface{}{ - (FieldType)(0), // 0: wire.FieldType - (*SpanContext)(nil), // 1: wire.SpanContext - (*Span)(nil), // 2: wire.Span - (*Trace)(nil), // 3: wire.Trace - (*Field)(nil), // 4: wire.Field - (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp + (FieldType)(0), // 0: wire.FieldType + (*SpanContext)(nil), // 1: wire.SpanContext + (*Span)(nil), // 2: wire.Span + (*Trace)(nil), // 3: wire.Trace + (*Field)(nil), // 4: wire.Field + (*timestamp.Timestamp)(nil), // 5: google.protobuf.Timestamp } var file_binary_proto_depIdxs = []int32{ 1, // 0: wire.Span.context:type_name -> wire.SpanContext diff --git a/query/internal/internal.pb.go b/query/internal/internal.pb.go index 77c6f6a6e47..c6cb604b5b0 100644 --- a/query/internal/internal.pb.go +++ b/query/internal/internal.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: internal/internal.proto package query diff --git a/services/meta/internal/meta.pb.go b/services/meta/internal/meta.pb.go index e06ac839c5a..ed85cc95989 100644 --- a/services/meta/internal/meta.pb.go +++ b/services/meta/internal/meta.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: internal/meta.proto package meta @@ -670,7 +670,7 @@ type ShardInfo struct { unknownFields protoimpl.UnknownFields ID *uint64 `protobuf:"varint,1,req,name=ID" json:"ID,omitempty"` - // Deprecated: Marked as deprecated in internal/meta.proto. + // Deprecated: Do not use. OwnerIDs []uint64 `protobuf:"varint,2,rep,name=OwnerIDs" json:"OwnerIDs,omitempty"` Owners []*ShardOwner `protobuf:"bytes,3,rep,name=Owners" json:"Owners,omitempty"` } @@ -714,7 +714,7 @@ func (x *ShardInfo) GetID() uint64 { return 0 } -// Deprecated: Marked as deprecated in internal/meta.proto. +// Deprecated: Do not use. func (x *ShardInfo) GetOwnerIDs() []uint64 { if x != nil { return x.OwnerIDs diff --git a/services/storage/source.pb.go b/services/storage/source.pb.go index ad3af6a8ce9..3168eb3ef8a 100644 --- a/services/storage/source.pb.go +++ b/services/storage/source.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: source.proto package storage diff --git a/storage/reads/datatypes/predicate.pb.go b/storage/reads/datatypes/predicate.pb.go index 22b5374e11b..695ea0d27bf 100644 --- a/storage/reads/datatypes/predicate.pb.go +++ b/storage/reads/datatypes/predicate.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: predicate.proto package datatypes @@ -200,7 +200,6 @@ type Node struct { NodeType Node_Type `protobuf:"varint,1,opt,name=node_type,json=nodeType,proto3,enum=influxdata.platform.storage.Node_Type" json:"node_type,omitempty"` Children []*Node `protobuf:"bytes,2,rep,name=children,proto3" json:"children,omitempty"` // Types that are assignable to Value: - // // *Node_StringValue // *Node_BooleanValue // *Node_IntegerValue diff --git a/storage/reads/datatypes/storage_common.pb.go b/storage/reads/datatypes/storage_common.pb.go index 32d36d81706..bde5b6789d7 100644 --- a/storage/reads/datatypes/storage_common.pb.go +++ b/storage/reads/datatypes/storage_common.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: storage_common.proto package datatypes import ( + any "github.com/golang/protobuf/ptypes/any" + empty "github.com/golang/protobuf/ptypes/empty" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - anypb "google.golang.org/protobuf/types/known/anypb" - emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -301,7 +301,7 @@ type ReadFilterRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ReadSource *anypb.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` + ReadSource *any.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` Range *TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` Predicate *Predicate `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"` } @@ -338,7 +338,7 @@ func (*ReadFilterRequest) Descriptor() ([]byte, []int) { return file_storage_common_proto_rawDescGZIP(), []int{0} } -func (x *ReadFilterRequest) GetReadSource() *anypb.Any { +func (x *ReadFilterRequest) GetReadSource() *any.Any { if x != nil { return x.ReadSource } @@ -364,7 +364,7 @@ type ReadGroupRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ReadSource *anypb.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` + ReadSource *any.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` Range *TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` Predicate *Predicate `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"` // GroupKeys specifies a list of tag keys used to order the data. @@ -407,7 +407,7 @@ func (*ReadGroupRequest) Descriptor() ([]byte, []int) { return file_storage_common_proto_rawDescGZIP(), []int{1} } -func (x *ReadGroupRequest) GetReadSource() *anypb.Any { +func (x *ReadGroupRequest) GetReadSource() *any.Any { if x != nil { return x.ReadSource } @@ -508,7 +508,7 @@ type ReadWindowAggregateRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ReadSource *anypb.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` + ReadSource *any.Any `protobuf:"bytes,1,opt,name=ReadSource,proto3" json:"ReadSource,omitempty"` Range *TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` Predicate *Predicate `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"` WindowEvery int64 `protobuf:"varint,4,opt,name=WindowEvery,proto3" json:"WindowEvery,omitempty"` @@ -549,7 +549,7 @@ func (*ReadWindowAggregateRequest) Descriptor() ([]byte, []int) { return file_storage_common_proto_rawDescGZIP(), []int{3} } -func (x *ReadWindowAggregateRequest) GetReadSource() *anypb.Any { +func (x *ReadWindowAggregateRequest) GetReadSource() *any.Any { if x != nil { return x.ReadSource } @@ -930,7 +930,7 @@ type TagKeysRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TagsSource *anypb.Any `protobuf:"bytes,1,opt,name=TagsSource,proto3" json:"TagsSource,omitempty"` + TagsSource *any.Any `protobuf:"bytes,1,opt,name=TagsSource,proto3" json:"TagsSource,omitempty"` Range *TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` Predicate *Predicate `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"` } @@ -967,7 +967,7 @@ func (*TagKeysRequest) Descriptor() ([]byte, []int) { return file_storage_common_proto_rawDescGZIP(), []int{10} } -func (x *TagKeysRequest) GetTagsSource() *anypb.Any { +func (x *TagKeysRequest) GetTagsSource() *any.Any { if x != nil { return x.TagsSource } @@ -994,7 +994,7 @@ type TagValuesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TagsSource *anypb.Any `protobuf:"bytes,1,opt,name=TagsSource,proto3" json:"TagsSource,omitempty"` + TagsSource *any.Any `protobuf:"bytes,1,opt,name=TagsSource,proto3" json:"TagsSource,omitempty"` Range *TimestampRange `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` Predicate *Predicate `protobuf:"bytes,3,opt,name=predicate,proto3" json:"predicate,omitempty"` TagKey string `protobuf:"bytes,4,opt,name=tag_key,json=tagKey,proto3" json:"tag_key,omitempty"` @@ -1032,7 +1032,7 @@ func (*TagValuesRequest) Descriptor() ([]byte, []int) { return file_storage_common_proto_rawDescGZIP(), []int{11} } -func (x *TagValuesRequest) GetTagsSource() *anypb.Any { +func (x *TagValuesRequest) GetTagsSource() *any.Any { if x != nil { return x.TagsSource } @@ -1114,7 +1114,6 @@ type ReadResponse_Frame struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Data: - // // *ReadResponse_Frame_Group // *ReadResponse_Frame_Series // *ReadResponse_Frame_FloatPoints @@ -1626,7 +1625,6 @@ type ReadResponse_AnyPoints struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Data: - // // *ReadResponse_AnyPoints_Floats // *ReadResponse_AnyPoints_Integers // *ReadResponse_AnyPoints_Unsigneds @@ -2485,9 +2483,9 @@ var file_storage_common_proto_goTypes = []interface{}{ (*ReadResponse_BooleanPointsFrame)(nil), // 31: influxdata.platform.storage.ReadResponse.BooleanPointsFrame (*ReadResponse_StringPointsFrame)(nil), // 32: influxdata.platform.storage.ReadResponse.StringPointsFrame nil, // 33: influxdata.platform.storage.CapabilitiesResponse.CapsEntry - (*anypb.Any)(nil), // 34: google.protobuf.Any + (*any.Any)(nil), // 34: google.protobuf.Any (*Predicate)(nil), // 35: influxdata.platform.storage.Predicate - (*emptypb.Empty)(nil), // 36: google.protobuf.Empty + (*empty.Empty)(nil), // 36: google.protobuf.Empty } var file_storage_common_proto_depIdxs = []int32{ 34, // 0: influxdata.platform.storage.ReadFilterRequest.ReadSource:type_name -> google.protobuf.Any diff --git a/tsdb/internal/fieldsindex.pb.go b/tsdb/internal/fieldsindex.pb.go index b251d9f5b91..d0557e060d5 100644 --- a/tsdb/internal/fieldsindex.pb.go +++ b/tsdb/internal/fieldsindex.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v5.26.1 +// protoc-gen-go v1.27.1 +// protoc v3.12.4 // source: internal/fieldsindex.proto package tsdb