regenerate internal protobuf with non-conflicting package

pull/10616/head
Jeff Wendling 2018-09-24 19:18:07 -06:00 committed by Edd Robinson
parent 992884ab6c
commit f2381de7bf
3 changed files with 168 additions and 70 deletions

View File

@ -1,21 +1,7 @@
// Code generated by protoc-gen-gogo.
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: internal/meta.proto
// DO NOT EDIT!
/*
Package tsdb is a generated protocol buffer package.
It is generated from these files:
internal/meta.proto
It has these top-level messages:
Series
Tag
MeasurementFields
Field
MeasurementFieldSet
*/
package tsdb
package internal
import proto "github.com/gogo/protobuf/proto"
import fmt "fmt"
@ -33,14 +19,36 @@ var _ = math.Inf
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Series struct {
Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
Tags []*Tag `protobuf:"bytes,2,rep,name=Tags" json:"Tags,omitempty"`
Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
Tags []*Tag `protobuf:"bytes,2,rep,name=Tags" json:"Tags,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Series) Reset() { *m = Series{} }
func (m *Series) String() string { return proto.CompactTextString(m) }
func (*Series) ProtoMessage() {}
func (*Series) Descriptor() ([]byte, []int) { return fileDescriptorMeta, []int{0} }
func (m *Series) Reset() { *m = Series{} }
func (m *Series) String() string { return proto.CompactTextString(m) }
func (*Series) ProtoMessage() {}
func (*Series) Descriptor() ([]byte, []int) {
return fileDescriptor_meta_7ee628d194324698, []int{0}
}
func (m *Series) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Series.Unmarshal(m, b)
}
func (m *Series) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Series.Marshal(b, m, deterministic)
}
func (dst *Series) XXX_Merge(src proto.Message) {
xxx_messageInfo_Series.Merge(dst, src)
}
func (m *Series) XXX_Size() int {
return xxx_messageInfo_Series.Size(m)
}
func (m *Series) XXX_DiscardUnknown() {
xxx_messageInfo_Series.DiscardUnknown(m)
}
var xxx_messageInfo_Series proto.InternalMessageInfo
func (m *Series) GetKey() string {
if m != nil {
@ -57,14 +65,36 @@ func (m *Series) GetTags() []*Tag {
}
type Tag struct {
Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
Value string `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
Value string `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Tag) Reset() { *m = Tag{} }
func (m *Tag) String() string { return proto.CompactTextString(m) }
func (*Tag) ProtoMessage() {}
func (*Tag) Descriptor() ([]byte, []int) { return fileDescriptorMeta, []int{1} }
func (m *Tag) Reset() { *m = Tag{} }
func (m *Tag) String() string { return proto.CompactTextString(m) }
func (*Tag) ProtoMessage() {}
func (*Tag) Descriptor() ([]byte, []int) {
return fileDescriptor_meta_7ee628d194324698, []int{1}
}
func (m *Tag) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Tag.Unmarshal(m, b)
}
func (m *Tag) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Tag.Marshal(b, m, deterministic)
}
func (dst *Tag) XXX_Merge(src proto.Message) {
xxx_messageInfo_Tag.Merge(dst, src)
}
func (m *Tag) XXX_Size() int {
return xxx_messageInfo_Tag.Size(m)
}
func (m *Tag) XXX_DiscardUnknown() {
xxx_messageInfo_Tag.DiscardUnknown(m)
}
var xxx_messageInfo_Tag proto.InternalMessageInfo
func (m *Tag) GetKey() string {
if m != nil {
@ -81,14 +111,36 @@ func (m *Tag) GetValue() string {
}
type MeasurementFields struct {
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
Fields []*Field `protobuf:"bytes,2,rep,name=Fields" json:"Fields,omitempty"`
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
Fields []*Field `protobuf:"bytes,2,rep,name=Fields" json:"Fields,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *MeasurementFields) Reset() { *m = MeasurementFields{} }
func (m *MeasurementFields) String() string { return proto.CompactTextString(m) }
func (*MeasurementFields) ProtoMessage() {}
func (*MeasurementFields) Descriptor() ([]byte, []int) { return fileDescriptorMeta, []int{2} }
func (m *MeasurementFields) Reset() { *m = MeasurementFields{} }
func (m *MeasurementFields) String() string { return proto.CompactTextString(m) }
func (*MeasurementFields) ProtoMessage() {}
func (*MeasurementFields) Descriptor() ([]byte, []int) {
return fileDescriptor_meta_7ee628d194324698, []int{2}
}
func (m *MeasurementFields) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_MeasurementFields.Unmarshal(m, b)
}
func (m *MeasurementFields) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_MeasurementFields.Marshal(b, m, deterministic)
}
func (dst *MeasurementFields) XXX_Merge(src proto.Message) {
xxx_messageInfo_MeasurementFields.Merge(dst, src)
}
func (m *MeasurementFields) XXX_Size() int {
return xxx_messageInfo_MeasurementFields.Size(m)
}
func (m *MeasurementFields) XXX_DiscardUnknown() {
xxx_messageInfo_MeasurementFields.DiscardUnknown(m)
}
var xxx_messageInfo_MeasurementFields proto.InternalMessageInfo
func (m *MeasurementFields) GetName() string {
if m != nil {
@ -105,14 +157,36 @@ func (m *MeasurementFields) GetFields() []*Field {
}
type Field struct {
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
Type int32 `protobuf:"varint,2,opt,name=Type,proto3" json:"Type,omitempty"`
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
Type int32 `protobuf:"varint,2,opt,name=Type,proto3" json:"Type,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Field) Reset() { *m = Field{} }
func (m *Field) String() string { return proto.CompactTextString(m) }
func (*Field) ProtoMessage() {}
func (*Field) Descriptor() ([]byte, []int) { return fileDescriptorMeta, []int{3} }
func (m *Field) Reset() { *m = Field{} }
func (m *Field) String() string { return proto.CompactTextString(m) }
func (*Field) ProtoMessage() {}
func (*Field) Descriptor() ([]byte, []int) {
return fileDescriptor_meta_7ee628d194324698, []int{3}
}
func (m *Field) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Field.Unmarshal(m, b)
}
func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Field.Marshal(b, m, deterministic)
}
func (dst *Field) XXX_Merge(src proto.Message) {
xxx_messageInfo_Field.Merge(dst, src)
}
func (m *Field) XXX_Size() int {
return xxx_messageInfo_Field.Size(m)
}
func (m *Field) XXX_DiscardUnknown() {
xxx_messageInfo_Field.DiscardUnknown(m)
}
var xxx_messageInfo_Field proto.InternalMessageInfo
func (m *Field) GetName() string {
if m != nil {
@ -129,13 +203,35 @@ func (m *Field) GetType() int32 {
}
type MeasurementFieldSet struct {
Measurements []*MeasurementFields `protobuf:"bytes,1,rep,name=Measurements" json:"Measurements,omitempty"`
Measurements []*MeasurementFields `protobuf:"bytes,1,rep,name=Measurements" json:"Measurements,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *MeasurementFieldSet) Reset() { *m = MeasurementFieldSet{} }
func (m *MeasurementFieldSet) String() string { return proto.CompactTextString(m) }
func (*MeasurementFieldSet) ProtoMessage() {}
func (*MeasurementFieldSet) Descriptor() ([]byte, []int) { return fileDescriptorMeta, []int{4} }
func (m *MeasurementFieldSet) Reset() { *m = MeasurementFieldSet{} }
func (m *MeasurementFieldSet) String() string { return proto.CompactTextString(m) }
func (*MeasurementFieldSet) ProtoMessage() {}
func (*MeasurementFieldSet) Descriptor() ([]byte, []int) {
return fileDescriptor_meta_7ee628d194324698, []int{4}
}
func (m *MeasurementFieldSet) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_MeasurementFieldSet.Unmarshal(m, b)
}
func (m *MeasurementFieldSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_MeasurementFieldSet.Marshal(b, m, deterministic)
}
func (dst *MeasurementFieldSet) XXX_Merge(src proto.Message) {
xxx_messageInfo_MeasurementFieldSet.Merge(dst, src)
}
func (m *MeasurementFieldSet) XXX_Size() int {
return xxx_messageInfo_MeasurementFieldSet.Size(m)
}
func (m *MeasurementFieldSet) XXX_DiscardUnknown() {
xxx_messageInfo_MeasurementFieldSet.DiscardUnknown(m)
}
var xxx_messageInfo_MeasurementFieldSet proto.InternalMessageInfo
func (m *MeasurementFieldSet) GetMeasurements() []*MeasurementFields {
if m != nil {
@ -145,30 +241,31 @@ func (m *MeasurementFieldSet) GetMeasurements() []*MeasurementFields {
}
func init() {
proto.RegisterType((*Series)(nil), "tsdb.Series")
proto.RegisterType((*Tag)(nil), "tsdb.Tag")
proto.RegisterType((*MeasurementFields)(nil), "tsdb.MeasurementFields")
proto.RegisterType((*Field)(nil), "tsdb.Field")
proto.RegisterType((*MeasurementFieldSet)(nil), "tsdb.MeasurementFieldSet")
proto.RegisterType((*Series)(nil), "platform.tsdb.Series")
proto.RegisterType((*Tag)(nil), "platform.tsdb.Tag")
proto.RegisterType((*MeasurementFields)(nil), "platform.tsdb.MeasurementFields")
proto.RegisterType((*Field)(nil), "platform.tsdb.Field")
proto.RegisterType((*MeasurementFieldSet)(nil), "platform.tsdb.MeasurementFieldSet")
}
func init() { proto.RegisterFile("internal/meta.proto", fileDescriptorMeta) }
func init() { proto.RegisterFile("internal/meta.proto", fileDescriptor_meta_7ee628d194324698) }
var fileDescriptorMeta = []byte{
// 225 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xbf, 0x6b, 0xc3, 0x30,
0x10, 0x85, 0x71, 0x2c, 0x1b, 0x72, 0xe9, 0xd0, 0x5e, 0x0a, 0xd5, 0x52, 0x08, 0xea, 0x92, 0xa5,
0x0e, 0xb4, 0x53, 0xe9, 0xde, 0xa5, 0x3f, 0x06, 0x45, 0x74, 0xbf, 0x90, 0xc3, 0x18, 0x6c, 0x27,
0x48, 0xca, 0x90, 0xff, 0xbe, 0xf8, 0xe4, 0xa1, 0x6d, 0xbc, 0x3d, 0x7d, 0xa7, 0xa7, 0x4f, 0x1c,
0x2c, 0x9b, 0x3e, 0xb2, 0xef, 0xa9, 0xdd, 0x74, 0x1c, 0xa9, 0x3a, 0xfa, 0x43, 0x3c, 0xa0, 0x8a,
0x61, 0xbf, 0x33, 0x2f, 0x50, 0x6e, 0xd9, 0x37, 0x1c, 0xf0, 0x1a, 0xf2, 0x77, 0x3e, 0xeb, 0x6c,
0x95, 0xad, 0xe7, 0x76, 0x88, 0x78, 0x0f, 0xca, 0x51, 0x1d, 0xf4, 0x6c, 0x95, 0xaf, 0x17, 0x4f,
0xf3, 0x6a, 0x28, 0x54, 0x8e, 0x6a, 0x2b, 0xd8, 0x3c, 0x42, 0xee, 0xa8, 0x9e, 0xe8, 0xdd, 0x42,
0xf1, 0x4d, 0xed, 0x89, 0xf5, 0x4c, 0x58, 0x3a, 0x98, 0x0f, 0xb8, 0xf9, 0x64, 0x0a, 0x27, 0xcf,
0x1d, 0xf7, 0xf1, 0xad, 0xe1, 0x76, 0x1f, 0x10, 0x41, 0x7d, 0x51, 0xc7, 0x63, 0x5b, 0x32, 0x3e,
0x40, 0x99, 0xa6, 0xa3, 0x78, 0x91, 0xc4, 0xc2, 0xec, 0x38, 0x32, 0x1b, 0x28, 0x24, 0x4d, 0xbe,
0x80, 0xa0, 0xdc, 0xf9, 0x98, 0xfc, 0x85, 0x95, 0x6c, 0x2c, 0x2c, 0xff, 0xeb, 0xb7, 0x1c, 0xf1,
0x15, 0xae, 0x7e, 0xe1, 0xa0, 0x33, 0x51, 0xde, 0x25, 0xe5, 0xc5, 0x7f, 0xed, 0x9f, 0xcb, 0xbb,
0x52, 0x36, 0xf9, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x31, 0x1f, 0xb9, 0x60, 0x01, 0x00,
0x00,
var fileDescriptor_meta_7ee628d194324698 = []byte{
// 242 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x3f, 0x4f, 0xc3, 0x40,
0x0c, 0xc5, 0x95, 0xe6, 0x8f, 0xc0, 0x80, 0x04, 0x6e, 0x87, 0x8c, 0xd1, 0x0d, 0xa8, 0x03, 0xa4,
0x12, 0x7c, 0x83, 0x0a, 0xb1, 0x20, 0x18, 0xae, 0x81, 0x01, 0x26, 0x57, 0x35, 0x51, 0xa4, 0x5c,
0x12, 0xdd, 0x5d, 0x87, 0x7e, 0x7b, 0x84, 0x13, 0x24, 0x9a, 0x66, 0x7b, 0xe7, 0x77, 0xcf, 0xfe,
0xd9, 0x30, 0xaf, 0x1a, 0xcf, 0xb6, 0xa1, 0x7a, 0x65, 0xd8, 0x53, 0xde, 0xd9, 0xd6, 0xb7, 0x78,
0xd5, 0xd5, 0xe4, 0xbf, 0x5b, 0x6b, 0x72, 0xef, 0x76, 0x5b, 0xb5, 0x86, 0x64, 0xc3, 0xb6, 0x62,
0x87, 0xd7, 0x10, 0xbe, 0xf0, 0x21, 0x0d, 0xb2, 0x60, 0x79, 0xae, 0x7f, 0x25, 0xde, 0x42, 0x54,
0x50, 0xe9, 0xd2, 0x59, 0x16, 0x2e, 0x2f, 0x1e, 0x30, 0x3f, 0x4a, 0xe6, 0x05, 0x95, 0x5a, 0x7c,
0x75, 0x0f, 0x61, 0x41, 0xe5, 0x44, 0x83, 0x05, 0xc4, 0x1f, 0x54, 0xef, 0x39, 0x9d, 0x49, 0xad,
0x7f, 0xa8, 0x77, 0xb8, 0x79, 0x65, 0x72, 0x7b, 0xcb, 0x86, 0x1b, 0xff, 0x5c, 0x71, 0xbd, 0x73,
0x88, 0x10, 0xbd, 0x91, 0xe1, 0x21, 0x2d, 0x1a, 0xef, 0x20, 0xe9, 0xdd, 0x81, 0x60, 0x31, 0x22,
0x10, 0x53, 0x0f, 0x7f, 0xd4, 0x0a, 0x62, 0x51, 0x93, 0xad, 0x10, 0xa2, 0xe2, 0xd0, 0xf5, 0x20,
0xb1, 0x16, 0xad, 0xbe, 0x60, 0x3e, 0xe6, 0xd8, 0xb0, 0xc7, 0x27, 0xb8, 0xfc, 0x57, 0x76, 0x69,
0x20, 0xb3, 0xb3, 0xd1, 0xec, 0x93, 0x0d, 0xf4, 0x51, 0x6a, 0x0d, 0x9f, 0x67, 0x7f, 0xd7, 0xdf,
0x26, 0x72, 0xf9, 0xc7, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x04, 0x15, 0xce, 0x90, 0x01,
0x00, 0x00,
}

View File

@ -1,6 +1,7 @@
syntax = "proto3";
package tsdb;
package platform.tsdb;
option go_package = "internal";
//========================================================================
//

View File

@ -26,7 +26,7 @@ import (
"github.com/influxdata/influxdb/pkg/slices"
"github.com/influxdata/influxdb/query"
"github.com/influxdata/influxql"
internal "github.com/influxdata/platform/tsdb/internal"
"github.com/influxdata/platform/tsdb/internal"
"go.uber.org/zap"
)