From 3938aebdfc15cef3a713de483ddd8aacb8a8d03e Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 17 Sep 2018 15:19:04 -0700 Subject: [PATCH] llb: make sure to use stable marshaler Signed-off-by: Tonis Tiigi --- frontend/dockerfile/dockerfile2llb/convert.go | 13 +- solver/pb/ops.pb.go | 227 ++++++++++-------- solver/pb/ops.proto | 2 + 3 files changed, 139 insertions(+), 103 deletions(-) diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go index 70cc10a40..6a29dbcc1 100644 --- a/frontend/dockerfile/dockerfile2llb/convert.go +++ b/frontend/dockerfile/dockerfile2llb/convert.go @@ -703,16 +703,17 @@ func dispatchCopy(d *dispatchState, c instructions.SourcesAndDest, sourceState l args = append(args[:1], append([]string{"--unpack"}, args[1:]...)...) } - runOpt := []llb.RunOption{llb.Args(args), llb.Dir("/dest"), llb.ReadonlyRootFS(), dfCmd(cmdToPrint), llb.WithCustomName(prefixCommand(d, uppercaseCmd(processCmdEnv(opt.shlex, cmdToPrint.String(), d.state.Env())), d.prefixPlatform, &opt.targetPlatform))} + platform := opt.targetPlatform + if d.platform != nil { + platform = *d.platform + } + + runOpt := []llb.RunOption{llb.Args(args), llb.Dir("/dest"), llb.ReadonlyRootFS(), dfCmd(cmdToPrint), llb.WithCustomName(prefixCommand(d, uppercaseCmd(processCmdEnv(opt.shlex, cmdToPrint.String(), d.state.Env())), d.prefixPlatform, &platform))} if d.ignoreCache { runOpt = append(runOpt, llb.IgnoreCache) } run := img.Run(append(runOpt, mounts...)...) - d.state = run.AddMount("/dest", d.state).Platform(opt.targetPlatform) - - if d.platform != nil { - d.state = d.state.Platform(*d.platform) - } + d.state = run.AddMount("/dest", d.state).Platform(platform) return commitToHistory(&d.image, commitMessage.String(), true, &d.state) } diff --git a/solver/pb/ops.pb.go b/solver/pb/ops.pb.go index 44301aa24..fd97675db 100644 --- a/solver/pb/ops.pb.go +++ b/solver/pb/ops.pb.go @@ -42,6 +42,8 @@ import _ "github.com/gogo/protobuf/gogoproto" import github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" import github_com_moby_buildkit_util_apicaps "github.com/moby/buildkit/util/apicaps" +import sortkeys "github.com/gogo/protobuf/sortkeys" + import io "io" // Reference imports to suppress errors if they are not otherwise used. @@ -1649,10 +1651,15 @@ func (m *SourceOp) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], m.Identifier) } if len(m.Attrs) > 0 { + keysForAttrs := make([]string, 0, len(m.Attrs)) for k, _ := range m.Attrs { + keysForAttrs = append(keysForAttrs, string(k)) + } + sortkeys.Strings(keysForAttrs) + for _, k := range keysForAttrs { dAtA[i] = 0x12 i++ - v := m.Attrs[k] + v := m.Attrs[string(k)] mapSize := 1 + len(k) + sovOps(uint64(len(k))) + 1 + len(v) + sovOps(uint64(len(v))) i = encodeVarintOps(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa @@ -1689,10 +1696,15 @@ func (m *BuildOp) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintOps(dAtA, i, uint64(m.Builder)) } if len(m.Inputs) > 0 { + keysForInputs := make([]string, 0, len(m.Inputs)) for k, _ := range m.Inputs { + keysForInputs = append(keysForInputs, string(k)) + } + sortkeys.Strings(keysForInputs) + for _, k := range keysForInputs { dAtA[i] = 0x12 i++ - v := m.Inputs[k] + v := m.Inputs[string(k)] msgSize := 0 if v != nil { msgSize = v.Size() @@ -1727,10 +1739,15 @@ func (m *BuildOp) MarshalTo(dAtA []byte) (int, error) { i += n14 } if len(m.Attrs) > 0 { + keysForAttrs := make([]string, 0, len(m.Attrs)) for k, _ := range m.Attrs { + keysForAttrs = append(keysForAttrs, string(k)) + } + sortkeys.Strings(keysForAttrs) + for _, k := range keysForAttrs { dAtA[i] = 0x22 i++ - v := m.Attrs[k] + v := m.Attrs[string(k)] mapSize := 1 + len(k) + sovOps(uint64(len(k))) + 1 + len(v) + sovOps(uint64(len(v))) i = encodeVarintOps(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa @@ -1795,10 +1812,15 @@ func (m *OpMetadata) MarshalTo(dAtA []byte) (int, error) { i++ } if len(m.Description) > 0 { + keysForDescription := make([]string, 0, len(m.Description)) for k, _ := range m.Description { + keysForDescription = append(keysForDescription, string(k)) + } + sortkeys.Strings(keysForDescription) + for _, k := range keysForDescription { dAtA[i] = 0x12 i++ - v := m.Description[k] + v := m.Description[string(k)] mapSize := 1 + len(k) + sovOps(uint64(len(k))) + 1 + len(v) + sovOps(uint64(len(v))) i = encodeVarintOps(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa @@ -1822,10 +1844,15 @@ func (m *OpMetadata) MarshalTo(dAtA []byte) (int, error) { i += n15 } if len(m.Caps) > 0 { + keysForCaps := make([]string, 0, len(m.Caps)) for k, _ := range m.Caps { + keysForCaps = append(keysForCaps, string(k)) + } + sortkeys.Strings(keysForCaps) + for _, k := range keysForCaps { dAtA[i] = 0x2a i++ - v := m.Caps[k] + v := m.Caps[github_com_moby_buildkit_util_apicaps.CapID(k)] mapSize := 1 + len(k) + sovOps(uint64(len(k))) + 1 + 1 i = encodeVarintOps(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa @@ -1972,10 +1999,15 @@ func (m *Definition) MarshalTo(dAtA []byte) (int, error) { } } if len(m.Metadata) > 0 { + keysForMetadata := make([]string, 0, len(m.Metadata)) for k, _ := range m.Metadata { + keysForMetadata = append(keysForMetadata, string(k)) + } + sortkeys.Strings(keysForMetadata) + for _, k := range keysForMetadata { dAtA[i] = 0x12 i++ - v := m.Metadata[k] + v := m.Metadata[github_com_opencontainers_go_digest.Digest(k)] msgSize := 0 if (&v) != nil { msgSize = (&v).Size() @@ -6004,95 +6036,96 @@ var ( func init() { proto.RegisterFile("ops.proto", fileDescriptorOps) } var fileDescriptorOps = []byte{ - // 1437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5b, 0x6f, 0x1b, 0xc5, - 0x17, 0x8f, 0xd7, 0xd7, 0x3d, 0x4e, 0x52, 0xff, 0xa7, 0x97, 0xbf, 0x09, 0x25, 0x09, 0x5b, 0x40, - 0x69, 0xd2, 0x38, 0x92, 0x2b, 0xb5, 0x15, 0x0f, 0x15, 0xf1, 0xa5, 0x8a, 0x29, 0x89, 0xa3, 0x71, - 0x08, 0x8f, 0xd5, 0x66, 0x3d, 0x76, 0x56, 0x71, 0x76, 0x56, 0xbb, 0xe3, 0x36, 0x7e, 0xe1, 0xa1, - 0x9f, 0x00, 0x09, 0x89, 0x77, 0x1e, 0xf9, 0x10, 0xbc, 0xf7, 0x11, 0xf1, 0x06, 0x0f, 0x05, 0x95, - 0x2f, 0x82, 0xce, 0x99, 0x59, 0xef, 0xf6, 0x82, 0x68, 0x05, 0xe2, 0xc9, 0x67, 0xce, 0xf9, 0xcd, - 0x6f, 0xce, 0x6d, 0xe6, 0xac, 0xc1, 0x96, 0x61, 0xdc, 0x08, 0x23, 0xa9, 0x24, 0xb3, 0xc2, 0x93, - 0x95, 0xed, 0xb1, 0xaf, 0x4e, 0xa7, 0x27, 0x0d, 0x4f, 0x9e, 0xef, 0x8c, 0xe5, 0x58, 0xee, 0x90, - 0xe9, 0x64, 0x3a, 0xa2, 0x15, 0x2d, 0x48, 0xd2, 0x5b, 0x9c, 0xef, 0x2d, 0xb0, 0xfa, 0x21, 0xfb, - 0x10, 0x4a, 0x7e, 0x10, 0x4e, 0x55, 0x5c, 0xcf, 0xad, 0xe7, 0x37, 0xaa, 0x4d, 0xbb, 0x11, 0x9e, - 0x34, 0x7a, 0xa8, 0xe1, 0xc6, 0xc0, 0xd6, 0xa1, 0x20, 0x2e, 0x84, 0x57, 0xb7, 0xd6, 0x73, 0x1b, - 0xd5, 0x26, 0x20, 0xa0, 0x7b, 0x21, 0xbc, 0x7e, 0xb8, 0xb7, 0xc0, 0xc9, 0xc2, 0x3e, 0x81, 0x52, - 0x2c, 0xa7, 0x91, 0x27, 0xea, 0x79, 0xc2, 0x2c, 0x22, 0x66, 0x40, 0x1a, 0x42, 0x19, 0x2b, 0x32, - 0x79, 0x32, 0x9c, 0xd5, 0x0b, 0x29, 0x53, 0x5b, 0x86, 0x33, 0xcd, 0x84, 0x16, 0x76, 0x03, 0x8a, - 0x27, 0x53, 0x7f, 0x32, 0xac, 0x17, 0x09, 0x52, 0x45, 0x48, 0x0b, 0x15, 0x84, 0xd1, 0x36, 0xb6, - 0x01, 0x95, 0x70, 0xe2, 0xaa, 0x91, 0x8c, 0xce, 0xeb, 0x90, 0x1e, 0x78, 0x68, 0x74, 0x7c, 0x6e, - 0x65, 0x77, 0xa1, 0xea, 0xc9, 0x20, 0x56, 0x91, 0xeb, 0x07, 0x2a, 0xae, 0x57, 0x09, 0x7c, 0x15, - 0xc1, 0x5f, 0xc9, 0xe8, 0x4c, 0x44, 0xed, 0xd4, 0xc8, 0xb3, 0xc8, 0x56, 0x01, 0x2c, 0x19, 0x3a, - 0xdf, 0xe5, 0xa0, 0x92, 0xb0, 0x32, 0x07, 0x16, 0x77, 0x23, 0xef, 0xd4, 0x57, 0xc2, 0x53, 0xd3, - 0x48, 0xd4, 0x73, 0xeb, 0xb9, 0x0d, 0x9b, 0xbf, 0xa4, 0x63, 0xcb, 0x60, 0xf5, 0x07, 0x94, 0x28, - 0x9b, 0x5b, 0xfd, 0x01, 0xab, 0x43, 0xf9, 0xd8, 0x8d, 0x7c, 0x37, 0x50, 0x94, 0x19, 0x9b, 0x27, - 0x4b, 0x76, 0x1d, 0xec, 0xfe, 0xe0, 0x58, 0x44, 0xb1, 0x2f, 0x03, 0xca, 0x87, 0xcd, 0x53, 0x05, - 0x5b, 0x05, 0xe8, 0x0f, 0x1e, 0x08, 0x17, 0x49, 0xe3, 0x7a, 0x71, 0x3d, 0xbf, 0x61, 0xf3, 0x8c, - 0xc6, 0xf9, 0x1a, 0x8a, 0x54, 0x23, 0xf6, 0x39, 0x94, 0x86, 0xfe, 0x58, 0xc4, 0x4a, 0xbb, 0xd3, - 0x6a, 0x3e, 0x7b, 0xbe, 0xb6, 0xf0, 0xeb, 0xf3, 0xb5, 0xcd, 0x4c, 0x33, 0xc8, 0x50, 0x04, 0x9e, - 0x0c, 0x94, 0xeb, 0x07, 0x22, 0x8a, 0x77, 0xc6, 0x72, 0x5b, 0x6f, 0x69, 0x74, 0xe8, 0x87, 0x1b, - 0x06, 0x76, 0x13, 0x8a, 0x7e, 0x30, 0x14, 0x17, 0xe4, 0x7f, 0xbe, 0x75, 0xd9, 0x50, 0x55, 0xfb, - 0x53, 0x15, 0x4e, 0x55, 0x0f, 0x4d, 0x5c, 0x23, 0x9c, 0x10, 0x4a, 0xba, 0x05, 0xd8, 0x75, 0x28, - 0x9c, 0x0b, 0xe5, 0xd2, 0xf1, 0xd5, 0x66, 0x05, 0x53, 0xbb, 0x2f, 0x94, 0xcb, 0x49, 0x8b, 0xdd, - 0x75, 0x2e, 0xa7, 0x98, 0x7a, 0x2b, 0xed, 0xae, 0x7d, 0xd4, 0x70, 0x63, 0x60, 0x1f, 0x43, 0x39, - 0x10, 0xea, 0x89, 0x8c, 0xce, 0x28, 0x45, 0xcb, 0xba, 0xe6, 0x07, 0x42, 0xed, 0xcb, 0xa1, 0xe0, - 0x89, 0xcd, 0xf9, 0x21, 0x07, 0x05, 0x24, 0x66, 0x0c, 0x0a, 0x6e, 0x34, 0xd6, 0xed, 0x6a, 0x73, - 0x92, 0x59, 0x0d, 0xf2, 0x22, 0x78, 0x4c, 0x67, 0xd8, 0x1c, 0x45, 0xd4, 0x78, 0x4f, 0x86, 0x26, - 0xe9, 0x28, 0xe2, 0xbe, 0x69, 0x2c, 0x22, 0x93, 0x6b, 0x92, 0xd9, 0x4d, 0xb0, 0xc3, 0x48, 0x5e, - 0xcc, 0x1e, 0xe1, 0xee, 0x62, 0xa6, 0x93, 0x50, 0xd9, 0x0d, 0x1e, 0xf3, 0x4a, 0x68, 0x24, 0xb6, - 0x09, 0x20, 0x2e, 0x54, 0xe4, 0xee, 0xc9, 0x58, 0xc5, 0xf5, 0x12, 0x45, 0x43, 0x0d, 0x8c, 0x8a, - 0xde, 0x21, 0xcf, 0x58, 0x9d, 0x9f, 0x2d, 0x28, 0x52, 0x90, 0x6c, 0x03, 0x53, 0x1a, 0x4e, 0x75, - 0x75, 0xf2, 0x2d, 0x66, 0x52, 0x0a, 0x54, 0xbc, 0x79, 0x46, 0xb1, 0x90, 0x2b, 0x50, 0x89, 0xc5, - 0x44, 0x78, 0x4a, 0x46, 0xa6, 0x7f, 0xe6, 0x6b, 0x74, 0x7d, 0x88, 0x25, 0xd6, 0xd1, 0x90, 0xcc, - 0xb6, 0xa0, 0x24, 0xa9, 0x2e, 0x14, 0xd0, 0x5f, 0x54, 0xcb, 0x40, 0x90, 0x3c, 0x12, 0xee, 0x50, - 0x06, 0x93, 0x19, 0x85, 0x59, 0xe1, 0xf3, 0x35, 0xdb, 0x02, 0x9b, 0x2a, 0x71, 0x34, 0x0b, 0x45, - 0xbd, 0x44, 0x15, 0x58, 0x9a, 0x57, 0x09, 0x95, 0x3c, 0xb5, 0xe3, 0xcd, 0xf3, 0x5c, 0xef, 0x54, - 0xf4, 0x43, 0x55, 0xbf, 0x92, 0xe6, 0xab, 0x6d, 0x74, 0x7c, 0x6e, 0x45, 0xda, 0x58, 0x78, 0x91, - 0x50, 0x08, 0xbd, 0x4a, 0x50, 0xa2, 0x1d, 0x24, 0x4a, 0x9e, 0xda, 0x99, 0x03, 0xa5, 0xc1, 0x60, - 0x0f, 0x91, 0xd7, 0xd2, 0x97, 0x41, 0x6b, 0xb8, 0xb1, 0x38, 0x3d, 0xa8, 0x24, 0xc7, 0xe0, 0x35, - 0xeb, 0x75, 0xcc, 0x05, 0xb4, 0x7a, 0x1d, 0xb6, 0x0d, 0xe5, 0xf8, 0xd4, 0x8d, 0xfc, 0x60, 0x4c, - 0xb9, 0x5b, 0x6e, 0x5e, 0x9e, 0x7b, 0x35, 0xd0, 0x7a, 0x64, 0x4a, 0x30, 0x8e, 0x04, 0x7b, 0xee, - 0xc6, 0x6b, 0x5c, 0x35, 0xc8, 0x4f, 0xfd, 0x21, 0xf1, 0x2c, 0x71, 0x14, 0x51, 0x33, 0xf6, 0x75, - 0x2f, 0x2d, 0x71, 0x14, 0xb1, 0x20, 0xe7, 0x72, 0x28, 0x28, 0xf5, 0x4b, 0x9c, 0x64, 0xcc, 0xb1, - 0x0c, 0x95, 0x2f, 0x03, 0x77, 0x92, 0xe4, 0x38, 0x59, 0x3b, 0x93, 0x24, 0xbe, 0xff, 0xe4, 0xb4, - 0xfb, 0x50, 0xd2, 0xaf, 0x2a, 0x5b, 0x87, 0x7c, 0x1c, 0x79, 0xe6, 0x65, 0x5f, 0x4e, 0x9e, 0x5b, - 0xfd, 0x30, 0x73, 0x34, 0xcd, 0x5b, 0xcb, 0x4a, 0x5b, 0xcb, 0xe1, 0x00, 0x29, 0xec, 0xdf, 0x69, - 0x61, 0xe7, 0xdb, 0x1c, 0x54, 0x92, 0x81, 0x80, 0xaf, 0x9b, 0x3f, 0x14, 0x81, 0xf2, 0x47, 0xbe, - 0x88, 0x4c, 0x32, 0x32, 0x1a, 0xb6, 0x0d, 0x45, 0x57, 0xa9, 0x28, 0x79, 0x34, 0xfe, 0x9f, 0x9d, - 0x26, 0x8d, 0x5d, 0xb4, 0x74, 0x03, 0x15, 0xcd, 0xb8, 0x46, 0xad, 0xdc, 0x03, 0x48, 0x95, 0x98, - 0xbf, 0x33, 0x31, 0x33, 0xac, 0x28, 0xb2, 0x2b, 0x50, 0x7c, 0xec, 0x4e, 0xa6, 0xc2, 0x38, 0xa5, - 0x17, 0x9f, 0x5a, 0xf7, 0x72, 0xce, 0x8f, 0x16, 0x94, 0xcd, 0x74, 0x61, 0xb7, 0xa0, 0x4c, 0xd3, - 0xc5, 0x78, 0xf4, 0xe6, 0x48, 0x13, 0x08, 0xdb, 0x99, 0x8f, 0xcd, 0x8c, 0x8f, 0x86, 0x4a, 0x8f, - 0x4f, 0xe3, 0x63, 0x3a, 0x44, 0xf3, 0x43, 0x31, 0x32, 0xf3, 0x91, 0x4a, 0xd1, 0x11, 0x23, 0x3f, - 0xf0, 0xb1, 0x66, 0x1c, 0x4d, 0xec, 0x56, 0x12, 0x75, 0x81, 0x18, 0xaf, 0x65, 0x19, 0x5f, 0x0f, - 0xba, 0x07, 0xd5, 0xcc, 0x31, 0x6f, 0x88, 0xfa, 0xa3, 0x6c, 0xd4, 0xe6, 0x48, 0xa2, 0xd3, 0xc3, - 0x3d, 0xcd, 0xc2, 0x3f, 0xc8, 0xdf, 0x1d, 0x80, 0x94, 0xf2, 0xed, 0x3b, 0xc5, 0x79, 0x9a, 0x07, - 0xe8, 0x87, 0xf8, 0x9c, 0x0f, 0x5d, 0x9a, 0x12, 0x8b, 0xfe, 0x38, 0x90, 0x91, 0x78, 0x44, 0xcf, - 0x07, 0xed, 0xaf, 0xf0, 0xaa, 0xd6, 0xd1, 0x2d, 0x66, 0xbb, 0x50, 0x1d, 0x8a, 0xd8, 0x8b, 0x7c, - 0x6a, 0x72, 0x93, 0xf4, 0x35, 0x8c, 0x29, 0xe5, 0x69, 0x74, 0x52, 0x84, 0xce, 0x55, 0x76, 0x0f, - 0x6b, 0xc2, 0xa2, 0xb8, 0x08, 0x65, 0xa4, 0xcc, 0x29, 0xfa, 0x23, 0xe4, 0x92, 0xfe, 0x9c, 0x41, - 0x3d, 0x9d, 0xc4, 0xab, 0x22, 0x5d, 0x30, 0x17, 0x0a, 0x9e, 0x1b, 0xea, 0x09, 0x5c, 0x6d, 0xd6, - 0x5f, 0x39, 0xaf, 0xed, 0x86, 0x3a, 0x69, 0xad, 0xdb, 0x18, 0xeb, 0xd3, 0xdf, 0xd6, 0xb6, 0x32, - 0x63, 0xf7, 0x5c, 0x9e, 0xcc, 0x76, 0xa8, 0x5f, 0xce, 0x7c, 0xb5, 0x33, 0x55, 0xfe, 0x64, 0xc7, - 0x0d, 0x7d, 0xa4, 0xc3, 0x8d, 0xbd, 0x0e, 0x27, 0xea, 0x95, 0xfb, 0x50, 0x7b, 0xd5, 0xef, 0x77, - 0xa9, 0xc1, 0xca, 0x5d, 0xb0, 0xe7, 0x7e, 0xfc, 0xdd, 0xc6, 0x4a, 0xb6, 0x78, 0x37, 0xa0, 0x9a, - 0x89, 0x1b, 0x81, 0xc7, 0x04, 0xd4, 0xd9, 0xd7, 0x0b, 0xe7, 0x29, 0x7e, 0x01, 0x25, 0x33, 0xf0, - 0x03, 0x80, 0x53, 0xa5, 0xc2, 0x47, 0x34, 0x14, 0xcd, 0x21, 0x36, 0x6a, 0x08, 0xc1, 0xd6, 0xa0, - 0x8a, 0x8b, 0xd8, 0xd8, 0xb5, 0xa7, 0xb4, 0x23, 0xd6, 0x80, 0xf7, 0xc1, 0x1e, 0xcd, 0xb7, 0xeb, - 0x61, 0x56, 0x19, 0x25, 0xbb, 0xdf, 0x83, 0x4a, 0x20, 0x8d, 0x4d, 0xcf, 0xe8, 0x72, 0x20, 0xc9, - 0xe4, 0x6c, 0xc1, 0xff, 0x5e, 0xfb, 0x5c, 0x63, 0xd7, 0xa0, 0x34, 0xf2, 0x27, 0x8a, 0xae, 0x2b, - 0x8e, 0x7d, 0xb3, 0x72, 0x7e, 0xc9, 0x01, 0xa4, 0x57, 0x0b, 0x33, 0x82, 0xf7, 0x0e, 0x31, 0x8b, - 0xfa, 0x9e, 0x4d, 0xa0, 0x72, 0x6e, 0x2a, 0x68, 0xfa, 0xe8, 0xfa, 0xcb, 0xd7, 0xb1, 0x91, 0x14, - 0x58, 0xd7, 0xb6, 0x69, 0x6a, 0xfb, 0x2e, 0x9f, 0x54, 0xf3, 0x13, 0x56, 0x1e, 0xc2, 0xd2, 0x4b, - 0x74, 0x6f, 0x79, 0x53, 0xd3, 0x2e, 0xcb, 0x96, 0xec, 0x16, 0x94, 0xf4, 0xe7, 0x06, 0xbe, 0xdb, - 0x28, 0x19, 0x1a, 0x92, 0x69, 0xb6, 0x1c, 0x26, 0x1f, 0x9f, 0xbd, 0xc3, 0xcd, 0x0d, 0x28, 0x9b, - 0xcf, 0x28, 0x66, 0x43, 0xf1, 0xcb, 0x83, 0x41, 0xf7, 0xa8, 0xb6, 0xc0, 0x2a, 0x50, 0xd8, 0xeb, - 0x0f, 0x8e, 0x6a, 0x39, 0x94, 0x0e, 0xfa, 0x07, 0xdd, 0x9a, 0xb5, 0xf9, 0x19, 0xd8, 0xf3, 0x71, - 0x8f, 0xea, 0x56, 0xef, 0xa0, 0x53, 0x5b, 0x60, 0x00, 0xa5, 0x41, 0xb7, 0xcd, 0xbb, 0x08, 0x2e, - 0x43, 0x7e, 0x30, 0xd8, 0xab, 0x59, 0x48, 0xd5, 0xde, 0x6d, 0xef, 0x75, 0x6b, 0x79, 0x14, 0x8f, - 0xf6, 0x0f, 0x1f, 0x0c, 0x6a, 0x85, 0xcd, 0x3b, 0x70, 0xe9, 0x95, 0x71, 0x4b, 0xbb, 0xf7, 0x76, - 0x79, 0x17, 0x99, 0xaa, 0x50, 0x3e, 0xe4, 0xbd, 0xe3, 0xdd, 0xa3, 0x6e, 0x2d, 0x87, 0x86, 0x2f, - 0xfa, 0xed, 0x87, 0xdd, 0x4e, 0xcd, 0x6a, 0xd5, 0x9e, 0xbd, 0x58, 0xcd, 0xfd, 0xf4, 0x62, 0x35, - 0xf7, 0xfb, 0x8b, 0xd5, 0xdc, 0x37, 0x7f, 0xac, 0x2e, 0x9c, 0x94, 0xe8, 0xef, 0xc9, 0xed, 0x3f, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x88, 0x88, 0x34, 0x3c, 0xde, 0x0c, 0x00, 0x00, + // 1444 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x6f, 0x1b, 0x47, + 0x12, 0x16, 0x87, 0xcf, 0x29, 0x4a, 0x32, 0xb7, 0xfd, 0x58, 0xae, 0xd6, 0x2b, 0x69, 0xc7, 0xbb, + 0x81, 0x2c, 0x59, 0x14, 0x40, 0x03, 0xb6, 0x91, 0x83, 0x11, 0xf1, 0x61, 0x88, 0x71, 0x24, 0x0a, + 0x4d, 0x45, 0x39, 0x1a, 0xa3, 0x61, 0x93, 0x1a, 0x88, 0x9a, 0x1e, 0xcc, 0x34, 0x6d, 0xf1, 0x92, + 0x83, 0x7f, 0x41, 0x80, 0x00, 0xb9, 0xe7, 0x98, 0x1f, 0x91, 0xbb, 0x8f, 0x41, 0x4e, 0x49, 0x0e, + 0x4e, 0xa0, 0xfc, 0x91, 0xa0, 0xaa, 0x7b, 0x38, 0xe3, 0x47, 0x10, 0x1b, 0x09, 0x72, 0x62, 0x75, + 0xd5, 0xd7, 0x5f, 0xd7, 0xab, 0xbb, 0x86, 0x60, 0xcb, 0x30, 0x6e, 0x84, 0x91, 0x54, 0x92, 0x59, + 0xe1, 0xc9, 0xca, 0xf6, 0xd8, 0x57, 0xa7, 0xd3, 0x93, 0x86, 0x27, 0xcf, 0x77, 0xc6, 0x72, 0x2c, + 0x77, 0xc8, 0x74, 0x32, 0x1d, 0xd1, 0x8a, 0x16, 0x24, 0xe9, 0x2d, 0xce, 0xd7, 0x16, 0x58, 0xfd, + 0x90, 0xfd, 0x17, 0x4a, 0x7e, 0x10, 0x4e, 0x55, 0x5c, 0xcf, 0xad, 0xe7, 0x37, 0xaa, 0x4d, 0xbb, + 0x11, 0x9e, 0x34, 0x7a, 0xa8, 0xe1, 0xc6, 0xc0, 0xd6, 0xa1, 0x20, 0x2e, 0x84, 0x57, 0xb7, 0xd6, + 0x73, 0x1b, 0xd5, 0x26, 0x20, 0xa0, 0x7b, 0x21, 0xbc, 0x7e, 0xb8, 0xb7, 0xc0, 0xc9, 0xc2, 0x3e, + 0x80, 0x52, 0x2c, 0xa7, 0x91, 0x27, 0xea, 0x79, 0xc2, 0x2c, 0x22, 0x66, 0x40, 0x1a, 0x42, 0x19, + 0x2b, 0x32, 0x79, 0x32, 0x9c, 0xd5, 0x0b, 0x29, 0x53, 0x5b, 0x86, 0x33, 0xcd, 0x84, 0x16, 0x76, + 0x0b, 0x8a, 0x27, 0x53, 0x7f, 0x32, 0xac, 0x17, 0x09, 0x52, 0x45, 0x48, 0x0b, 0x15, 0x84, 0xd1, + 0x36, 0xb6, 0x01, 0x95, 0x70, 0xe2, 0xaa, 0x91, 0x8c, 0xce, 0xeb, 0x90, 0x1e, 0x78, 0x68, 0x74, + 0x7c, 0x6e, 0x65, 0xf7, 0xa1, 0xea, 0xc9, 0x20, 0x56, 0x91, 0xeb, 0x07, 0x2a, 0xae, 0x57, 0x09, + 0x7c, 0x1d, 0xc1, 0x9f, 0xc9, 0xe8, 0x4c, 0x44, 0xed, 0xd4, 0xc8, 0xb3, 0xc8, 0x56, 0x01, 0x2c, + 0x19, 0x3a, 0x5f, 0xe5, 0xa0, 0x92, 0xb0, 0x32, 0x07, 0x16, 0x77, 0x23, 0xef, 0xd4, 0x57, 0xc2, + 0x53, 0xd3, 0x48, 0xd4, 0x73, 0xeb, 0xb9, 0x0d, 0x9b, 0xbf, 0xa2, 0x63, 0xcb, 0x60, 0xf5, 0x07, + 0x94, 0x28, 0x9b, 0x5b, 0xfd, 0x01, 0xab, 0x43, 0xf9, 0xd8, 0x8d, 0x7c, 0x37, 0x50, 0x94, 0x19, + 0x9b, 0x27, 0x4b, 0x76, 0x13, 0xec, 0xfe, 0xe0, 0x58, 0x44, 0xb1, 0x2f, 0x03, 0xca, 0x87, 0xcd, + 0x53, 0x05, 0x5b, 0x05, 0xe8, 0x0f, 0x1e, 0x09, 0x17, 0x49, 0xe3, 0x7a, 0x71, 0x3d, 0xbf, 0x61, + 0xf3, 0x8c, 0xc6, 0xf9, 0x1c, 0x8a, 0x54, 0x23, 0xf6, 0x31, 0x94, 0x86, 0xfe, 0x58, 0xc4, 0x4a, + 0xbb, 0xd3, 0x6a, 0xbe, 0x78, 0xb9, 0xb6, 0xf0, 0xd3, 0xcb, 0xb5, 0xcd, 0x4c, 0x33, 0xc8, 0x50, + 0x04, 0x9e, 0x0c, 0x94, 0xeb, 0x07, 0x22, 0x8a, 0x77, 0xc6, 0x72, 0x5b, 0x6f, 0x69, 0x74, 0xe8, + 0x87, 0x1b, 0x06, 0x76, 0x1b, 0x8a, 0x7e, 0x30, 0x14, 0x17, 0xe4, 0x7f, 0xbe, 0x75, 0xd5, 0x50, + 0x55, 0xfb, 0x53, 0x15, 0x4e, 0x55, 0x0f, 0x4d, 0x5c, 0x23, 0x9c, 0x10, 0x4a, 0xba, 0x05, 0xd8, + 0x4d, 0x28, 0x9c, 0x0b, 0xe5, 0xd2, 0xf1, 0xd5, 0x66, 0x05, 0x53, 0xbb, 0x2f, 0x94, 0xcb, 0x49, + 0x8b, 0xdd, 0x75, 0x2e, 0xa7, 0x98, 0x7a, 0x2b, 0xed, 0xae, 0x7d, 0xd4, 0x70, 0x63, 0x60, 0xff, + 0x87, 0x72, 0x20, 0xd4, 0x33, 0x19, 0x9d, 0x51, 0x8a, 0x96, 0x75, 0xcd, 0x0f, 0x84, 0xda, 0x97, + 0x43, 0xc1, 0x13, 0x9b, 0xf3, 0x4d, 0x0e, 0x0a, 0x48, 0xcc, 0x18, 0x14, 0xdc, 0x68, 0xac, 0xdb, + 0xd5, 0xe6, 0x24, 0xb3, 0x1a, 0xe4, 0x45, 0xf0, 0x94, 0xce, 0xb0, 0x39, 0x8a, 0xa8, 0xf1, 0x9e, + 0x0d, 0x4d, 0xd2, 0x51, 0xc4, 0x7d, 0xd3, 0x58, 0x44, 0x26, 0xd7, 0x24, 0xb3, 0xdb, 0x60, 0x87, + 0x91, 0xbc, 0x98, 0x3d, 0xc1, 0xdd, 0xc5, 0x4c, 0x27, 0xa1, 0xb2, 0x1b, 0x3c, 0xe5, 0x95, 0xd0, + 0x48, 0x6c, 0x13, 0x40, 0x5c, 0xa8, 0xc8, 0xdd, 0x93, 0xb1, 0x8a, 0xeb, 0x25, 0x8a, 0x86, 0x1a, + 0x18, 0x15, 0xbd, 0x43, 0x9e, 0xb1, 0x3a, 0xdf, 0x5b, 0x50, 0xa4, 0x20, 0xd9, 0x06, 0xa6, 0x34, + 0x9c, 0xea, 0xea, 0xe4, 0x5b, 0xcc, 0xa4, 0x14, 0xa8, 0x78, 0xf3, 0x8c, 0x62, 0x21, 0x57, 0xa0, + 0x12, 0x8b, 0x89, 0xf0, 0x94, 0x8c, 0x4c, 0xff, 0xcc, 0xd7, 0xe8, 0xfa, 0x10, 0x4b, 0xac, 0xa3, + 0x21, 0x99, 0x6d, 0x41, 0x49, 0x52, 0x5d, 0x28, 0xa0, 0xdf, 0xa9, 0x96, 0x81, 0x20, 0x79, 0x24, + 0xdc, 0xa1, 0x0c, 0x26, 0x33, 0x0a, 0xb3, 0xc2, 0xe7, 0x6b, 0xb6, 0x05, 0x36, 0x55, 0xe2, 0x68, + 0x16, 0x8a, 0x7a, 0x89, 0x2a, 0xb0, 0x34, 0xaf, 0x12, 0x2a, 0x79, 0x6a, 0xc7, 0x9b, 0xe7, 0xb9, + 0xde, 0xa9, 0xe8, 0x87, 0xaa, 0x7e, 0x2d, 0xcd, 0x57, 0xdb, 0xe8, 0xf8, 0xdc, 0x8a, 0xb4, 0xb1, + 0xf0, 0x22, 0xa1, 0x10, 0x7a, 0x9d, 0xa0, 0x44, 0x3b, 0x48, 0x94, 0x3c, 0xb5, 0x33, 0x07, 0x4a, + 0x83, 0xc1, 0x1e, 0x22, 0x6f, 0xa4, 0x2f, 0x83, 0xd6, 0x70, 0x63, 0x71, 0x7a, 0x50, 0x49, 0x8e, + 0xc1, 0x6b, 0xd6, 0xeb, 0x98, 0x0b, 0x68, 0xf5, 0x3a, 0x6c, 0x1b, 0xca, 0xf1, 0xa9, 0x1b, 0xf9, + 0xc1, 0x98, 0x72, 0xb7, 0xdc, 0xbc, 0x3a, 0xf7, 0x6a, 0xa0, 0xf5, 0xc8, 0x94, 0x60, 0x1c, 0x09, + 0xf6, 0xdc, 0x8d, 0x37, 0xb8, 0x6a, 0x90, 0x9f, 0xfa, 0x43, 0xe2, 0x59, 0xe2, 0x28, 0xa2, 0x66, + 0xec, 0xeb, 0x5e, 0x5a, 0xe2, 0x28, 0x62, 0x41, 0xce, 0xe5, 0x50, 0x50, 0xea, 0x97, 0x38, 0xc9, + 0x98, 0x63, 0x19, 0x2a, 0x5f, 0x06, 0xee, 0x24, 0xc9, 0x71, 0xb2, 0x76, 0x26, 0x49, 0x7c, 0x7f, + 0xcb, 0x69, 0x0f, 0xa1, 0xa4, 0x5f, 0x55, 0xb6, 0x0e, 0xf9, 0x38, 0xf2, 0xcc, 0xcb, 0xbe, 0x9c, + 0x3c, 0xb7, 0xfa, 0x61, 0xe6, 0x68, 0x9a, 0xb7, 0x96, 0x95, 0xb6, 0x96, 0xc3, 0x01, 0x52, 0xd8, + 0x5f, 0xd3, 0xc2, 0xce, 0x97, 0x39, 0xa8, 0x24, 0x03, 0x01, 0x5f, 0x37, 0x7f, 0x28, 0x02, 0xe5, + 0x8f, 0x7c, 0x11, 0x99, 0x64, 0x64, 0x34, 0x6c, 0x1b, 0x8a, 0xae, 0x52, 0x51, 0xf2, 0x68, 0xfc, + 0x33, 0x3b, 0x4d, 0x1a, 0xbb, 0x68, 0xe9, 0x06, 0x2a, 0x9a, 0x71, 0x8d, 0x5a, 0x79, 0x00, 0x90, + 0x2a, 0x31, 0x7f, 0x67, 0x62, 0x66, 0x58, 0x51, 0x64, 0xd7, 0xa0, 0xf8, 0xd4, 0x9d, 0x4c, 0x85, + 0x71, 0x4a, 0x2f, 0x3e, 0xb4, 0x1e, 0xe4, 0x9c, 0x6f, 0x2d, 0x28, 0x9b, 0xe9, 0xc2, 0xee, 0x40, + 0x99, 0xa6, 0x8b, 0xf1, 0xe8, 0xed, 0x91, 0x26, 0x10, 0xb6, 0x33, 0x1f, 0x9b, 0x19, 0x1f, 0x0d, + 0x95, 0x1e, 0x9f, 0xc6, 0xc7, 0x74, 0x88, 0xe6, 0x87, 0x62, 0x64, 0xe6, 0x23, 0x95, 0xa2, 0x23, + 0x46, 0x7e, 0xe0, 0x63, 0xcd, 0x38, 0x9a, 0xd8, 0x9d, 0x24, 0xea, 0x02, 0x31, 0xde, 0xc8, 0x32, + 0xbe, 0x19, 0x74, 0x0f, 0xaa, 0x99, 0x63, 0xde, 0x12, 0xf5, 0xff, 0xb2, 0x51, 0x9b, 0x23, 0x89, + 0x4e, 0x0f, 0xf7, 0x34, 0x0b, 0x7f, 0x22, 0x7f, 0xf7, 0x00, 0x52, 0xca, 0x77, 0xef, 0x14, 0xe7, + 0x79, 0x1e, 0xa0, 0x1f, 0xe2, 0x73, 0x3e, 0x74, 0x69, 0x4a, 0x2c, 0xfa, 0xe3, 0x40, 0x46, 0xe2, + 0x09, 0x3d, 0x1f, 0xb4, 0xbf, 0xc2, 0xab, 0x5a, 0x47, 0xb7, 0x98, 0xed, 0x42, 0x75, 0x28, 0x62, + 0x2f, 0xf2, 0xa9, 0xc9, 0x4d, 0xd2, 0xd7, 0x30, 0xa6, 0x94, 0xa7, 0xd1, 0x49, 0x11, 0x3a, 0x57, + 0xd9, 0x3d, 0xac, 0x09, 0x8b, 0xe2, 0x22, 0x94, 0x91, 0x32, 0xa7, 0xe8, 0x8f, 0x90, 0x2b, 0xfa, + 0x73, 0x06, 0xf5, 0x74, 0x12, 0xaf, 0x8a, 0x74, 0xc1, 0x5c, 0x28, 0x78, 0x6e, 0xa8, 0x27, 0x70, + 0xb5, 0x59, 0x7f, 0xed, 0xbc, 0xb6, 0x1b, 0xea, 0xa4, 0xb5, 0xee, 0x62, 0xac, 0xcf, 0x7f, 0x5e, + 0xdb, 0xca, 0x8c, 0xdd, 0x73, 0x79, 0x32, 0xdb, 0xa1, 0x7e, 0x39, 0xf3, 0xd5, 0xce, 0x54, 0xf9, + 0x93, 0x1d, 0x37, 0xf4, 0x91, 0x0e, 0x37, 0xf6, 0x3a, 0x9c, 0xa8, 0x57, 0x1e, 0x42, 0xed, 0x75, + 0xbf, 0xdf, 0xa7, 0x06, 0x2b, 0xf7, 0xc1, 0x9e, 0xfb, 0xf1, 0x47, 0x1b, 0x2b, 0xd9, 0xe2, 0xdd, + 0x82, 0x6a, 0x26, 0x6e, 0x04, 0x1e, 0x13, 0x50, 0x67, 0x5f, 0x2f, 0x9c, 0xe7, 0xf8, 0x05, 0x94, + 0xcc, 0xc0, 0xff, 0x00, 0x9c, 0x2a, 0x15, 0x3e, 0xa1, 0xa1, 0x68, 0x0e, 0xb1, 0x51, 0x43, 0x08, + 0xb6, 0x06, 0x55, 0x5c, 0xc4, 0xc6, 0xae, 0x3d, 0xa5, 0x1d, 0xb1, 0x06, 0xfc, 0x1b, 0xec, 0xd1, + 0x7c, 0xbb, 0x1e, 0x66, 0x95, 0x51, 0xb2, 0xfb, 0x5f, 0x50, 0x09, 0xa4, 0xb1, 0xe9, 0x19, 0x5d, + 0x0e, 0x24, 0x99, 0x9c, 0x2d, 0xf8, 0xc7, 0x1b, 0x9f, 0x6b, 0xec, 0x06, 0x94, 0x46, 0xfe, 0x44, + 0xd1, 0x75, 0xc5, 0xb1, 0x6f, 0x56, 0xce, 0x8f, 0x39, 0x80, 0xf4, 0x6a, 0x61, 0x46, 0xf0, 0xde, + 0x21, 0x66, 0x51, 0xdf, 0xb3, 0x09, 0x54, 0xce, 0x4d, 0x05, 0x4d, 0x1f, 0xdd, 0x7c, 0xf5, 0x3a, + 0x36, 0x92, 0x02, 0xeb, 0xda, 0x36, 0x4d, 0x6d, 0xdf, 0xe7, 0x93, 0x6a, 0x7e, 0xc2, 0xca, 0x63, + 0x58, 0x7a, 0x85, 0xee, 0x1d, 0x6f, 0x6a, 0xda, 0x65, 0xd9, 0x92, 0xdd, 0x81, 0x92, 0xfe, 0xdc, + 0xc0, 0x77, 0x1b, 0x25, 0x43, 0x43, 0x32, 0xcd, 0x96, 0xc3, 0xe4, 0xe3, 0xb3, 0x77, 0xb8, 0xb9, + 0x01, 0x65, 0xf3, 0x19, 0xc5, 0x6c, 0x28, 0x7e, 0x7a, 0x30, 0xe8, 0x1e, 0xd5, 0x16, 0x58, 0x05, + 0x0a, 0x7b, 0xfd, 0xc1, 0x51, 0x2d, 0x87, 0xd2, 0x41, 0xff, 0xa0, 0x5b, 0xb3, 0x36, 0x3f, 0x02, + 0x7b, 0x3e, 0xee, 0x51, 0xdd, 0xea, 0x1d, 0x74, 0x6a, 0x0b, 0x0c, 0xa0, 0x34, 0xe8, 0xb6, 0x79, + 0x17, 0xc1, 0x65, 0xc8, 0x0f, 0x06, 0x7b, 0x35, 0x0b, 0xa9, 0xda, 0xbb, 0xed, 0xbd, 0x6e, 0x2d, + 0x8f, 0xe2, 0xd1, 0xfe, 0xe1, 0xa3, 0x41, 0xad, 0xb0, 0x79, 0x0f, 0xae, 0xbc, 0x36, 0x6e, 0x69, + 0xf7, 0xde, 0x2e, 0xef, 0x22, 0x53, 0x15, 0xca, 0x87, 0xbc, 0x77, 0xbc, 0x7b, 0xd4, 0xad, 0xe5, + 0xd0, 0xf0, 0x49, 0xbf, 0xfd, 0xb8, 0xdb, 0xa9, 0x59, 0xad, 0x6b, 0x2f, 0x2e, 0x57, 0x73, 0xdf, + 0x5d, 0xae, 0xe6, 0x7e, 0xb8, 0x5c, 0xcd, 0xfd, 0x72, 0xb9, 0x9a, 0xfb, 0xe2, 0xd7, 0xd5, 0x85, + 0x93, 0x12, 0xfd, 0x45, 0xb9, 0xfb, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0xfe, 0x08, 0x0c, + 0xe2, 0x0c, 0x00, 0x00, } diff --git a/solver/pb/ops.proto b/solver/pb/ops.proto index b89dd656d..09442f60c 100644 --- a/solver/pb/ops.proto +++ b/solver/pb/ops.proto @@ -6,6 +6,8 @@ package pb; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +option (gogoproto.stable_marshaler_all) = true; + // Op represents a vertex of the LLB DAG. message Op { // inputs is a set of input edges.