diff --git a/vendor.conf b/vendor.conf
index 0d2682b66..4970b69dd 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -32,8 +32,8 @@ github.com/hashicorp/golang-lru 7f827b33c0f158ec5dfbba01bb0b14a4541fd81d # v0.5.
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 # v1.1.1
github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0
-github.com/gogo/protobuf ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1
-github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0
+github.com/golang/protobuf b5d812f8a3706043e23a9cd5babf2e5423744d30 # v1.3.1
+github.com/gogo/protobuf 5628607bb4c51c3157aacc3a50f0ab707582b805 # v1.3.1
github.com/godbus/dbus/v5 37bf87eef99d69c4f1d3528bd66e3a87dc201472 # v5.0.3
github.com/docker/go-units 519db1ee28dcc9fd2474ae59fca29a810482bfb1 # v0.4.0
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
@@ -62,7 +62,7 @@ sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0
k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
k8s.io/kubernetes v1.17.1
k8s.io/klog v1.0.0
-k8s.io/cri-api kubernetes-1.17.1
+k8s.io/cri-api kubernetes-1.18.0-alpha.2
k8s.io/client-go kubernetes-1.17.1
k8s.io/api kubernetes-1.17.1
k8s.io/apiserver kubernetes-1.17.1
diff --git a/vendor/github.com/gogo/protobuf/Readme.md b/vendor/github.com/gogo/protobuf/Readme.md
index 06685a28a..7e2d538a9 100644
--- a/vendor/github.com/gogo/protobuf/Readme.md
+++ b/vendor/github.com/gogo/protobuf/Readme.md
@@ -17,6 +17,18 @@ This code generation is used to achieve:
Keeping track of how up to date gogoprotobuf is relative to golang/protobuf is done in this
issue
+## Release v1.3.0
+
+The project has updated to release v1.3.0. Check out the release notes here.
+
+With this new release comes a new internal library version. This means any newly generated *pb.go files generated with the v1.3.0 library will not be compatible with the old library version (v1.2.1). However, current *pb.go files (generated with v1.2.1) should still work with the new library.
+
+Please make sure you manage your dependencies correctly when upgrading your project. If you are still using v1.2.1 and you update your dependencies, one of which could include a new *pb.go (generated with v1.3.0), you could get a compile time error.
+
+Our upstream repo, golang/protobuf, also had to go through this process in order to update their library version.
+Here is a link explaining hermetic builds.
+
+
## Users
These projects use gogoprotobuf:
@@ -49,6 +61,8 @@ These projects use gogoprotobuf:
- go-spacemesh
- cortex - sample proto file
- Apache SkyWalking APM - Istio telemetry receiver based on Mixer bypass protocol
+ - Hyperledger Burrow - a permissioned DLT framework
+ - IOV Weave - a blockchain framework - sample proto files
Please let us know if you are using gogoprotobuf by posting on our GoogleGroup.
diff --git a/vendor/github.com/gogo/protobuf/go.mod b/vendor/github.com/gogo/protobuf/go.mod
index 6f7e29139..fa2c3a967 100644
--- a/vendor/github.com/gogo/protobuf/go.mod
+++ b/vendor/github.com/gogo/protobuf/go.mod
@@ -1,3 +1,6 @@
module github.com/gogo/protobuf
-require github.com/kisielk/errcheck v1.1.0 // indirect
+require (
+ github.com/kisielk/errcheck v1.2.0 // indirect
+ github.com/kisielk/gotool v1.0.0 // indirect
+)
diff --git a/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go b/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
index e352808b9..1e91766ae 100644
--- a/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
+++ b/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
@@ -19,7 +19,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
var E_GoprotoEnumPrefix = &proto.ExtensionDesc{
ExtendedType: (*descriptor.EnumOptions)(nil),
diff --git a/vendor/github.com/gogo/protobuf/proto/encode.go b/vendor/github.com/gogo/protobuf/proto/encode.go
index 3abfed2cf..9581ccd30 100644
--- a/vendor/github.com/gogo/protobuf/proto/encode.go
+++ b/vendor/github.com/gogo/protobuf/proto/encode.go
@@ -189,6 +189,8 @@ type Marshaler interface {
// prefixed by a varint-encoded length.
func (p *Buffer) EncodeMessage(pb Message) error {
siz := Size(pb)
+ sizVar := SizeVarint(uint64(siz))
+ p.grow(siz + sizVar)
p.EncodeVarint(uint64(siz))
return p.Marshal(pb)
}
diff --git a/vendor/github.com/gogo/protobuf/proto/extensions.go b/vendor/github.com/gogo/protobuf/proto/extensions.go
index 686bd2a09..341c6f57f 100644
--- a/vendor/github.com/gogo/protobuf/proto/extensions.go
+++ b/vendor/github.com/gogo/protobuf/proto/extensions.go
@@ -527,6 +527,7 @@ func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
// SetExtension sets the specified extension of pb to the specified value.
func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
if epb, ok := pb.(extensionsBytes); ok {
+ ClearExtension(pb, extension)
newb, err := encodeExtension(extension, value)
if err != nil {
return err
diff --git a/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
index 53ebd8cca..6f1ae120e 100644
--- a/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
+++ b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
@@ -154,6 +154,10 @@ func EncodeInternalExtension(m extendableProto, data []byte) (n int, err error)
return EncodeExtensionMap(m.extensionsWrite(), data)
}
+func EncodeInternalExtensionBackwards(m extendableProto, data []byte) (n int, err error) {
+ return EncodeExtensionMapBackwards(m.extensionsWrite(), data)
+}
+
func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
o := 0
for _, e := range m {
@@ -169,6 +173,23 @@ func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
return o, nil
}
+func EncodeExtensionMapBackwards(m map[int32]Extension, data []byte) (n int, err error) {
+ o := 0
+ end := len(data)
+ for _, e := range m {
+ if err := e.Encode(); err != nil {
+ return 0, err
+ }
+ n := copy(data[end-len(e.enc):], e.enc)
+ if n != len(e.enc) {
+ return 0, io.ErrShortBuffer
+ }
+ end -= n
+ o += n
+ }
+ return o, nil
+}
+
func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
e := m[id]
if err := e.Encode(); err != nil {
diff --git a/vendor/github.com/gogo/protobuf/proto/lib.go b/vendor/github.com/gogo/protobuf/proto/lib.go
index d17f80209..80db1c155 100644
--- a/vendor/github.com/gogo/protobuf/proto/lib.go
+++ b/vendor/github.com/gogo/protobuf/proto/lib.go
@@ -948,13 +948,19 @@ func isProto3Zero(v reflect.Value) bool {
return false
}
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const GoGoProtoPackageIsVersion2 = true
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const GoGoProtoPackageIsVersion1 = true
+const (
+ // ProtoPackageIsVersion3 is referenced from generated protocol buffer files
+ // to assert that that code is compatible with this version of the proto package.
+ GoGoProtoPackageIsVersion3 = true
+
+ // ProtoPackageIsVersion2 is referenced from generated protocol buffer files
+ // to assert that that code is compatible with this version of the proto package.
+ GoGoProtoPackageIsVersion2 = true
+
+ // ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+ // to assert that that code is compatible with this version of the proto package.
+ GoGoProtoPackageIsVersion1 = true
+)
// InternalMessageInfo is a type used internally by generated .pb.go files.
// This type is not intended to be used by non-generated code.
diff --git a/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
index c9e5fa020..28da1475f 100644
--- a/vendor/github.com/gogo/protobuf/proto/properties.go
+++ b/vendor/github.com/gogo/protobuf/proto/properties.go
@@ -43,7 +43,6 @@ package proto
import (
"fmt"
"log"
- "os"
"reflect"
"sort"
"strconv"
@@ -205,7 +204,7 @@ func (p *Properties) Parse(s string) {
// "bytes,49,opt,name=foo,def=hello!"
fields := strings.Split(s, ",") // breaks def=, but handled below.
if len(fields) < 2 {
- fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+ log.Printf("proto: tag has too few fields: %q", s)
return
}
@@ -225,7 +224,7 @@ func (p *Properties) Parse(s string) {
p.WireType = WireBytes
// no numeric converter for non-numeric types
default:
- fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+ log.Printf("proto: tag has unknown wire type: %q", s)
return
}
@@ -400,6 +399,15 @@ func GetProperties(t reflect.Type) *StructProperties {
return sprop
}
+type (
+ oneofFuncsIface interface {
+ XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+ }
+ oneofWrappersIface interface {
+ XXX_OneofWrappers() []interface{}
+ }
+)
+
// getPropertiesLocked requires that propertiesMu is held.
func getPropertiesLocked(t reflect.Type) *StructProperties {
if prop, ok := propertiesMap[t]; ok {
@@ -441,37 +449,40 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
// Re-order prop.order.
sort.Sort(prop)
- type oneofMessage interface {
- XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
- }
- if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
+ if isOneofMessage {
var oots []interface{}
- _, _, _, oots = om.XXX_OneofFuncs()
-
- // Interpret oneof metadata.
- prop.OneofTypes = make(map[string]*OneofProperties)
- for _, oot := range oots {
- oop := &OneofProperties{
- Type: reflect.ValueOf(oot).Type(), // *T
- Prop: new(Properties),
- }
- sft := oop.Type.Elem().Field(0)
- oop.Prop.Name = sft.Name
- oop.Prop.Parse(sft.Tag.Get("protobuf"))
- // There will be exactly one interface field that
- // this new value is assignable to.
- for i := 0; i < t.NumField(); i++ {
- f := t.Field(i)
- if f.Type.Kind() != reflect.Interface {
- continue
+ switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+ case oneofFuncsIface:
+ _, _, _, oots = m.XXX_OneofFuncs()
+ case oneofWrappersIface:
+ oots = m.XXX_OneofWrappers()
+ }
+ if len(oots) > 0 {
+ // Interpret oneof metadata.
+ prop.OneofTypes = make(map[string]*OneofProperties)
+ for _, oot := range oots {
+ oop := &OneofProperties{
+ Type: reflect.ValueOf(oot).Type(), // *T
+ Prop: new(Properties),
}
- if !oop.Type.AssignableTo(f.Type) {
- continue
+ sft := oop.Type.Elem().Field(0)
+ oop.Prop.Name = sft.Name
+ oop.Prop.Parse(sft.Tag.Get("protobuf"))
+ // There will be exactly one interface field that
+ // this new value is assignable to.
+ for i := 0; i < t.NumField(); i++ {
+ f := t.Field(i)
+ if f.Type.Kind() != reflect.Interface {
+ continue
+ }
+ if !oop.Type.AssignableTo(f.Type) {
+ continue
+ }
+ oop.Field = i
+ break
}
- oop.Field = i
- break
+ prop.OneofTypes[oop.Prop.OrigName] = oop
}
- prop.OneofTypes[oop.Prop.OrigName] = oop
}
}
diff --git a/vendor/github.com/gogo/protobuf/proto/table_marshal.go b/vendor/github.com/gogo/protobuf/proto/table_marshal.go
index 9b1538d05..f8babdefa 100644
--- a/vendor/github.com/gogo/protobuf/proto/table_marshal.go
+++ b/vendor/github.com/gogo/protobuf/proto/table_marshal.go
@@ -389,8 +389,13 @@ func (u *marshalInfo) computeMarshalInfo() {
// get oneof implementers
var oneofImplementers []interface{}
// gogo: isOneofMessage is needed for embedded oneof messages, without a marshaler and unmarshaler
- if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok && isOneofMessage {
- _, _, _, oneofImplementers = m.XXX_OneofFuncs()
+ if isOneofMessage {
+ switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+ case oneofFuncsIface:
+ _, _, _, oneofImplementers = m.XXX_OneofFuncs()
+ case oneofWrappersIface:
+ oneofImplementers = m.XXX_OneofWrappers()
+ }
}
// normal fields
@@ -519,10 +524,6 @@ func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofI
}
}
-type oneofMessage interface {
- XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
-}
-
// wiretype returns the wire encoding of the type.
func wiretype(encoding string) uint64 {
switch encoding {
@@ -2968,7 +2969,9 @@ func (p *Buffer) Marshal(pb Message) error {
if m, ok := pb.(newMarshaler); ok {
siz := m.XXX_Size()
p.grow(siz) // make sure buf has enough capacity
- p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
+ pp := p.buf[len(p.buf) : len(p.buf) : len(p.buf)+siz]
+ pp, err = m.XXX_Marshal(pp, p.deterministic)
+ p.buf = append(p.buf, pp...)
return err
}
if m, ok := pb.(Marshaler); ok {
diff --git a/vendor/github.com/gogo/protobuf/proto/table_merge.go b/vendor/github.com/gogo/protobuf/proto/table_merge.go
index f520106e0..60dcf70d1 100644
--- a/vendor/github.com/gogo/protobuf/proto/table_merge.go
+++ b/vendor/github.com/gogo/protobuf/proto/table_merge.go
@@ -530,6 +530,25 @@ func (mi *mergeInfo) computeMergeInfo() {
}
case reflect.Struct:
switch {
+ case isSlice && !isPointer: // E.g. []pb.T
+ mergeInfo := getMergeInfo(tf)
+ zero := reflect.Zero(tf)
+ mfi.merge = func(dst, src pointer) {
+ // TODO: Make this faster?
+ dstsp := dst.asPointerTo(f.Type)
+ dsts := dstsp.Elem()
+ srcs := src.asPointerTo(f.Type).Elem()
+ for i := 0; i < srcs.Len(); i++ {
+ dsts = reflect.Append(dsts, zero)
+ srcElement := srcs.Index(i).Addr()
+ dstElement := dsts.Index(dsts.Len() - 1).Addr()
+ mergeInfo.merge(valToPointer(dstElement), valToPointer(srcElement))
+ }
+ if dsts.IsNil() {
+ dsts = reflect.MakeSlice(f.Type, 0, 0)
+ }
+ dstsp.Elem().Set(dsts)
+ }
case !isPointer:
mergeInfo := getMergeInfo(tf)
mfi.merge = func(dst, src pointer) {
diff --git a/vendor/github.com/gogo/protobuf/proto/table_unmarshal.go b/vendor/github.com/gogo/protobuf/proto/table_unmarshal.go
index bb2622f28..937229386 100644
--- a/vendor/github.com/gogo/protobuf/proto/table_unmarshal.go
+++ b/vendor/github.com/gogo/protobuf/proto/table_unmarshal.go
@@ -371,15 +371,18 @@ func (u *unmarshalInfo) computeUnmarshalInfo() {
}
// Find any types associated with oneof fields.
- // TODO: XXX_OneofFuncs returns more info than we need. Get rid of some of it?
- fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs")
// gogo: len(oneofFields) > 0 is needed for embedded oneof messages, without a marshaler and unmarshaler
- if fn.IsValid() && len(oneofFields) > 0 {
- res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{}
- for i := res.Len() - 1; i >= 0; i-- {
- v := res.Index(i) // interface{}
- tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X
- typ := tptr.Elem() // Msg_X
+ if len(oneofFields) > 0 {
+ var oneofImplementers []interface{}
+ switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
+ case oneofFuncsIface:
+ _, _, _, oneofImplementers = m.XXX_OneofFuncs()
+ case oneofWrappersIface:
+ oneofImplementers = m.XXX_OneofWrappers()
+ }
+ for _, v := range oneofImplementers {
+ tptr := reflect.TypeOf(v) // *Msg_X
+ typ := tptr.Elem() // Msg_X
f := typ.Field(0) // oneof implementers have one field
baseUnmarshal := fieldUnmarshaler(&f)
@@ -407,11 +410,12 @@ func (u *unmarshalInfo) computeUnmarshalInfo() {
u.setTag(fieldNum, of.field, unmarshal, 0, name)
}
}
+
}
}
// Get extension ranges, if any.
- fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
+ fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
if fn.IsValid() {
if !u.extensions.IsValid() && !u.oldExtensions.IsValid() && !u.bytesExtensions.IsValid() {
panic("a message with extensions, but no extensions field in " + t.Name())
diff --git a/vendor/github.com/gogo/protobuf/proto/text.go b/vendor/github.com/gogo/protobuf/proto/text.go
index 0407ba85d..87416afe9 100644
--- a/vendor/github.com/gogo/protobuf/proto/text.go
+++ b/vendor/github.com/gogo/protobuf/proto/text.go
@@ -476,6 +476,8 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
return nil
}
+var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
+
// writeAny writes an arbitrary field.
func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
v = reflect.Indirect(v)
@@ -589,8 +591,8 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
// mutating this value.
v = v.Addr()
}
- if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
- text, err := etm.MarshalText()
+ if v.Type().Implements(textMarshalerType) {
+ text, err := v.Interface().(encoding.TextMarshaler).MarshalText()
if err != nil {
return err
}
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto
index e85c852fc..4a88adf14 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/compiler/plugin.proto
@@ -45,6 +45,7 @@
// flag "--${NAME}_out" is passed to protoc.
syntax = "proto2";
+
package google.protobuf.compiler;
option java_package = "com.google.protobuf.compiler";
option java_outer_classname = "PluginProtos";
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto
index 887f16ddc..4a08905a5 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/descriptor.proto
@@ -40,6 +40,7 @@
syntax = "proto2";
package google.protobuf;
+
option go_package = "descriptor";
option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
@@ -59,8 +60,8 @@ message FileDescriptorSet {
// Describes a complete .proto file.
message FileDescriptorProto {
- optional string name = 1; // file name, relative to root of source tree
- optional string package = 2; // e.g. "foo", "foo.bar", etc.
+ optional string name = 1; // file name, relative to root of source tree
+ optional string package = 2; // e.g. "foo", "foo.bar", etc.
// Names of files imported by this file.
repeated string dependency = 3;
@@ -100,8 +101,8 @@ message DescriptorProto {
repeated EnumDescriptorProto enum_type = 4;
message ExtensionRange {
- optional int32 start = 1;
- optional int32 end = 2;
+ optional int32 start = 1; // Inclusive.
+ optional int32 end = 2; // Exclusive.
optional ExtensionRangeOptions options = 3;
}
@@ -115,8 +116,8 @@ message DescriptorProto {
// fields or extension ranges in the same message. Reserved ranges may
// not overlap.
message ReservedRange {
- optional int32 start = 1; // Inclusive.
- optional int32 end = 2; // Exclusive.
+ optional int32 start = 1; // Inclusive.
+ optional int32 end = 2; // Exclusive.
}
repeated ReservedRange reserved_range = 9;
// Reserved field names, which may not be used by fields in the same message.
@@ -137,42 +138,42 @@ message FieldDescriptorProto {
enum Type {
// 0 is reserved for errors.
// Order is weird for historical reasons.
- TYPE_DOUBLE = 1;
- TYPE_FLOAT = 2;
+ TYPE_DOUBLE = 1;
+ TYPE_FLOAT = 2;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if
// negative values are likely.
- TYPE_INT64 = 3;
- TYPE_UINT64 = 4;
+ TYPE_INT64 = 3;
+ TYPE_UINT64 = 4;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if
// negative values are likely.
- TYPE_INT32 = 5;
- TYPE_FIXED64 = 6;
- TYPE_FIXED32 = 7;
- TYPE_BOOL = 8;
- TYPE_STRING = 9;
+ TYPE_INT32 = 5;
+ TYPE_FIXED64 = 6;
+ TYPE_FIXED32 = 7;
+ TYPE_BOOL = 8;
+ TYPE_STRING = 9;
// Tag-delimited aggregate.
// Group type is deprecated and not supported in proto3. However, Proto3
// implementations should still be able to parse the group wire format and
// treat group fields as unknown fields.
- TYPE_GROUP = 10;
- TYPE_MESSAGE = 11; // Length-delimited aggregate.
+ TYPE_GROUP = 10;
+ TYPE_MESSAGE = 11; // Length-delimited aggregate.
// New in version 2.
- TYPE_BYTES = 12;
- TYPE_UINT32 = 13;
- TYPE_ENUM = 14;
- TYPE_SFIXED32 = 15;
- TYPE_SFIXED64 = 16;
- TYPE_SINT32 = 17; // Uses ZigZag encoding.
- TYPE_SINT64 = 18; // Uses ZigZag encoding.
- };
+ TYPE_BYTES = 12;
+ TYPE_UINT32 = 13;
+ TYPE_ENUM = 14;
+ TYPE_SFIXED32 = 15;
+ TYPE_SFIXED64 = 16;
+ TYPE_SINT32 = 17; // Uses ZigZag encoding.
+ TYPE_SINT64 = 18; // Uses ZigZag encoding.
+ }
enum Label {
// 0 is reserved for errors
- LABEL_OPTIONAL = 1;
- LABEL_REQUIRED = 2;
- LABEL_REPEATED = 3;
- };
+ LABEL_OPTIONAL = 1;
+ LABEL_REQUIRED = 2;
+ LABEL_REPEATED = 3;
+ }
optional string name = 1;
optional int32 number = 3;
@@ -234,8 +235,8 @@ message EnumDescriptorProto {
// is inclusive such that it can appropriately represent the entire int32
// domain.
message EnumReservedRange {
- optional int32 start = 1; // Inclusive.
- optional int32 end = 2; // Inclusive.
+ optional int32 start = 1; // Inclusive.
+ optional int32 end = 2; // Inclusive.
}
// Range of reserved numeric values. Reserved numeric values may not be used
@@ -276,9 +277,9 @@ message MethodDescriptorProto {
optional MethodOptions options = 4;
// Identifies if client streams multiple client messages
- optional bool client_streaming = 5 [default=false];
+ optional bool client_streaming = 5 [default = false];
// Identifies if server streams multiple server messages
- optional bool server_streaming = 6 [default=false];
+ optional bool server_streaming = 6 [default = false];
}
@@ -314,7 +315,6 @@ message MethodDescriptorProto {
// If this turns out to be popular, a web service will be set up
// to automatically assign option numbers.
-
message FileOptions {
// Sets the Java package where classes generated from this .proto will be
@@ -337,7 +337,7 @@ message FileOptions {
// named by java_outer_classname. However, the outer class will still be
// generated to contain the file's getDescriptor() method as well as any
// top-level extensions defined in the file.
- optional bool java_multiple_files = 10 [default=false];
+ optional bool java_multiple_files = 10 [default = false];
// This option does nothing.
optional bool java_generate_equals_and_hash = 20 [deprecated=true];
@@ -348,17 +348,17 @@ message FileOptions {
// Message reflection will do the same.
// However, an extension field still accepts non-UTF-8 byte sequences.
// This option has no effect on when used with the lite runtime.
- optional bool java_string_check_utf8 = 27 [default=false];
+ optional bool java_string_check_utf8 = 27 [default = false];
// Generated classes can be optimized for speed or code size.
enum OptimizeMode {
- SPEED = 1; // Generate complete code for parsing, serialization,
- // etc.
- CODE_SIZE = 2; // Use ReflectionOps to implement these methods.
- LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
+ SPEED = 1; // Generate complete code for parsing, serialization,
+ // etc.
+ CODE_SIZE = 2; // Use ReflectionOps to implement these methods.
+ LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
}
- optional OptimizeMode optimize_for = 9 [default=SPEED];
+ optional OptimizeMode optimize_for = 9 [default = SPEED];
// Sets the Go package where structs generated from this .proto will be
// placed. If omitted, the Go package will be derived from the following:
@@ -369,6 +369,7 @@ message FileOptions {
+
// Should generic services be generated in each language? "Generic" services
// are not specific to any particular RPC system. They are generated by the
// main code generators in each language (without additional plugins).
@@ -379,20 +380,20 @@ message FileOptions {
// that generate code specific to your particular RPC system. Therefore,
// these default to false. Old code which depends on generic services should
// explicitly set them to true.
- optional bool cc_generic_services = 16 [default=false];
- optional bool java_generic_services = 17 [default=false];
- optional bool py_generic_services = 18 [default=false];
- optional bool php_generic_services = 42 [default=false];
+ optional bool cc_generic_services = 16 [default = false];
+ optional bool java_generic_services = 17 [default = false];
+ optional bool py_generic_services = 18 [default = false];
+ optional bool php_generic_services = 42 [default = false];
// Is this file deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for everything in the file, or it will be completely ignored; in the very
// least, this is a formalization for deprecating files.
- optional bool deprecated = 23 [default=false];
+ optional bool deprecated = 23 [default = false];
// Enables the use of arenas for the proto messages in this file. This applies
// only to generated classes for C++.
- optional bool cc_enable_arenas = 31 [default=false];
+ optional bool cc_enable_arenas = 31 [default = false];
// Sets the objective c class prefix which is prepended to all objective c
@@ -417,10 +418,9 @@ message FileOptions {
// determining the namespace.
optional string php_namespace = 41;
-
// Use this option to change the namespace of php generated metadata classes.
- // Default is empty. When this option is empty, the proto file name will be used
- // for determining the namespace.
+ // Default is empty. When this option is empty, the proto file name will be
+ // used for determining the namespace.
optional string php_metadata_namespace = 44;
// Use this option to change the package of ruby generated classes. Default
@@ -428,6 +428,7 @@ message FileOptions {
// determining the ruby package.
optional string ruby_package = 45;
+
// The parser stores options it doesn't recognize here.
// See the documentation for the "Options" section above.
repeated UninterpretedOption uninterpreted_option = 999;
@@ -458,18 +459,18 @@ message MessageOptions {
//
// Because this is an option, the above two restrictions are not enforced by
// the protocol compiler.
- optional bool message_set_wire_format = 1 [default=false];
+ optional bool message_set_wire_format = 1 [default = false];
// Disables the generation of the standard "descriptor()" accessor, which can
// conflict with a field of the same name. This is meant to make migration
// from proto1 easier; new code should avoid fields named "descriptor".
- optional bool no_standard_descriptor_accessor = 2 [default=false];
+ optional bool no_standard_descriptor_accessor = 2 [default = false];
// Is this message deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the message, or it will be completely ignored; in the very least,
// this is a formalization for deprecating messages.
- optional bool deprecated = 3 [default=false];
+ optional bool deprecated = 3 [default = false];
// Whether the message is an automatically generated map entry type for the
// maps field.
@@ -486,7 +487,7 @@ message MessageOptions {
//
// Implementations may choose not to generate the map_entry=true message, but
// use a native map in the target language to hold the keys and values.
- // The reflection APIs in such implementions still need to work as
+ // The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
@@ -497,6 +498,7 @@ message MessageOptions {
//reserved 8; // javalite_serializable
//reserved 9; // javanano_as_lite
+
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
@@ -576,16 +578,16 @@ message FieldOptions {
// implementation must either *always* check its required fields, or *never*
// check its required fields, regardless of whether or not the message has
// been parsed.
- optional bool lazy = 5 [default=false];
+ optional bool lazy = 5 [default = false];
// Is this field deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for accessors, or it will be completely ignored; in the very least, this
// is a formalization for deprecating fields.
- optional bool deprecated = 3 [default=false];
+ optional bool deprecated = 3 [default = false];
// For Google-internal migration only. Do not use.
- optional bool weak = 10 [default=false];
+ optional bool weak = 10 [default = false];
// The parser stores options it doesn't recognize here. See above.
@@ -615,7 +617,7 @@ message EnumOptions {
// Depending on the target platform, this can emit Deprecated annotations
// for the enum, or it will be completely ignored; in the very least, this
// is a formalization for deprecating enums.
- optional bool deprecated = 3 [default=false];
+ optional bool deprecated = 3 [default = false];
//reserved 5; // javanano_as_lite
@@ -631,7 +633,7 @@ message EnumValueOptions {
// Depending on the target platform, this can emit Deprecated annotations
// for the enum value, or it will be completely ignored; in the very least,
// this is a formalization for deprecating enum values.
- optional bool deprecated = 1 [default=false];
+ optional bool deprecated = 1 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
@@ -651,7 +653,7 @@ message ServiceOptions {
// Depending on the target platform, this can emit Deprecated annotations
// for the service, or it will be completely ignored; in the very least,
// this is a formalization for deprecating services.
- optional bool deprecated = 33 [default=false];
+ optional bool deprecated = 33 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
@@ -671,18 +673,18 @@ message MethodOptions {
// Depending on the target platform, this can emit Deprecated annotations
// for the method, or it will be completely ignored; in the very least,
// this is a formalization for deprecating methods.
- optional bool deprecated = 33 [default=false];
+ optional bool deprecated = 33 [default = false];
// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
// or neither? HTTP based RPC implementation may choose GET verb for safe
// methods, and PUT verb for idempotent methods instead of the default POST.
enum IdempotencyLevel {
IDEMPOTENCY_UNKNOWN = 0;
- NO_SIDE_EFFECTS = 1; // implies idempotent
- IDEMPOTENT = 2; // idempotent, but may have side effects
+ NO_SIDE_EFFECTS = 1; // implies idempotent
+ IDEMPOTENT = 2; // idempotent, but may have side effects
}
- optional IdempotencyLevel idempotency_level =
- 34 [default=IDEMPOTENCY_UNKNOWN];
+ optional IdempotencyLevel idempotency_level = 34
+ [default = IDEMPOTENCY_UNKNOWN];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
@@ -763,7 +765,7 @@ message SourceCodeInfo {
// beginning of the "extend" block and is shared by all extensions within
// the block.
// - Just because a location's span is a subset of some other location's span
- // does not mean that it is a descendent. For example, a "group" defines
+ // does not mean that it is a descendant. For example, a "group" defines
// both a type and a field in a single declaration. Thus, the locations
// corresponding to the type and field and their components will overlap.
// - Code which tries to interpret locations should probably be designed to
@@ -794,14 +796,14 @@ message SourceCodeInfo {
// [ 4, 3, 2, 7 ]
// this path refers to the whole field declaration (from the beginning
// of the label to the terminating semicolon).
- repeated int32 path = 1 [packed=true];
+ repeated int32 path = 1 [packed = true];
// Always has exactly three or four elements: start line, start column,
// end line (optional, otherwise assumed same as start line), end column.
// These are packed into a single field for efficiency. Note that line
// and column numbers are zero-based -- typically you will want to add
// 1 to each before displaying to a user.
- repeated int32 span = 2 [packed=true];
+ repeated int32 span = 2 [packed = true];
// If this SourceCodeInfo represents a complete declaration, these are any
// comments appearing before and after the declaration which appear to be
@@ -866,7 +868,7 @@ message GeneratedCodeInfo {
message Annotation {
// Identifies the element in the original source .proto file. This field
// is formatted the same as SourceCodeInfo.Location.path.
- repeated int32 path = 1 [packed=true];
+ repeated int32 path = 1 [packed = true];
// Identifies the filesystem path to the original source .proto.
optional string source_file = 2;
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto
index 8bbaa8b62..b14bea5d0 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/duration.proto
@@ -101,7 +101,6 @@ option objc_class_prefix = "GPB";
//
//
message Duration {
-
// Signed seconds of the span of time. Must be from -315,576,000,000
// to +315,576,000,000 inclusive. Note: these bounds are computed from:
// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto
index 4f78641fa..9db077159 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/struct.proto
@@ -40,7 +40,6 @@ option java_outer_classname = "StructProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
-
// `Struct` represents a structured data value, consisting of fields
// which map to dynamically typed values. In some languages, `Struct`
// might be supported by a native representation. For example, in
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto
index 18cb7c3ea..0ebe36ea7 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/timestamp.proto
@@ -113,17 +113,18 @@ option objc_class_prefix = "GPB";
// 01:30 UTC on January 15, 2017.
//
// In JavaScript, one can convert a Date object to this format using the
-// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+// standard
+// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
-// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
-// can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
+// to this format using
+// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
+// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
+// the Joda Time's [`ISODateTimeFormat.dateTime()`](
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
// ) to obtain a formatter capable of generating timestamps in this format.
//
//
message Timestamp {
-
// Represents seconds of UTC time since Unix epoch
// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
// 9999-12-31T23:59:59Z inclusive.
diff --git a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto
index fcd15bfd7..cc626250d 100644
--- a/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto
+++ b/vendor/github.com/gogo/protobuf/protobuf/google/protobuf/type.proto
@@ -64,44 +64,44 @@ message Field {
// Basic field types.
enum Kind {
// Field type unknown.
- TYPE_UNKNOWN = 0;
+ TYPE_UNKNOWN = 0;
// Field type double.
- TYPE_DOUBLE = 1;
+ TYPE_DOUBLE = 1;
// Field type float.
- TYPE_FLOAT = 2;
+ TYPE_FLOAT = 2;
// Field type int64.
- TYPE_INT64 = 3;
+ TYPE_INT64 = 3;
// Field type uint64.
- TYPE_UINT64 = 4;
+ TYPE_UINT64 = 4;
// Field type int32.
- TYPE_INT32 = 5;
+ TYPE_INT32 = 5;
// Field type fixed64.
- TYPE_FIXED64 = 6;
+ TYPE_FIXED64 = 6;
// Field type fixed32.
- TYPE_FIXED32 = 7;
+ TYPE_FIXED32 = 7;
// Field type bool.
- TYPE_BOOL = 8;
+ TYPE_BOOL = 8;
// Field type string.
- TYPE_STRING = 9;
+ TYPE_STRING = 9;
// Field type group. Proto2 syntax only, and deprecated.
- TYPE_GROUP = 10;
+ TYPE_GROUP = 10;
// Field type message.
- TYPE_MESSAGE = 11;
+ TYPE_MESSAGE = 11;
// Field type bytes.
- TYPE_BYTES = 12;
+ TYPE_BYTES = 12;
// Field type uint32.
- TYPE_UINT32 = 13;
+ TYPE_UINT32 = 13;
// Field type enum.
- TYPE_ENUM = 14;
+ TYPE_ENUM = 14;
// Field type sfixed32.
- TYPE_SFIXED32 = 15;
+ TYPE_SFIXED32 = 15;
// Field type sfixed64.
- TYPE_SFIXED64 = 16;
+ TYPE_SFIXED64 = 16;
// Field type sint32.
- TYPE_SINT32 = 17;
+ TYPE_SINT32 = 17;
// Field type sint64.
- TYPE_SINT64 = 18;
- };
+ TYPE_SINT64 = 18;
+ }
// Whether a field is optional, required, or repeated.
enum Cardinality {
diff --git a/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
index cacfa3923..18b2a3318 100644
--- a/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
+++ b/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/descriptor.pb.go
@@ -18,7 +18,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type FieldDescriptorProto_Type int32
@@ -1364,8 +1364,8 @@ type FileOptions struct {
// determining the namespace.
PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"`
// Use this option to change the namespace of php generated metadata classes.
- // Default is empty. When this option is empty, the proto file name will be used
- // for determining the namespace.
+ // Default is empty. When this option is empty, the proto file name will be
+ // used for determining the namespace.
PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"`
// Use this option to change the package of ruby generated classes. Default
// is empty. When this option is not set, the package name will be used for
@@ -1615,7 +1615,7 @@ type MessageOptions struct {
//
// Implementations may choose not to generate the map_entry=true message, but
// use a native map in the target language to hold the keys and values.
- // The reflection APIs in such implementions still need to work as
+ // The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
@@ -2363,7 +2363,7 @@ type SourceCodeInfo struct {
// beginning of the "extend" block and is shared by all extensions within
// the block.
// - Just because a location's span is a subset of some other location's span
- // does not mean that it is a descendent. For example, a "group" defines
+ // does not mean that it is a descendant. For example, a "group" defines
// both a type and a field in a single declaration. Thus, the locations
// corresponding to the type and field and their components will overlap.
// - Code which tries to interpret locations should probably be designed to
diff --git a/vendor/github.com/gogo/protobuf/types/any.pb.go b/vendor/github.com/gogo/protobuf/types/any.pb.go
index 202fe8e00..98e269d54 100644
--- a/vendor/github.com/gogo/protobuf/types/any.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/any.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// `Any` contains an arbitrary serialized protocol buffer message along with a
// URL that describes the type of the serialized message.
@@ -155,7 +156,7 @@ func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Any.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -309,7 +310,7 @@ func valueToGoStringAny(v interface{}, typ string) string {
func (m *Any) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -317,36 +318,46 @@ func (m *Any) Marshal() (dAtA []byte, err error) {
}
func (m *Any) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Any) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.TypeUrl) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintAny(dAtA, i, uint64(len(m.TypeUrl)))
- i += copy(dAtA[i:], m.TypeUrl)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if len(m.Value) > 0 {
- dAtA[i] = 0x12
- i++
+ i -= len(m.Value)
+ copy(dAtA[i:], m.Value)
i = encodeVarintAny(dAtA, i, uint64(len(m.Value)))
- i += copy(dAtA[i:], m.Value)
+ i--
+ dAtA[i] = 0x12
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.TypeUrl) > 0 {
+ i -= len(m.TypeUrl)
+ copy(dAtA[i:], m.TypeUrl)
+ i = encodeVarintAny(dAtA, i, uint64(len(m.TypeUrl)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintAny(dAtA []byte, offset int, v uint64) int {
+ offset -= sovAny(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedAny(r randyAny, easy bool) *Any {
this := &Any{}
@@ -455,14 +466,7 @@ func (m *Any) Size() (n int) {
}
func sovAny(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozAny(x uint64) (n int) {
return sovAny(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -610,6 +614,7 @@ func (m *Any) Unmarshal(dAtA []byte) error {
func skipAny(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -641,10 +646,8 @@ func skipAny(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -665,55 +668,30 @@ func skipAny(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthAny
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthAny
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowAny
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipAny(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthAny
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupAny
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthAny
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthAny = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowAny = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthAny = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowAny = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupAny = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/api.pb.go b/vendor/github.com/gogo/protobuf/types/api.pb.go
index fe0eefd2d..58bf4b53b 100644
--- a/vendor/github.com/gogo/protobuf/types/api.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/api.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// Api is a light-weight descriptor for an API Interface.
//
@@ -88,7 +89,7 @@ func (m *Api) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Api.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -194,7 +195,7 @@ func (m *Method) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Method.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -368,7 +369,7 @@ func (m *Mixin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Mixin.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -862,7 +863,7 @@ func valueToGoStringApi(v interface{}, typ string) string {
func (m *Api) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -870,83 +871,99 @@ func (m *Api) Marshal() (dAtA []byte, err error) {
}
func (m *Api) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Api) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- if len(m.Methods) > 0 {
- for _, msg := range m.Methods {
- dAtA[i] = 0x12
- i++
- i = encodeVarintApi(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ if m.Syntax != 0 {
+ i = encodeVarintApi(dAtA, i, uint64(m.Syntax))
+ i--
+ dAtA[i] = 0x38
+ }
+ if len(m.Mixins) > 0 {
+ for iNdEx := len(m.Mixins) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Mixins[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0x32
}
}
- if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintApi(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
+ if m.SourceContext != nil {
+ {
+ size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
- i += n
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
}
+ i--
+ dAtA[i] = 0x2a
}
if len(m.Version) > 0 {
- dAtA[i] = 0x22
- i++
+ i -= len(m.Version)
+ copy(dAtA[i:], m.Version)
i = encodeVarintApi(dAtA, i, uint64(len(m.Version)))
- i += copy(dAtA[i:], m.Version)
+ i--
+ dAtA[i] = 0x22
}
- if m.SourceContext != nil {
- dAtA[i] = 0x2a
- i++
- i = encodeVarintApi(dAtA, i, uint64(m.SourceContext.Size()))
- n1, err := m.SourceContext.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ if len(m.Options) > 0 {
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x1a
}
- i += n1
}
- if len(m.Mixins) > 0 {
- for _, msg := range m.Mixins {
- dAtA[i] = 0x32
- i++
- i = encodeVarintApi(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ if len(m.Methods) > 0 {
+ for iNdEx := len(m.Methods) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Methods[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0x12
}
}
- if m.Syntax != 0 {
- dAtA[i] = 0x38
- i++
- i = encodeVarintApi(dAtA, i, uint64(m.Syntax))
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Method) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -954,75 +971,86 @@ func (m *Method) Marshal() (dAtA []byte, err error) {
}
func (m *Method) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Method) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- if len(m.RequestTypeUrl) > 0 {
- dAtA[i] = 0x12
- i++
- i = encodeVarintApi(dAtA, i, uint64(len(m.RequestTypeUrl)))
- i += copy(dAtA[i:], m.RequestTypeUrl)
+ if m.Syntax != 0 {
+ i = encodeVarintApi(dAtA, i, uint64(m.Syntax))
+ i--
+ dAtA[i] = 0x38
}
- if m.RequestStreaming {
- dAtA[i] = 0x18
- i++
- if m.RequestStreaming {
+ if len(m.Options) > 0 {
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x32
+ }
+ }
+ if m.ResponseStreaming {
+ i--
+ if m.ResponseStreaming {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
- i++
+ i--
+ dAtA[i] = 0x28
}
if len(m.ResponseTypeUrl) > 0 {
- dAtA[i] = 0x22
- i++
+ i -= len(m.ResponseTypeUrl)
+ copy(dAtA[i:], m.ResponseTypeUrl)
i = encodeVarintApi(dAtA, i, uint64(len(m.ResponseTypeUrl)))
- i += copy(dAtA[i:], m.ResponseTypeUrl)
+ i--
+ dAtA[i] = 0x22
}
- if m.ResponseStreaming {
- dAtA[i] = 0x28
- i++
- if m.ResponseStreaming {
+ if m.RequestStreaming {
+ i--
+ if m.RequestStreaming {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
- i++
- }
- if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x32
- i++
- i = encodeVarintApi(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
- }
- i += n
- }
+ i--
+ dAtA[i] = 0x18
}
- if m.Syntax != 0 {
- dAtA[i] = 0x38
- i++
- i = encodeVarintApi(dAtA, i, uint64(m.Syntax))
+ if len(m.RequestTypeUrl) > 0 {
+ i -= len(m.RequestTypeUrl)
+ copy(dAtA[i:], m.RequestTypeUrl)
+ i = encodeVarintApi(dAtA, i, uint64(len(m.RequestTypeUrl)))
+ i--
+ dAtA[i] = 0x12
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Mixin) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1030,48 +1058,58 @@ func (m *Mixin) Marshal() (dAtA []byte, err error) {
}
func (m *Mixin) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Mixin) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if len(m.Root) > 0 {
- dAtA[i] = 0x12
- i++
+ i -= len(m.Root)
+ copy(dAtA[i:], m.Root)
i = encodeVarintApi(dAtA, i, uint64(len(m.Root)))
- i += copy(dAtA[i:], m.Root)
+ i--
+ dAtA[i] = 0x12
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintApi(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintApi(dAtA []byte, offset int, v uint64) int {
+ offset -= sovApi(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedApi(r randyApi, easy bool) *Api {
this := &Api{}
this.Name = string(randStringApi(r))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v1 := r.Intn(5)
this.Methods = make([]*Method, v1)
for i := 0; i < v1; i++ {
this.Methods[i] = NewPopulatedMethod(r, easy)
}
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v2 := r.Intn(5)
this.Options = make([]*Option, v2)
for i := 0; i < v2; i++ {
@@ -1079,10 +1117,10 @@ func NewPopulatedApi(r randyApi, easy bool) *Api {
}
}
this.Version = string(randStringApi(r))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
this.SourceContext = NewPopulatedSourceContext(r, easy)
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v3 := r.Intn(5)
this.Mixins = make([]*Mixin, v3)
for i := 0; i < v3; i++ {
@@ -1103,7 +1141,7 @@ func NewPopulatedMethod(r randyApi, easy bool) *Method {
this.RequestStreaming = bool(bool(r.Intn(2) == 0))
this.ResponseTypeUrl = string(randStringApi(r))
this.ResponseStreaming = bool(bool(r.Intn(2) == 0))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v4 := r.Intn(5)
this.Options = make([]*Option, v4)
for i := 0; i < v4; i++ {
@@ -1304,14 +1342,7 @@ func (m *Mixin) Size() (n int) {
}
func sovApi(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozApi(x uint64) (n int) {
return sovApi(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -1320,13 +1351,28 @@ func (this *Api) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForMethods := "[]*Method{"
+ for _, f := range this.Methods {
+ repeatedStringForMethods += strings.Replace(f.String(), "Method", "Method", 1) + ","
+ }
+ repeatedStringForMethods += "}"
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(fmt.Sprintf("%v", f), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
+ repeatedStringForMixins := "[]*Mixin{"
+ for _, f := range this.Mixins {
+ repeatedStringForMixins += strings.Replace(f.String(), "Mixin", "Mixin", 1) + ","
+ }
+ repeatedStringForMixins += "}"
s := strings.Join([]string{`&Api{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
- `Methods:` + strings.Replace(fmt.Sprintf("%v", this.Methods), "Method", "Method", 1) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Methods:` + repeatedStringForMethods + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`Version:` + fmt.Sprintf("%v", this.Version) + `,`,
`SourceContext:` + strings.Replace(fmt.Sprintf("%v", this.SourceContext), "SourceContext", "SourceContext", 1) + `,`,
- `Mixins:` + strings.Replace(fmt.Sprintf("%v", this.Mixins), "Mixin", "Mixin", 1) + `,`,
+ `Mixins:` + repeatedStringForMixins + `,`,
`Syntax:` + fmt.Sprintf("%v", this.Syntax) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@@ -1337,13 +1383,18 @@ func (this *Method) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(fmt.Sprintf("%v", f), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
s := strings.Join([]string{`&Method{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`RequestTypeUrl:` + fmt.Sprintf("%v", this.RequestTypeUrl) + `,`,
`RequestStreaming:` + fmt.Sprintf("%v", this.RequestStreaming) + `,`,
`ResponseTypeUrl:` + fmt.Sprintf("%v", this.ResponseTypeUrl) + `,`,
`ResponseStreaming:` + fmt.Sprintf("%v", this.ResponseStreaming) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`Syntax:` + fmt.Sprintf("%v", this.Syntax) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@@ -2009,6 +2060,7 @@ func (m *Mixin) Unmarshal(dAtA []byte) error {
func skipApi(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -2040,10 +2092,8 @@ func skipApi(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -2064,55 +2114,30 @@ func skipApi(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthApi
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthApi
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowApi
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipApi(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthApi
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupApi
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthApi
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowApi = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowApi = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupApi = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/duration.pb.go b/vendor/github.com/gogo/protobuf/types/duration.pb.go
index f328ee0e2..3959f0669 100644
--- a/vendor/github.com/gogo/protobuf/types/duration.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/duration.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// A Duration represents a signed, fixed-length span of time represented
// as a count of seconds and fractions of seconds at nanosecond
@@ -115,7 +116,7 @@ func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Duration.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -272,7 +273,7 @@ func valueToGoStringDuration(v interface{}, typ string) string {
func (m *Duration) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -280,34 +281,42 @@ func (m *Duration) Marshal() (dAtA []byte, err error) {
}
func (m *Duration) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if m.Seconds != 0 {
- dAtA[i] = 0x8
- i++
- i = encodeVarintDuration(dAtA, i, uint64(m.Seconds))
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Nanos != 0 {
- dAtA[i] = 0x10
- i++
i = encodeVarintDuration(dAtA, i, uint64(m.Nanos))
+ i--
+ dAtA[i] = 0x10
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if m.Seconds != 0 {
+ i = encodeVarintDuration(dAtA, i, uint64(m.Seconds))
+ i--
+ dAtA[i] = 0x8
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintDuration(dAtA []byte, offset int, v uint64) int {
+ offset -= sovDuration(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func (m *Duration) Size() (n int) {
if m == nil {
@@ -328,14 +337,7 @@ func (m *Duration) Size() (n int) {
}
func sovDuration(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozDuration(x uint64) (n int) {
return sovDuration(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -435,6 +437,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error {
func skipDuration(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -466,10 +469,8 @@ func skipDuration(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -490,55 +491,30 @@ func skipDuration(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthDuration
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthDuration
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowDuration
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipDuration(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthDuration
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupDuration
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthDuration
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthDuration = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowDuration = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthDuration = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowDuration = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupDuration = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/empty.pb.go b/vendor/github.com/gogo/protobuf/types/empty.pb.go
index 85881878f..17e3aa558 100644
--- a/vendor/github.com/gogo/protobuf/types/empty.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/empty.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// A generic empty message that you can re-use to avoid defining duplicated
// empty messages in your APIs. A typical example is to use it as the request
@@ -53,7 +54,7 @@ func (m *Empty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Empty.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -173,7 +174,7 @@ func valueToGoStringEmpty(v interface{}, typ string) string {
func (m *Empty) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -181,24 +182,32 @@ func (m *Empty) Marshal() (dAtA []byte, err error) {
}
func (m *Empty) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Empty) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintEmpty(dAtA []byte, offset int, v uint64) int {
+ offset -= sovEmpty(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedEmpty(r randyEmpty, easy bool) *Empty {
this := &Empty{}
@@ -293,14 +302,7 @@ func (m *Empty) Size() (n int) {
}
func sovEmpty(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozEmpty(x uint64) (n int) {
return sovEmpty(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -380,6 +382,7 @@ func (m *Empty) Unmarshal(dAtA []byte) error {
func skipEmpty(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -411,10 +414,8 @@ func skipEmpty(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -435,55 +436,30 @@ func skipEmpty(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthEmpty
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthEmpty
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowEmpty
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipEmpty(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthEmpty
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupEmpty
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthEmpty
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupEmpty = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/field_mask.pb.go b/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
index b401a2b3f..7226b57f7 100644
--- a/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/field_mask.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// `FieldMask` represents a set of symbolic field paths, for example:
//
@@ -244,7 +245,7 @@ func (m *FieldMask) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_FieldMask.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -396,7 +397,7 @@ func valueToGoStringFieldMask(v interface{}, typ string) string {
func (m *FieldMask) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -404,39 +405,41 @@ func (m *FieldMask) Marshal() (dAtA []byte, err error) {
}
func (m *FieldMask) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *FieldMask) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.Paths) > 0 {
- for _, s := range m.Paths {
+ for iNdEx := len(m.Paths) - 1; iNdEx >= 0; iNdEx-- {
+ i -= len(m.Paths[iNdEx])
+ copy(dAtA[i:], m.Paths[iNdEx])
+ i = encodeVarintFieldMask(dAtA, i, uint64(len(m.Paths[iNdEx])))
+ i--
dAtA[i] = 0xa
- i++
- l = len(s)
- for l >= 1<<7 {
- dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
- l >>= 7
- i++
- }
- dAtA[i] = uint8(l)
- i++
- i += copy(dAtA[i:], s)
}
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintFieldMask(dAtA []byte, offset int, v uint64) int {
+ offset -= sovFieldMask(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedFieldMask(r randyFieldMask, easy bool) *FieldMask {
this := &FieldMask{}
@@ -542,14 +545,7 @@ func (m *FieldMask) Size() (n int) {
}
func sovFieldMask(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozFieldMask(x uint64) (n int) {
return sovFieldMask(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -662,6 +658,7 @@ func (m *FieldMask) Unmarshal(dAtA []byte) error {
func skipFieldMask(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -693,10 +690,8 @@ func skipFieldMask(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -717,55 +712,30 @@ func skipFieldMask(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthFieldMask
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthFieldMask
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowFieldMask
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipFieldMask(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthFieldMask
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupFieldMask
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthFieldMask
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthFieldMask = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowFieldMask = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthFieldMask = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowFieldMask = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupFieldMask = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/source_context.pb.go b/vendor/github.com/gogo/protobuf/types/source_context.pb.go
index 3688840b5..61045ce10 100644
--- a/vendor/github.com/gogo/protobuf/types/source_context.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/source_context.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// `SourceContext` represents information about the source of a
// protobuf element, like the file in which it is defined.
@@ -48,7 +49,7 @@ func (m *SourceContext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error
return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -190,7 +191,7 @@ func valueToGoStringSourceContext(v interface{}, typ string) string {
func (m *SourceContext) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -198,30 +199,39 @@ func (m *SourceContext) Marshal() (dAtA []byte, err error) {
}
func (m *SourceContext) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SourceContext) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.FileName) > 0 {
- dAtA[i] = 0xa
- i++
+ i -= len(m.FileName)
+ copy(dAtA[i:], m.FileName)
i = encodeVarintSourceContext(dAtA, i, uint64(len(m.FileName)))
- i += copy(dAtA[i:], m.FileName)
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintSourceContext(dAtA []byte, offset int, v uint64) int {
+ offset -= sovSourceContext(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedSourceContext(r randySourceContext, easy bool) *SourceContext {
this := &SourceContext{}
@@ -321,14 +331,7 @@ func (m *SourceContext) Size() (n int) {
}
func sovSourceContext(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozSourceContext(x uint64) (n int) {
return sovSourceContext(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -441,6 +444,7 @@ func (m *SourceContext) Unmarshal(dAtA []byte) error {
func skipSourceContext(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -472,10 +476,8 @@ func skipSourceContext(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -496,55 +498,30 @@ func skipSourceContext(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthSourceContext
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthSourceContext
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowSourceContext
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipSourceContext(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthSourceContext
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupSourceContext
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthSourceContext
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthSourceContext = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowSourceContext = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthSourceContext = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowSourceContext = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupSourceContext = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/struct.pb.go b/vendor/github.com/gogo/protobuf/types/struct.pb.go
index 63fd17b03..cea553eef 100644
--- a/vendor/github.com/gogo/protobuf/types/struct.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/struct.pb.go
@@ -11,6 +11,7 @@ import (
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strconv "strconv"
strings "strings"
@@ -25,7 +26,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// `NullValue` is a singleton enumeration to represent the null value for the
// `Value` type union.
@@ -82,7 +83,7 @@ func (m *Struct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Struct.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -148,7 +149,7 @@ func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Value.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -172,25 +173,26 @@ type isValue_Kind interface {
Equal(interface{}) bool
MarshalTo([]byte) (int, error)
Size() int
+ Compare(interface{}) int
}
type Value_NullValue struct {
- NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"`
+ NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof" json:"null_value,omitempty"`
}
type Value_NumberValue struct {
- NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,proto3,oneof"`
+ NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,proto3,oneof" json:"number_value,omitempty"`
}
type Value_StringValue struct {
- StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof"`
+ StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof" json:"string_value,omitempty"`
}
type Value_BoolValue struct {
- BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof"`
+ BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof" json:"bool_value,omitempty"`
}
type Value_StructValue struct {
- StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,proto3,oneof"`
+ StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,proto3,oneof" json:"struct_value,omitempty"`
}
type Value_ListValue struct {
- ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,proto3,oneof"`
+ ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,proto3,oneof" json:"list_value,omitempty"`
}
func (*Value_NullValue) isValue_Kind() {}
@@ -249,9 +251,9 @@ func (m *Value) GetListValue() *ListValue {
return nil
}
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
- return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Value) XXX_OneofWrappers() []interface{} {
+ return []interface{}{
(*Value_NullValue)(nil),
(*Value_NumberValue)(nil),
(*Value_StringValue)(nil),
@@ -261,129 +263,6 @@ func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error,
}
}
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
- m := msg.(*Value)
- // kind
- switch x := m.Kind.(type) {
- case *Value_NullValue:
- _ = b.EncodeVarint(1<<3 | proto.WireVarint)
- _ = b.EncodeVarint(uint64(x.NullValue))
- case *Value_NumberValue:
- _ = b.EncodeVarint(2<<3 | proto.WireFixed64)
- _ = b.EncodeFixed64(math.Float64bits(x.NumberValue))
- case *Value_StringValue:
- _ = b.EncodeVarint(3<<3 | proto.WireBytes)
- _ = b.EncodeStringBytes(x.StringValue)
- case *Value_BoolValue:
- t := uint64(0)
- if x.BoolValue {
- t = 1
- }
- _ = b.EncodeVarint(4<<3 | proto.WireVarint)
- _ = b.EncodeVarint(t)
- case *Value_StructValue:
- _ = b.EncodeVarint(5<<3 | proto.WireBytes)
- if err := b.EncodeMessage(x.StructValue); err != nil {
- return err
- }
- case *Value_ListValue:
- _ = b.EncodeVarint(6<<3 | proto.WireBytes)
- if err := b.EncodeMessage(x.ListValue); err != nil {
- return err
- }
- case nil:
- default:
- return fmt.Errorf("Value.Kind has unexpected type %T", x)
- }
- return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
- m := msg.(*Value)
- switch tag {
- case 1: // kind.null_value
- if wire != proto.WireVarint {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeVarint()
- m.Kind = &Value_NullValue{NullValue(x)}
- return true, err
- case 2: // kind.number_value
- if wire != proto.WireFixed64 {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeFixed64()
- m.Kind = &Value_NumberValue{math.Float64frombits(x)}
- return true, err
- case 3: // kind.string_value
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeStringBytes()
- m.Kind = &Value_StringValue{x}
- return true, err
- case 4: // kind.bool_value
- if wire != proto.WireVarint {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeVarint()
- m.Kind = &Value_BoolValue{x != 0}
- return true, err
- case 5: // kind.struct_value
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- msg := new(Struct)
- err := b.DecodeMessage(msg)
- m.Kind = &Value_StructValue{msg}
- return true, err
- case 6: // kind.list_value
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- msg := new(ListValue)
- err := b.DecodeMessage(msg)
- m.Kind = &Value_ListValue{msg}
- return true, err
- default:
- return false, nil
- }
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
- m := msg.(*Value)
- // kind
- switch x := m.Kind.(type) {
- case *Value_NullValue:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(x.NullValue))
- case *Value_NumberValue:
- n += 1 // tag and wire
- n += 8
- case *Value_StringValue:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(len(x.StringValue)))
- n += len(x.StringValue)
- case *Value_BoolValue:
- n += 1 // tag and wire
- n += 1
- case *Value_StructValue:
- s := proto.Size(x.StructValue)
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(s))
- n += s
- case *Value_ListValue:
- s := proto.Size(x.ListValue)
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(s))
- n += s
- case nil:
- default:
- panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
- }
- return n
-}
-
func (*Value) XXX_MessageName() string {
return "google.protobuf.Value"
}
@@ -413,7 +292,7 @@ func (m *ListValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ListValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -453,37 +332,392 @@ func init() {
func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_df322afd6c9fb402) }
var fileDescriptor_df322afd6c9fb402 = []byte{
- // 439 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x6b, 0xd4, 0x40,
- 0x14, 0xc6, 0xf3, 0xb2, 0xdd, 0xe0, 0xbe, 0x48, 0x2d, 0x23, 0xe8, 0x52, 0x65, 0x5c, 0xb6, 0x97,
- 0x45, 0x24, 0x85, 0xf5, 0x22, 0xae, 0x17, 0x17, 0x6a, 0x0b, 0x86, 0x12, 0xa3, 0xad, 0xe0, 0x65,
- 0x31, 0x69, 0xba, 0x84, 0x4e, 0x67, 0x4a, 0x32, 0xa3, 0xec, 0x4d, 0xff, 0x0b, 0xcf, 0x9e, 0xc4,
- 0xa3, 0x7f, 0x85, 0x47, 0x8f, 0x1e, 0xdd, 0x78, 0xf1, 0xd8, 0x63, 0x8f, 0x32, 0x33, 0x49, 0x94,
- 0x2e, 0xbd, 0xe5, 0x7d, 0xf3, 0x7b, 0xdf, 0x7b, 0xdf, 0x0b, 0xde, 0x9d, 0x0b, 0x31, 0x67, 0xd9,
- 0xf6, 0x59, 0x21, 0xa4, 0x48, 0xd4, 0xf1, 0x76, 0x29, 0x0b, 0x95, 0xca, 0xc0, 0xd4, 0xe4, 0x86,
- 0x7d, 0x0d, 0x9a, 0xd7, 0xe1, 0x27, 0x40, 0xef, 0xa5, 0x21, 0xc8, 0x04, 0xbd, 0xe3, 0x3c, 0x63,
- 0x47, 0x65, 0x1f, 0x06, 0x9d, 0x91, 0x3f, 0xde, 0x0a, 0x2e, 0xc1, 0x81, 0x05, 0x83, 0x67, 0x86,
- 0xda, 0xe1, 0xb2, 0x58, 0xc4, 0x75, 0xcb, 0xe6, 0x0b, 0xf4, 0xff, 0x93, 0xc9, 0x06, 0x76, 0x4e,
- 0xb2, 0x45, 0x1f, 0x06, 0x30, 0xea, 0xc5, 0xfa, 0x93, 0x3c, 0xc0, 0xee, 0xbb, 0xb7, 0x4c, 0x65,
- 0x7d, 0x77, 0x00, 0x23, 0x7f, 0x7c, 0x6b, 0xc5, 0xfc, 0x50, 0xbf, 0xc6, 0x16, 0x7a, 0xec, 0x3e,
- 0x82, 0xe1, 0x37, 0x17, 0xbb, 0x46, 0x24, 0x13, 0x44, 0xae, 0x18, 0x9b, 0x59, 0x03, 0x6d, 0xba,
- 0x3e, 0xde, 0x5c, 0x31, 0xd8, 0x57, 0x8c, 0x19, 0x7e, 0xcf, 0x89, 0x7b, 0xbc, 0x29, 0xc8, 0x16,
- 0x5e, 0xe7, 0xea, 0x34, 0xc9, 0x8a, 0xd9, 0xbf, 0xf9, 0xb0, 0xe7, 0xc4, 0xbe, 0x55, 0x5b, 0xa8,
- 0x94, 0x45, 0xce, 0xe7, 0x35, 0xd4, 0xd1, 0x8b, 0x6b, 0xc8, 0xaa, 0x16, 0xba, 0x87, 0x98, 0x08,
- 0xd1, 0xac, 0xb1, 0x36, 0x80, 0xd1, 0x35, 0x3d, 0x4a, 0x6b, 0x16, 0x78, 0x62, 0x5c, 0x54, 0x2a,
- 0x6b, 0xa4, 0x6b, 0xa2, 0xde, 0xbe, 0xe2, 0x8e, 0xb5, 0xbd, 0x4a, 0x65, 0x9b, 0x92, 0xe5, 0x65,
- 0xd3, 0xeb, 0x99, 0xde, 0xd5, 0x94, 0x61, 0x5e, 0xca, 0x36, 0x25, 0x6b, 0x8a, 0xa9, 0x87, 0x6b,
- 0x27, 0x39, 0x3f, 0x1a, 0x4e, 0xb0, 0xd7, 0x12, 0x24, 0x40, 0xcf, 0x98, 0x35, 0x7f, 0xf4, 0xaa,
- 0xa3, 0xd7, 0xd4, 0xfd, 0x3b, 0xd8, 0x6b, 0x8f, 0x48, 0xd6, 0x11, 0xf7, 0x0f, 0xc2, 0x70, 0x76,
- 0xf8, 0x34, 0x3c, 0xd8, 0xd9, 0x70, 0xa6, 0x1f, 0xe1, 0xe7, 0x92, 0x3a, 0xe7, 0x4b, 0x0a, 0x17,
- 0x4b, 0x0a, 0x1f, 0x2a, 0x0a, 0x5f, 0x2a, 0x0a, 0xdf, 0x2b, 0x0a, 0x3f, 0x2a, 0x0a, 0xbf, 0x2a,
- 0x0a, 0x7f, 0x2a, 0xea, 0x9c, 0x6b, 0xed, 0x37, 0x05, 0xbc, 0x99, 0x8a, 0xd3, 0xcb, 0xe3, 0xa6,
- 0xbe, 0x4d, 0x1e, 0xe9, 0x3a, 0x82, 0x37, 0x5d, 0xb9, 0x38, 0xcb, 0xca, 0x0b, 0x80, 0xcf, 0x6e,
- 0x67, 0x37, 0x9a, 0x7e, 0x75, 0xe9, 0xae, 0x6d, 0x88, 0x9a, 0xfd, 0x5e, 0x67, 0x8c, 0x3d, 0xe7,
- 0xe2, 0x3d, 0x7f, 0xa5, 0xc9, 0xc4, 0x33, 0x4e, 0x0f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xad,
- 0x84, 0x08, 0xae, 0xe5, 0x02, 0x00, 0x00,
+ // 443 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x6f, 0xd3, 0x40,
+ 0x14, 0xc6, 0xfd, 0x9c, 0xc6, 0x22, 0xcf, 0xa8, 0x54, 0x87, 0x04, 0x51, 0x41, 0x47, 0x94, 0x2e,
+ 0x11, 0x42, 0xae, 0x14, 0x16, 0x44, 0x58, 0x88, 0x54, 0x5a, 0x89, 0xa8, 0x32, 0x86, 0x16, 0x89,
+ 0x25, 0xc2, 0xae, 0x1b, 0x59, 0xbd, 0xde, 0x55, 0xf6, 0x1d, 0x28, 0x1b, 0x0b, 0xff, 0x03, 0x33,
+ 0x13, 0x62, 0xe4, 0xaf, 0xe8, 0xc8, 0xc8, 0x48, 0xdc, 0x85, 0xb1, 0x63, 0x47, 0x74, 0x77, 0xb6,
+ 0x41, 0x8d, 0xb2, 0xf9, 0x7d, 0xf7, 0x7b, 0xdf, 0x7b, 0xdf, 0x33, 0xde, 0x9f, 0x09, 0x31, 0x63,
+ 0xe9, 0xf6, 0x59, 0x2e, 0xa4, 0x88, 0xd5, 0xf1, 0x76, 0x21, 0x73, 0x95, 0xc8, 0xc0, 0xd4, 0xe4,
+ 0x96, 0x7d, 0x0d, 0xea, 0xd7, 0xfe, 0x17, 0x40, 0xef, 0xb5, 0x21, 0xc8, 0x08, 0xbd, 0xe3, 0x2c,
+ 0x65, 0x47, 0x45, 0x17, 0x7a, 0xad, 0x81, 0x3f, 0xdc, 0x0a, 0xae, 0xc1, 0x81, 0x05, 0x83, 0x17,
+ 0x86, 0xda, 0xe1, 0x32, 0x9f, 0x47, 0x55, 0xcb, 0xe6, 0x2b, 0xf4, 0xff, 0x93, 0xc9, 0x06, 0xb6,
+ 0x4e, 0xd2, 0x79, 0x17, 0x7a, 0x30, 0xe8, 0x44, 0xfa, 0x93, 0x3c, 0xc2, 0xf6, 0x87, 0xf7, 0x4c,
+ 0xa5, 0x5d, 0xb7, 0x07, 0x03, 0x7f, 0x78, 0x67, 0xc9, 0xfc, 0x50, 0xbf, 0x46, 0x16, 0x7a, 0xea,
+ 0x3e, 0x81, 0xfe, 0x0f, 0x17, 0xdb, 0x46, 0x24, 0x23, 0x44, 0xae, 0x18, 0x9b, 0x5a, 0x03, 0x6d,
+ 0xba, 0x3e, 0xdc, 0x5c, 0x32, 0xd8, 0x57, 0x8c, 0x19, 0x7e, 0xcf, 0x89, 0x3a, 0xbc, 0x2e, 0xc8,
+ 0x16, 0xde, 0xe4, 0xea, 0x34, 0x4e, 0xf3, 0xe9, 0xbf, 0xf9, 0xb0, 0xe7, 0x44, 0xbe, 0x55, 0x1b,
+ 0xa8, 0x90, 0x79, 0xc6, 0x67, 0x15, 0xd4, 0xd2, 0x8b, 0x6b, 0xc8, 0xaa, 0x16, 0x7a, 0x80, 0x18,
+ 0x0b, 0x51, 0xaf, 0xb1, 0xd6, 0x83, 0xc1, 0x0d, 0x3d, 0x4a, 0x6b, 0x16, 0x78, 0x66, 0x5c, 0x54,
+ 0x22, 0x2b, 0xa4, 0x6d, 0xa2, 0xde, 0x5d, 0x71, 0xc7, 0xca, 0x5e, 0x25, 0xb2, 0x49, 0xc9, 0xb2,
+ 0xa2, 0xee, 0xf5, 0x4c, 0xef, 0x72, 0xca, 0x49, 0x56, 0xc8, 0x26, 0x25, 0xab, 0x8b, 0xb1, 0x87,
+ 0x6b, 0x27, 0x19, 0x3f, 0xea, 0x8f, 0xb0, 0xd3, 0x10, 0x24, 0x40, 0xcf, 0x98, 0xd5, 0x7f, 0x74,
+ 0xd5, 0xd1, 0x2b, 0xea, 0xe1, 0x3d, 0xec, 0x34, 0x47, 0x24, 0xeb, 0x88, 0xfb, 0x07, 0x93, 0xc9,
+ 0xf4, 0xf0, 0xf9, 0xe4, 0x60, 0x67, 0xc3, 0x19, 0x7f, 0x86, 0x5f, 0x0b, 0xea, 0x5c, 0x2e, 0x28,
+ 0x5c, 0x2d, 0x28, 0x7c, 0x2a, 0x29, 0x7c, 0x2b, 0x29, 0x9c, 0x97, 0x14, 0x7e, 0x96, 0x14, 0x7e,
+ 0x97, 0x14, 0xfe, 0x94, 0xd4, 0xb9, 0xd4, 0xfa, 0x05, 0x85, 0xf3, 0x0b, 0x0a, 0x78, 0x3b, 0x11,
+ 0xa7, 0xd7, 0x47, 0x8e, 0x7d, 0x9b, 0x3e, 0xd4, 0x75, 0x08, 0xef, 0xda, 0x72, 0x7e, 0x96, 0x16,
+ 0x57, 0x00, 0x5f, 0xdd, 0xd6, 0x6e, 0x38, 0xfe, 0xee, 0xd2, 0x5d, 0xdb, 0x10, 0xd6, 0x3b, 0xbe,
+ 0x4d, 0x19, 0x7b, 0xc9, 0xc5, 0x47, 0xfe, 0x46, 0x93, 0xb1, 0x67, 0x9c, 0x1e, 0xff, 0x0d, 0x00,
+ 0x00, 0xff, 0xff, 0x26, 0x30, 0xdb, 0xbe, 0xe9, 0x02, 0x00, 0x00,
+}
+
+func (this *Struct) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Struct)
+ if !ok {
+ that2, ok := that.(Struct)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if len(this.Fields) != len(that1.Fields) {
+ if len(this.Fields) < len(that1.Fields) {
+ return -1
+ }
+ return 1
+ }
+ for i := range this.Fields {
+ if c := this.Fields[i].Compare(that1.Fields[i]); c != 0 {
+ return c
+ }
+ }
+ if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 {
+ return c
+ }
+ return 0
+}
+func (this *Value) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value)
+ if !ok {
+ that2, ok := that.(Value)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if that1.Kind == nil {
+ if this.Kind != nil {
+ return 1
+ }
+ } else if this.Kind == nil {
+ return -1
+ } else {
+ thisType := -1
+ switch this.Kind.(type) {
+ case *Value_NullValue:
+ thisType = 0
+ case *Value_NumberValue:
+ thisType = 1
+ case *Value_StringValue:
+ thisType = 2
+ case *Value_BoolValue:
+ thisType = 3
+ case *Value_StructValue:
+ thisType = 4
+ case *Value_ListValue:
+ thisType = 5
+ default:
+ panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Kind))
+ }
+ that1Type := -1
+ switch that1.Kind.(type) {
+ case *Value_NullValue:
+ that1Type = 0
+ case *Value_NumberValue:
+ that1Type = 1
+ case *Value_StringValue:
+ that1Type = 2
+ case *Value_BoolValue:
+ that1Type = 3
+ case *Value_StructValue:
+ that1Type = 4
+ case *Value_ListValue:
+ that1Type = 5
+ default:
+ panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Kind))
+ }
+ if thisType == that1Type {
+ if c := this.Kind.Compare(that1.Kind); c != 0 {
+ return c
+ }
+ } else if thisType < that1Type {
+ return -1
+ } else if thisType > that1Type {
+ return 1
+ }
+ }
+ if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 {
+ return c
+ }
+ return 0
+}
+func (this *Value_NullValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value_NullValue)
+ if !ok {
+ that2, ok := that.(Value_NullValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if this.NullValue != that1.NullValue {
+ if this.NullValue < that1.NullValue {
+ return -1
+ }
+ return 1
+ }
+ return 0
+}
+func (this *Value_NumberValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value_NumberValue)
+ if !ok {
+ that2, ok := that.(Value_NumberValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if this.NumberValue != that1.NumberValue {
+ if this.NumberValue < that1.NumberValue {
+ return -1
+ }
+ return 1
+ }
+ return 0
+}
+func (this *Value_StringValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value_StringValue)
+ if !ok {
+ that2, ok := that.(Value_StringValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if this.StringValue != that1.StringValue {
+ if this.StringValue < that1.StringValue {
+ return -1
+ }
+ return 1
+ }
+ return 0
+}
+func (this *Value_BoolValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value_BoolValue)
+ if !ok {
+ that2, ok := that.(Value_BoolValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if this.BoolValue != that1.BoolValue {
+ if !this.BoolValue {
+ return -1
+ }
+ return 1
+ }
+ return 0
+}
+func (this *Value_StructValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*Value_StructValue)
+ if !ok {
+ that2, ok := that.(Value_StructValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if c := this.StructValue.Compare(that1.StructValue); c != 0 {
+ return c
+ }
+ return 0
}
+func (this *Value_ListValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+ that1, ok := that.(*Value_ListValue)
+ if !ok {
+ that2, ok := that.(Value_ListValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if c := this.ListValue.Compare(that1.ListValue); c != 0 {
+ return c
+ }
+ return 0
+}
+func (this *ListValue) Compare(that interface{}) int {
+ if that == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ }
+
+ that1, ok := that.(*ListValue)
+ if !ok {
+ that2, ok := that.(ListValue)
+ if ok {
+ that1 = &that2
+ } else {
+ return 1
+ }
+ }
+ if that1 == nil {
+ if this == nil {
+ return 0
+ }
+ return 1
+ } else if this == nil {
+ return -1
+ }
+ if len(this.Values) != len(that1.Values) {
+ if len(this.Values) < len(that1.Values) {
+ return -1
+ }
+ return 1
+ }
+ for i := range this.Values {
+ if c := this.Values[i].Compare(that1.Values[i]); c != 0 {
+ return c
+ }
+ }
+ if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 {
+ return c
+ }
+ return 0
+}
func (x NullValue) String() string {
s, ok := NullValue_name[int32(x)]
if ok {
@@ -846,7 +1080,7 @@ func valueToGoStringStruct(v interface{}, typ string) string {
func (m *Struct) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -854,48 +1088,52 @@ func (m *Struct) Marshal() (dAtA []byte, err error) {
}
func (m *Struct) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Struct) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.Fields) > 0 {
for k := range m.Fields {
- dAtA[i] = 0xa
- i++
v := m.Fields[k]
- msgSize := 0
- if v != nil {
- msgSize = v.Size()
- msgSize += 1 + sovStruct(uint64(msgSize))
- }
- mapSize := 1 + len(k) + sovStruct(uint64(len(k))) + msgSize
- i = encodeVarintStruct(dAtA, i, uint64(mapSize))
- dAtA[i] = 0xa
- i++
- i = encodeVarintStruct(dAtA, i, uint64(len(k)))
- i += copy(dAtA[i:], k)
+ baseI := i
if v != nil {
- dAtA[i] = 0x12
- i++
- i = encodeVarintStruct(dAtA, i, uint64(v.Size()))
- n1, err := v.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ {
+ size, err := v.MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintStruct(dAtA, i, uint64(size))
}
- i += n1
+ i--
+ dAtA[i] = 0x12
}
+ i -= len(k)
+ copy(dAtA[i:], k)
+ i = encodeVarintStruct(dAtA, i, uint64(len(k)))
+ i--
+ dAtA[i] = 0xa
+ i = encodeVarintStruct(dAtA, i, uint64(baseI-i))
+ i--
+ dAtA[i] = 0xa
}
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Value) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -903,90 +1141,133 @@ func (m *Value) Marshal() (dAtA []byte, err error) {
}
func (m *Value) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Kind != nil {
- nn2, err := m.Kind.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ {
+ size := m.Kind.Size()
+ i -= size
+ if _, err := m.Kind.MarshalTo(dAtA[i:]); err != nil {
+ return 0, err
+ }
}
- i += nn2
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Value_NullValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
- dAtA[i] = 0x8
- i++
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_NullValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
i = encodeVarintStruct(dAtA, i, uint64(m.NullValue))
- return i, nil
+ i--
+ dAtA[i] = 0x8
+ return len(dAtA) - i, nil
}
func (m *Value_NumberValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
- dAtA[i] = 0x11
- i++
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_NumberValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ i -= 8
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.NumberValue))))
- i += 8
- return i, nil
+ i--
+ dAtA[i] = 0x11
+ return len(dAtA) - i, nil
}
func (m *Value_StringValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
- dAtA[i] = 0x1a
- i++
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_StringValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ i -= len(m.StringValue)
+ copy(dAtA[i:], m.StringValue)
i = encodeVarintStruct(dAtA, i, uint64(len(m.StringValue)))
- i += copy(dAtA[i:], m.StringValue)
- return i, nil
+ i--
+ dAtA[i] = 0x1a
+ return len(dAtA) - i, nil
}
func (m *Value_BoolValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
- dAtA[i] = 0x20
- i++
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_BoolValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ i--
if m.BoolValue {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
- i++
- return i, nil
+ i--
+ dAtA[i] = 0x20
+ return len(dAtA) - i, nil
}
func (m *Value_StructValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_StructValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
if m.StructValue != nil {
- dAtA[i] = 0x2a
- i++
- i = encodeVarintStruct(dAtA, i, uint64(m.StructValue.Size()))
- n3, err := m.StructValue.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ {
+ size, err := m.StructValue.MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintStruct(dAtA, i, uint64(size))
}
- i += n3
+ i--
+ dAtA[i] = 0x2a
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Value_ListValue) MarshalTo(dAtA []byte) (int, error) {
- i := 0
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Value_ListValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
if m.ListValue != nil {
- dAtA[i] = 0x32
- i++
- i = encodeVarintStruct(dAtA, i, uint64(m.ListValue.Size()))
- n4, err := m.ListValue.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ {
+ size, err := m.ListValue.MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintStruct(dAtA, i, uint64(size))
}
- i += n4
+ i--
+ dAtA[i] = 0x32
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *ListValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -994,40 +1275,50 @@ func (m *ListValue) Marshal() (dAtA []byte, err error) {
}
func (m *ListValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ListValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.Values) > 0 {
- for _, msg := range m.Values {
- dAtA[i] = 0xa
- i++
- i = encodeVarintStruct(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ for iNdEx := len(m.Values) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Values[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintStruct(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0xa
}
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintStruct(dAtA []byte, offset int, v uint64) int {
+ offset -= sovStruct(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedStruct(r randyStruct, easy bool) *Struct {
this := &Struct{}
- if r.Intn(10) == 0 {
+ if r.Intn(5) == 0 {
v1 := r.Intn(10)
this.Fields = make(map[string]*Value)
for i := 0; i < v1; i++ {
@@ -1098,7 +1389,7 @@ func NewPopulatedValue_ListValue(r randyStruct, easy bool) *Value_ListValue {
}
func NewPopulatedListValue(r randyStruct, easy bool) *ListValue {
this := &ListValue{}
- if r.Intn(10) == 0 {
+ if r.Intn(5) == 0 {
v2 := r.Intn(5)
this.Values = make([]*Value, v2)
for i := 0; i < v2; i++ {
@@ -1303,14 +1594,7 @@ func (m *ListValue) Size() (n int) {
}
func sovStruct(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozStruct(x uint64) (n int) {
return sovStruct(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -1411,8 +1695,13 @@ func (this *ListValue) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForValues := "[]*Value{"
+ for _, f := range this.Values {
+ repeatedStringForValues += strings.Replace(f.String(), "Value", "Value", 1) + ","
+ }
+ repeatedStringForValues += "}"
s := strings.Join([]string{`&ListValue{`,
- `Values:` + strings.Replace(fmt.Sprintf("%v", this.Values), "Value", "Value", 1) + `,`,
+ `Values:` + repeatedStringForValues + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@@ -1908,6 +2197,7 @@ func (m *ListValue) Unmarshal(dAtA []byte) error {
func skipStruct(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -1939,10 +2229,8 @@ func skipStruct(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -1963,55 +2251,30 @@ func skipStruct(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthStruct
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthStruct
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowStruct
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipStruct(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthStruct
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupStruct
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthStruct
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthStruct = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowStruct = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthStruct = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowStruct = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupStruct = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/timestamp.pb.go b/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
index 3ee6cb0a1..b81875267 100644
--- a/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/timestamp.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -22,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// A Timestamp represents a point in time independent of any time zone or local
// calendar, encoded as a count of seconds and fractions of seconds at
@@ -97,11 +98,13 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
// 01:30 UTC on January 15, 2017.
//
// In JavaScript, one can convert a Date object to this format using the
-// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+// standard
+// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
-// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
-// can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
+// to this format using
+// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
+// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
+// the Joda Time's [`ISODateTimeFormat.dateTime()`](
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
// ) to obtain a formatter capable of generating timestamps in this format.
//
@@ -135,7 +138,7 @@ func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -292,7 +295,7 @@ func valueToGoStringTimestamp(v interface{}, typ string) string {
func (m *Timestamp) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -300,34 +303,42 @@ func (m *Timestamp) Marshal() (dAtA []byte, err error) {
}
func (m *Timestamp) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if m.Seconds != 0 {
- dAtA[i] = 0x8
- i++
- i = encodeVarintTimestamp(dAtA, i, uint64(m.Seconds))
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Nanos != 0 {
- dAtA[i] = 0x10
- i++
i = encodeVarintTimestamp(dAtA, i, uint64(m.Nanos))
+ i--
+ dAtA[i] = 0x10
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if m.Seconds != 0 {
+ i = encodeVarintTimestamp(dAtA, i, uint64(m.Seconds))
+ i--
+ dAtA[i] = 0x8
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintTimestamp(dAtA []byte, offset int, v uint64) int {
+ offset -= sovTimestamp(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func (m *Timestamp) Size() (n int) {
if m == nil {
@@ -348,14 +359,7 @@ func (m *Timestamp) Size() (n int) {
}
func sovTimestamp(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozTimestamp(x uint64) (n int) {
return sovTimestamp(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -455,6 +459,7 @@ func (m *Timestamp) Unmarshal(dAtA []byte) error {
func skipTimestamp(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -486,10 +491,8 @@ func skipTimestamp(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -510,55 +513,30 @@ func skipTimestamp(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthTimestamp
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthTimestamp
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowTimestamp
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipTimestamp(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthTimestamp
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupTimestamp
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthTimestamp
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthTimestamp = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowTimestamp = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthTimestamp = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowTimestamp = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupTimestamp = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/type.pb.go b/vendor/github.com/gogo/protobuf/types/type.pb.go
index 366f493d2..13b7ec02f 100644
--- a/vendor/github.com/gogo/protobuf/types/type.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/type.pb.go
@@ -9,6 +9,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strconv "strconv"
strings "strings"
@@ -23,7 +24,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// The syntax in which a protocol buffer element is defined.
type Syntax int32
@@ -205,7 +206,7 @@ func (m *Type) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Type.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -312,7 +313,7 @@ func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Field.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -435,7 +436,7 @@ func (m *Enum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Enum.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -519,7 +520,7 @@ func (m *EnumValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -594,7 +595,7 @@ func (m *Option) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Option.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -1404,7 +1405,7 @@ func valueToGoStringType(v interface{}, typ string) string {
func (m *Type) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1412,80 +1413,87 @@ func (m *Type) Marshal() (dAtA []byte, err error) {
}
func (m *Type) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Type) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- if len(m.Fields) > 0 {
- for _, msg := range m.Fields {
- dAtA[i] = 0x12
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
+ if m.Syntax != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Syntax))
+ i--
+ dAtA[i] = 0x30
+ }
+ if m.SourceContext != nil {
+ {
+ size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
- i += n
- }
- }
- if len(m.Oneofs) > 0 {
- for _, s := range m.Oneofs {
- dAtA[i] = 0x1a
- i++
- l = len(s)
- for l >= 1<<7 {
- dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
- l >>= 7
- i++
- }
- dAtA[i] = uint8(l)
- i++
- i += copy(dAtA[i:], s)
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
+ i--
+ dAtA[i] = 0x2a
}
if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x22
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0x22
}
}
- if m.SourceContext != nil {
- dAtA[i] = 0x2a
- i++
- i = encodeVarintType(dAtA, i, uint64(m.SourceContext.Size()))
- n1, err := m.SourceContext.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ if len(m.Oneofs) > 0 {
+ for iNdEx := len(m.Oneofs) - 1; iNdEx >= 0; iNdEx-- {
+ i -= len(m.Oneofs[iNdEx])
+ copy(dAtA[i:], m.Oneofs[iNdEx])
+ i = encodeVarintType(dAtA, i, uint64(len(m.Oneofs[iNdEx])))
+ i--
+ dAtA[i] = 0x1a
}
- i += n1
}
- if m.Syntax != 0 {
- dAtA[i] = 0x30
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Syntax))
+ if len(m.Fields) > 0 {
+ for iNdEx := len(m.Fields) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Fields[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x12
+ }
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Field) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1493,86 +1501,98 @@ func (m *Field) Marshal() (dAtA []byte, err error) {
}
func (m *Field) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Field) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if m.Kind != 0 {
- dAtA[i] = 0x8
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Kind))
- }
- if m.Cardinality != 0 {
- dAtA[i] = 0x10
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Cardinality))
- }
- if m.Number != 0 {
- dAtA[i] = 0x18
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Number))
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- if len(m.Name) > 0 {
- dAtA[i] = 0x22
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if len(m.DefaultValue) > 0 {
+ i -= len(m.DefaultValue)
+ copy(dAtA[i:], m.DefaultValue)
+ i = encodeVarintType(dAtA, i, uint64(len(m.DefaultValue)))
+ i--
+ dAtA[i] = 0x5a
}
- if len(m.TypeUrl) > 0 {
- dAtA[i] = 0x32
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.TypeUrl)))
- i += copy(dAtA[i:], m.TypeUrl)
+ if len(m.JsonName) > 0 {
+ i -= len(m.JsonName)
+ copy(dAtA[i:], m.JsonName)
+ i = encodeVarintType(dAtA, i, uint64(len(m.JsonName)))
+ i--
+ dAtA[i] = 0x52
}
- if m.OneofIndex != 0 {
- dAtA[i] = 0x38
- i++
- i = encodeVarintType(dAtA, i, uint64(m.OneofIndex))
+ if len(m.Options) > 0 {
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x4a
+ }
}
if m.Packed {
- dAtA[i] = 0x40
- i++
+ i--
if m.Packed {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
- i++
+ i--
+ dAtA[i] = 0x40
}
- if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x4a
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
- }
- i += n
- }
+ if m.OneofIndex != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.OneofIndex))
+ i--
+ dAtA[i] = 0x38
}
- if len(m.JsonName) > 0 {
- dAtA[i] = 0x52
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.JsonName)))
- i += copy(dAtA[i:], m.JsonName)
+ if len(m.TypeUrl) > 0 {
+ i -= len(m.TypeUrl)
+ copy(dAtA[i:], m.TypeUrl)
+ i = encodeVarintType(dAtA, i, uint64(len(m.TypeUrl)))
+ i--
+ dAtA[i] = 0x32
}
- if len(m.DefaultValue) > 0 {
- dAtA[i] = 0x5a
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.DefaultValue)))
- i += copy(dAtA[i:], m.DefaultValue)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0x22
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if m.Number != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Number))
+ i--
+ dAtA[i] = 0x18
+ }
+ if m.Cardinality != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Cardinality))
+ i--
+ dAtA[i] = 0x10
+ }
+ if m.Kind != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Kind))
+ i--
+ dAtA[i] = 0x8
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Enum) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1580,65 +1600,78 @@ func (m *Enum) Marshal() (dAtA []byte, err error) {
}
func (m *Enum) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Enum) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
- if len(m.Enumvalue) > 0 {
- for _, msg := range m.Enumvalue {
- dAtA[i] = 0x12
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
+ if m.Syntax != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Syntax))
+ i--
+ dAtA[i] = 0x28
+ }
+ if m.SourceContext != nil {
+ {
+ size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
- i += n
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
+ i--
+ dAtA[i] = 0x22
}
if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0x1a
}
}
- if m.SourceContext != nil {
- dAtA[i] = 0x22
- i++
- i = encodeVarintType(dAtA, i, uint64(m.SourceContext.Size()))
- n2, err := m.SourceContext.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ if len(m.Enumvalue) > 0 {
+ for iNdEx := len(m.Enumvalue) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Enumvalue[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x12
}
- i += n2
}
- if m.Syntax != 0 {
- dAtA[i] = 0x28
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Syntax))
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *EnumValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1646,43 +1679,52 @@ func (m *EnumValue) Marshal() (dAtA []byte, err error) {
}
func (m *EnumValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *EnumValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
- }
- if m.Number != 0 {
- dAtA[i] = 0x10
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Number))
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if len(m.Options) > 0 {
- for _, msg := range m.Options {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintType(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
- i += n
+ i--
+ dAtA[i] = 0x1a
}
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if m.Number != 0 {
+ i = encodeVarintType(dAtA, i, uint64(m.Number))
+ i--
+ dAtA[i] = 0x10
}
- return i, nil
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
+ }
+ return len(dAtA) - i, nil
}
func (m *Option) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1690,45 +1732,56 @@ func (m *Option) Marshal() (dAtA []byte, err error) {
}
func (m *Option) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Option) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.Name) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
- i += copy(dAtA[i:], m.Name)
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Value != nil {
- dAtA[i] = 0x12
- i++
- i = encodeVarintType(dAtA, i, uint64(m.Value.Size()))
- n3, err := m.Value.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
+ {
+ size, err := m.Value.MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintType(dAtA, i, uint64(size))
}
- i += n3
+ i--
+ dAtA[i] = 0x12
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ if len(m.Name) > 0 {
+ i -= len(m.Name)
+ copy(dAtA[i:], m.Name)
+ i = encodeVarintType(dAtA, i, uint64(len(m.Name)))
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintType(dAtA []byte, offset int, v uint64) int {
+ offset -= sovType(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedType(r randyType, easy bool) *Type {
this := &Type{}
this.Name = string(randStringType(r))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v1 := r.Intn(5)
this.Fields = make([]*Field, v1)
for i := 0; i < v1; i++ {
@@ -1740,14 +1793,14 @@ func NewPopulatedType(r randyType, easy bool) *Type {
for i := 0; i < v2; i++ {
this.Oneofs[i] = string(randStringType(r))
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v3 := r.Intn(5)
this.Options = make([]*Option, v3)
for i := 0; i < v3; i++ {
this.Options[i] = NewPopulatedOption(r, easy)
}
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
this.SourceContext = NewPopulatedSourceContext(r, easy)
}
this.Syntax = Syntax([]int32{0, 1}[r.Intn(2)])
@@ -1772,7 +1825,7 @@ func NewPopulatedField(r randyType, easy bool) *Field {
this.OneofIndex *= -1
}
this.Packed = bool(bool(r.Intn(2) == 0))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v4 := r.Intn(5)
this.Options = make([]*Option, v4)
for i := 0; i < v4; i++ {
@@ -1790,21 +1843,21 @@ func NewPopulatedField(r randyType, easy bool) *Field {
func NewPopulatedEnum(r randyType, easy bool) *Enum {
this := &Enum{}
this.Name = string(randStringType(r))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v5 := r.Intn(5)
this.Enumvalue = make([]*EnumValue, v5)
for i := 0; i < v5; i++ {
this.Enumvalue[i] = NewPopulatedEnumValue(r, easy)
}
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v6 := r.Intn(5)
this.Options = make([]*Option, v6)
for i := 0; i < v6; i++ {
this.Options[i] = NewPopulatedOption(r, easy)
}
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
this.SourceContext = NewPopulatedSourceContext(r, easy)
}
this.Syntax = Syntax([]int32{0, 1}[r.Intn(2)])
@@ -1821,7 +1874,7 @@ func NewPopulatedEnumValue(r randyType, easy bool) *EnumValue {
if r.Intn(2) == 0 {
this.Number *= -1
}
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
v7 := r.Intn(5)
this.Options = make([]*Option, v7)
for i := 0; i < v7; i++ {
@@ -1837,7 +1890,7 @@ func NewPopulatedEnumValue(r randyType, easy bool) *EnumValue {
func NewPopulatedOption(r randyType, easy bool) *Option {
this := &Option{}
this.Name = string(randStringType(r))
- if r.Intn(10) != 0 {
+ if r.Intn(5) != 0 {
this.Value = NewPopulatedAny(r, easy)
}
if !easy && r.Intn(10) != 0 {
@@ -2089,14 +2142,7 @@ func (m *Option) Size() (n int) {
}
func sovType(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozType(x uint64) (n int) {
return sovType(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -2105,11 +2151,21 @@ func (this *Type) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForFields := "[]*Field{"
+ for _, f := range this.Fields {
+ repeatedStringForFields += strings.Replace(f.String(), "Field", "Field", 1) + ","
+ }
+ repeatedStringForFields += "}"
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(f.String(), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
s := strings.Join([]string{`&Type{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
- `Fields:` + strings.Replace(fmt.Sprintf("%v", this.Fields), "Field", "Field", 1) + `,`,
+ `Fields:` + repeatedStringForFields + `,`,
`Oneofs:` + fmt.Sprintf("%v", this.Oneofs) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`SourceContext:` + strings.Replace(fmt.Sprintf("%v", this.SourceContext), "SourceContext", "SourceContext", 1) + `,`,
`Syntax:` + fmt.Sprintf("%v", this.Syntax) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
@@ -2121,6 +2177,11 @@ func (this *Field) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(f.String(), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
s := strings.Join([]string{`&Field{`,
`Kind:` + fmt.Sprintf("%v", this.Kind) + `,`,
`Cardinality:` + fmt.Sprintf("%v", this.Cardinality) + `,`,
@@ -2129,7 +2190,7 @@ func (this *Field) String() string {
`TypeUrl:` + fmt.Sprintf("%v", this.TypeUrl) + `,`,
`OneofIndex:` + fmt.Sprintf("%v", this.OneofIndex) + `,`,
`Packed:` + fmt.Sprintf("%v", this.Packed) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`JsonName:` + fmt.Sprintf("%v", this.JsonName) + `,`,
`DefaultValue:` + fmt.Sprintf("%v", this.DefaultValue) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
@@ -2141,10 +2202,20 @@ func (this *Enum) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForEnumvalue := "[]*EnumValue{"
+ for _, f := range this.Enumvalue {
+ repeatedStringForEnumvalue += strings.Replace(f.String(), "EnumValue", "EnumValue", 1) + ","
+ }
+ repeatedStringForEnumvalue += "}"
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(f.String(), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
s := strings.Join([]string{`&Enum{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
- `Enumvalue:` + strings.Replace(fmt.Sprintf("%v", this.Enumvalue), "EnumValue", "EnumValue", 1) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Enumvalue:` + repeatedStringForEnumvalue + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`SourceContext:` + strings.Replace(fmt.Sprintf("%v", this.SourceContext), "SourceContext", "SourceContext", 1) + `,`,
`Syntax:` + fmt.Sprintf("%v", this.Syntax) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
@@ -2156,10 +2227,15 @@ func (this *EnumValue) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForOptions := "[]*Option{"
+ for _, f := range this.Options {
+ repeatedStringForOptions += strings.Replace(f.String(), "Option", "Option", 1) + ","
+ }
+ repeatedStringForOptions += "}"
s := strings.Join([]string{`&EnumValue{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Number:` + fmt.Sprintf("%v", this.Number) + `,`,
- `Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Option", "Option", 1) + `,`,
+ `Options:` + repeatedStringForOptions + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@@ -3211,6 +3287,7 @@ func (m *Option) Unmarshal(dAtA []byte) error {
func skipType(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -3242,10 +3319,8 @@ func skipType(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -3266,55 +3341,30 @@ func skipType(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthType
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthType
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowType
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipType(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthType
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupType
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthType
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthType = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowType = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthType = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowType = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupType = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/github.com/gogo/protobuf/types/wrappers.pb.go b/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
index 5ade933ef..8f1edb57d 100644
--- a/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
+++ b/vendor/github.com/gogo/protobuf/types/wrappers.pb.go
@@ -10,6 +10,7 @@ import (
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
reflect "reflect"
strings "strings"
)
@@ -23,7 +24,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// Wrapper message for `double`.
//
@@ -50,7 +51,7 @@ func (m *DoubleValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return xxx_messageInfo_DoubleValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -105,7 +106,7 @@ func (m *FloatValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_FloatValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -160,7 +161,7 @@ func (m *Int64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Int64Value.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -215,7 +216,7 @@ func (m *UInt64Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return xxx_messageInfo_UInt64Value.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -270,7 +271,7 @@ func (m *Int32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Int32Value.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -325,7 +326,7 @@ func (m *UInt32Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return xxx_messageInfo_UInt32Value.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -380,7 +381,7 @@ func (m *BoolValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_BoolValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -435,7 +436,7 @@ func (m *StringValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
return xxx_messageInfo_StringValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -490,7 +491,7 @@ func (m *BytesValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_BytesValue.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
- n, err := m.MarshalTo(b)
+ n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
@@ -1247,7 +1248,7 @@ func valueToGoStringWrappers(v interface{}, typ string) string {
func (m *DoubleValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1255,26 +1256,32 @@ func (m *DoubleValue) Marshal() (dAtA []byte, err error) {
}
func (m *DoubleValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *DoubleValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0x9
- i++
+ i -= 8
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value))))
- i += 8
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0x9
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *FloatValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1282,26 +1289,32 @@ func (m *FloatValue) Marshal() (dAtA []byte, err error) {
}
func (m *FloatValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *FloatValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0xd
- i++
+ i -= 4
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Value))))
- i += 4
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0xd
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Int64Value) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1309,25 +1322,31 @@ func (m *Int64Value) Marshal() (dAtA []byte, err error) {
}
func (m *Int64Value) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Int64Value) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0x8
- i++
i = encodeVarintWrappers(dAtA, i, uint64(m.Value))
+ i--
+ dAtA[i] = 0x8
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *UInt64Value) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1335,25 +1354,31 @@ func (m *UInt64Value) Marshal() (dAtA []byte, err error) {
}
func (m *UInt64Value) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *UInt64Value) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0x8
- i++
i = encodeVarintWrappers(dAtA, i, uint64(m.Value))
+ i--
+ dAtA[i] = 0x8
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *Int32Value) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1361,25 +1386,31 @@ func (m *Int32Value) Marshal() (dAtA []byte, err error) {
}
func (m *Int32Value) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Int32Value) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0x8
- i++
i = encodeVarintWrappers(dAtA, i, uint64(m.Value))
+ i--
+ dAtA[i] = 0x8
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *UInt32Value) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1387,25 +1418,31 @@ func (m *UInt32Value) Marshal() (dAtA []byte, err error) {
}
func (m *UInt32Value) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *UInt32Value) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value != 0 {
- dAtA[i] = 0x8
- i++
i = encodeVarintWrappers(dAtA, i, uint64(m.Value))
+ i--
+ dAtA[i] = 0x8
}
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
- }
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *BoolValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1413,30 +1450,36 @@ func (m *BoolValue) Marshal() (dAtA []byte, err error) {
}
func (m *BoolValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *BoolValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if m.Value {
- dAtA[i] = 0x8
- i++
+ i--
if m.Value {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
- i++
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0x8
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *StringValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1444,26 +1487,33 @@ func (m *StringValue) Marshal() (dAtA []byte, err error) {
}
func (m *StringValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *StringValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.Value) > 0 {
- dAtA[i] = 0xa
- i++
+ i -= len(m.Value)
+ copy(dAtA[i:], m.Value)
i = encodeVarintWrappers(dAtA, i, uint64(len(m.Value)))
- i += copy(dAtA[i:], m.Value)
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func (m *BytesValue) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
@@ -1471,30 +1521,39 @@ func (m *BytesValue) Marshal() (dAtA []byte, err error) {
}
func (m *BytesValue) MarshalTo(dAtA []byte) (int, error) {
- var i int
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *BytesValue) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
_ = i
var l int
_ = l
+ if m.XXX_unrecognized != nil {
+ i -= len(m.XXX_unrecognized)
+ copy(dAtA[i:], m.XXX_unrecognized)
+ }
if len(m.Value) > 0 {
- dAtA[i] = 0xa
- i++
+ i -= len(m.Value)
+ copy(dAtA[i:], m.Value)
i = encodeVarintWrappers(dAtA, i, uint64(len(m.Value)))
- i += copy(dAtA[i:], m.Value)
- }
- if m.XXX_unrecognized != nil {
- i += copy(dAtA[i:], m.XXX_unrecognized)
+ i--
+ dAtA[i] = 0xa
}
- return i, nil
+ return len(dAtA) - i, nil
}
func encodeVarintWrappers(dAtA []byte, offset int, v uint64) int {
+ offset -= sovWrappers(v)
+ base := offset
for v >= 1<<7 {
dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
dAtA[offset] = uint8(v)
- return offset + 1
+ return base
}
func NewPopulatedDoubleValue(r randyWrappers, easy bool) *DoubleValue {
this := &DoubleValue{}
@@ -1803,14 +1862,7 @@ func (m *BytesValue) Size() (n int) {
}
func sovWrappers(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozWrappers(x uint64) (n int) {
return sovWrappers(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -2595,6 +2647,7 @@ func (m *BytesValue) Unmarshal(dAtA []byte) error {
func skipWrappers(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -2626,10 +2679,8 @@ func skipWrappers(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -2650,55 +2701,30 @@ func skipWrappers(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthWrappers
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthWrappers
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowWrappers
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipWrappers(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthWrappers
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupWrappers
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthWrappers
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthWrappers = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowWrappers = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthWrappers = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowWrappers = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupWrappers = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/k8s.io/cri-api/go.mod b/vendor/k8s.io/cri-api/go.mod
index 6f1eff44b..dc203aff0 100644
--- a/vendor/k8s.io/cri-api/go.mod
+++ b/vendor/k8s.io/cri-api/go.mod
@@ -2,21 +2,20 @@
module k8s.io/cri-api
-go 1.12
+go 1.13
require (
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
- github.com/golang/protobuf v1.3.2 // indirect
+ github.com/gogo/protobuf v1.3.1
+ github.com/google/go-cmp v0.3.0 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/stretchr/testify v1.4.0
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 // indirect
golang.org/x/text v0.3.2 // indirect
- google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect
- google.golang.org/grpc v1.23.1
+ google.golang.org/grpc v1.26.0
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
- gopkg.in/yaml.v2 v2.2.4 // indirect
+ gopkg.in/yaml.v2 v2.2.7 // indirect
)
replace (
diff --git a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go
index 2d3e1f7b0..0350fb6e6 100644
--- a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go
+++ b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go
@@ -44,7 +44,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Protocol int32
@@ -2215,9 +2215,11 @@ type LinuxContainerResources struct {
// CpusetCpus constrains the allowed set of logical CPUs. Default: "" (not specified).
CpusetCpus string `protobuf:"bytes,6,opt,name=cpuset_cpus,json=cpusetCpus,proto3" json:"cpuset_cpus,omitempty"`
// CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified).
- CpusetMems string `protobuf:"bytes,7,opt,name=cpuset_mems,json=cpusetMems,proto3" json:"cpuset_mems,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ CpusetMems string `protobuf:"bytes,7,opt,name=cpuset_mems,json=cpusetMems,proto3" json:"cpuset_mems,omitempty"`
+ // List of HugepageLimits to limit the HugeTLB usage of container per page size. Default: nil (not specified).
+ HugepageLimits []*HugepageLimit `protobuf:"bytes,8,rep,name=hugepage_limits,json=hugepageLimits,proto3" json:"hugepage_limits,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *LinuxContainerResources) Reset() { *m = LinuxContainerResources{} }
@@ -2301,6 +2303,72 @@ func (m *LinuxContainerResources) GetCpusetMems() string {
return ""
}
+func (m *LinuxContainerResources) GetHugepageLimits() []*HugepageLimit {
+ if m != nil {
+ return m.HugepageLimits
+ }
+ return nil
+}
+
+// HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup.
+// For example, `PageSize=1GB`, `Limit=1073741824` means setting `1073741824` bytes to hugetlb.1GB.limit_in_bytes.
+type HugepageLimit struct {
+ // The value of PageSize has the format B (2MB, 1GB),
+ // and must match the of the corresponding control file found in `hugetlb..limit_in_bytes`.
+ // The values of are intended to be parsed using base 1024("1KB" = 1024, "1MB" = 1048576, etc).
+ PageSize string `protobuf:"bytes,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+ // limit in bytes of hugepagesize HugeTLB usage.
+ Limit uint64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *HugepageLimit) Reset() { *m = HugepageLimit{} }
+func (*HugepageLimit) ProtoMessage() {}
+func (*HugepageLimit) Descriptor() ([]byte, []int) {
+ return fileDescriptor_00212fb1f9d3bf1c, []int{32}
+}
+func (m *HugepageLimit) XXX_Unmarshal(b []byte) error {
+ return m.Unmarshal(b)
+}
+func (m *HugepageLimit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ if deterministic {
+ return xxx_messageInfo_HugepageLimit.Marshal(b, m, deterministic)
+ } else {
+ b = b[:cap(b)]
+ n, err := m.MarshalToSizedBuffer(b)
+ if err != nil {
+ return nil, err
+ }
+ return b[:n], nil
+ }
+}
+func (m *HugepageLimit) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_HugepageLimit.Merge(m, src)
+}
+func (m *HugepageLimit) XXX_Size() int {
+ return m.Size()
+}
+func (m *HugepageLimit) XXX_DiscardUnknown() {
+ xxx_messageInfo_HugepageLimit.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HugepageLimit proto.InternalMessageInfo
+
+func (m *HugepageLimit) GetPageSize() string {
+ if m != nil {
+ return m.PageSize
+ }
+ return ""
+}
+
+func (m *HugepageLimit) GetLimit() uint64 {
+ if m != nil {
+ return m.Limit
+ }
+ return 0
+}
+
// SELinuxOption are the labels to be applied to the container.
type SELinuxOption struct {
User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
@@ -2314,7 +2382,7 @@ type SELinuxOption struct {
func (m *SELinuxOption) Reset() { *m = SELinuxOption{} }
func (*SELinuxOption) ProtoMessage() {}
func (*SELinuxOption) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{32}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{33}
}
func (m *SELinuxOption) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2384,7 +2452,7 @@ type Capability struct {
func (m *Capability) Reset() { *m = Capability{} }
func (*Capability) ProtoMessage() {}
func (*Capability) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{33}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{34}
}
func (m *Capability) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2500,7 +2568,7 @@ type LinuxContainerSecurityContext struct {
func (m *LinuxContainerSecurityContext) Reset() { *m = LinuxContainerSecurityContext{} }
func (*LinuxContainerSecurityContext) ProtoMessage() {}
func (*LinuxContainerSecurityContext) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{34}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{35}
}
func (m *LinuxContainerSecurityContext) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2641,7 +2709,7 @@ type LinuxContainerConfig struct {
func (m *LinuxContainerConfig) Reset() { *m = LinuxContainerConfig{} }
func (*LinuxContainerConfig) ProtoMessage() {}
func (*LinuxContainerConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{35}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{36}
}
func (m *LinuxContainerConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2699,7 +2767,7 @@ type WindowsContainerSecurityContext struct {
func (m *WindowsContainerSecurityContext) Reset() { *m = WindowsContainerSecurityContext{} }
func (*WindowsContainerSecurityContext) ProtoMessage() {}
func (*WindowsContainerSecurityContext) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{36}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{37}
}
func (m *WindowsContainerSecurityContext) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2756,7 +2824,7 @@ type WindowsContainerConfig struct {
func (m *WindowsContainerConfig) Reset() { *m = WindowsContainerConfig{} }
func (*WindowsContainerConfig) ProtoMessage() {}
func (*WindowsContainerConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{37}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{38}
}
func (m *WindowsContainerConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2817,7 +2885,7 @@ type WindowsContainerResources struct {
func (m *WindowsContainerResources) Reset() { *m = WindowsContainerResources{} }
func (*WindowsContainerResources) ProtoMessage() {}
func (*WindowsContainerResources) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{38}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{39}
}
func (m *WindowsContainerResources) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2891,7 +2959,7 @@ type ContainerMetadata struct {
func (m *ContainerMetadata) Reset() { *m = ContainerMetadata{} }
func (*ContainerMetadata) ProtoMessage() {}
func (*ContainerMetadata) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{39}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{40}
}
func (m *ContainerMetadata) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2952,7 +3020,7 @@ type Device struct {
func (m *Device) Reset() { *m = Device{} }
func (*Device) ProtoMessage() {}
func (*Device) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{40}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{41}
}
func (m *Device) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3071,7 +3139,7 @@ type ContainerConfig struct {
func (m *ContainerConfig) Reset() { *m = ContainerConfig{} }
func (*ContainerConfig) ProtoMessage() {}
func (*ContainerConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{41}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{42}
}
func (m *ContainerConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3229,7 +3297,7 @@ type CreateContainerRequest struct {
func (m *CreateContainerRequest) Reset() { *m = CreateContainerRequest{} }
func (*CreateContainerRequest) ProtoMessage() {}
func (*CreateContainerRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{42}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{43}
}
func (m *CreateContainerRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3289,7 +3357,7 @@ type CreateContainerResponse struct {
func (m *CreateContainerResponse) Reset() { *m = CreateContainerResponse{} }
func (*CreateContainerResponse) ProtoMessage() {}
func (*CreateContainerResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{43}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{44}
}
func (m *CreateContainerResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3335,7 +3403,7 @@ type StartContainerRequest struct {
func (m *StartContainerRequest) Reset() { *m = StartContainerRequest{} }
func (*StartContainerRequest) ProtoMessage() {}
func (*StartContainerRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{44}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{45}
}
func (m *StartContainerRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3379,7 +3447,7 @@ type StartContainerResponse struct {
func (m *StartContainerResponse) Reset() { *m = StartContainerResponse{} }
func (*StartContainerResponse) ProtoMessage() {}
func (*StartContainerResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{45}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{46}
}
func (m *StartContainerResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3421,7 +3489,7 @@ type StopContainerRequest struct {
func (m *StopContainerRequest) Reset() { *m = StopContainerRequest{} }
func (*StopContainerRequest) ProtoMessage() {}
func (*StopContainerRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{46}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{47}
}
func (m *StopContainerRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3472,7 +3540,7 @@ type StopContainerResponse struct {
func (m *StopContainerResponse) Reset() { *m = StopContainerResponse{} }
func (*StopContainerResponse) ProtoMessage() {}
func (*StopContainerResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{47}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{48}
}
func (m *StopContainerResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3511,7 +3579,7 @@ type RemoveContainerRequest struct {
func (m *RemoveContainerRequest) Reset() { *m = RemoveContainerRequest{} }
func (*RemoveContainerRequest) ProtoMessage() {}
func (*RemoveContainerRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{48}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{49}
}
func (m *RemoveContainerRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3555,7 +3623,7 @@ type RemoveContainerResponse struct {
func (m *RemoveContainerResponse) Reset() { *m = RemoveContainerResponse{} }
func (*RemoveContainerResponse) ProtoMessage() {}
func (*RemoveContainerResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{49}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{50}
}
func (m *RemoveContainerResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3595,7 +3663,7 @@ type ContainerStateValue struct {
func (m *ContainerStateValue) Reset() { *m = ContainerStateValue{} }
func (*ContainerStateValue) ProtoMessage() {}
func (*ContainerStateValue) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{50}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{51}
}
func (m *ContainerStateValue) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3651,7 +3719,7 @@ type ContainerFilter struct {
func (m *ContainerFilter) Reset() { *m = ContainerFilter{} }
func (*ContainerFilter) ProtoMessage() {}
func (*ContainerFilter) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{51}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{52}
}
func (m *ContainerFilter) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3717,7 +3785,7 @@ type ListContainersRequest struct {
func (m *ListContainersRequest) Reset() { *m = ListContainersRequest{} }
func (*ListContainersRequest) ProtoMessage() {}
func (*ListContainersRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{52}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{53}
}
func (m *ListContainersRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3786,7 +3854,7 @@ type Container struct {
func (m *Container) Reset() { *m = Container{} }
func (*Container) ProtoMessage() {}
func (*Container) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{53}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{54}
}
func (m *Container) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3888,7 +3956,7 @@ type ListContainersResponse struct {
func (m *ListContainersResponse) Reset() { *m = ListContainersResponse{} }
func (*ListContainersResponse) ProtoMessage() {}
func (*ListContainersResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{54}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{55}
}
func (m *ListContainersResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -3936,7 +4004,7 @@ type ContainerStatusRequest struct {
func (m *ContainerStatusRequest) Reset() { *m = ContainerStatusRequest{} }
func (*ContainerStatusRequest) ProtoMessage() {}
func (*ContainerStatusRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{55}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{56}
}
func (m *ContainerStatusRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4023,7 +4091,7 @@ type ContainerStatus struct {
func (m *ContainerStatus) Reset() { *m = ContainerStatus{} }
func (*ContainerStatus) ProtoMessage() {}
func (*ContainerStatus) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{56}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{57}
}
func (m *ContainerStatus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4172,7 +4240,7 @@ type ContainerStatusResponse struct {
func (m *ContainerStatusResponse) Reset() { *m = ContainerStatusResponse{} }
func (*ContainerStatusResponse) ProtoMessage() {}
func (*ContainerStatusResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{57}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{58}
}
func (m *ContainerStatusResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4227,7 +4295,7 @@ type UpdateContainerResourcesRequest struct {
func (m *UpdateContainerResourcesRequest) Reset() { *m = UpdateContainerResourcesRequest{} }
func (*UpdateContainerResourcesRequest) ProtoMessage() {}
func (*UpdateContainerResourcesRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{58}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{59}
}
func (m *UpdateContainerResourcesRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4278,7 +4346,7 @@ type UpdateContainerResourcesResponse struct {
func (m *UpdateContainerResourcesResponse) Reset() { *m = UpdateContainerResourcesResponse{} }
func (*UpdateContainerResourcesResponse) ProtoMessage() {}
func (*UpdateContainerResourcesResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{59}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{60}
}
func (m *UpdateContainerResourcesResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4321,7 +4389,7 @@ type ExecSyncRequest struct {
func (m *ExecSyncRequest) Reset() { *m = ExecSyncRequest{} }
func (*ExecSyncRequest) ProtoMessage() {}
func (*ExecSyncRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{60}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{61}
}
func (m *ExecSyncRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4385,7 +4453,7 @@ type ExecSyncResponse struct {
func (m *ExecSyncResponse) Reset() { *m = ExecSyncResponse{} }
func (*ExecSyncResponse) ProtoMessage() {}
func (*ExecSyncResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{61}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{62}
}
func (m *ExecSyncResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4461,7 +4529,7 @@ type ExecRequest struct {
func (m *ExecRequest) Reset() { *m = ExecRequest{} }
func (*ExecRequest) ProtoMessage() {}
func (*ExecRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{62}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{63}
}
func (m *ExecRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4542,7 +4610,7 @@ type ExecResponse struct {
func (m *ExecResponse) Reset() { *m = ExecResponse{} }
func (*ExecResponse) ProtoMessage() {}
func (*ExecResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{63}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{64}
}
func (m *ExecResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4603,7 +4671,7 @@ type AttachRequest struct {
func (m *AttachRequest) Reset() { *m = AttachRequest{} }
func (*AttachRequest) ProtoMessage() {}
func (*AttachRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{64}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{65}
}
func (m *AttachRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4677,7 +4745,7 @@ type AttachResponse struct {
func (m *AttachResponse) Reset() { *m = AttachResponse{} }
func (*AttachResponse) ProtoMessage() {}
func (*AttachResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{65}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{66}
}
func (m *AttachResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4725,7 +4793,7 @@ type PortForwardRequest struct {
func (m *PortForwardRequest) Reset() { *m = PortForwardRequest{} }
func (*PortForwardRequest) ProtoMessage() {}
func (*PortForwardRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{66}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{67}
}
func (m *PortForwardRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4778,7 +4846,7 @@ type PortForwardResponse struct {
func (m *PortForwardResponse) Reset() { *m = PortForwardResponse{} }
func (*PortForwardResponse) ProtoMessage() {}
func (*PortForwardResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{67}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{68}
}
func (m *PortForwardResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4824,7 +4892,7 @@ type ImageFilter struct {
func (m *ImageFilter) Reset() { *m = ImageFilter{} }
func (*ImageFilter) ProtoMessage() {}
func (*ImageFilter) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{68}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{69}
}
func (m *ImageFilter) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4870,7 +4938,7 @@ type ListImagesRequest struct {
func (m *ListImagesRequest) Reset() { *m = ListImagesRequest{} }
func (*ListImagesRequest) ProtoMessage() {}
func (*ListImagesRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{69}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{70}
}
func (m *ListImagesRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -4930,7 +4998,7 @@ type Image struct {
func (m *Image) Reset() { *m = Image{} }
func (*Image) ProtoMessage() {}
func (*Image) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{70}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{71}
}
func (m *Image) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5011,7 +5079,7 @@ type ListImagesResponse struct {
func (m *ListImagesResponse) Reset() { *m = ListImagesResponse{} }
func (*ListImagesResponse) ProtoMessage() {}
func (*ListImagesResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{71}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{72}
}
func (m *ListImagesResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5059,7 +5127,7 @@ type ImageStatusRequest struct {
func (m *ImageStatusRequest) Reset() { *m = ImageStatusRequest{} }
func (*ImageStatusRequest) ProtoMessage() {}
func (*ImageStatusRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{72}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{73}
}
func (m *ImageStatusRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5117,7 +5185,7 @@ type ImageStatusResponse struct {
func (m *ImageStatusResponse) Reset() { *m = ImageStatusResponse{} }
func (*ImageStatusResponse) ProtoMessage() {}
func (*ImageStatusResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{73}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{74}
}
func (m *ImageStatusResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5178,7 +5246,7 @@ type AuthConfig struct {
func (m *AuthConfig) Reset() { *m = AuthConfig{} }
func (*AuthConfig) ProtoMessage() {}
func (*AuthConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{74}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{75}
}
func (m *AuthConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5263,7 +5331,7 @@ type PullImageRequest struct {
func (m *PullImageRequest) Reset() { *m = PullImageRequest{} }
func (*PullImageRequest) ProtoMessage() {}
func (*PullImageRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{75}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{76}
}
func (m *PullImageRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5324,7 +5392,7 @@ type PullImageResponse struct {
func (m *PullImageResponse) Reset() { *m = PullImageResponse{} }
func (*PullImageResponse) ProtoMessage() {}
func (*PullImageResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{76}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{77}
}
func (m *PullImageResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5370,7 +5438,7 @@ type RemoveImageRequest struct {
func (m *RemoveImageRequest) Reset() { *m = RemoveImageRequest{} }
func (*RemoveImageRequest) ProtoMessage() {}
func (*RemoveImageRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{77}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{78}
}
func (m *RemoveImageRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5414,7 +5482,7 @@ type RemoveImageResponse struct {
func (m *RemoveImageResponse) Reset() { *m = RemoveImageResponse{} }
func (*RemoveImageResponse) ProtoMessage() {}
func (*RemoveImageResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{78}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{79}
}
func (m *RemoveImageResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5454,7 +5522,7 @@ type NetworkConfig struct {
func (m *NetworkConfig) Reset() { *m = NetworkConfig{} }
func (*NetworkConfig) ProtoMessage() {}
func (*NetworkConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{79}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{80}
}
func (m *NetworkConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5499,7 +5567,7 @@ type RuntimeConfig struct {
func (m *RuntimeConfig) Reset() { *m = RuntimeConfig{} }
func (*RuntimeConfig) ProtoMessage() {}
func (*RuntimeConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{80}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{81}
}
func (m *RuntimeConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5544,7 +5612,7 @@ type UpdateRuntimeConfigRequest struct {
func (m *UpdateRuntimeConfigRequest) Reset() { *m = UpdateRuntimeConfigRequest{} }
func (*UpdateRuntimeConfigRequest) ProtoMessage() {}
func (*UpdateRuntimeConfigRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{81}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{82}
}
func (m *UpdateRuntimeConfigRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5588,7 +5656,7 @@ type UpdateRuntimeConfigResponse struct {
func (m *UpdateRuntimeConfigResponse) Reset() { *m = UpdateRuntimeConfigResponse{} }
func (*UpdateRuntimeConfigResponse) ProtoMessage() {}
func (*UpdateRuntimeConfigResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{82}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{83}
}
func (m *UpdateRuntimeConfigResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5646,7 +5714,7 @@ type RuntimeCondition struct {
func (m *RuntimeCondition) Reset() { *m = RuntimeCondition{} }
func (*RuntimeCondition) ProtoMessage() {}
func (*RuntimeCondition) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{83}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{84}
}
func (m *RuntimeCondition) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5714,7 +5782,7 @@ type RuntimeStatus struct {
func (m *RuntimeStatus) Reset() { *m = RuntimeStatus{} }
func (*RuntimeStatus) ProtoMessage() {}
func (*RuntimeStatus) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{84}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{85}
}
func (m *RuntimeStatus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5760,7 +5828,7 @@ type StatusRequest struct {
func (m *StatusRequest) Reset() { *m = StatusRequest{} }
func (*StatusRequest) ProtoMessage() {}
func (*StatusRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{85}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{86}
}
func (m *StatusRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5811,7 +5879,7 @@ type StatusResponse struct {
func (m *StatusResponse) Reset() { *m = StatusResponse{} }
func (*StatusResponse) ProtoMessage() {}
func (*StatusResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{86}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{87}
}
func (m *StatusResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5862,7 +5930,7 @@ type ImageFsInfoRequest struct {
func (m *ImageFsInfoRequest) Reset() { *m = ImageFsInfoRequest{} }
func (*ImageFsInfoRequest) ProtoMessage() {}
func (*ImageFsInfoRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{87}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{88}
}
func (m *ImageFsInfoRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5902,7 +5970,7 @@ type UInt64Value struct {
func (m *UInt64Value) Reset() { *m = UInt64Value{} }
func (*UInt64Value) ProtoMessage() {}
func (*UInt64Value) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{88}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{89}
}
func (m *UInt64Value) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -5949,7 +6017,7 @@ type FilesystemIdentifier struct {
func (m *FilesystemIdentifier) Reset() { *m = FilesystemIdentifier{} }
func (*FilesystemIdentifier) ProtoMessage() {}
func (*FilesystemIdentifier) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{89}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{90}
}
func (m *FilesystemIdentifier) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6006,7 +6074,7 @@ type FilesystemUsage struct {
func (m *FilesystemUsage) Reset() { *m = FilesystemUsage{} }
func (*FilesystemUsage) ProtoMessage() {}
func (*FilesystemUsage) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{90}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{91}
}
func (m *FilesystemUsage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6073,7 +6141,7 @@ type ImageFsInfoResponse struct {
func (m *ImageFsInfoResponse) Reset() { *m = ImageFsInfoResponse{} }
func (*ImageFsInfoResponse) ProtoMessage() {}
func (*ImageFsInfoResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{91}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{92}
}
func (m *ImageFsInfoResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6119,7 +6187,7 @@ type ContainerStatsRequest struct {
func (m *ContainerStatsRequest) Reset() { *m = ContainerStatsRequest{} }
func (*ContainerStatsRequest) ProtoMessage() {}
func (*ContainerStatsRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{92}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{93}
}
func (m *ContainerStatsRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6165,7 +6233,7 @@ type ContainerStatsResponse struct {
func (m *ContainerStatsResponse) Reset() { *m = ContainerStatsResponse{} }
func (*ContainerStatsResponse) ProtoMessage() {}
func (*ContainerStatsResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{93}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{94}
}
func (m *ContainerStatsResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6211,7 +6279,7 @@ type ListContainerStatsRequest struct {
func (m *ListContainerStatsRequest) Reset() { *m = ListContainerStatsRequest{} }
func (*ListContainerStatsRequest) ProtoMessage() {}
func (*ListContainerStatsRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{94}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{95}
}
func (m *ListContainerStatsRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6265,7 +6333,7 @@ type ContainerStatsFilter struct {
func (m *ContainerStatsFilter) Reset() { *m = ContainerStatsFilter{} }
func (*ContainerStatsFilter) ProtoMessage() {}
func (*ContainerStatsFilter) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{95}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{96}
}
func (m *ContainerStatsFilter) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6325,7 +6393,7 @@ type ListContainerStatsResponse struct {
func (m *ListContainerStatsResponse) Reset() { *m = ListContainerStatsResponse{} }
func (*ListContainerStatsResponse) ProtoMessage() {}
func (*ListContainerStatsResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{96}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{97}
}
func (m *ListContainerStatsResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6381,7 +6449,7 @@ type ContainerAttributes struct {
func (m *ContainerAttributes) Reset() { *m = ContainerAttributes{} }
func (*ContainerAttributes) ProtoMessage() {}
func (*ContainerAttributes) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{97}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{98}
}
func (m *ContainerAttributes) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6455,7 +6523,7 @@ type ContainerStats struct {
func (m *ContainerStats) Reset() { *m = ContainerStats{} }
func (*ContainerStats) ProtoMessage() {}
func (*ContainerStats) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{98}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{99}
}
func (m *ContainerStats) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6525,7 +6593,7 @@ type CpuUsage struct {
func (m *CpuUsage) Reset() { *m = CpuUsage{} }
func (*CpuUsage) ProtoMessage() {}
func (*CpuUsage) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{99}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{100}
}
func (m *CpuUsage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6581,7 +6649,7 @@ type MemoryUsage struct {
func (m *MemoryUsage) Reset() { *m = MemoryUsage{} }
func (*MemoryUsage) ProtoMessage() {}
func (*MemoryUsage) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{100}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{101}
}
func (m *MemoryUsage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6634,7 +6702,7 @@ type ReopenContainerLogRequest struct {
func (m *ReopenContainerLogRequest) Reset() { *m = ReopenContainerLogRequest{} }
func (*ReopenContainerLogRequest) ProtoMessage() {}
func (*ReopenContainerLogRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{101}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{102}
}
func (m *ReopenContainerLogRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6678,7 +6746,7 @@ type ReopenContainerLogResponse struct {
func (m *ReopenContainerLogResponse) Reset() { *m = ReopenContainerLogResponse{} }
func (*ReopenContainerLogResponse) ProtoMessage() {}
func (*ReopenContainerLogResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_00212fb1f9d3bf1c, []int{102}
+ return fileDescriptor_00212fb1f9d3bf1c, []int{103}
}
func (m *ReopenContainerLogResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -6754,6 +6822,7 @@ func init() {
proto.RegisterType((*ImageSpec)(nil), "runtime.v1alpha2.ImageSpec")
proto.RegisterType((*KeyValue)(nil), "runtime.v1alpha2.KeyValue")
proto.RegisterType((*LinuxContainerResources)(nil), "runtime.v1alpha2.LinuxContainerResources")
+ proto.RegisterType((*HugepageLimit)(nil), "runtime.v1alpha2.HugepageLimit")
proto.RegisterType((*SELinuxOption)(nil), "runtime.v1alpha2.SELinuxOption")
proto.RegisterType((*Capability)(nil), "runtime.v1alpha2.Capability")
proto.RegisterType((*LinuxContainerSecurityContext)(nil), "runtime.v1alpha2.LinuxContainerSecurityContext")
@@ -6843,306 +6912,309 @@ func init() {
func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) }
var fileDescriptor_00212fb1f9d3bf1c = []byte{
- // 4770 bytes of a gzipped FileDescriptorProto
+ // 4821 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xcd, 0x6f, 0x1b, 0x49,
- 0x76, 0x57, 0x93, 0xa2, 0x44, 0x3e, 0x8a, 0x14, 0x55, 0x96, 0x2d, 0x9a, 0x1e, 0x6b, 0xac, 0x9e,
- 0xf1, 0xe7, 0xcc, 0xc8, 0x63, 0xcd, 0xac, 0x27, 0xb6, 0x67, 0x6d, 0xd3, 0x92, 0x6c, 0x33, 0x6b,
- 0x53, 0x4c, 0x53, 0x9a, 0x8f, 0x9d, 0x01, 0x7a, 0x5b, 0xec, 0x12, 0xd5, 0x6b, 0xb2, 0xbb, 0xa7,
- 0xbb, 0x69, 0x5b, 0x09, 0x10, 0x2c, 0xb0, 0xc8, 0x1e, 0x02, 0x04, 0xc8, 0x39, 0xc7, 0xcd, 0x21,
- 0x87, 0xdc, 0x02, 0x04, 0x39, 0xe4, 0xb4, 0x41, 0x0e, 0x7b, 0x09, 0x90, 0xd3, 0x22, 0x41, 0x2e,
- 0x99, 0x49, 0x72, 0x09, 0x90, 0x20, 0x7f, 0x40, 0x0e, 0x41, 0x7d, 0xf5, 0x77, 0xf3, 0xc3, 0xe3,
- 0xdd, 0xd9, 0x9c, 0xd4, 0xf5, 0xfa, 0xbd, 0x57, 0xaf, 0x5f, 0xbd, 0x7a, 0xf5, 0xea, 0x57, 0x45,
- 0x41, 0x49, 0xb3, 0x8d, 0x4d, 0xdb, 0xb1, 0x3c, 0x0b, 0xd5, 0x9c, 0x91, 0xe9, 0x19, 0x43, 0xbc,
- 0xf9, 0xfc, 0x86, 0x36, 0xb0, 0x8f, 0xb5, 0xad, 0xc6, 0x7b, 0x7d, 0xc3, 0x3b, 0x1e, 0x1d, 0x6e,
- 0xf6, 0xac, 0xe1, 0xf5, 0xbe, 0xd5, 0xb7, 0xae, 0x53, 0xc6, 0xc3, 0xd1, 0x11, 0x6d, 0xd1, 0x06,
- 0x7d, 0x62, 0x0a, 0xe4, 0x6b, 0x50, 0xfd, 0x04, 0x3b, 0xae, 0x61, 0x99, 0x0a, 0xfe, 0x6a, 0x84,
- 0x5d, 0x0f, 0xd5, 0x61, 0xf1, 0x39, 0xa3, 0xd4, 0xa5, 0x0b, 0xd2, 0x95, 0x92, 0x22, 0x9a, 0xf2,
- 0x5f, 0x48, 0xb0, 0xec, 0x33, 0xbb, 0xb6, 0x65, 0xba, 0x38, 0x9b, 0x1b, 0x6d, 0xc0, 0x12, 0x37,
- 0x4e, 0x35, 0xb5, 0x21, 0xae, 0xe7, 0xe8, 0xeb, 0x32, 0xa7, 0xb5, 0xb5, 0x21, 0x46, 0x97, 0x61,
- 0x59, 0xb0, 0x08, 0x25, 0x79, 0xca, 0x55, 0xe5, 0x64, 0xde, 0x1b, 0xda, 0x84, 0x53, 0x82, 0x51,
- 0xb3, 0x0d, 0x9f, 0x79, 0x9e, 0x32, 0xaf, 0xf0, 0x57, 0x4d, 0xdb, 0xe0, 0xfc, 0xf2, 0x17, 0x50,
- 0xda, 0x69, 0x77, 0xb7, 0x2d, 0xf3, 0xc8, 0xe8, 0x13, 0x13, 0x5d, 0xec, 0x10, 0x99, 0xba, 0x74,
- 0x21, 0x4f, 0x4c, 0xe4, 0x4d, 0xd4, 0x80, 0xa2, 0x8b, 0x35, 0xa7, 0x77, 0x8c, 0xdd, 0x7a, 0x8e,
- 0xbe, 0xf2, 0xdb, 0x44, 0xca, 0xb2, 0x3d, 0xc3, 0x32, 0xdd, 0x7a, 0x9e, 0x49, 0xf1, 0xa6, 0xfc,
- 0x73, 0x09, 0xca, 0x1d, 0xcb, 0xf1, 0x9e, 0x6a, 0xb6, 0x6d, 0x98, 0x7d, 0x74, 0x13, 0x8a, 0xd4,
- 0x97, 0x3d, 0x6b, 0x40, 0x7d, 0x50, 0xdd, 0x6a, 0x6c, 0xc6, 0x87, 0x65, 0xb3, 0xc3, 0x39, 0x14,
- 0x9f, 0x17, 0x5d, 0x84, 0x6a, 0xcf, 0x32, 0x3d, 0xcd, 0x30, 0xb1, 0xa3, 0xda, 0x96, 0xe3, 0x51,
- 0x17, 0x15, 0x94, 0x8a, 0x4f, 0x25, 0xbd, 0xa0, 0x73, 0x50, 0x3a, 0xb6, 0x5c, 0x8f, 0x71, 0xe4,
- 0x29, 0x47, 0x91, 0x10, 0xe8, 0xcb, 0x35, 0x58, 0xa4, 0x2f, 0x0d, 0x9b, 0x3b, 0x63, 0x81, 0x34,
- 0x5b, 0xb6, 0xfc, 0x2b, 0x09, 0x0a, 0x4f, 0xad, 0x91, 0xe9, 0xc5, 0xba, 0xd1, 0xbc, 0x63, 0x3e,
- 0x50, 0xa1, 0x6e, 0x34, 0xef, 0x38, 0xe8, 0x86, 0x70, 0xb0, 0xb1, 0x62, 0xdd, 0x90, 0x97, 0x0d,
- 0x28, 0x3a, 0x58, 0xd3, 0x2d, 0x73, 0x70, 0x42, 0x4d, 0x28, 0x2a, 0x7e, 0x9b, 0x0c, 0xa2, 0x8b,
- 0x07, 0x86, 0x39, 0x7a, 0xa9, 0x3a, 0x78, 0xa0, 0x1d, 0xe2, 0x01, 0x35, 0xa5, 0xa8, 0x54, 0x39,
- 0x59, 0x61, 0x54, 0xb4, 0x03, 0x65, 0xdb, 0xb1, 0x6c, 0xad, 0xaf, 0x11, 0x3f, 0xd6, 0x0b, 0xd4,
- 0x55, 0x72, 0xd2, 0x55, 0xd4, 0xec, 0x4e, 0xc0, 0xa9, 0x84, 0xc5, 0xe4, 0xbf, 0x92, 0x60, 0x99,
- 0x04, 0x8f, 0x6b, 0x6b, 0x3d, 0xbc, 0x47, 0x87, 0x04, 0xdd, 0x82, 0x45, 0x13, 0x7b, 0x2f, 0x2c,
- 0xe7, 0x19, 0x1f, 0x80, 0x37, 0x93, 0x5a, 0x7d, 0x99, 0xa7, 0x96, 0x8e, 0x15, 0xc1, 0x8f, 0x6e,
- 0x40, 0xde, 0x36, 0x74, 0xfa, 0xc1, 0x53, 0x88, 0x11, 0x5e, 0x22, 0x62, 0xd8, 0x3d, 0xea, 0x87,
- 0x69, 0x44, 0x0c, 0xbb, 0x27, 0xcb, 0x00, 0x2d, 0xd3, 0xbb, 0xf9, 0xe1, 0x27, 0xda, 0x60, 0x84,
- 0xd1, 0x2a, 0x14, 0x9e, 0x93, 0x07, 0x6a, 0x6c, 0x5e, 0x61, 0x0d, 0xf9, 0xeb, 0x3c, 0x9c, 0x7b,
- 0x42, 0xfc, 0xd5, 0xd5, 0x4c, 0xfd, 0xd0, 0x7a, 0xd9, 0xc5, 0xbd, 0x91, 0x63, 0x78, 0x27, 0xdb,
- 0x96, 0xe9, 0xe1, 0x97, 0x1e, 0x6a, 0xc3, 0x8a, 0x29, 0x34, 0xab, 0x22, 0x34, 0x89, 0x86, 0xf2,
- 0xd6, 0xc6, 0x18, 0x23, 0x98, 0x8b, 0x94, 0x9a, 0x19, 0x25, 0xb8, 0xe8, 0x71, 0x30, 0x6e, 0x42,
- 0x5b, 0x8e, 0x6a, 0x4b, 0xf9, 0xa4, 0xee, 0x2e, 0xb5, 0x8c, 0xeb, 0x12, 0x03, 0x2b, 0x34, 0x7d,
- 0x0c, 0x64, 0x56, 0xab, 0x9a, 0xab, 0x8e, 0x5c, 0xec, 0x50, 0xc7, 0x94, 0xb7, 0xde, 0x48, 0x6a,
- 0x09, 0x5c, 0xa0, 0x94, 0x9c, 0x91, 0xd9, 0x74, 0x0f, 0x5c, 0xec, 0xa0, 0xbb, 0x34, 0x4f, 0x10,
- 0xe9, 0xbe, 0x63, 0x8d, 0xec, 0x7a, 0x71, 0x0a, 0x71, 0xa0, 0xe2, 0x8f, 0x08, 0x3f, 0x4d, 0x22,
- 0x3c, 0x16, 0x55, 0xc7, 0xb2, 0xbc, 0x23, 0x57, 0xc4, 0x9f, 0x20, 0x2b, 0x94, 0x8a, 0xae, 0xc3,
- 0x29, 0x77, 0x64, 0xdb, 0x03, 0x3c, 0xc4, 0xa6, 0xa7, 0x0d, 0x58, 0x77, 0x6e, 0xbd, 0x70, 0x21,
- 0x7f, 0x25, 0xaf, 0xa0, 0xf0, 0x2b, 0xaa, 0xd8, 0x45, 0xeb, 0x00, 0xb6, 0x63, 0x3c, 0x37, 0x06,
- 0xb8, 0x8f, 0xf5, 0xfa, 0x02, 0x55, 0x1a, 0xa2, 0xa0, 0xf7, 0x61, 0xd5, 0xc5, 0xbd, 0x9e, 0x35,
- 0xb4, 0x55, 0xdb, 0xb1, 0x8e, 0x8c, 0x01, 0x66, 0xb3, 0x67, 0x91, 0xce, 0x1e, 0xc4, 0xdf, 0x75,
- 0xd8, 0x2b, 0x32, 0x8f, 0xe4, 0x9f, 0xe7, 0xe0, 0x34, 0xf5, 0x64, 0xc7, 0xd2, 0xf9, 0x30, 0xf3,
- 0x24, 0xf5, 0x16, 0x54, 0x7a, 0xd4, 0x20, 0xd5, 0xd6, 0x1c, 0x6c, 0x7a, 0x7c, 0x92, 0x2e, 0x31,
- 0x62, 0x87, 0xd2, 0xd0, 0x67, 0x50, 0x73, 0x79, 0x54, 0xa8, 0x3d, 0x16, 0x16, 0x7c, 0xcc, 0xde,
- 0x4b, 0xba, 0x6b, 0x4c, 0x2c, 0x29, 0xcb, 0x6e, 0x22, 0xb8, 0x16, 0xdd, 0x13, 0xb7, 0xe7, 0x0d,
- 0x58, 0xb6, 0x2b, 0x6f, 0x7d, 0x98, 0xa1, 0x30, 0x6e, 0xf8, 0x66, 0x97, 0x89, 0xed, 0x9a, 0x9e,
- 0x73, 0xa2, 0x08, 0x25, 0x8d, 0xdb, 0xb0, 0x14, 0x7e, 0x81, 0x6a, 0x90, 0x7f, 0x86, 0x4f, 0xf8,
- 0x47, 0x91, 0xc7, 0x60, 0x12, 0xb0, 0x5c, 0xc3, 0x1a, 0xb7, 0x73, 0xbf, 0x23, 0xc9, 0x0e, 0xa0,
- 0xa0, 0x97, 0xa7, 0xd8, 0xd3, 0x74, 0xcd, 0xd3, 0x10, 0x82, 0x79, 0xba, 0x8c, 0x30, 0x15, 0xf4,
- 0x99, 0x68, 0x1d, 0xf1, 0xc9, 0x5b, 0x52, 0xc8, 0x23, 0x7a, 0x03, 0x4a, 0x7e, 0xa0, 0xf3, 0xb5,
- 0x24, 0x20, 0x90, 0x9c, 0xae, 0x79, 0x1e, 0x1e, 0xda, 0x1e, 0x0d, 0x91, 0x8a, 0x22, 0x9a, 0xf2,
- 0x7f, 0xcf, 0x43, 0x2d, 0x31, 0x26, 0xf7, 0xa1, 0x38, 0xe4, 0xdd, 0xf3, 0x89, 0xf6, 0x76, 0x4a,
- 0x62, 0x4f, 0x98, 0xaa, 0xf8, 0x52, 0x24, 0x6f, 0x92, 0x1c, 0x1a, 0x5a, 0xff, 0xfc, 0x36, 0x19,
- 0xf1, 0x81, 0xd5, 0x57, 0x75, 0xc3, 0xc1, 0x3d, 0xcf, 0x72, 0x4e, 0xb8, 0xb9, 0x4b, 0x03, 0xab,
- 0xbf, 0x23, 0x68, 0xe8, 0x36, 0x80, 0x6e, 0xba, 0x64, 0xb0, 0x8f, 0x8c, 0x3e, 0x35, 0xba, 0xbc,
- 0x75, 0x2e, 0x69, 0x84, 0xbf, 0xd8, 0x29, 0x25, 0xdd, 0x74, 0xb9, 0xf9, 0x0f, 0xa0, 0x42, 0xd6,
- 0x0c, 0x75, 0xc8, 0xd6, 0x29, 0x16, 0xe9, 0xe5, 0xad, 0xf3, 0x69, 0xdf, 0xe0, 0xaf, 0x66, 0xca,
- 0x92, 0x1d, 0x34, 0x5c, 0xf4, 0x10, 0x16, 0x68, 0xf2, 0x76, 0xeb, 0x0b, 0x54, 0x78, 0x73, 0x9c,
- 0x03, 0x78, 0x44, 0x3c, 0xa1, 0x02, 0x2c, 0x20, 0xb8, 0x34, 0x3a, 0x80, 0xb2, 0x66, 0x9a, 0x96,
- 0xa7, 0xb1, 0x44, 0xb3, 0x48, 0x95, 0x7d, 0x30, 0x85, 0xb2, 0x66, 0x20, 0xc5, 0x34, 0x86, 0xf5,
- 0xa0, 0xef, 0x43, 0x81, 0x66, 0x22, 0x9e, 0x34, 0x2e, 0x4f, 0x19, 0xb4, 0x0a, 0x93, 0x6a, 0xdc,
- 0x82, 0x72, 0xc8, 0xd8, 0x59, 0x82, 0xb4, 0x71, 0x17, 0x6a, 0x71, 0xd3, 0x66, 0x0a, 0xf2, 0x3f,
- 0x80, 0x55, 0x65, 0x64, 0x06, 0x86, 0x89, 0xea, 0xeb, 0x36, 0x2c, 0xf0, 0xc1, 0x66, 0x11, 0x27,
- 0x4f, 0xf6, 0x91, 0xc2, 0x25, 0xc2, 0xe5, 0xd4, 0xb1, 0x66, 0xea, 0x03, 0xec, 0xf0, 0x7e, 0x45,
- 0x39, 0xf5, 0x98, 0x51, 0xe5, 0xef, 0xc3, 0xe9, 0x58, 0xe7, 0xbc, 0x9a, 0x7b, 0x1b, 0xaa, 0xb6,
- 0xa5, 0xab, 0x2e, 0x23, 0xab, 0x86, 0x2e, 0xd2, 0x90, 0xed, 0xf3, 0xb6, 0x74, 0x22, 0xde, 0xf5,
- 0x2c, 0x3b, 0x69, 0xfc, 0x74, 0xe2, 0x75, 0x38, 0x13, 0x17, 0x67, 0xdd, 0xcb, 0xf7, 0x60, 0x4d,
- 0xc1, 0x43, 0xeb, 0x39, 0x7e, 0x55, 0xd5, 0x0d, 0xa8, 0x27, 0x15, 0x70, 0xe5, 0x9f, 0xc3, 0x5a,
- 0x40, 0xed, 0x7a, 0x9a, 0x37, 0x72, 0x67, 0x52, 0xce, 0x4b, 0xdd, 0x43, 0xcb, 0x65, 0xc3, 0x59,
- 0x54, 0x44, 0x53, 0x5e, 0x83, 0x42, 0xc7, 0xd2, 0x5b, 0x1d, 0x54, 0x85, 0x9c, 0x61, 0x73, 0xe1,
- 0x9c, 0x61, 0xcb, 0x46, 0xb8, 0xcf, 0x36, 0x2b, 0x39, 0x58, 0xd7, 0x71, 0x56, 0x74, 0x17, 0xaa,
- 0x9a, 0xae, 0x1b, 0x24, 0x9c, 0xb4, 0x81, 0x6a, 0xd8, 0xac, 0x22, 0x2d, 0x6f, 0xad, 0xa5, 0x06,
- 0x40, 0xab, 0xa3, 0x54, 0x02, 0xf6, 0x96, 0xed, 0xca, 0x8f, 0xa1, 0xe4, 0xaf, 0xf9, 0xe8, 0x4e,
- 0x50, 0xbc, 0xe6, 0xa6, 0xad, 0x10, 0xfc, 0xfa, 0x76, 0x3f, 0xb1, 0x46, 0x71, 0x93, 0xef, 0x00,
- 0xf8, 0xb9, 0x54, 0x94, 0x1e, 0xe7, 0xc6, 0x28, 0x56, 0x42, 0xec, 0xf2, 0x4f, 0x0b, 0xe1, 0x0c,
- 0x1b, 0x72, 0x82, 0xee, 0x3b, 0x41, 0x8f, 0x64, 0xdc, 0xdc, 0x2b, 0x65, 0xdc, 0x8f, 0xa0, 0xe0,
- 0x7a, 0x9a, 0x87, 0x79, 0x79, 0xb6, 0x31, 0x4e, 0x9c, 0x18, 0x81, 0x15, 0xc6, 0x8f, 0xce, 0x03,
- 0xf4, 0x1c, 0xac, 0x79, 0x58, 0x57, 0x35, 0xb6, 0x3c, 0xe4, 0x95, 0x12, 0xa7, 0x34, 0x3d, 0xb4,
- 0x1d, 0x94, 0x98, 0x05, 0x6a, 0xd8, 0xd5, 0x71, 0x9a, 0x23, 0x43, 0x1d, 0x14, 0x9b, 0x7e, 0xba,
- 0x5a, 0x98, 0x32, 0x5d, 0x71, 0x05, 0x4c, 0x2a, 0x94, 0x8c, 0x17, 0x27, 0x27, 0x63, 0x26, 0x3a,
- 0x4d, 0x32, 0x2e, 0x4e, 0x4e, 0xc6, 0x5c, 0xd9, 0xf8, 0x64, 0x9c, 0x92, 0x7e, 0x4a, 0x69, 0xe9,
- 0xe7, 0xbb, 0x4c, 0xbb, 0xff, 0x2c, 0x41, 0x3d, 0x99, 0x05, 0x78, 0xf6, 0xbb, 0x0d, 0x0b, 0x2e,
- 0xa5, 0x4c, 0x93, 0x7b, 0xb9, 0x2c, 0x97, 0x40, 0x8f, 0x61, 0xde, 0x30, 0x8f, 0x2c, 0x3e, 0x69,
- 0x3f, 0x9c, 0x42, 0x92, 0xf7, 0xba, 0xd9, 0x32, 0x8f, 0x2c, 0xe6, 0x4d, 0xaa, 0xa1, 0xf1, 0x11,
- 0x94, 0x7c, 0xd2, 0x4c, 0xdf, 0xb6, 0x07, 0xab, 0xb1, 0xd8, 0x66, 0xdb, 0x0d, 0x7f, 0x4a, 0x48,
- 0xb3, 0x4d, 0x09, 0xf9, 0x27, 0xb9, 0xf0, 0x94, 0x7d, 0x68, 0x0c, 0x3c, 0xec, 0x24, 0xa6, 0xec,
- 0xc7, 0x42, 0x3b, 0x9b, 0xaf, 0x97, 0x26, 0x6a, 0x67, 0x15, 0x3c, 0x9f, 0x75, 0x5f, 0x42, 0x95,
- 0x06, 0xa5, 0xea, 0xe2, 0x01, 0x2d, 0x79, 0x78, 0xf9, 0xf9, 0xbd, 0x71, 0x6a, 0x98, 0x25, 0x2c,
- 0xb4, 0xbb, 0x5c, 0x8e, 0x79, 0xb0, 0x32, 0x08, 0xd3, 0x1a, 0xf7, 0x01, 0x25, 0x99, 0x66, 0xf2,
- 0x69, 0x97, 0xe4, 0x42, 0xb2, 0xd7, 0x4e, 0x59, 0xa7, 0x8f, 0xa8, 0x19, 0xd3, 0xc4, 0x0a, 0x33,
- 0x58, 0xe1, 0x12, 0xf2, 0x7f, 0xe5, 0x01, 0x82, 0x97, 0xff, 0x8f, 0x92, 0xe0, 0x7d, 0x3f, 0x01,
- 0xb1, 0x52, 0xf2, 0xca, 0x38, 0xc5, 0xa9, 0xa9, 0x67, 0x2f, 0x9a, 0x7a, 0x58, 0x51, 0xf9, 0xde,
- 0x58, 0x35, 0x33, 0x27, 0x9d, 0xc5, 0xdf, 0xb6, 0xa4, 0xf3, 0x04, 0xce, 0xc4, 0x83, 0x88, 0x67,
- 0x9c, 0x2d, 0x28, 0x18, 0x1e, 0x1e, 0x32, 0x60, 0x2a, 0x75, 0xd3, 0x1b, 0x12, 0x62, 0xac, 0xf2,
- 0x06, 0x94, 0x5a, 0x43, 0xad, 0x8f, 0xbb, 0x36, 0xee, 0x91, 0x4e, 0x0d, 0xd2, 0xe0, 0x86, 0xb0,
- 0x86, 0xbc, 0x05, 0xc5, 0x1f, 0xe0, 0x13, 0x36, 0xfb, 0xa7, 0x34, 0x54, 0xfe, 0x93, 0x1c, 0xac,
- 0xd1, 0xd5, 0x67, 0x5b, 0xc0, 0x42, 0x0a, 0x76, 0xad, 0x91, 0xd3, 0xc3, 0x2e, 0x0d, 0x0b, 0x7b,
- 0xa4, 0xda, 0xd8, 0x31, 0x2c, 0x9d, 0xa3, 0x16, 0xa5, 0x9e, 0x3d, 0xea, 0x50, 0x02, 0x3a, 0x07,
- 0xa4, 0xa1, 0x7e, 0x35, 0xb2, 0x78, 0xc4, 0xe6, 0x95, 0x62, 0xcf, 0x1e, 0xfd, 0x1e, 0x69, 0x0b,
- 0x59, 0xf7, 0x58, 0x73, 0xb0, 0x4b, 0x03, 0x92, 0xc9, 0x76, 0x29, 0x01, 0xdd, 0x80, 0xd3, 0x43,
- 0x3c, 0xb4, 0x9c, 0x13, 0x75, 0x60, 0x0c, 0x0d, 0x4f, 0x35, 0x4c, 0xf5, 0xf0, 0xc4, 0xc3, 0x2e,
- 0x0f, 0x3e, 0xc4, 0x5e, 0x3e, 0x21, 0xef, 0x5a, 0xe6, 0x03, 0xf2, 0x06, 0xc9, 0x50, 0xb1, 0xac,
- 0xa1, 0xea, 0xf6, 0x2c, 0x07, 0xab, 0x9a, 0xfe, 0x63, 0xba, 0x20, 0xe7, 0x95, 0xb2, 0x65, 0x0d,
- 0xbb, 0x84, 0xd6, 0xd4, 0x7f, 0x8c, 0xde, 0x84, 0x72, 0xcf, 0x1e, 0xb9, 0xd8, 0x53, 0xc9, 0x1f,
- 0xba, 0xde, 0x96, 0x14, 0x60, 0xa4, 0x6d, 0x7b, 0xe4, 0x86, 0x18, 0x86, 0xc4, 0xff, 0x8b, 0x61,
- 0x86, 0xa7, 0xc4, 0xcd, 0x1a, 0x54, 0x22, 0xa8, 0x07, 0xd9, 0x80, 0x52, 0x78, 0x83, 0x6f, 0x40,
- 0xc9, 0x33, 0xa1, 0x39, 0xd6, 0x40, 0x78, 0x92, 0x3e, 0x13, 0x9a, 0x77, 0x62, 0x8b, 0xdd, 0x27,
- 0x7d, 0x26, 0x2e, 0x1f, 0xe0, 0xe7, 0x1c, 0x19, 0x2b, 0x29, 0xac, 0x21, 0xeb, 0x00, 0xdb, 0x9a,
- 0xad, 0x1d, 0x1a, 0x03, 0xc3, 0x3b, 0x41, 0x57, 0xa1, 0xa6, 0xe9, 0xba, 0xda, 0x13, 0x14, 0x03,
- 0x0b, 0xbc, 0x72, 0x59, 0xd3, 0xf5, 0xed, 0x10, 0x19, 0xbd, 0x03, 0x2b, 0xba, 0x63, 0xd9, 0x51,
- 0x5e, 0x06, 0x60, 0xd6, 0xc8, 0x8b, 0x30, 0xb3, 0xfc, 0xef, 0x05, 0x38, 0x1f, 0x1d, 0xd8, 0x38,
- 0xb2, 0x74, 0x1f, 0x96, 0x62, 0xbd, 0x66, 0x20, 0x30, 0x81, 0xb5, 0x4a, 0x44, 0x22, 0x86, 0x94,
- 0xe4, 0x12, 0x48, 0x49, 0x2a, 0x76, 0x95, 0x7f, 0xad, 0xd8, 0xd5, 0xfc, 0x6b, 0xc1, 0xae, 0x0a,
- 0xdf, 0x0e, 0xbb, 0x5a, 0x9a, 0x11, 0xbb, 0xba, 0x44, 0xb3, 0x97, 0xe8, 0x9d, 0xc2, 0x04, 0x2c,
- 0x54, 0x2b, 0x7e, 0x1f, 0xa6, 0x00, 0xca, 0x63, 0x18, 0xd7, 0xe2, 0x2c, 0x18, 0x57, 0x31, 0x13,
- 0xe3, 0x22, 0x51, 0x67, 0xdb, 0x9a, 0x33, 0xb4, 0x1c, 0x01, 0x62, 0xf1, 0xaa, 0x6d, 0x59, 0xd0,
- 0x39, 0x80, 0x95, 0x09, 0x77, 0x41, 0x16, 0xdc, 0x85, 0x2e, 0xc0, 0x92, 0x69, 0xa9, 0x26, 0x7e,
- 0xa1, 0x92, 0x58, 0x70, 0xeb, 0x65, 0x16, 0x18, 0xa6, 0xd5, 0xc6, 0x2f, 0x3a, 0x84, 0x82, 0x36,
- 0x60, 0x69, 0xa8, 0xb9, 0xcf, 0xb0, 0x4e, 0x55, 0xb9, 0xf5, 0x0a, 0x0d, 0xe2, 0x32, 0xa3, 0x11,
- 0x1d, 0x2e, 0xba, 0x08, 0xfe, 0x47, 0x72, 0xa6, 0x2a, 0x65, 0xaa, 0x08, 0x2a, 0x65, 0x93, 0xff,
- 0x56, 0x82, 0xd5, 0x68, 0x98, 0x73, 0x18, 0xe4, 0x11, 0x94, 0x1c, 0x91, 0xc9, 0x78, 0x68, 0x5f,
- 0xcd, 0x28, 0xbc, 0x93, 0xa9, 0x4f, 0x09, 0x64, 0xd1, 0x0f, 0x33, 0xd1, 0xb7, 0xeb, 0x93, 0xf4,
- 0x4d, 0xc2, 0xdf, 0x64, 0x07, 0xde, 0xfc, 0xd4, 0x30, 0x75, 0xeb, 0x85, 0x9b, 0x39, 0x4b, 0x53,
- 0x62, 0x45, 0xca, 0x88, 0x95, 0x9e, 0x83, 0x75, 0x6c, 0x7a, 0x86, 0x36, 0x50, 0x5d, 0x1b, 0xf7,
- 0x04, 0x0a, 0x10, 0x90, 0xc9, 0xda, 0x21, 0xff, 0x42, 0x82, 0x33, 0xf1, 0x4e, 0xb9, 0xcf, 0x5a,
- 0x49, 0x9f, 0xbd, 0x93, 0xfc, 0xc6, 0xb8, 0x70, 0xaa, 0xd7, 0xbe, 0xcc, 0xf4, 0xda, 0x8d, 0xc9,
- 0x1a, 0x27, 0xfa, 0xed, 0x2f, 0x25, 0x38, 0x9b, 0x69, 0x46, 0x6c, 0xed, 0x91, 0xe2, 0x6b, 0x0f,
- 0x5f, 0xb7, 0x7a, 0xd6, 0xc8, 0xf4, 0x42, 0xeb, 0xd6, 0x36, 0x3d, 0x36, 0x61, 0x0b, 0x84, 0x3a,
- 0xd4, 0x5e, 0x1a, 0xc3, 0xd1, 0x90, 0x2f, 0x5c, 0x44, 0xdd, 0x53, 0x46, 0x79, 0x85, 0x95, 0x4b,
- 0x6e, 0xc2, 0x8a, 0x6f, 0xe5, 0x58, 0x60, 0x33, 0x04, 0x54, 0xe6, 0xa2, 0x40, 0xa5, 0x09, 0x0b,
- 0x3b, 0xf8, 0xb9, 0xd1, 0xc3, 0xaf, 0xe5, 0x5c, 0xe7, 0x02, 0x94, 0x6d, 0xec, 0x0c, 0x0d, 0xd7,
- 0xf5, 0x33, 0x72, 0x49, 0x09, 0x93, 0xe4, 0xff, 0x58, 0x80, 0xe5, 0x78, 0x74, 0xdc, 0x4b, 0xe0,
- 0xa2, 0x6f, 0xa5, 0xac, 0x15, 0xf1, 0x0f, 0x0d, 0xd5, 0xa7, 0x37, 0x44, 0xd5, 0x92, 0xcb, 0xc2,
- 0x10, 0xfc, 0x0a, 0x87, 0x97, 0x34, 0xc4, 0x23, 0x3d, 0x6b, 0x38, 0xd4, 0x4c, 0x5d, 0x1c, 0xc7,
- 0xf1, 0x26, 0xf1, 0x9f, 0xe6, 0xf4, 0x89, 0xdb, 0x09, 0x99, 0x3e, 0x93, 0xc1, 0x23, 0x1b, 0x6e,
- 0xc3, 0xa4, 0xf8, 0x2a, 0xcd, 0xea, 0x25, 0x05, 0x38, 0x69, 0xc7, 0x70, 0xd0, 0x26, 0xcc, 0x63,
- 0xf3, 0xb9, 0x28, 0x40, 0x53, 0xce, 0xeb, 0x44, 0xfd, 0xa4, 0x50, 0x3e, 0x74, 0x1d, 0x16, 0x86,
- 0x24, 0x2c, 0xc4, 0xd6, 0x7b, 0x2d, 0xe3, 0xd8, 0x4a, 0xe1, 0x6c, 0x68, 0x0b, 0x16, 0x75, 0x3a,
- 0x4e, 0x62, 0x7f, 0x5d, 0x4f, 0x41, 0x6d, 0x29, 0x83, 0x22, 0x18, 0xd1, 0xae, 0x5f, 0x5e, 0x97,
- 0xb2, 0xea, 0xe2, 0xd8, 0x50, 0xa4, 0xd6, 0xd8, 0xfb, 0xd1, 0x1a, 0x1b, 0xa8, 0xae, 0xad, 0xc9,
- 0xba, 0xc6, 0x17, 0xda, 0x67, 0xa1, 0x38, 0xb0, 0xfa, 0x2c, 0x8c, 0xca, 0xec, 0xa4, 0x77, 0x60,
- 0xf5, 0x69, 0x14, 0xad, 0x92, 0xed, 0x86, 0x6e, 0x98, 0x74, 0xf9, 0x2b, 0x2a, 0xac, 0x41, 0x26,
- 0x1f, 0x7d, 0x50, 0x2d, 0xb3, 0x87, 0xeb, 0x15, 0xfa, 0xaa, 0x44, 0x29, 0x7b, 0x66, 0x8f, 0xd6,
- 0xa5, 0x9e, 0x77, 0x52, 0xaf, 0x52, 0x3a, 0x79, 0x24, 0x3b, 0x49, 0x86, 0x8e, 0x2c, 0x67, 0xed,
- 0x24, 0xd3, 0xf2, 0xbb, 0x00, 0x47, 0x1e, 0xc0, 0xe2, 0x0b, 0x96, 0x08, 0xea, 0x35, 0x2a, 0x7f,
- 0x65, 0x72, 0x7a, 0xe1, 0x1a, 0x84, 0xe0, 0x77, 0xb9, 0x47, 0xf8, 0x7b, 0x09, 0xce, 0x6c, 0xd3,
- 0x8d, 0x56, 0x28, 0x8f, 0xcd, 0x82, 0x4e, 0xde, 0xf2, 0x81, 0xe3, 0x4c, 0xc4, 0x2f, 0xfe, 0xdd,
- 0x02, 0x37, 0x6e, 0x41, 0x55, 0x28, 0xe7, 0x2a, 0xf2, 0x53, 0x63, 0xcf, 0x15, 0x37, 0xdc, 0x94,
- 0x3f, 0x86, 0xb5, 0xc4, 0x57, 0xf0, 0xbd, 0xce, 0x06, 0x2c, 0x05, 0xf9, 0xca, 0xff, 0x88, 0xb2,
- 0x4f, 0x6b, 0xe9, 0xf2, 0x6d, 0x38, 0xdd, 0xf5, 0x34, 0xc7, 0x4b, 0xb8, 0x60, 0x0a, 0x59, 0x8a,
- 0x2a, 0x47, 0x65, 0x39, 0xf0, 0xdb, 0x85, 0xd5, 0xae, 0x67, 0xd9, 0xaf, 0xa0, 0x94, 0x64, 0x1d,
- 0xf2, 0xfd, 0xd6, 0x48, 0xac, 0x0f, 0xa2, 0x29, 0xaf, 0x31, 0x0c, 0x3c, 0xd9, 0xdb, 0x1d, 0x38,
- 0xc3, 0x20, 0xe8, 0x57, 0xf9, 0x88, 0xb3, 0x02, 0x00, 0x4f, 0xea, 0x7d, 0x0a, 0xa7, 0x82, 0x65,
- 0x31, 0x00, 0x77, 0x6e, 0x46, 0xc1, 0x9d, 0x0b, 0x63, 0x46, 0x3d, 0x82, 0xed, 0xfc, 0x79, 0x2e,
- 0x94, 0xd7, 0x33, 0xa0, 0x9d, 0x3b, 0x51, 0x68, 0xe7, 0xe2, 0x24, 0xdd, 0x11, 0x64, 0x27, 0x19,
- 0xb5, 0xf9, 0x94, 0xa8, 0xfd, 0x22, 0x81, 0xff, 0xcc, 0x67, 0x01, 0x68, 0x31, 0x6b, 0x7f, 0x23,
- 0xf0, 0x8f, 0xc2, 0xe0, 0x1f, 0xbf, 0x6b, 0xff, 0xc4, 0xe0, 0x56, 0x0c, 0xfe, 0xd9, 0x98, 0x68,
- 0xaf, 0x8f, 0xfe, 0xfc, 0xf5, 0x3c, 0x94, 0xfc, 0x77, 0x09, 0x9f, 0x27, 0xdd, 0x96, 0x4b, 0x71,
- 0x5b, 0x78, 0x05, 0xce, 0x7f, 0xab, 0x15, 0x78, 0x7e, 0xea, 0x15, 0xf8, 0x1c, 0x94, 0xe8, 0x83,
- 0xea, 0xe0, 0x23, 0xbe, 0xa2, 0x16, 0x29, 0x41, 0xc1, 0x47, 0x41, 0x18, 0x2e, 0xcc, 0x14, 0x86,
- 0x31, 0xc0, 0x69, 0x31, 0x0e, 0x38, 0xdd, 0xf3, 0x57, 0x44, 0xb6, 0x88, 0x5e, 0x1e, 0xa3, 0x37,
- 0x75, 0x2d, 0x6c, 0x47, 0xd7, 0x42, 0xb6, 0xae, 0xbe, 0x3b, 0x4e, 0xcb, 0xd8, 0x55, 0xf0, 0xbb,
- 0x5c, 0x21, 0x0e, 0x18, 0x8a, 0x14, 0x8e, 0x45, 0x9e, 0x59, 0xef, 0x00, 0xf8, 0x49, 0x44, 0x40,
- 0x49, 0xe7, 0xc6, 0x7c, 0xa3, 0x12, 0x62, 0x27, 0x6a, 0x23, 0x43, 0x13, 0x9c, 0x8a, 0x4d, 0x97,
- 0x1f, 0x33, 0x8e, 0xc4, 0xfe, 0xb7, 0x10, 0xca, 0x2f, 0x19, 0xa7, 0x3d, 0xf7, 0x12, 0x40, 0xe7,
- 0x8c, 0x51, 0x7c, 0x33, 0x8a, 0x73, 0xbe, 0x62, 0xd4, 0x25, 0x60, 0x4e, 0x5a, 0xb9, 0x68, 0x0e,
- 0x7f, 0xcd, 0xd0, 0xa5, 0x12, 0xa7, 0x34, 0xe9, 0xce, 0xe0, 0xc8, 0x30, 0x0d, 0xf7, 0x98, 0xbd,
- 0x5f, 0x60, 0x3b, 0x03, 0x41, 0x6a, 0xd2, 0x1b, 0x5b, 0xf8, 0xa5, 0xe1, 0xa9, 0x3d, 0x4b, 0xc7,
- 0x34, 0xa6, 0x0b, 0x4a, 0x91, 0x10, 0xb6, 0x2d, 0x1d, 0x07, 0x33, 0xaf, 0xf8, 0x6a, 0x33, 0xaf,
- 0x14, 0x9b, 0x79, 0x67, 0x60, 0xc1, 0xc1, 0x9a, 0x6b, 0x99, 0x7c, 0x1f, 0xce, 0x5b, 0x64, 0x68,
- 0x86, 0xd8, 0x75, 0x49, 0x4f, 0xbc, 0x5c, 0xe3, 0xcd, 0x50, 0x99, 0xb9, 0x34, 0xb1, 0xcc, 0x1c,
- 0x73, 0x8a, 0x14, 0x2b, 0x33, 0x2b, 0x13, 0xcb, 0xcc, 0xa9, 0x0e, 0x91, 0x82, 0x42, 0xbb, 0x3a,
- 0x5d, 0xa1, 0x1d, 0xae, 0x4b, 0x97, 0x23, 0x75, 0xe9, 0x77, 0x39, 0x59, 0x7f, 0x25, 0xc1, 0x5a,
- 0x62, 0x5a, 0xf1, 0xe9, 0x7a, 0x2b, 0x76, 0xcc, 0xb4, 0x31, 0xd1, 0x67, 0xfe, 0x29, 0xd3, 0xa3,
- 0xc8, 0x29, 0xd3, 0x07, 0x93, 0x05, 0x5f, 0xfb, 0x21, 0xd3, 0x1f, 0x49, 0xf0, 0xe6, 0x81, 0xad,
- 0xc7, 0x2a, 0x3c, 0xbe, 0xed, 0x9f, 0x3e, 0x71, 0xdc, 0x13, 0xb5, 0x7e, 0x6e, 0x56, 0x40, 0x86,
- 0xc9, 0xc9, 0x32, 0x5c, 0xc8, 0x36, 0x83, 0x97, 0x4c, 0x3f, 0x82, 0xe5, 0xdd, 0x97, 0xb8, 0xd7,
- 0x3d, 0x31, 0x7b, 0x33, 0x98, 0x56, 0x83, 0x7c, 0x6f, 0xa8, 0x73, 0x38, 0x95, 0x3c, 0x86, 0xab,
- 0xc0, 0x7c, 0xb4, 0x0a, 0x54, 0xa1, 0x16, 0xf4, 0xc0, 0x87, 0xf7, 0x0c, 0x19, 0x5e, 0x9d, 0x30,
- 0x13, 0xe5, 0x4b, 0x0a, 0x6f, 0x71, 0x3a, 0x76, 0xd8, 0xa5, 0x0c, 0x46, 0xc7, 0x8e, 0x13, 0xcd,
- 0x16, 0xf9, 0x68, 0xb6, 0x90, 0xff, 0x4c, 0x82, 0x32, 0xe9, 0xe1, 0x5b, 0xd9, 0xcf, 0xb7, 0x5a,
- 0xf9, 0x60, 0xab, 0xe5, 0xef, 0xd8, 0xe6, 0xc3, 0x3b, 0xb6, 0xc0, 0xf2, 0x02, 0x25, 0x27, 0x2d,
- 0x5f, 0xf0, 0xe9, 0xd8, 0x71, 0xe4, 0x0b, 0xb0, 0xc4, 0x6c, 0xe3, 0x5f, 0x5e, 0x83, 0xfc, 0xc8,
- 0x19, 0x88, 0x38, 0x1a, 0x39, 0x03, 0xf9, 0x8f, 0x25, 0xa8, 0x34, 0x3d, 0x4f, 0xeb, 0x1d, 0xcf,
- 0xf0, 0x01, 0xbe, 0x71, 0xb9, 0xb0, 0x71, 0xc9, 0x8f, 0x08, 0xcc, 0x9d, 0xcf, 0x30, 0xb7, 0x10,
- 0x31, 0x57, 0x86, 0xaa, 0xb0, 0x25, 0xd3, 0xe0, 0x36, 0xa0, 0x8e, 0xe5, 0x78, 0x0f, 0x2d, 0xe7,
- 0x85, 0xe6, 0xe8, 0xb3, 0xed, 0xc0, 0x10, 0xcc, 0xf3, 0x5b, 0xbc, 0xf9, 0x2b, 0x05, 0x85, 0x3e,
- 0xcb, 0x97, 0xe1, 0x54, 0x44, 0x5f, 0x66, 0xc7, 0xf7, 0xa1, 0x4c, 0xf3, 0x3e, 0x2f, 0xc5, 0x6f,
- 0x84, 0xcf, 0x75, 0xa6, 0x5a, 0x25, 0xe4, 0xdf, 0x85, 0x15, 0x52, 0x1f, 0x50, 0xba, 0x3f, 0x15,
- 0xbf, 0x17, 0xab, 0x53, 0xcf, 0x67, 0x28, 0x8a, 0xd5, 0xa8, 0x7f, 0x23, 0x41, 0x81, 0xd2, 0x13,
- 0x6b, 0xf6, 0x39, 0x28, 0x39, 0xd8, 0xb6, 0x54, 0x4f, 0xeb, 0xfb, 0x77, 0xa6, 0x09, 0x61, 0x5f,
- 0xeb, 0x53, 0x34, 0x97, 0xbe, 0xd4, 0x8d, 0x3e, 0x76, 0x3d, 0x71, 0x71, 0xba, 0x4c, 0x68, 0x3b,
- 0x8c, 0x44, 0x9c, 0xe4, 0x1a, 0xbf, 0xcf, 0xea, 0xce, 0x79, 0x85, 0x3e, 0xa3, 0x4d, 0x76, 0x8d,
- 0x6f, 0x1a, 0xec, 0x9d, 0x5e, 0xf2, 0x6b, 0x40, 0x31, 0x06, 0x97, 0xfb, 0x6d, 0x79, 0x17, 0x50,
- 0xd8, 0x0b, 0xdc, 0xdf, 0xd7, 0x61, 0x81, 0x3a, 0x49, 0x54, 0x47, 0x6b, 0x19, 0x6e, 0x50, 0x38,
- 0x9b, 0xac, 0x01, 0x62, 0x0e, 0x8e, 0x54, 0x44, 0xb3, 0x8f, 0xca, 0x98, 0x0a, 0xe9, 0xef, 0x24,
- 0x38, 0x15, 0xe9, 0x83, 0xdb, 0xfa, 0x5e, 0xb4, 0x93, 0x4c, 0x53, 0x79, 0x07, 0xdb, 0x91, 0x25,
- 0xe1, 0x7a, 0x96, 0x49, 0xbf, 0xa6, 0xe5, 0xe0, 0x1f, 0x24, 0x80, 0xe6, 0xc8, 0x3b, 0xe6, 0xc8,
- 0x60, 0x78, 0x64, 0xa4, 0xe8, 0xc8, 0x90, 0x77, 0xb6, 0xe6, 0xba, 0x2f, 0x2c, 0x47, 0xec, 0x69,
- 0xfc, 0x36, 0xc5, 0xf0, 0x46, 0xde, 0xb1, 0x38, 0x33, 0x23, 0xcf, 0xe8, 0x22, 0x54, 0xd9, 0x3d,
- 0x7d, 0x55, 0xd3, 0x75, 0x07, 0xbb, 0x2e, 0x3f, 0x3c, 0xab, 0x30, 0x6a, 0x93, 0x11, 0x09, 0x9b,
- 0x41, 0x51, 0x6d, 0xef, 0x44, 0xf5, 0xac, 0x67, 0xd8, 0xe4, 0x7b, 0x93, 0x8a, 0xa0, 0xee, 0x13,
- 0x22, 0x3b, 0x45, 0xe8, 0x1b, 0xae, 0xe7, 0x08, 0x36, 0x71, 0xd0, 0xc2, 0xa9, 0x94, 0x8d, 0x0c,
- 0x4a, 0xad, 0x33, 0x1a, 0x0c, 0x98, 0x8b, 0x5f, 0x7d, 0xd8, 0xdf, 0xe7, 0x1f, 0x94, 0xcb, 0x8a,
- 0xe9, 0xc0, 0x69, 0xfc, 0x73, 0x5f, 0x23, 0x08, 0xf3, 0x3e, 0xac, 0x84, 0xbe, 0x81, 0x87, 0x55,
- 0xa4, 0x88, 0x94, 0xa2, 0x45, 0xa4, 0xfc, 0x08, 0x10, 0xc3, 0x1d, 0xbe, 0xe5, 0x77, 0xcb, 0xa7,
- 0xe1, 0x54, 0x44, 0x11, 0x5f, 0x89, 0xaf, 0x41, 0x85, 0x5f, 0x89, 0xe2, 0x81, 0x72, 0x16, 0x8a,
- 0x24, 0xa3, 0xf6, 0x0c, 0x5d, 0x1c, 0xa8, 0x2e, 0xda, 0x96, 0xbe, 0x6d, 0xe8, 0x8e, 0xfc, 0x29,
- 0x54, 0x14, 0xd6, 0x0f, 0xe7, 0x7d, 0x08, 0x55, 0x7e, 0x81, 0x4a, 0x8d, 0x5c, 0x8d, 0x4c, 0xbb,
- 0x7a, 0x1f, 0xee, 0x44, 0xa9, 0x98, 0xe1, 0xa6, 0xac, 0x43, 0x83, 0x95, 0x0c, 0x11, 0xf5, 0xe2,
- 0x63, 0x1f, 0x82, 0xb8, 0x31, 0x30, 0xb1, 0x97, 0xa8, 0x7c, 0xc5, 0x09, 0x37, 0xe5, 0xf3, 0x70,
- 0x2e, 0xb5, 0x17, 0xee, 0x09, 0x1b, 0x6a, 0xc1, 0x0b, 0x76, 0x7f, 0xcf, 0x3f, 0x31, 0x96, 0x42,
- 0x27, 0xc6, 0x67, 0xfc, 0x22, 0x31, 0x27, 0x16, 0x31, 0x5a, 0x01, 0x06, 0xe5, 0x7e, 0x3e, 0xab,
- 0xdc, 0x9f, 0x8f, 0x94, 0xfb, 0x72, 0xd7, 0xf7, 0x27, 0xdf, 0x86, 0x3d, 0xa0, 0xdb, 0x45, 0xd6,
- 0xb7, 0x48, 0x88, 0xf2, 0xb8, 0xaf, 0x64, 0xac, 0x4a, 0x48, 0x4a, 0xbe, 0x0a, 0x95, 0x68, 0x6a,
- 0x0c, 0xe5, 0x39, 0x29, 0x91, 0xe7, 0xaa, 0xb1, 0x14, 0xf7, 0x51, 0xac, 0x02, 0xce, 0xf6, 0x71,
- 0xac, 0xfe, 0xbd, 0x1b, 0x49, 0x76, 0xd7, 0x52, 0x0e, 0x7b, 0x7f, 0x4d, 0x79, 0x6e, 0x95, 0xaf,
- 0x07, 0x0f, 0x5d, 0x22, 0xcf, 0x3f, 0x5a, 0x7e, 0x0b, 0xca, 0x07, 0x59, 0xbf, 0xeb, 0x98, 0x17,
- 0x17, 0x2b, 0x6e, 0xc2, 0xea, 0x43, 0x63, 0x80, 0xdd, 0x13, 0xd7, 0xc3, 0xc3, 0x16, 0x4d, 0x4a,
- 0x47, 0x06, 0x76, 0xd0, 0x3a, 0x00, 0xdd, 0xc2, 0xd8, 0x96, 0xe1, 0x5f, 0xf7, 0x0f, 0x51, 0xe4,
- 0xff, 0x94, 0x60, 0x39, 0x10, 0x3c, 0xa0, 0x5b, 0xb7, 0x37, 0xa0, 0x44, 0xbe, 0xd7, 0xf5, 0xb4,
- 0xa1, 0x2d, 0xce, 0xb3, 0x7c, 0x02, 0xba, 0x03, 0x85, 0x23, 0x57, 0x40, 0x46, 0xa9, 0x00, 0x7a,
- 0x9a, 0x21, 0xca, 0xfc, 0x91, 0xdb, 0xd2, 0xd1, 0xc7, 0x00, 0x23, 0x17, 0xeb, 0xfc, 0x0c, 0x2b,
- 0x9f, 0x55, 0x2d, 0x1c, 0x84, 0x0f, 0xc2, 0x89, 0x00, 0xbb, 0x93, 0x71, 0x17, 0xca, 0x86, 0x69,
- 0xe9, 0x98, 0x1e, 0x4e, 0xea, 0x1c, 0x55, 0x9a, 0x20, 0x0e, 0x4c, 0xe2, 0xc0, 0xc5, 0xba, 0x8c,
- 0xf9, 0x5a, 0x28, 0xfc, 0xcb, 0x03, 0xa5, 0x0d, 0x2b, 0x2c, 0x69, 0x1d, 0xf9, 0x86, 0x8b, 0x88,
- 0xdd, 0x18, 0xf7, 0x75, 0xd4, 0x5b, 0x4a, 0xcd, 0xe0, 0xa5, 0x8d, 0x10, 0x95, 0x6f, 0xc3, 0xe9,
- 0xc8, 0x0e, 0x69, 0x86, 0x2d, 0x8b, 0xdc, 0x89, 0x01, 0x25, 0x41, 0x38, 0x73, 0x18, 0x42, 0x44,
- 0xf3, 0x24, 0x18, 0xc2, 0x65, 0x30, 0x84, 0x2b, 0x7f, 0x01, 0x67, 0x23, 0x88, 0x4e, 0xc4, 0xa2,
- 0xbb, 0xb1, 0xca, 0xed, 0xd2, 0x24, 0xad, 0xb1, 0x12, 0xee, 0x7f, 0x24, 0x58, 0x4d, 0x63, 0x78,
- 0x45, 0xc4, 0xf1, 0x47, 0x19, 0x17, 0xf5, 0x6e, 0x4d, 0x67, 0xd6, 0x6f, 0x04, 0xad, 0xdd, 0x87,
- 0x46, 0x9a, 0x3f, 0x93, 0xa3, 0x94, 0x9f, 0x65, 0x94, 0x7e, 0x96, 0x0f, 0x21, 0xef, 0x4d, 0xcf,
- 0x73, 0x8c, 0xc3, 0x11, 0x09, 0xf9, 0xd7, 0x8e, 0x66, 0xb5, 0x7c, 0x5c, 0x86, 0xb9, 0xf6, 0xc6,
- 0x18, 0xf1, 0xc0, 0x8e, 0x54, 0x6c, 0xe6, 0xb3, 0x28, 0x36, 0xc3, 0x30, 0xf5, 0x9b, 0xd3, 0xe9,
- 0xfb, 0xad, 0x05, 0x40, 0x7f, 0x96, 0x83, 0x6a, 0x74, 0x88, 0xd0, 0x2e, 0x80, 0xe6, 0x5b, 0xce,
- 0x27, 0xca, 0xc5, 0xa9, 0x3e, 0x53, 0x09, 0x09, 0xa2, 0x77, 0x21, 0xdf, 0xb3, 0x47, 0x7c, 0xd4,
- 0x52, 0x0e, 0x83, 0xb7, 0xed, 0x11, 0xcb, 0x28, 0x84, 0x8d, 0xec, 0xa9, 0xd8, 0xd9, 0x7e, 0x76,
- 0x96, 0x7c, 0x4a, 0xdf, 0x33, 0x19, 0xce, 0x8c, 0x1e, 0x43, 0xf5, 0x85, 0x63, 0x78, 0xda, 0xe1,
- 0x00, 0xab, 0x03, 0xed, 0x04, 0x3b, 0x3c, 0x4b, 0x4e, 0x91, 0xc8, 0x2a, 0x42, 0xf0, 0x09, 0x91,
- 0x93, 0xff, 0x10, 0x8a, 0xc2, 0xa2, 0x09, 0x2b, 0xc2, 0x3e, 0xac, 0x8d, 0x08, 0x9b, 0x4a, 0xef,
- 0xca, 0x99, 0x9a, 0x69, 0xa9, 0x2e, 0x26, 0xcb, 0xb8, 0xf8, 0x5d, 0xc0, 0x84, 0x14, 0xbd, 0x4a,
- 0xa5, 0xb7, 0x2d, 0x07, 0xb7, 0x35, 0xd3, 0xea, 0x32, 0x51, 0xf9, 0x39, 0x94, 0x43, 0x1f, 0x38,
- 0xc1, 0x84, 0x16, 0xac, 0x88, 0xa3, 0x78, 0x17, 0x7b, 0x7c, 0x79, 0x99, 0xaa, 0xf3, 0x65, 0x2e,
- 0xd7, 0xc5, 0x1e, 0xbb, 0x3e, 0x71, 0x17, 0xce, 0x2a, 0xd8, 0xb2, 0xb1, 0xe9, 0x8f, 0xe7, 0x13,
- 0xab, 0x3f, 0x43, 0x06, 0x7f, 0x03, 0x1a, 0x69, 0xf2, 0x2c, 0x3f, 0x5c, 0xbb, 0x04, 0x45, 0xf1,
- 0x23, 0x5d, 0xb4, 0x08, 0xf9, 0xfd, 0xed, 0x4e, 0x6d, 0x8e, 0x3c, 0x1c, 0xec, 0x74, 0x6a, 0x12,
- 0x2a, 0xc2, 0x7c, 0x77, 0x7b, 0xbf, 0x53, 0xcb, 0x5d, 0x1b, 0x42, 0x2d, 0xfe, 0x0b, 0x55, 0xb4,
- 0x06, 0xa7, 0x3a, 0xca, 0x5e, 0xa7, 0xf9, 0xa8, 0xb9, 0xdf, 0xda, 0x6b, 0xab, 0x1d, 0xa5, 0xf5,
- 0x49, 0x73, 0x7f, 0xb7, 0x36, 0x87, 0x36, 0xe0, 0x7c, 0xf8, 0xc5, 0xe3, 0xbd, 0xee, 0xbe, 0xba,
- 0xbf, 0xa7, 0x6e, 0xef, 0xb5, 0xf7, 0x9b, 0xad, 0xf6, 0xae, 0x52, 0x93, 0xd0, 0x79, 0x38, 0x1b,
- 0x66, 0x79, 0xd0, 0xda, 0x69, 0x29, 0xbb, 0xdb, 0xe4, 0xb9, 0xf9, 0xa4, 0x96, 0xbb, 0x76, 0x03,
- 0x2a, 0x91, 0x1f, 0x94, 0x12, 0x93, 0x3a, 0x7b, 0x3b, 0xb5, 0x39, 0x54, 0x81, 0x52, 0x58, 0x4f,
- 0x11, 0xe6, 0xdb, 0x7b, 0x3b, 0xbb, 0xb5, 0xdc, 0xb5, 0xdb, 0xb0, 0x1c, 0xbb, 0xdf, 0x8b, 0x56,
- 0xa0, 0xd2, 0x6d, 0xb6, 0x77, 0x1e, 0xec, 0x7d, 0xa6, 0x2a, 0xbb, 0xcd, 0x9d, 0xcf, 0x6b, 0x73,
- 0x68, 0x15, 0x6a, 0x82, 0xd4, 0xde, 0xdb, 0x67, 0x54, 0xe9, 0xda, 0xb3, 0xd8, 0x1c, 0xc3, 0xe8,
- 0x34, 0xac, 0xf8, 0xdd, 0xa8, 0xdb, 0xca, 0x6e, 0x73, 0x7f, 0x97, 0xf4, 0x1e, 0x21, 0x2b, 0x07,
- 0xed, 0x76, 0xab, 0xfd, 0xa8, 0x26, 0x11, 0xad, 0x01, 0x79, 0xf7, 0xb3, 0x16, 0x61, 0xce, 0x45,
- 0x99, 0x0f, 0xda, 0x3f, 0x68, 0xef, 0x7d, 0xda, 0xae, 0xe5, 0xb7, 0x7e, 0xb1, 0x02, 0x55, 0x51,
- 0xe8, 0x61, 0x87, 0xde, 0x6a, 0xe9, 0xc0, 0xa2, 0xf8, 0xd1, 0x77, 0x4a, 0x86, 0x8e, 0xfe, 0x54,
- 0xbd, 0xb1, 0x31, 0x86, 0x83, 0xd7, 0xdb, 0x73, 0xe8, 0x90, 0xd6, 0xbf, 0xa1, 0xfb, 0xd6, 0x97,
- 0x52, 0xab, 0xcd, 0xc4, 0x15, 0xef, 0xc6, 0xe5, 0x89, 0x7c, 0x7e, 0x1f, 0x98, 0x94, 0xb8, 0xe1,
- 0x9f, 0x34, 0xa1, 0xcb, 0x69, 0xb5, 0x69, 0xca, 0x6f, 0xa6, 0x1a, 0x57, 0x26, 0x33, 0xfa, 0xdd,
- 0x3c, 0x83, 0x5a, 0xfc, 0xe7, 0x4d, 0x28, 0x05, 0x3a, 0xcd, 0xf8, 0x0d, 0x55, 0xe3, 0xda, 0x34,
- 0xac, 0xe1, 0xce, 0x12, 0xbf, 0xd7, 0xb9, 0x3a, 0xcd, 0xef, 0x1a, 0x32, 0x3b, 0xcb, 0xfa, 0x09,
- 0x04, 0x73, 0x60, 0xf4, 0x8a, 0x34, 0x4a, 0xfd, 0x71, 0x4c, 0xca, 0x4d, 0xfc, 0x34, 0x07, 0xa6,
- 0xdf, 0xb6, 0x96, 0xe7, 0xd0, 0x31, 0x2c, 0xc7, 0xae, 0x27, 0xa0, 0x14, 0xf1, 0xf4, 0x7b, 0x18,
- 0x8d, 0xab, 0x53, 0x70, 0x46, 0x23, 0x22, 0x7c, 0x1d, 0x21, 0x3d, 0x22, 0x52, 0x2e, 0x3b, 0xa4,
- 0x47, 0x44, 0xea, 0xcd, 0x06, 0x1a, 0xdc, 0x91, 0x6b, 0x08, 0x69, 0xc1, 0x9d, 0x76, 0xf9, 0xa1,
- 0x71, 0x79, 0x22, 0x5f, 0xd8, 0x69, 0xb1, 0x4b, 0x09, 0x69, 0x4e, 0x4b, 0xbf, 0xf4, 0xd0, 0xb8,
- 0x3a, 0x05, 0x67, 0x3c, 0x0a, 0x82, 0x23, 0xce, 0xac, 0x28, 0x48, 0x1c, 0xc8, 0x67, 0x45, 0x41,
- 0xf2, 0xb4, 0x94, 0x47, 0x41, 0xec, 0x68, 0xf2, 0xca, 0x14, 0x47, 0x29, 0xd9, 0x51, 0x90, 0x7e,
- 0xe8, 0x22, 0xcf, 0xa1, 0x9f, 0x4a, 0x50, 0xcf, 0x3a, 0xa6, 0x40, 0x29, 0xf5, 0xdd, 0x84, 0x93,
- 0x95, 0xc6, 0xd6, 0x2c, 0x22, 0xbe, 0x15, 0x5f, 0x01, 0x4a, 0xae, 0x7b, 0xe8, 0x9d, 0xb4, 0x91,
- 0xc9, 0x58, 0x5d, 0x1b, 0xef, 0x4e, 0xc7, 0xec, 0x77, 0xd9, 0x85, 0xa2, 0x38, 0x18, 0x41, 0x29,
- 0x59, 0x3a, 0x76, 0x2c, 0xd3, 0x90, 0xc7, 0xb1, 0xf8, 0x4a, 0x1f, 0xc1, 0x3c, 0xa1, 0xa2, 0xf3,
- 0xe9, 0xdc, 0x42, 0xd9, 0x7a, 0xd6, 0x6b, 0x5f, 0xd1, 0x53, 0x58, 0x60, 0x27, 0x01, 0x28, 0x05,
- 0x79, 0x88, 0x9c, 0x57, 0x34, 0x2e, 0x64, 0x33, 0xf8, 0xea, 0xbe, 0x64, 0xff, 0x0f, 0x84, 0x83,
- 0xfc, 0xe8, 0xed, 0xf4, 0x1f, 0x58, 0x47, 0xcf, 0x14, 0x1a, 0x17, 0x27, 0x70, 0x85, 0x27, 0x45,
- 0xac, 0xea, 0xbd, 0x3c, 0x71, 0xeb, 0x92, 0x3d, 0x29, 0xd2, 0x37, 0x47, 0x2c, 0x48, 0x92, 0x9b,
- 0xa7, 0xb4, 0x20, 0xc9, 0xdc, 0xb2, 0xa6, 0x05, 0x49, 0xf6, 0x7e, 0x4c, 0x9e, 0x43, 0x1e, 0x9c,
- 0x4a, 0x81, 0xca, 0xd0, 0xbb, 0x59, 0x41, 0x9e, 0x86, 0xdb, 0x35, 0xde, 0x9b, 0x92, 0x3b, 0x3c,
- 0xf8, 0x7c, 0xd2, 0xbf, 0x99, 0x8d, 0x1f, 0x65, 0x0e, 0x7e, 0x7c, 0x8a, 0x6f, 0xfd, 0x4b, 0x1e,
- 0x96, 0x18, 0x0c, 0xca, 0x2b, 0x98, 0xcf, 0x01, 0x82, 0x13, 0x08, 0xf4, 0x56, 0xba, 0x4f, 0x22,
- 0xa7, 0x34, 0x8d, 0xb7, 0xc7, 0x33, 0x85, 0x03, 0x2d, 0x84, 0xe6, 0xa7, 0x05, 0x5a, 0xf2, 0xd0,
- 0x22, 0x2d, 0xd0, 0x52, 0x8e, 0x04, 0xe4, 0x39, 0xf4, 0x09, 0x94, 0x7c, 0xd8, 0x18, 0xa5, 0xc1,
- 0xce, 0x31, 0x5c, 0xbc, 0xf1, 0xd6, 0x58, 0x9e, 0xb0, 0xd5, 0x21, 0x4c, 0x38, 0xcd, 0xea, 0x24,
- 0xf6, 0x9c, 0x66, 0x75, 0x1a, 0xb0, 0x1c, 0xf8, 0x84, 0x21, 0x47, 0x99, 0x3e, 0x89, 0x00, 0x77,
- 0x99, 0x3e, 0x89, 0xc2, 0x4f, 0xf2, 0xdc, 0x83, 0x4b, 0xbf, 0xfc, 0x7a, 0x5d, 0xfa, 0xa7, 0xaf,
- 0xd7, 0xe7, 0x7e, 0xf2, 0xcd, 0xba, 0xf4, 0xcb, 0x6f, 0xd6, 0xa5, 0x7f, 0xfc, 0x66, 0x5d, 0xfa,
- 0xd7, 0x6f, 0xd6, 0xa5, 0x3f, 0xfd, 0xb7, 0xf5, 0xb9, 0x1f, 0x16, 0x85, 0xf4, 0xe1, 0x02, 0xfd,
- 0xaf, 0x3e, 0x1f, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xde, 0xe7, 0x02, 0x9b, 0x49,
- 0x00, 0x00,
+ 0x76, 0x17, 0xbf, 0x24, 0xf2, 0x51, 0xa4, 0xa8, 0xb2, 0x6c, 0xd1, 0xf4, 0x58, 0xb6, 0xda, 0xe3,
+ 0xcf, 0x19, 0xcb, 0x63, 0xcd, 0xac, 0x27, 0xb6, 0x67, 0x6d, 0xd3, 0x92, 0x6c, 0x33, 0x6b, 0x53,
+ 0x4c, 0x53, 0x9a, 0x8f, 0x9d, 0x01, 0x7a, 0x5b, 0xec, 0x12, 0xd5, 0x6b, 0xb2, 0xbb, 0xa7, 0xbb,
+ 0x69, 0x5b, 0x1b, 0x20, 0x58, 0x60, 0x91, 0x3d, 0xe4, 0x94, 0x73, 0x8e, 0x9b, 0x43, 0x0e, 0xb9,
+ 0x05, 0x08, 0x72, 0xc8, 0x69, 0x83, 0x1c, 0xf6, 0x12, 0x20, 0xa7, 0x4d, 0x82, 0x5c, 0x32, 0x93,
+ 0xe4, 0x12, 0x20, 0x41, 0xfe, 0x80, 0x1c, 0x82, 0xfa, 0xea, 0xef, 0xe6, 0x87, 0xc7, 0xbb, 0x33,
+ 0x7b, 0x12, 0xeb, 0xf5, 0x7b, 0xaf, 0x5e, 0xbf, 0x7a, 0xf5, 0xea, 0xd5, 0xaf, 0xaa, 0x05, 0x25,
+ 0xd5, 0xd2, 0x37, 0x2c, 0xdb, 0x74, 0x4d, 0x54, 0xb3, 0x47, 0x86, 0xab, 0x0f, 0xf1, 0xc6, 0x8b,
+ 0x9b, 0xea, 0xc0, 0x3a, 0x52, 0x37, 0x1b, 0xd7, 0xfb, 0xba, 0x7b, 0x34, 0x3a, 0xd8, 0xe8, 0x99,
+ 0xc3, 0x1b, 0x7d, 0xb3, 0x6f, 0xde, 0xa0, 0x8c, 0x07, 0xa3, 0x43, 0xda, 0xa2, 0x0d, 0xfa, 0x8b,
+ 0x29, 0x90, 0xae, 0x41, 0xf5, 0x63, 0x6c, 0x3b, 0xba, 0x69, 0xc8, 0xf8, 0xcb, 0x11, 0x76, 0x5c,
+ 0x54, 0x87, 0x85, 0x17, 0x8c, 0x52, 0xcf, 0x9c, 0xcf, 0x5c, 0x29, 0xc9, 0xa2, 0x29, 0xfd, 0x45,
+ 0x06, 0x96, 0x3c, 0x66, 0xc7, 0x32, 0x0d, 0x07, 0xa7, 0x73, 0xa3, 0x75, 0x58, 0xe4, 0xc6, 0x29,
+ 0x86, 0x3a, 0xc4, 0xf5, 0x2c, 0x7d, 0x5c, 0xe6, 0xb4, 0xb6, 0x3a, 0xc4, 0xe8, 0x32, 0x2c, 0x09,
+ 0x16, 0xa1, 0x24, 0x47, 0xb9, 0xaa, 0x9c, 0xcc, 0x7b, 0x43, 0x1b, 0x70, 0x42, 0x30, 0xaa, 0x96,
+ 0xee, 0x31, 0xe7, 0x29, 0xf3, 0x32, 0x7f, 0xd4, 0xb4, 0x74, 0xce, 0x2f, 0x7d, 0x0e, 0xa5, 0xed,
+ 0x76, 0x77, 0xcb, 0x34, 0x0e, 0xf5, 0x3e, 0x31, 0xd1, 0xc1, 0x36, 0x91, 0xa9, 0x67, 0xce, 0xe7,
+ 0x88, 0x89, 0xbc, 0x89, 0x1a, 0x50, 0x74, 0xb0, 0x6a, 0xf7, 0x8e, 0xb0, 0x53, 0xcf, 0xd2, 0x47,
+ 0x5e, 0x9b, 0x48, 0x99, 0x96, 0xab, 0x9b, 0x86, 0x53, 0xcf, 0x31, 0x29, 0xde, 0x94, 0x7e, 0x91,
+ 0x81, 0x72, 0xc7, 0xb4, 0xdd, 0x67, 0xaa, 0x65, 0xe9, 0x46, 0x1f, 0xdd, 0x82, 0x22, 0xf5, 0x65,
+ 0xcf, 0x1c, 0x50, 0x1f, 0x54, 0x37, 0x1b, 0x1b, 0xd1, 0x61, 0xd9, 0xe8, 0x70, 0x0e, 0xd9, 0xe3,
+ 0x45, 0x17, 0xa1, 0xda, 0x33, 0x0d, 0x57, 0xd5, 0x0d, 0x6c, 0x2b, 0x96, 0x69, 0xbb, 0xd4, 0x45,
+ 0x05, 0xb9, 0xe2, 0x51, 0x49, 0x2f, 0xe8, 0x0c, 0x94, 0x8e, 0x4c, 0xc7, 0x65, 0x1c, 0x39, 0xca,
+ 0x51, 0x24, 0x04, 0xfa, 0x70, 0x15, 0x16, 0xe8, 0x43, 0xdd, 0xe2, 0xce, 0x98, 0x27, 0xcd, 0x96,
+ 0x25, 0xfd, 0x3a, 0x03, 0x85, 0x67, 0xe6, 0xc8, 0x70, 0x23, 0xdd, 0xa8, 0xee, 0x11, 0x1f, 0xa8,
+ 0x40, 0x37, 0xaa, 0x7b, 0xe4, 0x77, 0x43, 0x38, 0xd8, 0x58, 0xb1, 0x6e, 0xc8, 0xc3, 0x06, 0x14,
+ 0x6d, 0xac, 0x6a, 0xa6, 0x31, 0x38, 0xa6, 0x26, 0x14, 0x65, 0xaf, 0x4d, 0x06, 0xd1, 0xc1, 0x03,
+ 0xdd, 0x18, 0xbd, 0x52, 0x6c, 0x3c, 0x50, 0x0f, 0xf0, 0x80, 0x9a, 0x52, 0x94, 0xab, 0x9c, 0x2c,
+ 0x33, 0x2a, 0xda, 0x86, 0xb2, 0x65, 0x9b, 0x96, 0xda, 0x57, 0x89, 0x1f, 0xeb, 0x05, 0xea, 0x2a,
+ 0x29, 0xee, 0x2a, 0x6a, 0x76, 0xc7, 0xe7, 0x94, 0x83, 0x62, 0xd2, 0x5f, 0x65, 0x60, 0x89, 0x04,
+ 0x8f, 0x63, 0xa9, 0x3d, 0xbc, 0x4b, 0x87, 0x04, 0xdd, 0x86, 0x05, 0x03, 0xbb, 0x2f, 0x4d, 0xfb,
+ 0x39, 0x1f, 0x80, 0x73, 0x71, 0xad, 0x9e, 0xcc, 0x33, 0x53, 0xc3, 0xb2, 0xe0, 0x47, 0x37, 0x21,
+ 0x67, 0xe9, 0x1a, 0x7d, 0xe1, 0x29, 0xc4, 0x08, 0x2f, 0x11, 0xd1, 0xad, 0x1e, 0xf5, 0xc3, 0x34,
+ 0x22, 0xba, 0xd5, 0x93, 0x24, 0x80, 0x96, 0xe1, 0xde, 0xfa, 0xe0, 0x63, 0x75, 0x30, 0xc2, 0x68,
+ 0x05, 0x0a, 0x2f, 0xc8, 0x0f, 0x6a, 0x6c, 0x4e, 0x66, 0x0d, 0xe9, 0xab, 0x1c, 0x9c, 0x79, 0x4a,
+ 0xfc, 0xd5, 0x55, 0x0d, 0xed, 0xc0, 0x7c, 0xd5, 0xc5, 0xbd, 0x91, 0xad, 0xbb, 0xc7, 0x5b, 0xa6,
+ 0xe1, 0xe2, 0x57, 0x2e, 0x6a, 0xc3, 0xb2, 0x21, 0x34, 0x2b, 0x22, 0x34, 0x89, 0x86, 0xf2, 0xe6,
+ 0xfa, 0x18, 0x23, 0x98, 0x8b, 0xe4, 0x9a, 0x11, 0x26, 0x38, 0xe8, 0x89, 0x3f, 0x6e, 0x42, 0x5b,
+ 0x96, 0x6a, 0x4b, 0x78, 0xa5, 0xee, 0x0e, 0xb5, 0x8c, 0xeb, 0x12, 0x03, 0x2b, 0x34, 0x7d, 0x04,
+ 0x64, 0x56, 0x2b, 0xaa, 0xa3, 0x8c, 0x1c, 0x6c, 0x53, 0xc7, 0x94, 0x37, 0xdf, 0x8a, 0x6b, 0xf1,
+ 0x5d, 0x20, 0x97, 0xec, 0x91, 0xd1, 0x74, 0xf6, 0x1d, 0x6c, 0xa3, 0x7b, 0x34, 0x4f, 0x10, 0xe9,
+ 0xbe, 0x6d, 0x8e, 0xac, 0x7a, 0x71, 0x0a, 0x71, 0xa0, 0xe2, 0x8f, 0x09, 0x3f, 0x4d, 0x22, 0x3c,
+ 0x16, 0x15, 0xdb, 0x34, 0xdd, 0x43, 0x47, 0xc4, 0x9f, 0x20, 0xcb, 0x94, 0x8a, 0x6e, 0xc0, 0x09,
+ 0x67, 0x64, 0x59, 0x03, 0x3c, 0xc4, 0x86, 0xab, 0x0e, 0x58, 0x77, 0x4e, 0xbd, 0x70, 0x3e, 0x77,
+ 0x25, 0x27, 0xa3, 0xe0, 0x23, 0xaa, 0xd8, 0x41, 0x6b, 0x00, 0x96, 0xad, 0xbf, 0xd0, 0x07, 0xb8,
+ 0x8f, 0xb5, 0xfa, 0x3c, 0x55, 0x1a, 0xa0, 0xa0, 0xf7, 0x60, 0xc5, 0xc1, 0xbd, 0x9e, 0x39, 0xb4,
+ 0x14, 0xcb, 0x36, 0x0f, 0xf5, 0x01, 0x66, 0xb3, 0x67, 0x81, 0xce, 0x1e, 0xc4, 0x9f, 0x75, 0xd8,
+ 0x23, 0x32, 0x8f, 0xa4, 0x5f, 0x64, 0xe1, 0x24, 0xf5, 0x64, 0xc7, 0xd4, 0xf8, 0x30, 0xf3, 0x24,
+ 0x75, 0x01, 0x2a, 0x3d, 0x6a, 0x90, 0x62, 0xa9, 0x36, 0x36, 0x5c, 0x3e, 0x49, 0x17, 0x19, 0xb1,
+ 0x43, 0x69, 0xe8, 0x53, 0xa8, 0x39, 0x3c, 0x2a, 0x94, 0x1e, 0x0b, 0x0b, 0x3e, 0x66, 0xd7, 0xe3,
+ 0xee, 0x1a, 0x13, 0x4b, 0xf2, 0x92, 0x13, 0x0b, 0xae, 0x05, 0xe7, 0xd8, 0xe9, 0xb9, 0x03, 0x96,
+ 0xed, 0xca, 0x9b, 0x1f, 0xa4, 0x28, 0x8c, 0x1a, 0xbe, 0xd1, 0x65, 0x62, 0x3b, 0x86, 0x6b, 0x1f,
+ 0xcb, 0x42, 0x49, 0xe3, 0x0e, 0x2c, 0x06, 0x1f, 0xa0, 0x1a, 0xe4, 0x9e, 0xe3, 0x63, 0xfe, 0x52,
+ 0xe4, 0xa7, 0x3f, 0x09, 0x58, 0xae, 0x61, 0x8d, 0x3b, 0xd9, 0xdf, 0xcb, 0x48, 0x36, 0x20, 0xbf,
+ 0x97, 0x67, 0xd8, 0x55, 0x35, 0xd5, 0x55, 0x11, 0x82, 0x3c, 0x5d, 0x46, 0x98, 0x0a, 0xfa, 0x9b,
+ 0x68, 0x1d, 0xf1, 0xc9, 0x5b, 0x92, 0xc9, 0x4f, 0xf4, 0x16, 0x94, 0xbc, 0x40, 0xe7, 0x6b, 0x89,
+ 0x4f, 0x20, 0x39, 0x5d, 0x75, 0x5d, 0x3c, 0xb4, 0x5c, 0x1a, 0x22, 0x15, 0x59, 0x34, 0xa5, 0xff,
+ 0xc9, 0x43, 0x2d, 0x36, 0x26, 0x0f, 0xa0, 0x38, 0xe4, 0xdd, 0xf3, 0x89, 0xf6, 0x76, 0x42, 0x62,
+ 0x8f, 0x99, 0x2a, 0x7b, 0x52, 0x24, 0x6f, 0x92, 0x1c, 0x1a, 0x58, 0xff, 0xbc, 0x36, 0x19, 0xf1,
+ 0x81, 0xd9, 0x57, 0x34, 0xdd, 0xc6, 0x3d, 0xd7, 0xb4, 0x8f, 0xb9, 0xb9, 0x8b, 0x03, 0xb3, 0xbf,
+ 0x2d, 0x68, 0xe8, 0x0e, 0x80, 0x66, 0x38, 0x64, 0xb0, 0x0f, 0xf5, 0x3e, 0x35, 0xba, 0xbc, 0x79,
+ 0x26, 0x6e, 0x84, 0xb7, 0xd8, 0xc9, 0x25, 0xcd, 0x70, 0xb8, 0xf9, 0x0f, 0xa1, 0x42, 0xd6, 0x0c,
+ 0x65, 0xc8, 0xd6, 0x29, 0x16, 0xe9, 0xe5, 0xcd, 0xb3, 0x49, 0xef, 0xe0, 0xad, 0x66, 0xf2, 0xa2,
+ 0xe5, 0x37, 0x1c, 0xf4, 0x08, 0xe6, 0x69, 0xf2, 0x76, 0xea, 0xf3, 0x54, 0x78, 0x63, 0x9c, 0x03,
+ 0x78, 0x44, 0x3c, 0xa5, 0x02, 0x2c, 0x20, 0xb8, 0x34, 0xda, 0x87, 0xb2, 0x6a, 0x18, 0xa6, 0xab,
+ 0xb2, 0x44, 0xb3, 0x40, 0x95, 0xbd, 0x3f, 0x85, 0xb2, 0xa6, 0x2f, 0xc5, 0x34, 0x06, 0xf5, 0xa0,
+ 0xef, 0x43, 0x81, 0x66, 0x22, 0x9e, 0x34, 0x2e, 0x4f, 0x19, 0xb4, 0x32, 0x93, 0x6a, 0xdc, 0x86,
+ 0x72, 0xc0, 0xd8, 0x59, 0x82, 0xb4, 0x71, 0x0f, 0x6a, 0x51, 0xd3, 0x66, 0x0a, 0xf2, 0x3f, 0x84,
+ 0x15, 0x79, 0x64, 0xf8, 0x86, 0x89, 0xea, 0xeb, 0x0e, 0xcc, 0xf3, 0xc1, 0x66, 0x11, 0x27, 0x4d,
+ 0xf6, 0x91, 0xcc, 0x25, 0x82, 0xe5, 0xd4, 0x91, 0x6a, 0x68, 0x03, 0x6c, 0xf3, 0x7e, 0x45, 0x39,
+ 0xf5, 0x84, 0x51, 0xa5, 0xef, 0xc3, 0xc9, 0x48, 0xe7, 0xbc, 0x9a, 0x7b, 0x1b, 0xaa, 0x96, 0xa9,
+ 0x29, 0x0e, 0x23, 0x2b, 0xba, 0x26, 0xd2, 0x90, 0xe5, 0xf1, 0xb6, 0x34, 0x22, 0xde, 0x75, 0x4d,
+ 0x2b, 0x6e, 0xfc, 0x74, 0xe2, 0x75, 0x38, 0x15, 0x15, 0x67, 0xdd, 0x4b, 0xf7, 0x61, 0x55, 0xc6,
+ 0x43, 0xf3, 0x05, 0x7e, 0x5d, 0xd5, 0x0d, 0xa8, 0xc7, 0x15, 0x70, 0xe5, 0x9f, 0xc1, 0xaa, 0x4f,
+ 0xed, 0xba, 0xaa, 0x3b, 0x72, 0x66, 0x52, 0xce, 0x4b, 0xdd, 0x03, 0xd3, 0x61, 0xc3, 0x59, 0x94,
+ 0x45, 0x53, 0x5a, 0x85, 0x42, 0xc7, 0xd4, 0x5a, 0x1d, 0x54, 0x85, 0xac, 0x6e, 0x71, 0xe1, 0xac,
+ 0x6e, 0x49, 0x7a, 0xb0, 0xcf, 0x36, 0x2b, 0x39, 0x58, 0xd7, 0x51, 0x56, 0x74, 0x0f, 0xaa, 0xaa,
+ 0xa6, 0xe9, 0x24, 0x9c, 0xd4, 0x81, 0xa2, 0x5b, 0xac, 0x22, 0x2d, 0x6f, 0xae, 0x26, 0x06, 0x40,
+ 0xab, 0x23, 0x57, 0x7c, 0xf6, 0x96, 0xe5, 0x48, 0x4f, 0xa0, 0xe4, 0xad, 0xf9, 0xe8, 0xae, 0x5f,
+ 0xbc, 0x66, 0xa7, 0xad, 0x10, 0xbc, 0xfa, 0x76, 0x2f, 0xb6, 0x46, 0x71, 0x93, 0xef, 0x02, 0x78,
+ 0xb9, 0x54, 0x94, 0x1e, 0x67, 0xc6, 0x28, 0x96, 0x03, 0xec, 0xd2, 0xcf, 0x0a, 0xc1, 0x0c, 0x1b,
+ 0x70, 0x82, 0xe6, 0x39, 0x41, 0x0b, 0x65, 0xdc, 0xec, 0x6b, 0x65, 0xdc, 0x0f, 0xa1, 0xe0, 0xb8,
+ 0xaa, 0x8b, 0x79, 0x79, 0xb6, 0x3e, 0x4e, 0x9c, 0x18, 0x81, 0x65, 0xc6, 0x8f, 0xce, 0x02, 0xf4,
+ 0x6c, 0xac, 0xba, 0x58, 0x53, 0x54, 0xb6, 0x3c, 0xe4, 0xe4, 0x12, 0xa7, 0x34, 0x5d, 0xb4, 0xe5,
+ 0x97, 0x98, 0x05, 0x6a, 0xd8, 0xd5, 0x71, 0x9a, 0x43, 0x43, 0xed, 0x17, 0x9b, 0x5e, 0xba, 0x9a,
+ 0x9f, 0x32, 0x5d, 0x71, 0x05, 0x4c, 0x2a, 0x90, 0x8c, 0x17, 0x26, 0x27, 0x63, 0x26, 0x3a, 0x4d,
+ 0x32, 0x2e, 0x4e, 0x4e, 0xc6, 0x5c, 0xd9, 0xf8, 0x64, 0x9c, 0x90, 0x7e, 0x4a, 0x49, 0xe9, 0xe7,
+ 0xdb, 0x4c, 0xbb, 0xff, 0x92, 0x81, 0x7a, 0x3c, 0x0b, 0xf0, 0xec, 0x77, 0x07, 0xe6, 0x1d, 0x4a,
+ 0x99, 0x26, 0xf7, 0x72, 0x59, 0x2e, 0x81, 0x9e, 0x40, 0x5e, 0x37, 0x0e, 0x4d, 0x3e, 0x69, 0x3f,
+ 0x98, 0x42, 0x92, 0xf7, 0xba, 0xd1, 0x32, 0x0e, 0x4d, 0xe6, 0x4d, 0xaa, 0xa1, 0xf1, 0x21, 0x94,
+ 0x3c, 0xd2, 0x4c, 0xef, 0xb6, 0x0b, 0x2b, 0x91, 0xd8, 0x66, 0xdb, 0x0d, 0x6f, 0x4a, 0x64, 0x66,
+ 0x9b, 0x12, 0xd2, 0x4f, 0xb3, 0xc1, 0x29, 0xfb, 0x48, 0x1f, 0xb8, 0xd8, 0x8e, 0x4d, 0xd9, 0x8f,
+ 0x84, 0x76, 0x36, 0x5f, 0x2f, 0x4d, 0xd4, 0xce, 0x2a, 0x78, 0x3e, 0xeb, 0xbe, 0x80, 0x2a, 0x0d,
+ 0x4a, 0xc5, 0xc1, 0x03, 0x5a, 0xf2, 0xf0, 0xf2, 0xf3, 0x7b, 0xe3, 0xd4, 0x30, 0x4b, 0x58, 0x68,
+ 0x77, 0xb9, 0x1c, 0xf3, 0x60, 0x65, 0x10, 0xa4, 0x35, 0x1e, 0x00, 0x8a, 0x33, 0xcd, 0xe4, 0xd3,
+ 0x2e, 0xc9, 0x85, 0x64, 0xaf, 0x9d, 0xb0, 0x4e, 0x1f, 0x52, 0x33, 0xa6, 0x89, 0x15, 0x66, 0xb0,
+ 0xcc, 0x25, 0xa4, 0xff, 0xce, 0x01, 0xf8, 0x0f, 0x7f, 0x87, 0x92, 0xe0, 0x03, 0x2f, 0x01, 0xb1,
+ 0x52, 0xf2, 0xca, 0x38, 0xc5, 0x89, 0xa9, 0x67, 0x37, 0x9c, 0x7a, 0x58, 0x51, 0x79, 0x7d, 0xac,
+ 0x9a, 0x99, 0x93, 0xce, 0xc2, 0x77, 0x2d, 0xe9, 0x3c, 0x85, 0x53, 0xd1, 0x20, 0xe2, 0x19, 0x67,
+ 0x13, 0x0a, 0xba, 0x8b, 0x87, 0x0c, 0x98, 0x4a, 0xdc, 0xf4, 0x06, 0x84, 0x18, 0xab, 0xb4, 0x0e,
+ 0xa5, 0xd6, 0x50, 0xed, 0xe3, 0xae, 0x85, 0x7b, 0xa4, 0x53, 0x9d, 0x34, 0xb8, 0x21, 0xac, 0x21,
+ 0x6d, 0x42, 0xf1, 0x07, 0xf8, 0x98, 0xcd, 0xfe, 0x29, 0x0d, 0x95, 0xfe, 0x29, 0x0b, 0xab, 0x74,
+ 0xf5, 0xd9, 0x12, 0xb0, 0x90, 0x8c, 0x1d, 0x73, 0x64, 0xf7, 0xb0, 0x43, 0xc3, 0xc2, 0x1a, 0x29,
+ 0x16, 0xb6, 0x75, 0x53, 0xe3, 0xa8, 0x45, 0xa9, 0x67, 0x8d, 0x3a, 0x94, 0x80, 0xce, 0x00, 0x69,
+ 0x28, 0x5f, 0x8e, 0x4c, 0x1e, 0xb1, 0x39, 0xb9, 0xd8, 0xb3, 0x46, 0x7f, 0x40, 0xda, 0x42, 0xd6,
+ 0x39, 0x52, 0x6d, 0xec, 0xd0, 0x80, 0x64, 0xb2, 0x5d, 0x4a, 0x40, 0x37, 0xe1, 0xe4, 0x10, 0x0f,
+ 0x4d, 0xfb, 0x58, 0x19, 0xe8, 0x43, 0xdd, 0x55, 0x74, 0x43, 0x39, 0x38, 0x76, 0xb1, 0xc3, 0x83,
+ 0x0f, 0xb1, 0x87, 0x4f, 0xc9, 0xb3, 0x96, 0xf1, 0x90, 0x3c, 0x41, 0x12, 0x54, 0x4c, 0x73, 0xa8,
+ 0x38, 0x3d, 0xd3, 0xc6, 0x8a, 0xaa, 0xfd, 0x98, 0x2e, 0xc8, 0x39, 0xb9, 0x6c, 0x9a, 0xc3, 0x2e,
+ 0xa1, 0x35, 0xb5, 0x1f, 0xa3, 0x73, 0x50, 0xee, 0x59, 0x23, 0x07, 0xbb, 0x0a, 0xf9, 0x43, 0xd7,
+ 0xdb, 0x92, 0x0c, 0x8c, 0xb4, 0x65, 0x8d, 0x9c, 0x00, 0xc3, 0x90, 0xf8, 0x7f, 0x21, 0xc8, 0xf0,
+ 0x0c, 0x0f, 0x29, 0x3c, 0x72, 0x34, 0xea, 0x63, 0x4b, 0xed, 0x63, 0x66, 0x9a, 0x58, 0x28, 0x13,
+ 0xe0, 0x91, 0x27, 0x9c, 0x91, 0x9a, 0x29, 0x57, 0x8f, 0x82, 0x4d, 0x47, 0x7a, 0x08, 0x95, 0x10,
+ 0x03, 0xf1, 0x17, 0x55, 0xeb, 0xe8, 0x3f, 0x11, 0x03, 0x57, 0x24, 0x84, 0xae, 0xfe, 0x13, 0x0a,
+ 0x0e, 0xd1, 0xee, 0xa8, 0x23, 0xf3, 0x32, 0x6b, 0x48, 0x2a, 0x54, 0x42, 0x18, 0x0c, 0xd9, 0x0e,
+ 0x53, 0xb0, 0x85, 0x6f, 0x87, 0xc9, 0x6f, 0x42, 0xb3, 0xcd, 0x81, 0x18, 0x57, 0xfa, 0x9b, 0xd0,
+ 0xdc, 0x63, 0x4b, 0xec, 0x85, 0xe9, 0x6f, 0xda, 0x05, 0x7e, 0xc1, 0x71, 0xba, 0x92, 0xcc, 0x1a,
+ 0x92, 0x06, 0xb0, 0xa5, 0x5a, 0xea, 0x81, 0x3e, 0xd0, 0xdd, 0x63, 0x74, 0x15, 0x6a, 0xaa, 0xa6,
+ 0x29, 0x3d, 0x41, 0xd1, 0xb1, 0x40, 0x4f, 0x97, 0x54, 0x4d, 0xdb, 0x0a, 0x90, 0xd1, 0x3b, 0xb0,
+ 0xac, 0xd9, 0xa6, 0x15, 0xe6, 0x65, 0x70, 0x6a, 0x8d, 0x3c, 0x08, 0x32, 0x4b, 0xff, 0x51, 0x80,
+ 0xb3, 0xe1, 0x30, 0x8b, 0xe2, 0x5c, 0x0f, 0x60, 0x31, 0xd2, 0x6b, 0x0a, 0x1e, 0xe4, 0x5b, 0x2b,
+ 0x87, 0x24, 0x22, 0xb8, 0x4d, 0x36, 0x86, 0xdb, 0x24, 0x22, 0x69, 0xb9, 0x37, 0x8a, 0xa4, 0xe5,
+ 0xdf, 0x08, 0x92, 0x56, 0xf8, 0x66, 0x48, 0xda, 0xe2, 0x8c, 0x48, 0xda, 0x25, 0x9a, 0x4b, 0x45,
+ 0xef, 0x14, 0xb4, 0x60, 0x13, 0xa7, 0xe2, 0xf5, 0x61, 0x08, 0xd8, 0x3e, 0x82, 0xb8, 0x2d, 0xcc,
+ 0x82, 0xb8, 0x15, 0x53, 0x11, 0x37, 0x12, 0x75, 0x96, 0xa5, 0xda, 0x43, 0xd3, 0x16, 0x90, 0x1a,
+ 0xaf, 0x21, 0x97, 0x04, 0x9d, 0xc3, 0x69, 0xa9, 0xe0, 0x1b, 0xa4, 0x81, 0x6f, 0xe8, 0x3c, 0x2c,
+ 0x1a, 0xa6, 0x62, 0xe0, 0x97, 0x0a, 0x89, 0x05, 0xa7, 0x5e, 0x66, 0x81, 0x61, 0x98, 0x6d, 0xfc,
+ 0xb2, 0x43, 0x28, 0x68, 0x1d, 0x16, 0x87, 0xaa, 0xf3, 0x1c, 0x6b, 0x54, 0x95, 0x53, 0xaf, 0xd0,
+ 0x20, 0x2e, 0x33, 0x1a, 0xd1, 0xe1, 0xa0, 0x8b, 0xe0, 0xbd, 0x24, 0x67, 0xaa, 0x52, 0xa6, 0x8a,
+ 0xa0, 0x52, 0x36, 0xe9, 0x6f, 0x33, 0xb0, 0x12, 0x0e, 0x73, 0x0e, 0xca, 0x3c, 0x86, 0x92, 0x2d,
+ 0xf2, 0x2a, 0x0f, 0xed, 0xab, 0x29, 0xdb, 0x80, 0x78, 0x22, 0x96, 0x7d, 0x59, 0xf4, 0xc3, 0x54,
+ 0x2c, 0xf0, 0xc6, 0x24, 0x7d, 0x93, 0xd0, 0x40, 0xc9, 0x86, 0x73, 0x9f, 0xe8, 0x86, 0x66, 0xbe,
+ 0x74, 0x52, 0x67, 0x69, 0x42, 0xac, 0x64, 0x52, 0x62, 0xa5, 0x67, 0x63, 0x0d, 0x1b, 0xae, 0xae,
+ 0x0e, 0x14, 0xc7, 0xc2, 0x3d, 0x81, 0x49, 0xf8, 0x64, 0xb2, 0x92, 0x49, 0xbf, 0xcc, 0xc0, 0xa9,
+ 0x68, 0xa7, 0xdc, 0x67, 0xad, 0xb8, 0xcf, 0xde, 0x89, 0xbf, 0x63, 0x54, 0x38, 0xd1, 0x6b, 0x5f,
+ 0xa4, 0x7a, 0xed, 0xe6, 0x64, 0x8d, 0x13, 0xfd, 0xf6, 0x97, 0x19, 0x38, 0x9d, 0x6a, 0x46, 0x64,
+ 0x25, 0xcc, 0x44, 0x57, 0x42, 0xbe, 0x8a, 0xf6, 0xcc, 0x91, 0xe1, 0x06, 0x56, 0xd1, 0x2d, 0x7a,
+ 0x88, 0xc3, 0x96, 0x2b, 0x65, 0xa8, 0xbe, 0xd2, 0x87, 0xa3, 0x21, 0x5f, 0x46, 0x89, 0xba, 0x67,
+ 0x8c, 0xf2, 0x1a, 0xeb, 0xa8, 0xd4, 0x84, 0x65, 0xcf, 0xca, 0xb1, 0x30, 0x6b, 0x00, 0x36, 0xcd,
+ 0x86, 0x61, 0x53, 0x03, 0xe6, 0xb7, 0xf1, 0x0b, 0xbd, 0x87, 0xdf, 0xc8, 0x29, 0xd3, 0x79, 0x28,
+ 0x5b, 0xd8, 0x1e, 0xea, 0x8e, 0xe3, 0x65, 0xe4, 0x92, 0x1c, 0x24, 0x49, 0xff, 0x39, 0x0f, 0x4b,
+ 0xd1, 0xe8, 0xb8, 0x1f, 0x43, 0x69, 0x2f, 0x24, 0xac, 0x15, 0xd1, 0x17, 0x0d, 0x54, 0xcb, 0x37,
+ 0x45, 0x0d, 0x95, 0x4d, 0x43, 0x34, 0xbc, 0x7a, 0x8b, 0x17, 0x58, 0xc4, 0x23, 0x3d, 0x73, 0x38,
+ 0x54, 0x0d, 0x4d, 0x1c, 0x0e, 0xf2, 0x26, 0xf1, 0x9f, 0x6a, 0xf7, 0x89, 0xdb, 0x09, 0x99, 0xfe,
+ 0x26, 0x83, 0x47, 0xb6, 0xff, 0xba, 0x41, 0xd1, 0x5e, 0x9a, 0xd5, 0x4b, 0x32, 0x70, 0xd2, 0xb6,
+ 0x6e, 0xa3, 0x0d, 0xc8, 0x63, 0xe3, 0x85, 0x28, 0x87, 0x13, 0x4e, 0x0f, 0x45, 0x35, 0x27, 0x53,
+ 0x3e, 0x74, 0x03, 0xe6, 0x87, 0x24, 0x2c, 0x04, 0x10, 0xb0, 0x9a, 0x72, 0x88, 0x26, 0x73, 0x36,
+ 0xb4, 0x09, 0x0b, 0x1a, 0x1d, 0x27, 0x51, 0xc4, 0xd4, 0x13, 0x30, 0x64, 0xca, 0x20, 0x0b, 0x46,
+ 0xb4, 0xe3, 0x15, 0xfb, 0xa5, 0xb4, 0x2a, 0x3d, 0x32, 0x14, 0x89, 0x15, 0xff, 0x5e, 0xb8, 0xe2,
+ 0x07, 0xaa, 0x6b, 0x73, 0xb2, 0xae, 0xf1, 0x65, 0xff, 0x69, 0x28, 0x0e, 0xcc, 0x3e, 0x0b, 0xa3,
+ 0x32, 0x3b, 0x77, 0x1e, 0x98, 0x7d, 0x1a, 0x45, 0x2b, 0x64, 0xf3, 0xa3, 0xe9, 0x06, 0x5d, 0xfe,
+ 0x8a, 0x32, 0x6b, 0x90, 0xc9, 0x47, 0x7f, 0x28, 0xa6, 0xd1, 0xc3, 0xf5, 0x0a, 0x7d, 0x54, 0xa2,
+ 0x94, 0x5d, 0xa3, 0x47, 0xab, 0x64, 0xd7, 0x3d, 0xae, 0x57, 0x29, 0x9d, 0xfc, 0x24, 0xfb, 0x5a,
+ 0x86, 0xd5, 0x2c, 0xa5, 0xed, 0x6b, 0x93, 0xf2, 0xbb, 0x80, 0x6a, 0x1e, 0xc2, 0xc2, 0x4b, 0x96,
+ 0x08, 0xea, 0x35, 0x2a, 0x7f, 0x65, 0x72, 0x7a, 0xe1, 0x1a, 0x84, 0xe0, 0xb7, 0xb9, 0x63, 0xf9,
+ 0xfb, 0x0c, 0x9c, 0xda, 0xa2, 0xdb, 0xbe, 0x40, 0x1e, 0x9b, 0x05, 0x2b, 0xbd, 0xed, 0xc1, 0xd8,
+ 0xa9, 0xf8, 0x63, 0xf4, 0xbd, 0x05, 0x8a, 0xdd, 0x82, 0xaa, 0x50, 0xce, 0x55, 0xe4, 0xa6, 0x46,
+ 0xc2, 0x2b, 0x4e, 0xb0, 0x29, 0x7d, 0x04, 0xab, 0xb1, 0xb7, 0xe0, 0x3b, 0xaf, 0x75, 0x58, 0xf4,
+ 0xf3, 0x95, 0xf7, 0x12, 0x65, 0x8f, 0xd6, 0xd2, 0xa4, 0x3b, 0x70, 0xb2, 0xeb, 0xaa, 0xb6, 0x1b,
+ 0x73, 0xc1, 0x14, 0xb2, 0x14, 0xe3, 0x0e, 0xcb, 0x72, 0x18, 0xba, 0x0b, 0x2b, 0x5d, 0xd7, 0xb4,
+ 0x5e, 0x43, 0x29, 0xc9, 0x3a, 0xe4, 0xfd, 0xcd, 0x91, 0x58, 0x1f, 0x44, 0x53, 0x5a, 0x65, 0x88,
+ 0x7c, 0xbc, 0xb7, 0xbb, 0x70, 0x8a, 0x01, 0xe2, 0xaf, 0xf3, 0x12, 0xa7, 0x05, 0x1c, 0x1f, 0xd7,
+ 0xfb, 0x0c, 0x4e, 0xf8, 0xcb, 0xa2, 0x0f, 0x35, 0xdd, 0x0a, 0x43, 0x4d, 0xe7, 0xc7, 0x8c, 0x7a,
+ 0x08, 0x69, 0xfa, 0xf3, 0x6c, 0x20, 0xaf, 0xa7, 0x00, 0x4d, 0x77, 0xc3, 0x40, 0xd3, 0xc5, 0x49,
+ 0xba, 0x43, 0x38, 0x53, 0x3c, 0x6a, 0x73, 0x09, 0x51, 0xfb, 0x79, 0x0c, 0x8d, 0xca, 0xa7, 0xc1,
+ 0x79, 0x11, 0x6b, 0x7f, 0x2b, 0x60, 0x94, 0xcc, 0xc0, 0x28, 0xaf, 0x6b, 0xef, 0xfc, 0xe2, 0x76,
+ 0x04, 0x8c, 0x5a, 0x9f, 0x68, 0xaf, 0x87, 0x45, 0xfd, 0x75, 0x1e, 0x4a, 0xde, 0xb3, 0x98, 0xcf,
+ 0xe3, 0x6e, 0xcb, 0x26, 0xb8, 0x2d, 0xb8, 0x02, 0xe7, 0xbe, 0xd1, 0x0a, 0x9c, 0x9f, 0x7a, 0x05,
+ 0x3e, 0x03, 0x25, 0xfa, 0x43, 0xb1, 0xf1, 0x21, 0x5f, 0x51, 0x8b, 0x94, 0x20, 0xe3, 0x43, 0x3f,
+ 0x0c, 0xe7, 0x67, 0x0a, 0xc3, 0x08, 0xfc, 0xb5, 0x10, 0x85, 0xbf, 0xee, 0x7b, 0x2b, 0x22, 0x5b,
+ 0x44, 0x2f, 0x8f, 0xd1, 0x9b, 0xb8, 0x16, 0xb6, 0xc3, 0x6b, 0x21, 0x5b, 0x57, 0xdf, 0x1d, 0xa7,
+ 0x65, 0xec, 0x2a, 0xf8, 0x6d, 0xae, 0x10, 0xfb, 0x0c, 0xd3, 0x0a, 0xc6, 0x22, 0xcf, 0xac, 0x77,
+ 0x01, 0xbc, 0x24, 0x22, 0x80, 0xad, 0x33, 0x63, 0xde, 0x51, 0x0e, 0xb0, 0x13, 0xb5, 0xa1, 0xa1,
+ 0xf1, 0xcf, 0xe8, 0xa6, 0xcb, 0x8f, 0x29, 0x07, 0x74, 0xff, 0x57, 0x08, 0xe4, 0x97, 0x94, 0xb3,
+ 0xa7, 0xfb, 0x31, 0xd8, 0x75, 0xc6, 0x28, 0xbe, 0x15, 0x46, 0x5d, 0x5f, 0x33, 0xea, 0x62, 0xa0,
+ 0x2b, 0xad, 0x5c, 0x54, 0x9b, 0x3f, 0x66, 0x58, 0x57, 0x89, 0x53, 0x9a, 0x74, 0x67, 0x70, 0xa8,
+ 0x1b, 0xba, 0x73, 0xc4, 0x9e, 0xcf, 0xb3, 0x9d, 0x81, 0x20, 0x35, 0x29, 0xda, 0x84, 0x5f, 0xe9,
+ 0xae, 0xd2, 0x33, 0x35, 0x4c, 0x63, 0xba, 0x20, 0x17, 0x09, 0x61, 0xcb, 0xd4, 0xb0, 0x3f, 0xf3,
+ 0x8a, 0xaf, 0x37, 0xf3, 0x4a, 0x91, 0x99, 0x77, 0x0a, 0xe6, 0x6d, 0xac, 0x3a, 0xa6, 0xc1, 0xf7,
+ 0xe1, 0xbc, 0x45, 0x86, 0x66, 0x88, 0x1d, 0x87, 0xf4, 0xc4, 0xcb, 0x35, 0xde, 0x0c, 0x94, 0x99,
+ 0x8b, 0x13, 0xcb, 0xcc, 0x31, 0x67, 0x5a, 0x91, 0x32, 0xb3, 0x32, 0xb1, 0xcc, 0x9c, 0xea, 0x48,
+ 0xcb, 0x2f, 0xb4, 0xab, 0xd3, 0x15, 0xda, 0xc1, 0xba, 0x74, 0x29, 0x54, 0x97, 0x7e, 0x9b, 0x93,
+ 0xf5, 0xd7, 0x19, 0x58, 0x8d, 0x4d, 0x2b, 0x3e, 0x5d, 0x6f, 0x47, 0x0e, 0xbd, 0xd6, 0x27, 0xfa,
+ 0xcc, 0x3b, 0xf3, 0x7a, 0x1c, 0x3a, 0xf3, 0x7a, 0x7f, 0xb2, 0xe0, 0x1b, 0x3f, 0xf2, 0xfa, 0xe3,
+ 0x0c, 0x9c, 0xdb, 0xb7, 0xb4, 0x48, 0x85, 0xc7, 0xb7, 0xfd, 0xd3, 0x27, 0x8e, 0xfb, 0xa2, 0xd6,
+ 0xcf, 0xce, 0x0a, 0xc8, 0x30, 0x39, 0x49, 0x82, 0xf3, 0xe9, 0x66, 0xf0, 0x92, 0xe9, 0x47, 0xb0,
+ 0xb4, 0xf3, 0x0a, 0xf7, 0xba, 0xc7, 0x46, 0x6f, 0x06, 0xd3, 0x6a, 0x90, 0xeb, 0x0d, 0x35, 0x0e,
+ 0xa7, 0x92, 0x9f, 0xc1, 0x2a, 0x30, 0x17, 0xae, 0x02, 0x15, 0xa8, 0xf9, 0x3d, 0xf0, 0xe1, 0x3d,
+ 0x45, 0x86, 0x57, 0x23, 0xcc, 0x44, 0xf9, 0xa2, 0xcc, 0x5b, 0x9c, 0x8e, 0x6d, 0x76, 0x45, 0x84,
+ 0xd1, 0xb1, 0x6d, 0x87, 0xb3, 0x45, 0x2e, 0x9c, 0x2d, 0xa4, 0x3f, 0xcb, 0x40, 0x99, 0xf4, 0xf0,
+ 0x8d, 0xec, 0xe7, 0x5b, 0xad, 0x9c, 0xbf, 0xd5, 0xf2, 0x76, 0x6c, 0xf9, 0xe0, 0x8e, 0xcd, 0xb7,
+ 0xbc, 0x40, 0xc9, 0x71, 0xcb, 0xe7, 0x3d, 0x3a, 0xb6, 0x6d, 0xe9, 0x3c, 0x2c, 0x32, 0xdb, 0xf8,
+ 0x9b, 0xd7, 0x20, 0x37, 0xb2, 0x07, 0x22, 0x8e, 0x46, 0xf6, 0x40, 0xfa, 0x93, 0x0c, 0x54, 0x9a,
+ 0xae, 0xab, 0xf6, 0x8e, 0x66, 0x78, 0x01, 0xcf, 0xb8, 0x6c, 0xd0, 0xb8, 0xf8, 0x4b, 0xf8, 0xe6,
+ 0xe6, 0x53, 0xcc, 0x2d, 0x84, 0xcc, 0x95, 0xa0, 0x2a, 0x6c, 0x49, 0x35, 0xb8, 0x0d, 0xa8, 0x63,
+ 0xda, 0xee, 0x23, 0xd3, 0x7e, 0xa9, 0xda, 0xda, 0x6c, 0x3b, 0x30, 0x04, 0x79, 0x7e, 0xa7, 0x38,
+ 0x77, 0xa5, 0x20, 0xd3, 0xdf, 0xd2, 0x65, 0x38, 0x11, 0xd2, 0x97, 0xda, 0xf1, 0x03, 0x28, 0xd3,
+ 0xbc, 0xcf, 0x4b, 0xf1, 0x9b, 0xc1, 0x53, 0xa6, 0xa9, 0x56, 0x09, 0xe9, 0xf7, 0x61, 0x99, 0xd4,
+ 0x07, 0x94, 0xee, 0x4d, 0xc5, 0xef, 0x45, 0xea, 0xd4, 0xb3, 0x29, 0x8a, 0x22, 0x35, 0xea, 0xdf,
+ 0x64, 0xa0, 0x40, 0xe9, 0xb1, 0x35, 0xfb, 0x0c, 0x94, 0x6c, 0x6c, 0x99, 0x8a, 0xab, 0xf6, 0xbd,
+ 0x1b, 0xdc, 0x84, 0xb0, 0xa7, 0xf6, 0x29, 0x9a, 0x4b, 0x1f, 0x6a, 0x7a, 0x1f, 0x3b, 0xae, 0xb8,
+ 0xc6, 0x5d, 0x26, 0xb4, 0x6d, 0x46, 0x22, 0x4e, 0xa2, 0x87, 0x30, 0x79, 0x7a, 0xd6, 0x42, 0x7f,
+ 0xa3, 0x0d, 0x76, 0xa9, 0x70, 0x1a, 0xec, 0x9d, 0x5e, 0x39, 0x6c, 0x40, 0x31, 0x02, 0x97, 0x7b,
+ 0x6d, 0x69, 0x07, 0x50, 0xd0, 0x0b, 0xdc, 0xdf, 0x37, 0x60, 0x9e, 0x3a, 0x49, 0x54, 0x47, 0xab,
+ 0x29, 0x6e, 0x90, 0x39, 0x9b, 0xa4, 0x02, 0x62, 0x0e, 0x0e, 0x55, 0x44, 0xb3, 0x8f, 0xca, 0x98,
+ 0x0a, 0xe9, 0xef, 0x32, 0x70, 0x22, 0xd4, 0x07, 0xb7, 0xf5, 0x7a, 0xb8, 0x93, 0x54, 0x53, 0x79,
+ 0x07, 0x5b, 0xa1, 0x25, 0xe1, 0x46, 0x9a, 0x49, 0xbf, 0xa1, 0xe5, 0xe0, 0x1f, 0x32, 0x00, 0xcd,
+ 0x91, 0x7b, 0xc4, 0x91, 0xc1, 0xe0, 0xc8, 0x64, 0xc2, 0x23, 0x43, 0x9e, 0x59, 0xaa, 0xe3, 0xbc,
+ 0x34, 0x6d, 0xb1, 0xa7, 0xf1, 0xda, 0x14, 0xc3, 0x1b, 0xb9, 0x47, 0xe2, 0xcc, 0x8c, 0xfc, 0x46,
+ 0x17, 0xa1, 0xca, 0xbe, 0x1a, 0x50, 0x54, 0x4d, 0xb3, 0xb1, 0xe3, 0xf0, 0xc3, 0xb3, 0x0a, 0xa3,
+ 0x36, 0x19, 0x91, 0xb0, 0xe9, 0x14, 0xd5, 0x76, 0x8f, 0x15, 0xd7, 0x7c, 0x8e, 0x0d, 0xbe, 0x37,
+ 0xa9, 0x08, 0xea, 0x1e, 0x21, 0xb2, 0x53, 0x84, 0xbe, 0xee, 0xb8, 0xb6, 0x60, 0x13, 0x07, 0x2d,
+ 0x9c, 0x4a, 0xd9, 0xc8, 0xa0, 0xd4, 0x3a, 0xa3, 0xc1, 0x80, 0xb9, 0xf8, 0xf5, 0x87, 0xfd, 0x3d,
+ 0xfe, 0x42, 0xd9, 0xb4, 0x98, 0xf6, 0x9d, 0xc6, 0x5f, 0xf7, 0x0d, 0x82, 0x30, 0xef, 0xc1, 0x72,
+ 0xe0, 0x1d, 0x78, 0x58, 0x85, 0x8a, 0xc8, 0x4c, 0xb8, 0x88, 0x94, 0x1e, 0x03, 0x62, 0xb8, 0xc3,
+ 0x37, 0x7c, 0x6f, 0xe9, 0x24, 0x9c, 0x08, 0x29, 0xe2, 0x2b, 0xf1, 0x35, 0xa8, 0xf0, 0x0b, 0x5a,
+ 0x3c, 0x50, 0x4e, 0x43, 0x91, 0x64, 0xd4, 0x9e, 0xae, 0x89, 0x03, 0xd5, 0x05, 0xcb, 0xd4, 0xb6,
+ 0x74, 0xcd, 0x96, 0x3e, 0x81, 0x8a, 0xcc, 0xfa, 0xe1, 0xbc, 0x8f, 0xa0, 0xca, 0xaf, 0x73, 0x29,
+ 0xa1, 0x8b, 0x9a, 0x49, 0x1f, 0x02, 0x04, 0x3b, 0x91, 0x2b, 0x46, 0xb0, 0x29, 0x69, 0xd0, 0x60,
+ 0x25, 0x43, 0x48, 0xbd, 0x78, 0xd9, 0x47, 0x20, 0xee, 0x2f, 0x4c, 0xec, 0x25, 0x2c, 0x5f, 0xb1,
+ 0x83, 0x4d, 0xe9, 0x2c, 0x9c, 0x49, 0xec, 0x85, 0x7b, 0xc2, 0x82, 0x9a, 0xff, 0x80, 0xdd, 0x26,
+ 0xf4, 0x4e, 0x8c, 0x33, 0x81, 0x13, 0xe3, 0x53, 0x5e, 0x91, 0x98, 0x15, 0x8b, 0x18, 0xad, 0x00,
+ 0xfd, 0x72, 0x3f, 0x97, 0x56, 0xee, 0xe7, 0x43, 0xe5, 0xbe, 0xd4, 0xf5, 0xfc, 0xc9, 0xb7, 0x61,
+ 0x0f, 0xe9, 0x76, 0x91, 0xf5, 0x2d, 0x12, 0xa2, 0x34, 0xee, 0x2d, 0x19, 0xab, 0x1c, 0x90, 0x92,
+ 0xae, 0x42, 0x25, 0x9c, 0x1a, 0x03, 0x79, 0x2e, 0x13, 0xcb, 0x73, 0xd5, 0x48, 0x8a, 0xfb, 0x30,
+ 0x52, 0x01, 0xa7, 0xfb, 0x38, 0x52, 0xff, 0xde, 0x0b, 0x25, 0xbb, 0x6b, 0x09, 0x87, 0xbd, 0xbf,
+ 0xa1, 0x3c, 0xb7, 0xc2, 0xd7, 0x83, 0x47, 0x0e, 0x91, 0xe7, 0x2f, 0x2d, 0x5d, 0x80, 0xf2, 0x7e,
+ 0xda, 0x57, 0x26, 0x79, 0x71, 0xcd, 0xe3, 0x16, 0xac, 0x3c, 0xd2, 0x07, 0xd8, 0x39, 0x76, 0x5c,
+ 0x3c, 0x6c, 0xd1, 0xa4, 0x74, 0xa8, 0x63, 0x1b, 0xad, 0x01, 0xd0, 0x2d, 0x8c, 0x65, 0xea, 0xde,
+ 0xc7, 0x07, 0x01, 0x8a, 0xf4, 0x5f, 0x19, 0x58, 0xf2, 0x05, 0xf7, 0xe9, 0xd6, 0xed, 0x2d, 0x28,
+ 0x91, 0xf7, 0x75, 0x5c, 0x75, 0x68, 0x89, 0xf3, 0x2c, 0x8f, 0x80, 0xee, 0x42, 0xe1, 0xd0, 0x11,
+ 0x90, 0x51, 0x22, 0x80, 0x9e, 0x64, 0x88, 0x9c, 0x3f, 0x74, 0x5a, 0x1a, 0xfa, 0x08, 0x60, 0xe4,
+ 0x60, 0x8d, 0x9f, 0x61, 0xe5, 0xd2, 0xaa, 0x85, 0xfd, 0xe0, 0x41, 0x38, 0x11, 0x60, 0x37, 0x44,
+ 0xee, 0x41, 0x59, 0x37, 0x4c, 0x0d, 0xd3, 0xc3, 0x49, 0x8d, 0xa3, 0x4a, 0x13, 0xc4, 0x81, 0x49,
+ 0xec, 0x3b, 0x58, 0x93, 0x30, 0x5f, 0x0b, 0x85, 0x7f, 0x79, 0xa0, 0xb4, 0x61, 0x99, 0x25, 0xad,
+ 0x43, 0xcf, 0x70, 0x11, 0xb1, 0xeb, 0xe3, 0xde, 0x8e, 0x7a, 0x4b, 0xae, 0xe9, 0xbc, 0xb4, 0x11,
+ 0xa2, 0xd2, 0x1d, 0x38, 0x19, 0xda, 0x21, 0xcd, 0xb0, 0x65, 0x91, 0x3a, 0x11, 0xa0, 0xc4, 0x0f,
+ 0x67, 0x0e, 0x43, 0x88, 0x68, 0x9e, 0x04, 0x43, 0x38, 0x0c, 0x86, 0x70, 0xa4, 0xcf, 0xe1, 0x74,
+ 0x08, 0xd1, 0x09, 0x59, 0x74, 0x2f, 0x52, 0xb9, 0x5d, 0x9a, 0xa4, 0x35, 0x52, 0xc2, 0xfd, 0x6f,
+ 0x06, 0x56, 0x92, 0x18, 0x5e, 0x13, 0x71, 0xfc, 0x51, 0xca, 0xb5, 0xc1, 0xdb, 0xd3, 0x99, 0xf5,
+ 0x5b, 0x41, 0x6b, 0xf7, 0xa0, 0x91, 0xe4, 0xcf, 0xf8, 0x28, 0xe5, 0x66, 0x19, 0xa5, 0x9f, 0xe7,
+ 0x02, 0xc8, 0x7b, 0xd3, 0x75, 0x6d, 0xfd, 0x60, 0x44, 0x42, 0xfe, 0x8d, 0xa3, 0x59, 0x2d, 0x0f,
+ 0x97, 0x61, 0xae, 0xbd, 0x39, 0x46, 0xdc, 0xb7, 0x23, 0x11, 0x9b, 0xf9, 0x34, 0x8c, 0xcd, 0x30,
+ 0x4c, 0xfd, 0xd6, 0x74, 0xfa, 0xbe, 0xb3, 0x00, 0xe8, 0xcf, 0xb3, 0x50, 0x0d, 0x0f, 0x11, 0xda,
+ 0x01, 0x50, 0x3d, 0xcb, 0xf9, 0x44, 0xb9, 0x38, 0xd5, 0x6b, 0xca, 0x01, 0x41, 0xf4, 0x2e, 0xe4,
+ 0x7a, 0xd6, 0x88, 0x8f, 0x5a, 0xc2, 0x61, 0xf0, 0x96, 0x35, 0x62, 0x19, 0x85, 0xb0, 0x91, 0x3d,
+ 0x15, 0x3b, 0xdb, 0x4f, 0xcf, 0x92, 0xcf, 0xe8, 0x73, 0x26, 0xc3, 0x99, 0xd1, 0x13, 0xa8, 0xbe,
+ 0xb4, 0x75, 0x57, 0x3d, 0x18, 0x60, 0x65, 0xa0, 0x1e, 0x63, 0x9b, 0x67, 0xc9, 0x29, 0x12, 0x59,
+ 0x45, 0x08, 0x3e, 0x25, 0x72, 0xd2, 0x1f, 0x41, 0x51, 0x58, 0x34, 0x61, 0x45, 0xd8, 0x83, 0xd5,
+ 0x11, 0x61, 0x53, 0xe8, 0xcd, 0x3d, 0x43, 0x35, 0x4c, 0xc5, 0xc1, 0x64, 0x19, 0x17, 0x5f, 0x29,
+ 0x4c, 0x48, 0xd1, 0x2b, 0x54, 0x7a, 0xcb, 0xb4, 0x71, 0x5b, 0x35, 0xcc, 0x2e, 0x13, 0x95, 0x5e,
+ 0x40, 0x39, 0xf0, 0x82, 0x13, 0x4c, 0x68, 0xc1, 0xb2, 0x38, 0x8a, 0x77, 0xb0, 0xcb, 0x97, 0x97,
+ 0xa9, 0x3a, 0x5f, 0xe2, 0x72, 0x5d, 0xec, 0xb2, 0xeb, 0x13, 0xf7, 0xe0, 0xb4, 0x8c, 0x4d, 0x0b,
+ 0x1b, 0xde, 0x78, 0x3e, 0x35, 0xfb, 0x33, 0x64, 0xf0, 0xb7, 0xa0, 0x91, 0x24, 0xcf, 0xf2, 0xc3,
+ 0xb5, 0x4b, 0x50, 0x14, 0x9f, 0x0c, 0xa3, 0x05, 0xc8, 0xed, 0x6d, 0x75, 0x6a, 0x73, 0xe4, 0xc7,
+ 0xfe, 0x76, 0xa7, 0x96, 0x41, 0x45, 0xc8, 0x77, 0xb7, 0xf6, 0x3a, 0xb5, 0xec, 0xb5, 0x21, 0xd4,
+ 0xa2, 0xdf, 0xcb, 0xa2, 0x55, 0x38, 0xd1, 0x91, 0x77, 0x3b, 0xcd, 0xc7, 0xcd, 0xbd, 0xd6, 0x6e,
+ 0x5b, 0xe9, 0xc8, 0xad, 0x8f, 0x9b, 0x7b, 0x3b, 0xb5, 0x39, 0xb4, 0x0e, 0x67, 0x83, 0x0f, 0x9e,
+ 0xec, 0x76, 0xf7, 0x94, 0xbd, 0x5d, 0x65, 0x6b, 0xb7, 0xbd, 0xd7, 0x6c, 0xb5, 0x77, 0xe4, 0x5a,
+ 0x06, 0x9d, 0x85, 0xd3, 0x41, 0x96, 0x87, 0xad, 0xed, 0x96, 0xbc, 0xb3, 0x45, 0x7e, 0x37, 0x9f,
+ 0xd6, 0xb2, 0xd7, 0x6e, 0x42, 0x25, 0xf4, 0x79, 0x2b, 0x31, 0xa9, 0xb3, 0xbb, 0x5d, 0x9b, 0x43,
+ 0x15, 0x28, 0x05, 0xf5, 0x14, 0x21, 0xdf, 0xde, 0xdd, 0xde, 0xa9, 0x65, 0xaf, 0xdd, 0x81, 0xa5,
+ 0xc8, 0x6d, 0x63, 0xb4, 0x0c, 0x95, 0x6e, 0xb3, 0xbd, 0xfd, 0x70, 0xf7, 0x53, 0x45, 0xde, 0x69,
+ 0x6e, 0x7f, 0x56, 0x9b, 0x43, 0x2b, 0x50, 0x13, 0xa4, 0xf6, 0xee, 0x1e, 0xa3, 0x66, 0xae, 0x3d,
+ 0x8f, 0xcc, 0x31, 0x8c, 0x4e, 0xc2, 0xb2, 0xd7, 0x8d, 0xb2, 0x25, 0xef, 0x34, 0xf7, 0x76, 0x48,
+ 0xef, 0x21, 0xb2, 0xbc, 0xdf, 0x6e, 0xb7, 0xda, 0x8f, 0x6b, 0x19, 0xa2, 0xd5, 0x27, 0xef, 0x7c,
+ 0xda, 0x22, 0xcc, 0xd9, 0x30, 0xf3, 0x7e, 0xfb, 0x07, 0xed, 0xdd, 0x4f, 0xda, 0xb5, 0xdc, 0xe6,
+ 0x2f, 0x97, 0xa1, 0x2a, 0x0a, 0x3d, 0x6c, 0xd3, 0x5b, 0x2d, 0x1d, 0x58, 0x10, 0x9f, 0xa0, 0x27,
+ 0x64, 0xe8, 0xf0, 0x87, 0xf3, 0x8d, 0xf5, 0x31, 0x1c, 0xbc, 0xde, 0x9e, 0x43, 0x07, 0xb4, 0xfe,
+ 0x0d, 0xdc, 0xfe, 0xbe, 0x94, 0x58, 0x6d, 0xc6, 0x2e, 0x9c, 0x37, 0x2e, 0x4f, 0xe4, 0xf3, 0xfa,
+ 0xc0, 0xa4, 0xc4, 0x0d, 0x7e, 0x60, 0x85, 0x2e, 0x27, 0xd5, 0xa6, 0x09, 0x5f, 0x70, 0x35, 0xae,
+ 0x4c, 0x66, 0xf4, 0xba, 0x79, 0x0e, 0xb5, 0xe8, 0xc7, 0x56, 0x28, 0x01, 0x3a, 0x4d, 0xf9, 0xa2,
+ 0xab, 0x71, 0x6d, 0x1a, 0xd6, 0x60, 0x67, 0xb1, 0xaf, 0x87, 0xae, 0x4e, 0xf3, 0x95, 0x45, 0x6a,
+ 0x67, 0x69, 0x1f, 0x64, 0x30, 0x07, 0x86, 0x2f, 0x6c, 0xa3, 0xc4, 0x4f, 0x75, 0x12, 0xbe, 0x0b,
+ 0x48, 0x72, 0x60, 0xf2, 0xdd, 0x6f, 0x69, 0x0e, 0x1d, 0xc1, 0x52, 0xe4, 0x7a, 0x02, 0x4a, 0x10,
+ 0x4f, 0xbe, 0x87, 0xd1, 0xb8, 0x3a, 0x05, 0x67, 0x38, 0x22, 0x82, 0xd7, 0x11, 0x92, 0x23, 0x22,
+ 0xe1, 0xb2, 0x43, 0x72, 0x44, 0x24, 0xde, 0x6c, 0xa0, 0xc1, 0x1d, 0xba, 0x86, 0x90, 0x14, 0xdc,
+ 0x49, 0x97, 0x1f, 0x1a, 0x97, 0x27, 0xf2, 0x05, 0x9d, 0x16, 0xb9, 0x94, 0x90, 0xe4, 0xb4, 0xe4,
+ 0x4b, 0x0f, 0x8d, 0xab, 0x53, 0x70, 0x46, 0xa3, 0xc0, 0x3f, 0xe2, 0x4c, 0x8b, 0x82, 0xd8, 0x81,
+ 0x7c, 0x5a, 0x14, 0xc4, 0x4f, 0x4b, 0x79, 0x14, 0x44, 0x8e, 0x26, 0xaf, 0x4c, 0x71, 0x94, 0x92,
+ 0x1e, 0x05, 0xc9, 0x87, 0x2e, 0xd2, 0x1c, 0xfa, 0x59, 0x06, 0xea, 0x69, 0xc7, 0x14, 0x28, 0xa1,
+ 0xbe, 0x9b, 0x70, 0xb2, 0xd2, 0xd8, 0x9c, 0x45, 0xc4, 0xb3, 0xe2, 0x4b, 0x40, 0xf1, 0x75, 0x0f,
+ 0xbd, 0x93, 0x34, 0x32, 0x29, 0xab, 0x6b, 0xe3, 0xdd, 0xe9, 0x98, 0xbd, 0x2e, 0xbb, 0x50, 0x14,
+ 0x07, 0x23, 0x28, 0x21, 0x4b, 0x47, 0x8e, 0x65, 0x1a, 0xd2, 0x38, 0x16, 0x4f, 0xe9, 0x63, 0xc8,
+ 0x13, 0x2a, 0x3a, 0x9b, 0xcc, 0x2d, 0x94, 0xad, 0xa5, 0x3d, 0xf6, 0x14, 0x3d, 0x83, 0x79, 0x76,
+ 0x12, 0x80, 0x12, 0x90, 0x87, 0xd0, 0x79, 0x45, 0xe3, 0x7c, 0x3a, 0x83, 0xa7, 0xee, 0x0b, 0xf6,
+ 0xdf, 0x49, 0x38, 0xc8, 0x8f, 0xde, 0x4e, 0xfe, 0xdc, 0x3b, 0x7c, 0xa6, 0xd0, 0xb8, 0x38, 0x81,
+ 0x2b, 0x38, 0x29, 0x22, 0x55, 0xef, 0xe5, 0x89, 0x5b, 0x97, 0xf4, 0x49, 0x91, 0xbc, 0x39, 0x62,
+ 0x41, 0x12, 0xdf, 0x3c, 0x25, 0x05, 0x49, 0xea, 0x96, 0x35, 0x29, 0x48, 0xd2, 0xf7, 0x63, 0xd2,
+ 0x1c, 0x72, 0xe1, 0x44, 0x02, 0x54, 0x86, 0xde, 0x4d, 0x0b, 0xf2, 0x24, 0xdc, 0xae, 0x71, 0x7d,
+ 0x4a, 0xee, 0xe0, 0xe0, 0xf3, 0x49, 0x7f, 0x2e, 0x1d, 0x3f, 0x4a, 0x1d, 0xfc, 0xe8, 0x14, 0xdf,
+ 0xfc, 0xd7, 0x1c, 0x2c, 0x32, 0x18, 0x94, 0x57, 0x30, 0x9f, 0x01, 0xf8, 0x27, 0x10, 0xe8, 0x42,
+ 0xb2, 0x4f, 0x42, 0xa7, 0x34, 0x8d, 0xb7, 0xc7, 0x33, 0x05, 0x03, 0x2d, 0x80, 0xe6, 0x27, 0x05,
+ 0x5a, 0xfc, 0xd0, 0x22, 0x29, 0xd0, 0x12, 0x8e, 0x04, 0xa4, 0x39, 0xf4, 0x31, 0x94, 0x3c, 0xd8,
+ 0x18, 0x25, 0xc1, 0xce, 0x11, 0x5c, 0xbc, 0x71, 0x61, 0x2c, 0x4f, 0xd0, 0xea, 0x00, 0x26, 0x9c,
+ 0x64, 0x75, 0x1c, 0x7b, 0x4e, 0xb2, 0x3a, 0x09, 0x58, 0xf6, 0x7d, 0xc2, 0x90, 0xa3, 0x54, 0x9f,
+ 0x84, 0x80, 0xbb, 0x54, 0x9f, 0x84, 0xe1, 0x27, 0x69, 0xee, 0xe1, 0xa5, 0x5f, 0x7d, 0xb5, 0x96,
+ 0xf9, 0xe7, 0xaf, 0xd6, 0xe6, 0x7e, 0xfa, 0xf5, 0x5a, 0xe6, 0x57, 0x5f, 0xaf, 0x65, 0xfe, 0xf1,
+ 0xeb, 0xb5, 0xcc, 0xbf, 0x7d, 0xbd, 0x96, 0xf9, 0xd3, 0x7f, 0x5f, 0x9b, 0xfb, 0x61, 0x51, 0x48,
+ 0x1f, 0xcc, 0xd3, 0xff, 0x31, 0xf4, 0xfe, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xc0, 0x76,
+ 0xe9, 0x29, 0x4a, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -9847,6 +9919,20 @@ func (m *LinuxContainerResources) MarshalToSizedBuffer(dAtA []byte) (int, error)
_ = i
var l int
_ = l
+ if len(m.HugepageLimits) > 0 {
+ for iNdEx := len(m.HugepageLimits) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.HugepageLimits[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintApi(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x42
+ }
+ }
if len(m.CpusetMems) > 0 {
i -= len(m.CpusetMems)
copy(dAtA[i:], m.CpusetMems)
@@ -9889,6 +9975,41 @@ func (m *LinuxContainerResources) MarshalToSizedBuffer(dAtA []byte) (int, error)
return len(dAtA) - i, nil
}
+func (m *HugepageLimit) Marshal() (dAtA []byte, err error) {
+ size := m.Size()
+ dAtA = make([]byte, size)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
+ if err != nil {
+ return nil, err
+ }
+ return dAtA[:n], nil
+}
+
+func (m *HugepageLimit) MarshalTo(dAtA []byte) (int, error) {
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *HugepageLimit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ _ = i
+ var l int
+ _ = l
+ if m.Limit != 0 {
+ i = encodeVarintApi(dAtA, i, uint64(m.Limit))
+ i--
+ dAtA[i] = 0x10
+ }
+ if len(m.PageSize) > 0 {
+ i -= len(m.PageSize)
+ copy(dAtA[i:], m.PageSize)
+ i = encodeVarintApi(dAtA, i, uint64(len(m.PageSize)))
+ i--
+ dAtA[i] = 0xa
+ }
+ return len(dAtA) - i, nil
+}
+
func (m *SELinuxOption) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
@@ -13977,6 +14098,28 @@ func (m *LinuxContainerResources) Size() (n int) {
if l > 0 {
n += 1 + l + sovApi(uint64(l))
}
+ if len(m.HugepageLimits) > 0 {
+ for _, e := range m.HugepageLimits {
+ l = e.Size()
+ n += 1 + l + sovApi(uint64(l))
+ }
+ }
+ return n
+}
+
+func (m *HugepageLimit) Size() (n int) {
+ if m == nil {
+ return 0
+ }
+ var l int
+ _ = l
+ l = len(m.PageSize)
+ if l > 0 {
+ n += 1 + l + sovApi(uint64(l))
+ }
+ if m.Limit != 0 {
+ n += 1 + sovApi(uint64(m.Limit))
+ }
return n
}
@@ -15873,6 +16016,11 @@ func (this *LinuxContainerResources) String() string {
if this == nil {
return "nil"
}
+ repeatedStringForHugepageLimits := "[]*HugepageLimit{"
+ for _, f := range this.HugepageLimits {
+ repeatedStringForHugepageLimits += strings.Replace(f.String(), "HugepageLimit", "HugepageLimit", 1) + ","
+ }
+ repeatedStringForHugepageLimits += "}"
s := strings.Join([]string{`&LinuxContainerResources{`,
`CpuPeriod:` + fmt.Sprintf("%v", this.CpuPeriod) + `,`,
`CpuQuota:` + fmt.Sprintf("%v", this.CpuQuota) + `,`,
@@ -15881,6 +16029,18 @@ func (this *LinuxContainerResources) String() string {
`OomScoreAdj:` + fmt.Sprintf("%v", this.OomScoreAdj) + `,`,
`CpusetCpus:` + fmt.Sprintf("%v", this.CpusetCpus) + `,`,
`CpusetMems:` + fmt.Sprintf("%v", this.CpusetMems) + `,`,
+ `HugepageLimits:` + repeatedStringForHugepageLimits + `,`,
+ `}`,
+ }, "")
+ return s
+}
+func (this *HugepageLimit) String() string {
+ if this == nil {
+ return "nil"
+ }
+ s := strings.Join([]string{`&HugepageLimit{`,
+ `PageSize:` + fmt.Sprintf("%v", this.PageSize) + `,`,
+ `Limit:` + fmt.Sprintf("%v", this.Limit) + `,`,
`}`,
}, "")
return s
@@ -22109,6 +22269,144 @@ func (m *LinuxContainerResources) Unmarshal(dAtA []byte) error {
}
m.CpusetMems = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 8:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field HugepageLimits", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthApi
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthApi
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.HugepageLimits = append(m.HugepageLimits, &HugepageLimit{})
+ if err := m.HugepageLimits[len(m.HugepageLimits)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ default:
+ iNdEx = preIndex
+ skippy, err := skipApi(dAtA[iNdEx:])
+ if err != nil {
+ return err
+ }
+ if skippy < 0 {
+ return ErrInvalidLengthApi
+ }
+ if (iNdEx + skippy) < 0 {
+ return ErrInvalidLengthApi
+ }
+ if (iNdEx + skippy) > l {
+ return io.ErrUnexpectedEOF
+ }
+ iNdEx += skippy
+ }
+ }
+
+ if iNdEx > l {
+ return io.ErrUnexpectedEOF
+ }
+ return nil
+}
+func (m *HugepageLimit) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
+ iNdEx := 0
+ for iNdEx < l {
+ preIndex := iNdEx
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ wire |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ fieldNum := int32(wire >> 3)
+ wireType := int(wire & 0x7)
+ if wireType == 4 {
+ return fmt.Errorf("proto: HugepageLimit: wiretype end group for non-group")
+ }
+ if fieldNum <= 0 {
+ return fmt.Errorf("proto: HugepageLimit: illegal tag %d (wire type %d)", fieldNum, wire)
+ }
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field PageSize", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthApi
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthApi
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.PageSize = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 2:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Limit", wireType)
+ }
+ m.Limit = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Limit |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipApi(dAtA[iNdEx:])
@@ -32703,6 +33001,7 @@ func (m *ReopenContainerLogResponse) Unmarshal(dAtA []byte) error {
func skipApi(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
+ depth := 0
for iNdEx < l {
var wire uint64
for shift := uint(0); ; shift += 7 {
@@ -32734,10 +33033,8 @@ func skipApi(dAtA []byte) (n int, err error) {
break
}
}
- return iNdEx, nil
case 1:
iNdEx += 8
- return iNdEx, nil
case 2:
var length int
for shift := uint(0); ; shift += 7 {
@@ -32758,55 +33055,30 @@ func skipApi(dAtA []byte) (n int, err error) {
return 0, ErrInvalidLengthApi
}
iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthApi
- }
- return iNdEx, nil
case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowApi
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipApi(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthApi
- }
- }
- return iNdEx, nil
+ depth++
case 4:
- return iNdEx, nil
+ if depth == 0 {
+ return 0, ErrUnexpectedEndOfGroupApi
+ }
+ depth--
case 5:
iNdEx += 4
- return iNdEx, nil
default:
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
}
+ if iNdEx < 0 {
+ return 0, ErrInvalidLengthApi
+ }
+ if depth == 0 {
+ return iNdEx, nil
+ }
}
- panic("unreachable")
+ return 0, io.ErrUnexpectedEOF
}
var (
- ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowApi = fmt.Errorf("proto: integer overflow")
+ ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
+ ErrIntOverflowApi = fmt.Errorf("proto: integer overflow")
+ ErrUnexpectedEndOfGroupApi = fmt.Errorf("proto: unexpected end of group")
)
diff --git a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto
index 0290d0f24..ce5a63d56 100644
--- a/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto
+++ b/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.proto
@@ -543,6 +543,19 @@ message LinuxContainerResources {
string cpuset_cpus = 6;
// CpusetMems constrains the allowed set of memory nodes. Default: "" (not specified).
string cpuset_mems = 7;
+ // List of HugepageLimits to limit the HugeTLB usage of container per page size. Default: nil (not specified).
+ repeated HugepageLimit hugepage_limits = 8;
+}
+
+// HugepageLimit corresponds to the file`hugetlb..limit_in_byte` in container level cgroup.
+// For example, `PageSize=1GB`, `Limit=1073741824` means setting `1073741824` bytes to hugetlb.1GB.limit_in_bytes.
+message HugepageLimit {
+ // The value of PageSize has the format B (2MB, 1GB),
+ // and must match the of the corresponding control file found in `hugetlb..limit_in_bytes`.
+ // The values of are intended to be parsed using base 1024("1KB" = 1024, "1MB" = 1048576, etc).
+ string page_size = 1;
+ // limit in bytes of hugepagesize HugeTLB usage.
+ uint64 limit = 2;
}
// SELinuxOption are the labels to be applied to the container.