diff --git a/broker/list_apply_api.go b/broker/list_apply_api.go index c7f5885c..4d15e450 100644 --- a/broker/list_apply_api.go +++ b/broker/list_apply_api.go @@ -6,7 +6,7 @@ import ( "strings" log "github.com/sirupsen/logrus" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "go.gazette.dev/core/allocator" pb "go.gazette.dev/core/broker/protocol" pbx "go.gazette.dev/core/broker/protocol/ext" @@ -61,6 +61,7 @@ func (svc *Service) List(ctx context.Context, req *pb.ListRequest) (resp *pb.Lis continue } journal.ModRevision = s.Items[cur.Left].Raw.ModRevision + journal.CreateRevision = s.Items[cur.Left].Raw.CreateRevision pbx.Init(&journal.Route, s.Assignments[cur.RightBegin:cur.RightEnd]) pbx.AttachEndpoints(&journal.Route, s.KS) diff --git a/broker/list_apply_api_test.go b/broker/list_apply_api_test.go index 7248bcf1..6244a917 100644 --- a/broker/list_apply_api_test.go +++ b/broker/list_apply_api_test.go @@ -40,6 +40,7 @@ func TestListCases(t *testing.T) { } var broker = newTestBroker(t, etcd, pb.ProcessSpec_ID{Zone: "local", Suffix: "broker"}) + var fixtureRevision int64 { var resp, err = broker.client().Apply(ctx, &pb.ApplyRequest{ Changes: []pb.ApplyRequest_Change{ @@ -50,6 +51,7 @@ func TestListCases(t *testing.T) { }) require.NoError(t, err) require.Equal(t, pb.Status_OK, resp.Status) + fixtureRevision = resp.Header.Etcd.Revision } // Assign |specC| to |bk|, to verify its returned non-empty Route. @@ -72,6 +74,9 @@ func TestListCases(t *testing.T) { for i, exp := range expect { require.Equal(t, *exp, resp.Journals[i].Spec) + require.Equal(t, fixtureRevision, resp.Journals[i].CreateRevision) + require.Equal(t, fixtureRevision, resp.Journals[i].ModRevision) + if exp == specC { require.Equal(t, []pb.ProcessSpec_ID{{Zone: "local", Suffix: "broker"}}, resp.Journals[i].Route.Members) diff --git a/broker/protocol/protocol.pb.go b/broker/protocol/protocol.pb.go index 2701ccaf..d3694d29 100644 --- a/broker/protocol/protocol.pb.go +++ b/broker/protocol/protocol.pb.go @@ -12,10 +12,10 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" golang_proto "github.com/golang/protobuf/proto" - _ "github.com/golang/protobuf/ptypes/duration" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/durationpb" io "io" math "math" math_bits "math/bits" @@ -1235,10 +1235,12 @@ var xxx_messageInfo_ListResponse proto.InternalMessageInfo // Journals of the response. type ListResponse_Journal struct { Spec JournalSpec `protobuf:"bytes,1,opt,name=spec,proto3" json:"spec"` - // Current ModRevision of the JournalSpec. + // Current Etcd ModRevision of the JournalSpec. ModRevision int64 `protobuf:"varint,2,opt,name=mod_revision,json=modRevision,proto3" json:"mod_revision,omitempty"` // Route of the journal, including endpoints. Route Route `protobuf:"bytes,3,opt,name=route,proto3" json:"route"` + // Etcd CreateRevision of the JournalSpec. + CreateRevision int64 `protobuf:"varint,4,opt,name=create_revision,json=createRevision,proto3" json:"create_revision,omitempty"` } func (m *ListResponse_Journal) Reset() { *m = ListResponse_Journal{} } @@ -1765,169 +1767,170 @@ func init() { } var fileDescriptor_0c0999e5af553218 = []byte{ - // 2577 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4d, 0x70, 0xdb, 0xc6, - 0x15, 0x16, 0x48, 0x90, 0x04, 0x1f, 0x49, 0x09, 0xda, 0xc4, 0xb6, 0xcc, 0xc4, 0xa2, 0xc2, 0xfc, - 0x8c, 0xec, 0x24, 0x74, 0xa2, 0xb4, 0x49, 0xea, 0x4e, 0xda, 0x80, 0x22, 0x65, 0xd3, 0xa1, 0x49, - 0xce, 0x92, 0x8a, 0xe3, 0x1c, 0x8a, 0x81, 0x80, 0x15, 0x85, 0x0a, 0x04, 0x50, 0x00, 0x74, 0xa4, - 0xdc, 0x72, 0x69, 0x33, 0x9d, 0x74, 0xa6, 0xd3, 0x53, 0x4e, 0x9d, 0x5c, 0x7a, 0x6e, 0xcf, 0xed, - 0x74, 0xa6, 0x47, 0xf7, 0x96, 0x63, 0x67, 0xda, 0xaa, 0xd3, 0xf8, 0xd2, 0xb3, 0x8f, 0x39, 0x75, - 0xf6, 0x07, 0x24, 0x44, 0x91, 0x96, 0x7d, 0xf0, 0x45, 0x83, 0x7d, 0x7f, 0xfb, 0xf6, 0xbd, 0xb7, - 0xdf, 0xbe, 0x47, 0xc1, 0xfa, 0x5e, 0xe0, 0x1d, 0x92, 0xe0, 0xba, 0x1f, 0x78, 0x91, 0x67, 0x7a, - 0xce, 0xe4, 0xa3, 0xc6, 0x3e, 0x90, 0x12, 0xaf, 0xcb, 0xcf, 0x0f, 0xbd, 0xa1, 0xc7, 0x56, 0xd7, - 0xe9, 0x17, 0xe7, 0x97, 0xd7, 0x87, 0x9e, 0x37, 0x74, 0x08, 0x57, 0xdb, 0x1b, 0xef, 0x5f, 0xb7, - 0xc6, 0x81, 0x11, 0xd9, 0x9e, 0xcb, 0xf9, 0xd5, 0xf7, 0x20, 0xd3, 0x36, 0xf6, 0x88, 0x83, 0x10, - 0xc8, 0xae, 0x31, 0x22, 0x6b, 0xd2, 0x86, 0xb4, 0x99, 0xc7, 0xec, 0x1b, 0x3d, 0x0f, 0x99, 0xfb, - 0x86, 0x33, 0x26, 0x6b, 0x29, 0x46, 0xe4, 0x8b, 0x1b, 0xf2, 0xff, 0xbe, 0xa9, 0x48, 0xd5, 0x01, - 0x28, 0x4c, 0xb1, 0x4f, 0x22, 0x54, 0x87, 0xac, 0x43, 0xbf, 0xc3, 0x35, 0x69, 0x23, 0xbd, 0x59, - 0xd8, 0x5a, 0xa9, 0x4d, 0xbc, 0x64, 0x32, 0xf5, 0xcb, 0x0f, 0x4e, 0x2a, 0x4b, 0x8f, 0x4e, 0x2a, - 0xab, 0xc7, 0xc6, 0xc8, 0xb9, 0x51, 0x7d, 0xc3, 0x1b, 0xd9, 0x11, 0x19, 0xf9, 0xd1, 0x71, 0x15, - 0x0b, 0x4d, 0x61, 0xf5, 0x0b, 0x09, 0x4a, 0xc2, 0xac, 0x43, 0xcc, 0xc8, 0x0b, 0xd0, 0x16, 0xe4, - 0x6c, 0xd7, 0x74, 0xc6, 0x16, 0x77, 0xad, 0xb0, 0x85, 0x66, 0x8c, 0xf7, 0x49, 0x54, 0x97, 0xa9, - 0x7d, 0x1c, 0x0b, 0x52, 0x1d, 0x72, 0xc4, 0x75, 0x52, 0xe7, 0xe9, 0x08, 0xc1, 0x1b, 0xca, 0xd7, - 0xdf, 0x54, 0x96, 0x98, 0x0f, 0x5f, 0xe5, 0xa1, 0x70, 0xdb, 0x1b, 0x07, 0xae, 0xe1, 0xf4, 0x7d, - 0x62, 0xa2, 0x1f, 0x24, 0x23, 0x53, 0xdf, 0x98, 0x7b, 0x8c, 0xef, 0x4f, 0x2a, 0x39, 0xa1, 0x23, - 0x62, 0xf7, 0x1e, 0x14, 0x02, 0xe2, 0x3b, 0xb6, 0xc9, 0xa2, 0xcd, 0xfc, 0xc8, 0xd4, 0x2f, 0xcc, - 0x8f, 0x41, 0x52, 0x12, 0xf5, 0x26, 0xc1, 0x4c, 0x2f, 0xf4, 0xfd, 0x15, 0xea, 0xfb, 0xb7, 0x27, - 0x15, 0xe9, 0xd1, 0x49, 0x65, 0x6d, 0xd6, 0xde, 0x1b, 0xb6, 0xeb, 0xd8, 0x2e, 0x99, 0x84, 0x16, - 0xed, 0x82, 0xb2, 0x1f, 0x18, 0xc3, 0x11, 0x71, 0xa3, 0x35, 0x99, 0xd9, 0x5c, 0x9f, 0xda, 0x4c, - 0x9c, 0xb4, 0xb6, 0x23, 0xa4, 0x1e, 0x97, 0xaf, 0x89, 0x29, 0xf4, 0x53, 0xc8, 0xec, 0x3b, 0xc6, - 0x30, 0x5c, 0xcb, 0x6e, 0x48, 0x9b, 0xa5, 0xfa, 0xd5, 0x45, 0x81, 0x51, 0x13, 0x5b, 0xe8, 0x3b, - 0x8e, 0x31, 0xc4, 0x5c, 0x0f, 0xb5, 0x61, 0x65, 0x64, 0x1c, 0xe9, 0x86, 0xef, 0x13, 0xd7, 0xd2, - 0x03, 0x23, 0x22, 0x6b, 0xb9, 0x0d, 0x69, 0x33, 0x5d, 0x7f, 0xe5, 0xd1, 0x49, 0x65, 0x83, 0x9b, - 0x9a, 0x11, 0x48, 0x7a, 0x52, 0x1a, 0x19, 0x47, 0x1a, 0x63, 0x61, 0x23, 0x22, 0xe5, 0xaf, 0x32, - 0xa0, 0xc4, 0x07, 0x40, 0x6f, 0x42, 0xd6, 0x21, 0xee, 0x30, 0x3a, 0x60, 0x59, 0x4b, 0x2f, 0x0a, - 0xbc, 0x10, 0x42, 0x1e, 0xac, 0x9a, 0xde, 0xc8, 0x0f, 0x48, 0x18, 0xda, 0x9e, 0xab, 0x9b, 0x9e, - 0x45, 0x4c, 0x96, 0xb2, 0xe5, 0xad, 0xf2, 0x34, 0x54, 0xdb, 0x53, 0x91, 0x6d, 0x2a, 0x51, 0x7f, - 0xed, 0xd1, 0x49, 0xa5, 0xca, 0xad, 0x9e, 0x51, 0x4f, 0x6e, 0xa3, 0x9a, 0x33, 0x9a, 0xe8, 0x27, - 0x90, 0x0d, 0x23, 0x2f, 0x20, 0x34, 0xc9, 0xe9, 0xcd, 0x3c, 0xb3, 0x34, 0x37, 0x78, 0xa5, 0xf8, - 0x48, 0x7d, 0x2a, 0x8e, 0x85, 0x16, 0x0a, 0x41, 0x0d, 0xc8, 0x7e, 0x40, 0xc2, 0x03, 0xdd, 0x76, - 0x23, 0x12, 0xdc, 0x37, 0x1c, 0x91, 0xda, 0xcb, 0x35, 0x7e, 0xe3, 0x6b, 0xf1, 0x8d, 0xaf, 0x35, - 0xc4, 0x8d, 0xaf, 0xbf, 0x29, 0xb2, 0xfa, 0x12, 0xdf, 0x68, 0xd6, 0x40, 0x62, 0xe3, 0xaf, 0xff, - 0x53, 0x91, 0xf0, 0x8a, 0x10, 0x68, 0x09, 0x3e, 0xfa, 0x18, 0xf2, 0x01, 0x89, 0x88, 0xcb, 0x0a, - 0x3a, 0x73, 0xde, 0x6e, 0x57, 0x16, 0xd6, 0x10, 0xb3, 0x3e, 0x35, 0x85, 0x46, 0xb0, 0xbc, 0xef, - 0x8c, 0x93, 0x47, 0xc9, 0x9e, 0x67, 0xfc, 0x75, 0x61, 0xbc, 0xc2, 0x8d, 0x9f, 0x56, 0x9f, 0xdd, - 0xaa, 0xc4, 0xd8, 0x93, 0x63, 0xfc, 0x0c, 0x2e, 0xf8, 0x46, 0x74, 0xa0, 0xfb, 0x5e, 0x18, 0xed, - 0xdb, 0x47, 0x3a, 0x15, 0x75, 0xe2, 0xe2, 0xcb, 0xd7, 0xaf, 0x3d, 0x3a, 0xa9, 0xbc, 0xc6, 0xcd, - 0xce, 0x15, 0x4b, 0x26, 0xf6, 0x39, 0x2a, 0xd1, 0xe3, 0x02, 0x03, 0xc1, 0x17, 0x48, 0xa6, 0x81, - 0x4c, 0x6b, 0x1d, 0xad, 0x42, 0xa9, 0xd3, 0x1d, 0xe8, 0xfd, 0x5e, 0x73, 0xbb, 0xb5, 0xd3, 0x6a, - 0x36, 0xd4, 0x25, 0x54, 0x04, 0xa5, 0xab, 0xe3, 0x46, 0xb7, 0xd3, 0xbe, 0xa7, 0x4a, 0x7c, 0x75, - 0x17, 0xb3, 0x55, 0x0a, 0x01, 0x64, 0x29, 0xef, 0x2e, 0x56, 0x65, 0x61, 0xe8, 0x0f, 0x12, 0x14, - 0x7a, 0x81, 0x67, 0x92, 0x30, 0x64, 0x70, 0x54, 0x83, 0x94, 0x6d, 0x09, 0x2c, 0x5c, 0x9b, 0x16, - 0x67, 0x42, 0xa4, 0xd6, 0x6a, 0x08, 0x74, 0x4b, 0xd9, 0x16, 0xda, 0x04, 0x85, 0xb8, 0x96, 0xef, - 0xd9, 0x6e, 0xc4, 0x71, 0xbc, 0x5e, 0xfc, 0xfe, 0xa4, 0xa2, 0x34, 0x05, 0x0d, 0x4f, 0xb8, 0xe5, - 0x77, 0x21, 0xd5, 0x6a, 0xd0, 0x87, 0xe0, 0x73, 0xcf, 0x9d, 0x3c, 0x04, 0xf4, 0x1b, 0x5d, 0x84, - 0x6c, 0x38, 0xde, 0xdf, 0xb7, 0x8f, 0xc4, 0x4b, 0x20, 0x56, 0xdc, 0xc3, 0x1b, 0xf2, 0x97, 0xd4, - 0xcf, 0x5f, 0x49, 0x00, 0x75, 0xf6, 0x58, 0x31, 0x37, 0x07, 0x50, 0xf4, 0xb9, 0x4b, 0x7a, 0xe8, - 0x13, 0x53, 0x38, 0x7c, 0x61, 0xae, 0xc3, 0xf5, 0x72, 0x02, 0xcf, 0x96, 0x45, 0xbd, 0xc4, 0x28, - 0x56, 0xf0, 0x13, 0x87, 0x7f, 0x19, 0x4a, 0x3f, 0xe7, 0x68, 0xa2, 0x3b, 0xf6, 0xc8, 0xe6, 0x27, - 0x2a, 0xe1, 0xa2, 0x20, 0xb6, 0x29, 0xad, 0xfa, 0xcf, 0x54, 0x02, 0x09, 0x5e, 0x85, 0x9c, 0x60, - 0x0a, 0x00, 0x2f, 0x24, 0xb1, 0x3a, 0xe6, 0xa1, 0x0d, 0xc8, 0xec, 0x91, 0xa1, 0xcd, 0x81, 0x3a, - 0x5d, 0x87, 0xef, 0x4f, 0x2a, 0xd9, 0xee, 0xfe, 0x7e, 0x48, 0x22, 0xcc, 0x19, 0xe8, 0x45, 0x48, - 0x13, 0xd7, 0x62, 0xa0, 0x7c, 0x9a, 0x4f, 0xc9, 0xe8, 0x2a, 0xa4, 0xc3, 0xf1, 0x48, 0xdc, 0xc1, - 0xd5, 0xe9, 0x29, 0xfb, 0xb7, 0xb4, 0xb7, 0xfb, 0xe3, 0x91, 0xc8, 0x07, 0x95, 0x41, 0x37, 0xe7, - 0x81, 0x4d, 0xe6, 0x3c, 0xb0, 0x99, 0x03, 0x22, 0xef, 0x42, 0x69, 0xcf, 0x30, 0x0f, 0x6d, 0x77, - 0xa8, 0x33, 0x58, 0x60, 0xd7, 0x26, 0x5f, 0x5f, 0x3d, 0x0b, 0x1b, 0x45, 0x21, 0xc7, 0x56, 0xe8, - 0x32, 0x28, 0x23, 0xcf, 0xd2, 0x23, 0x7b, 0x24, 0x00, 0x17, 0xe7, 0x46, 0x9e, 0x35, 0xb0, 0x47, - 0x04, 0xbd, 0x04, 0xc5, 0x64, 0xd1, 0xaf, 0x29, 0x2c, 0xdd, 0x85, 0x44, 0x99, 0x57, 0x3f, 0x82, - 0x9c, 0x38, 0x14, 0xed, 0x0f, 0x7c, 0x23, 0x88, 0xde, 0x66, 0x91, 0xcd, 0x62, 0xbe, 0x88, 0xa9, - 0x5b, 0x2c, 0x94, 0x82, 0xba, 0x15, 0x53, 0xdf, 0x61, 0x01, 0xcc, 0x71, 0xea, 0x3b, 0xd5, 0x3f, - 0xa5, 0xa0, 0x80, 0x89, 0x61, 0x61, 0xf2, 0x8b, 0x31, 0x09, 0x23, 0xb4, 0x09, 0xd9, 0x03, 0x62, - 0x58, 0x24, 0x10, 0xf5, 0xa2, 0x4e, 0x03, 0x72, 0x8b, 0xd1, 0xb1, 0xe0, 0x27, 0xf3, 0x9a, 0x7a, - 0x4c, 0x5e, 0xab, 0x90, 0xf5, 0x58, 0x9a, 0xe6, 0x24, 0x4e, 0x70, 0xa8, 0x6b, 0x7b, 0x8e, 0x67, - 0x1e, 0xb2, 0xec, 0x29, 0x98, 0x2f, 0xd0, 0x06, 0x14, 0x2d, 0x4f, 0x77, 0xbd, 0x48, 0xf7, 0x03, - 0xef, 0xe8, 0x98, 0x65, 0x48, 0xc1, 0x60, 0x79, 0x1d, 0x2f, 0xea, 0x51, 0x0a, 0x2d, 0xc6, 0x11, - 0x89, 0x0c, 0xcb, 0x88, 0x0c, 0xdd, 0x73, 0x9d, 0x63, 0x16, 0x7f, 0x05, 0x17, 0x63, 0x62, 0xd7, - 0x75, 0x8e, 0xd1, 0x55, 0x00, 0xfa, 0x78, 0x09, 0x27, 0x72, 0x67, 0x9c, 0xc8, 0x13, 0xd7, 0xe2, - 0x9f, 0xe8, 0x15, 0x58, 0x66, 0xa5, 0xa6, 0x4f, 0xb2, 0xa3, 0xb0, 0xec, 0x14, 0x19, 0xf5, 0x0e, - 0x4f, 0x51, 0xf5, 0xf7, 0x29, 0x28, 0xf2, 0x90, 0x85, 0xbe, 0xe7, 0x86, 0x84, 0xc6, 0x2c, 0x8c, - 0x8c, 0x68, 0x1c, 0xb2, 0x98, 0x2d, 0x27, 0x63, 0xd6, 0x67, 0x74, 0x2c, 0xf8, 0x89, 0xe8, 0xa6, - 0xce, 0x89, 0xee, 0x93, 0x84, 0xed, 0x2a, 0xc0, 0x67, 0x81, 0x1d, 0x11, 0x9d, 0xea, 0xb0, 0xd8, - 0xcd, 0x9c, 0x8c, 0x71, 0xa9, 0x61, 0x54, 0x4b, 0x74, 0x20, 0x99, 0xd9, 0xae, 0x26, 0x2e, 0xd5, - 0x44, 0x6b, 0xf1, 0x12, 0x14, 0xe3, 0x6f, 0x7d, 0x1c, 0xf0, 0xf7, 0x20, 0x8f, 0x0b, 0x31, 0x6d, - 0x37, 0x70, 0xd0, 0x1a, 0xe4, 0x4c, 0xcf, 0xa5, 0x4f, 0x08, 0x0b, 0x6a, 0x11, 0xc7, 0xcb, 0xea, - 0x97, 0x69, 0x28, 0x89, 0xbe, 0xe0, 0x59, 0x55, 0xd5, 0x6c, 0x6d, 0xa4, 0xcf, 0xd4, 0xc6, 0x34, - 0x80, 0x99, 0x85, 0x01, 0xfc, 0x10, 0x56, 0xcc, 0x03, 0x62, 0x1e, 0xea, 0x01, 0x19, 0xda, 0x61, - 0x44, 0x82, 0x50, 0x3c, 0x7c, 0x97, 0xce, 0xb4, 0x7c, 0xbc, 0x19, 0xc6, 0xcb, 0x4c, 0x1e, 0xc7, - 0xe2, 0xe8, 0xc7, 0xb0, 0x32, 0x76, 0x29, 0x88, 0x4c, 0x2d, 0xe4, 0x16, 0x35, 0x8d, 0x78, 0x99, - 0x89, 0x4e, 0x95, 0x35, 0x40, 0xe1, 0x78, 0x2f, 0x0a, 0x0c, 0x33, 0x4a, 0xe8, 0x2b, 0x0b, 0xf5, - 0x57, 0x63, 0xe9, 0xa9, 0x89, 0x44, 0x12, 0xe4, 0x53, 0x49, 0x10, 0x6f, 0xd7, 0xef, 0x52, 0xb0, - 0x1c, 0xa7, 0xe2, 0xa9, 0xab, 0xb5, 0x76, 0x5e, 0xb5, 0x0a, 0x50, 0x8d, 0x73, 0x77, 0x0d, 0xb2, - 0xa6, 0x37, 0xa2, 0x8f, 0x42, 0x7a, 0x61, 0x89, 0x09, 0x09, 0xf4, 0x16, 0x6d, 0x65, 0xe2, 0x23, - 0xcb, 0x0b, 0x8f, 0x3c, 0x15, 0xa2, 0x25, 0x19, 0x79, 0x91, 0xe1, 0xe8, 0xe6, 0xc1, 0xd8, 0x3d, - 0x0c, 0x79, 0x5a, 0x71, 0x81, 0xd1, 0xb6, 0x19, 0x09, 0xbd, 0x0a, 0xcb, 0x16, 0x71, 0x8c, 0x63, - 0x62, 0xc5, 0x42, 0x59, 0x26, 0x54, 0x12, 0x54, 0x2e, 0x56, 0xfd, 0x4b, 0x0a, 0x54, 0x2c, 0x1a, - 0x7e, 0xf2, 0xf4, 0x25, 0x5a, 0x03, 0x3a, 0xf3, 0xf9, 0x5e, 0x68, 0x38, 0x8f, 0x39, 0xe8, 0x44, - 0xe6, 0xf4, 0x51, 0x73, 0x4f, 0x72, 0xd4, 0x0d, 0x28, 0x18, 0xe6, 0xa1, 0xeb, 0x7d, 0xe6, 0x10, - 0x6b, 0x48, 0x04, 0xaa, 0x25, 0x49, 0xe8, 0x06, 0x20, 0x8b, 0xf8, 0x01, 0xa1, 0x27, 0xb0, 0xf4, - 0xc7, 0xdc, 0x98, 0xd5, 0xa9, 0x98, 0x20, 0x2d, 0xae, 0x19, 0x8a, 0xa7, 0xe2, 0x53, 0xb7, 0x88, - 0x13, 0x19, 0x22, 0xc6, 0x45, 0x41, 0x6c, 0x50, 0x5a, 0xf5, 0xef, 0x12, 0xac, 0x26, 0xa2, 0xf7, - 0x0c, 0x31, 0x30, 0x09, 0x5a, 0xe9, 0x27, 0x00, 0xad, 0xa7, 0xae, 0xa9, 0xea, 0x00, 0x0a, 0x6d, - 0x3b, 0x8c, 0xe2, 0x1a, 0xf8, 0x11, 0x28, 0xa1, 0xb8, 0xe9, 0xa2, 0x0a, 0x16, 0x01, 0x81, 0xa8, - 0xfc, 0x89, 0xf8, 0x6d, 0x59, 0x49, 0xa9, 0xe9, 0xdb, 0xb2, 0x92, 0x56, 0xe5, 0xea, 0x5f, 0x53, - 0x50, 0xe4, 0x66, 0x9f, 0xf9, 0x95, 0xfb, 0x10, 0x14, 0x91, 0x7c, 0x3e, 0xc8, 0x9c, 0x9a, 0x2c, - 0x93, 0x3e, 0xc4, 0x63, 0x66, 0xec, 0x78, 0xac, 0x55, 0xfe, 0xb5, 0x04, 0x71, 0xb1, 0xa0, 0xeb, - 0x20, 0xcf, 0x6f, 0x15, 0x13, 0x03, 0xa4, 0x30, 0xc0, 0x04, 0xe9, 0x9d, 0xa4, 0x4f, 0x65, 0x40, - 0xee, 0xdb, 0x61, 0x3c, 0x64, 0xa7, 0x71, 0x61, 0xe4, 0x59, 0x58, 0x90, 0xd0, 0xeb, 0x90, 0x09, - 0xbc, 0x71, 0x44, 0x44, 0x06, 0x13, 0xbf, 0x4c, 0x60, 0x4a, 0x16, 0xe6, 0xb8, 0xcc, 0x6d, 0x59, - 0x91, 0xd5, 0x4c, 0xf5, 0x5f, 0x12, 0x14, 0x35, 0xdf, 0x77, 0x8e, 0xe3, 0xbc, 0x7c, 0x00, 0x39, - 0xf3, 0xc0, 0x70, 0x87, 0x24, 0xfe, 0x7d, 0xe3, 0xca, 0xd4, 0x4a, 0x52, 0xb0, 0xb6, 0xcd, 0xa4, - 0xe2, 0x5f, 0x16, 0x84, 0x4e, 0xf9, 0x2b, 0x09, 0xb2, 0x9c, 0x83, 0x6a, 0xf0, 0x1c, 0x39, 0xf2, - 0x89, 0x19, 0xe9, 0xa7, 0xfc, 0x66, 0x33, 0x2a, 0x5e, 0xe5, 0xac, 0x3b, 0x09, 0xef, 0xdf, 0x84, - 0xec, 0xd8, 0x0f, 0x49, 0x10, 0x89, 0x7c, 0xcc, 0x8f, 0x09, 0x16, 0x42, 0xe8, 0x65, 0xc8, 0x5a, - 0xc4, 0x21, 0xe2, 0xb4, 0x33, 0x57, 0x51, 0xb0, 0xaa, 0x36, 0x7b, 0x1d, 0xa9, 0xd3, 0xcf, 0xba, - 0x3c, 0xaa, 0xff, 0x4e, 0x81, 0x1a, 0x5f, 0x94, 0xf0, 0x99, 0x3d, 0xc6, 0x67, 0xdb, 0xa6, 0xf4, - 0xd9, 0xb6, 0x89, 0x3e, 0xd9, 0xb4, 0x0f, 0x9b, 0xc8, 0xb0, 0x7e, 0x05, 0xd3, 0xde, 0x2c, 0x96, - 0x78, 0x0d, 0x56, 0x5c, 0x72, 0x14, 0xe9, 0xbe, 0x31, 0x24, 0x7a, 0xe4, 0x1d, 0x12, 0x57, 0x00, - 0x50, 0x89, 0x92, 0x7b, 0xc6, 0x90, 0x0c, 0x28, 0x11, 0x5d, 0x01, 0x60, 0x22, 0x7c, 0x00, 0xa1, - 0xe8, 0x98, 0xc1, 0x79, 0x4a, 0x61, 0xd3, 0x07, 0xba, 0x09, 0xc5, 0xd0, 0x1e, 0xba, 0x46, 0x34, - 0x0e, 0xc8, 0x60, 0xd0, 0x16, 0x90, 0xfb, 0x98, 0x59, 0x56, 0x79, 0x70, 0x52, 0x91, 0xd8, 0xa0, - 0x7a, 0x4a, 0xf1, 0x4c, 0x93, 0xa1, 0xcc, 0x36, 0x19, 0xd5, 0x3f, 0xa7, 0x60, 0x35, 0x11, 0xdf, - 0x67, 0x7e, 0xdd, 0x5b, 0x90, 0x8f, 0xd1, 0x2e, 0xbe, 0xef, 0xaf, 0x9e, 0x85, 0xc4, 0x89, 0x27, - 0x35, 0x7d, 0xf2, 0x83, 0x12, 0xb7, 0x33, 0xd5, 0x9e, 0x17, 0x6c, 0x79, 0x4e, 0xb0, 0xcb, 0x9f, - 0x40, 0x7e, 0x62, 0x05, 0xbd, 0x71, 0x0a, 0x20, 0xe6, 0xa0, 0xf1, 0x29, 0x74, 0xb8, 0x02, 0x40, - 0xe3, 0x49, 0x2c, 0xd6, 0x42, 0xf2, 0xc1, 0x35, 0xcf, 0x29, 0xbb, 0x81, 0x53, 0xfd, 0x8d, 0x04, - 0x19, 0x86, 0x01, 0xe8, 0x7d, 0xc8, 0x8d, 0xc8, 0x68, 0x8f, 0xc2, 0x36, 0xbf, 0xdf, 0xe7, 0x8d, - 0xd5, 0xb1, 0x38, 0x7d, 0xcb, 0xfc, 0xc0, 0x1e, 0x19, 0xc1, 0x31, 0xff, 0x81, 0x0f, 0xc7, 0x4b, - 0x74, 0x0d, 0xf2, 0xf1, 0x5c, 0x1d, 0xff, 0xc6, 0x73, 0x7a, 0xec, 0x9e, 0xb2, 0x45, 0xaf, 0xf4, - 0xc7, 0x14, 0x64, 0x79, 0xd4, 0xd1, 0x07, 0x00, 0xf1, 0xec, 0xfc, 0xc4, 0xa3, 0x7e, 0x5e, 0x68, - 0xb4, 0xac, 0x29, 0xe6, 0xa5, 0xce, 0xc7, 0x3c, 0x0a, 0xba, 0x24, 0x32, 0x2d, 0x81, 0x8f, 0x17, - 0x66, 0x2b, 0xa0, 0xd6, 0x8c, 0x4c, 0x2b, 0x0e, 0x2b, 0x15, 0x2c, 0x7f, 0x21, 0x81, 0x4c, 0x89, - 0x34, 0xbe, 0xa6, 0x33, 0xa6, 0x2f, 0x59, 0xec, 0xa5, 0x8c, 0xf3, 0x82, 0xd2, 0xb2, 0xd0, 0x0b, - 0x90, 0xe7, 0x61, 0xa2, 0xdc, 0x14, 0xe3, 0x2a, 0x9c, 0xd0, 0xb2, 0x50, 0x19, 0x94, 0x09, 0xfa, - 0xf1, 0xdb, 0x3a, 0x59, 0x53, 0xc5, 0xc0, 0xd8, 0x8f, 0xf4, 0x88, 0x04, 0x7c, 0xa0, 0x96, 0xb1, - 0x42, 0x09, 0x03, 0x12, 0x8c, 0xe2, 0x5f, 0x1c, 0xe8, 0xdf, 0x6b, 0xdf, 0xa5, 0x20, 0xcb, 0x2b, - 0x1a, 0x65, 0x21, 0xd5, 0xfd, 0x48, 0x5d, 0x42, 0x17, 0x60, 0xf5, 0x76, 0x77, 0x17, 0x77, 0xb4, - 0xb6, 0xde, 0xe9, 0x0e, 0xf4, 0x9d, 0xee, 0x6e, 0xa7, 0xa1, 0x4a, 0xe8, 0x0a, 0x5c, 0xee, 0x74, - 0xf5, 0x98, 0xd3, 0xc3, 0xad, 0x3b, 0x1a, 0xbe, 0xa7, 0xd7, 0x71, 0xf7, 0xa3, 0x26, 0x56, 0x53, - 0x68, 0x1d, 0xca, 0x54, 0x7a, 0x01, 0x3f, 0x8d, 0x2e, 0x02, 0x4a, 0xf2, 0x05, 0x3d, 0x83, 0x36, - 0xe0, 0xc5, 0x56, 0xa7, 0xbf, 0xbb, 0xb3, 0xd3, 0xda, 0x6e, 0x35, 0x3b, 0xb3, 0x02, 0x7d, 0x55, - 0x46, 0x2f, 0xc2, 0x5a, 0x77, 0x67, 0xa7, 0xdf, 0x1c, 0x30, 0x77, 0xee, 0x35, 0x07, 0xba, 0xf6, - 0xb1, 0xd6, 0x6a, 0x6b, 0xf5, 0x76, 0x53, 0xcd, 0xa2, 0x15, 0x28, 0xdc, 0xc5, 0xdd, 0xce, 0x4d, - 0x1d, 0x77, 0x77, 0x07, 0x4d, 0x35, 0x47, 0xdd, 0xef, 0xe1, 0x6e, 0xaf, 0xdb, 0xd7, 0xda, 0xfa, - 0x9d, 0x56, 0xff, 0x8e, 0x36, 0xd8, 0xbe, 0xa5, 0x2a, 0xe8, 0x05, 0xb8, 0xd4, 0x1c, 0x6c, 0x37, - 0xf4, 0x01, 0xd6, 0x3a, 0x7d, 0x6d, 0x7b, 0xd0, 0xea, 0x76, 0xf4, 0x1d, 0xad, 0xd5, 0x6e, 0x36, - 0xd4, 0x3c, 0x35, 0x42, 0x6d, 0x6b, 0xed, 0x76, 0xf7, 0x6e, 0xb3, 0xa1, 0x02, 0xba, 0x04, 0xcf, - 0x71, 0xab, 0x5a, 0xaf, 0xd7, 0xec, 0x34, 0x74, 0xee, 0x80, 0x5a, 0xa0, 0xce, 0xb4, 0x3a, 0x8d, - 0xe6, 0x27, 0xfa, 0x2d, 0xad, 0xaf, 0xdf, 0xc4, 0x4d, 0x6d, 0xd0, 0xc4, 0x31, 0xb7, 0x48, 0xf7, - 0xc6, 0xcd, 0x9b, 0xad, 0x3e, 0x25, 0x4e, 0xf6, 0x2e, 0x5d, 0x73, 0x41, 0x9d, 0xfd, 0x29, 0x02, - 0x15, 0x20, 0xd7, 0xea, 0x7c, 0xac, 0xb5, 0x5b, 0x0d, 0x75, 0x09, 0x29, 0x20, 0x77, 0xba, 0x9d, - 0xa6, 0x2a, 0xd1, 0xaf, 0x9b, 0x9f, 0xb6, 0x7a, 0x6a, 0x0a, 0x95, 0x20, 0xff, 0x69, 0x7f, 0xa0, - 0x75, 0x1a, 0x1a, 0x6e, 0xa8, 0x69, 0x04, 0x90, 0xed, 0x77, 0xb4, 0x5e, 0xef, 0x9e, 0x2a, 0xd3, - 0x58, 0x53, 0x21, 0xba, 0x6f, 0xbb, 0xab, 0x35, 0xf4, 0x46, 0x73, 0xbb, 0x7b, 0xa7, 0x87, 0x9b, - 0xfd, 0x7e, 0xab, 0xdb, 0x51, 0x33, 0x5b, 0xbf, 0x4c, 0x4f, 0x1b, 0x82, 0x1f, 0x82, 0x4c, 0x9b, - 0x08, 0x74, 0x61, 0xb6, 0xa9, 0x60, 0x2f, 0x49, 0xf9, 0xe2, 0xfc, 0x5e, 0x03, 0xbd, 0x0f, 0x19, - 0xf6, 0xc2, 0xa1, 0x8b, 0xf3, 0xdf, 0xe9, 0xf2, 0xa5, 0x33, 0x74, 0xa1, 0xf9, 0x1e, 0xc8, 0x74, - 0xb4, 0x4e, 0x6e, 0x98, 0xf8, 0x75, 0x22, 0xb9, 0x61, 0x72, 0x02, 0x7f, 0x4b, 0x42, 0x1f, 0x40, - 0x96, 0xcf, 0x39, 0xe8, 0xb4, 0xed, 0xe9, 0x10, 0x5a, 0x5e, 0x3b, 0xcb, 0xe0, 0xea, 0x9b, 0x12, - 0xba, 0x05, 0xf9, 0x49, 0x4f, 0x8b, 0xca, 0xc9, 0x5d, 0x4e, 0x8f, 0x09, 0xe5, 0x17, 0xe6, 0xf2, - 0x62, 0x3b, 0x6f, 0x51, 0x4b, 0x25, 0x1a, 0x8b, 0x09, 0x16, 0x27, 0xad, 0xcd, 0x3e, 0xc5, 0x49, - 0x6b, 0x67, 0xc0, 0xbb, 0xde, 0x7c, 0xf0, 0xdf, 0xf5, 0xa5, 0x07, 0xdf, 0xad, 0x4b, 0xdf, 0x7e, - 0xb7, 0x2e, 0xfd, 0xf6, 0xe1, 0xfa, 0xd2, 0x37, 0x0f, 0xd7, 0xa5, 0xbf, 0x3d, 0x5c, 0x97, 0xbe, - 0x7d, 0xb8, 0xbe, 0xf4, 0x8f, 0x87, 0xeb, 0x4b, 0x9f, 0xbe, 0x3c, 0xf4, 0x6a, 0x43, 0xe3, 0x73, - 0x12, 0x45, 0xa4, 0x66, 0x91, 0xfb, 0xd7, 0x4d, 0x2f, 0x20, 0xd7, 0x67, 0xfe, 0x5f, 0xb5, 0x97, - 0x65, 0x5f, 0xef, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xcf, 0x98, 0xbc, 0xc9, 0x1a, 0x00, - 0x00, + // 2597 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x3d, 0x70, 0x1b, 0xc7, + 0xf5, 0xe7, 0x01, 0x07, 0xe0, 0xf0, 0x00, 0x90, 0xc7, 0xb5, 0x25, 0x51, 0xb0, 0x45, 0xd0, 0xf0, + 0xc7, 0x9f, 0x92, 0x6d, 0xd0, 0xa6, 0xff, 0xb1, 0x1d, 0x65, 0x9c, 0x18, 0x20, 0x40, 0x09, 0x32, + 0x04, 0x60, 0x16, 0xa0, 0x65, 0xb9, 0xc8, 0xcd, 0xf1, 0x6e, 0x09, 0x5e, 0x78, 0xb8, 0x43, 0xee, + 0x16, 0x32, 0xe9, 0xce, 0x4d, 0xe2, 0xc2, 0x99, 0xc9, 0xa4, 0x72, 0x95, 0x71, 0x93, 0x3a, 0x99, + 0x49, 0x97, 0x34, 0x29, 0x95, 0xce, 0x65, 0x66, 0x92, 0x30, 0x13, 0x6b, 0x26, 0x93, 0x5a, 0xa5, + 0xab, 0xcc, 0x7e, 0x1c, 0x70, 0x04, 0x41, 0x51, 0x2a, 0xd8, 0x60, 0x76, 0xdf, 0xd7, 0xbe, 0x7d, + 0xef, 0xed, 0x6f, 0xdf, 0x1e, 0x60, 0x75, 0x37, 0xf0, 0x0f, 0x48, 0xb0, 0x31, 0x0a, 0x7c, 0xea, + 0x5b, 0xbe, 0x3b, 0x19, 0x54, 0xf8, 0x00, 0x69, 0xd1, 0xbc, 0xf8, 0xfc, 0xc0, 0x1f, 0xf8, 0x7c, + 0xb6, 0xc1, 0x46, 0x82, 0x5f, 0x5c, 0x1d, 0xf8, 0xfe, 0xc0, 0x25, 0x42, 0x6d, 0x77, 0xbc, 0xb7, + 0x61, 0x8f, 0x03, 0x93, 0x3a, 0xbe, 0x27, 0xf8, 0xe5, 0xf7, 0x20, 0xd5, 0x32, 0x77, 0x89, 0x8b, + 0x10, 0xa8, 0x9e, 0x39, 0x24, 0x2b, 0xca, 0x9a, 0xb2, 0x9e, 0xc5, 0x7c, 0x8c, 0x9e, 0x87, 0xd4, + 0x03, 0xd3, 0x1d, 0x93, 0x95, 0x04, 0x27, 0x8a, 0xc9, 0x4d, 0xf5, 0xbf, 0xdf, 0x94, 0x94, 0x72, + 0x1f, 0x34, 0xae, 0xd8, 0x23, 0x14, 0xd5, 0x20, 0xed, 0xb2, 0x71, 0xb8, 0xa2, 0xac, 0x25, 0xd7, + 0x73, 0x9b, 0x4b, 0x95, 0x89, 0x97, 0x5c, 0xa6, 0x76, 0xf5, 0xe1, 0x71, 0x69, 0xe1, 0xf1, 0x71, + 0x69, 0xf9, 0xc8, 0x1c, 0xba, 0x37, 0xcb, 0x6f, 0xf8, 0x43, 0x87, 0x92, 0xe1, 0x88, 0x1e, 0x95, + 0xb1, 0xd4, 0x94, 0x56, 0xbf, 0x50, 0xa0, 0x20, 0xcd, 0xba, 0xc4, 0xa2, 0x7e, 0x80, 0x36, 0x21, + 0xe3, 0x78, 0x96, 0x3b, 0xb6, 0x85, 0x6b, 0xb9, 0x4d, 0x34, 0x63, 0xbc, 0x47, 0x68, 0x4d, 0x65, + 0xf6, 0x71, 0x24, 0xc8, 0x74, 0xc8, 0xa1, 0xd0, 0x49, 0x9c, 0xa7, 0x23, 0x05, 0x6f, 0x6a, 0x5f, + 0x7f, 0x53, 0x5a, 0xe0, 0x3e, 0x7c, 0x95, 0x85, 0xdc, 0x1d, 0x7f, 0x1c, 0x78, 0xa6, 0xdb, 0x1b, + 0x11, 0x0b, 0xfd, 0x7f, 0x3c, 0x32, 0xb5, 0xb5, 0xb9, 0xdb, 0xf8, 0xfe, 0xb8, 0x94, 0x91, 0x3a, + 0x32, 0x76, 0xef, 0x41, 0x2e, 0x20, 0x23, 0xd7, 0xb1, 0x78, 0xb4, 0xb9, 0x1f, 0xa9, 0xda, 0xa5, + 0xf9, 0x31, 0x88, 0x4b, 0xa2, 0xee, 0x24, 0x98, 0xc9, 0x33, 0x7d, 0x7f, 0x85, 0xf9, 0xfe, 0xed, + 0x71, 0x49, 0x79, 0x7c, 0x5c, 0x5a, 0x99, 0xb5, 0xf7, 0x86, 0xe3, 0xb9, 0x8e, 0x47, 0x26, 0xa1, + 0x45, 0x3b, 0xa0, 0xed, 0x05, 0xe6, 0x60, 0x48, 0x3c, 0xba, 0xa2, 0x72, 0x9b, 0xab, 0x53, 0x9b, + 0xb1, 0x9d, 0x56, 0xb6, 0xa5, 0xd4, 0x93, 0xf2, 0x35, 0x31, 0x85, 0x7e, 0x02, 0xa9, 0x3d, 0xd7, + 0x1c, 0x84, 0x2b, 0xe9, 0x35, 0x65, 0xbd, 0x50, 0xbb, 0x7e, 0x56, 0x60, 0xf4, 0xd8, 0x12, 0xc6, + 0xb6, 0x6b, 0x0e, 0xb0, 0xd0, 0x43, 0x2d, 0x58, 0x1a, 0x9a, 0x87, 0x86, 0x39, 0x1a, 0x11, 0xcf, + 0x36, 0x02, 0x93, 0x92, 0x95, 0xcc, 0x9a, 0xb2, 0x9e, 0xac, 0xbd, 0xf2, 0xf8, 0xb8, 0xb4, 0x26, + 0x4c, 0xcd, 0x08, 0xc4, 0x3d, 0x29, 0x0c, 0xcd, 0xc3, 0x2a, 0x67, 0x61, 0x93, 0x92, 0xe2, 0x57, + 0x29, 0xd0, 0xa2, 0x0d, 0xa0, 0x37, 0x21, 0xed, 0x12, 0x6f, 0x40, 0xf7, 0x79, 0xd6, 0x92, 0x67, + 0x05, 0x5e, 0x0a, 0x21, 0x1f, 0x96, 0x2d, 0x7f, 0x38, 0x0a, 0x48, 0x18, 0x3a, 0xbe, 0x67, 0x58, + 0xbe, 0x4d, 0x2c, 0x9e, 0xb2, 0xc5, 0xcd, 0xe2, 0x34, 0x54, 0x5b, 0x53, 0x91, 0x2d, 0x26, 0x51, + 0x7b, 0xed, 0xf1, 0x71, 0xa9, 0x2c, 0xac, 0x9e, 0x52, 0x8f, 0x2f, 0xa3, 0x5b, 0x33, 0x9a, 0xe8, + 0xc7, 0x90, 0x0e, 0xa9, 0x1f, 0x10, 0x96, 0xe4, 0xe4, 0x7a, 0x96, 0x5b, 0x9a, 0x1b, 0xbc, 0x42, + 0xb4, 0xa5, 0x1e, 0x13, 0xc7, 0x52, 0x0b, 0x85, 0xa0, 0x07, 0x64, 0x2f, 0x20, 0xe1, 0xbe, 0xe1, + 0x78, 0x94, 0x04, 0x0f, 0x4c, 0x57, 0xa6, 0xf6, 0x6a, 0x45, 0x9c, 0xf8, 0x4a, 0x74, 0xe2, 0x2b, + 0x75, 0x79, 0xe2, 0x6b, 0x6f, 0xca, 0xac, 0xbe, 0x24, 0x16, 0x9a, 0x35, 0x10, 0x5b, 0xf8, 0xeb, + 0x7f, 0x95, 0x14, 0xbc, 0x24, 0x05, 0x9a, 0x92, 0x8f, 0x3e, 0x86, 0x6c, 0x40, 0x28, 0xf1, 0x78, + 0x41, 0xa7, 0xce, 0x5b, 0xed, 0xda, 0x99, 0x35, 0xc4, 0xad, 0x4f, 0x4d, 0xa1, 0x21, 0x2c, 0xee, + 0xb9, 0xe3, 0xf8, 0x56, 0xd2, 0xe7, 0x19, 0x7f, 0x5d, 0x1a, 0x2f, 0x09, 0xe3, 0x27, 0xd5, 0x67, + 0x97, 0x2a, 0x70, 0xf6, 0x64, 0x1b, 0x3f, 0x85, 0x4b, 0x23, 0x93, 0xee, 0x1b, 0x23, 0x3f, 0xa4, + 0x7b, 0xce, 0xa1, 0xc1, 0x44, 0xdd, 0xa8, 0xf8, 0xb2, 0xb5, 0x1b, 0x8f, 0x8f, 0x4b, 0xaf, 0x09, + 0xb3, 0x73, 0xc5, 0xe2, 0x89, 0x7d, 0x8e, 0x49, 0x74, 0x85, 0x40, 0x5f, 0xf2, 0x25, 0x92, 0x55, + 0x41, 0x65, 0xb5, 0x8e, 0x96, 0xa1, 0xd0, 0xee, 0xf4, 0x8d, 0x5e, 0xb7, 0xb1, 0xd5, 0xdc, 0x6e, + 0x36, 0xea, 0xfa, 0x02, 0xca, 0x83, 0xd6, 0x31, 0x70, 0xbd, 0xd3, 0x6e, 0xdd, 0xd7, 0x15, 0x31, + 0xbb, 0x87, 0xf9, 0x2c, 0x81, 0x00, 0xd2, 0x8c, 0x77, 0x0f, 0xeb, 0xaa, 0x34, 0xf4, 0x3b, 0x05, + 0x72, 0xdd, 0xc0, 0xb7, 0x48, 0x18, 0x72, 0x38, 0xaa, 0x40, 0xc2, 0xb1, 0x25, 0x16, 0xae, 0x4c, + 0x8b, 0x33, 0x26, 0x52, 0x69, 0xd6, 0x25, 0xba, 0x25, 0x1c, 0x1b, 0xad, 0x83, 0x46, 0x3c, 0x7b, + 0xe4, 0x3b, 0x1e, 0x15, 0x38, 0x5e, 0xcb, 0x7f, 0x7f, 0x5c, 0xd2, 0x1a, 0x92, 0x86, 0x27, 0xdc, + 0xe2, 0xbb, 0x90, 0x68, 0xd6, 0xd9, 0x45, 0xf0, 0xb9, 0xef, 0x4d, 0x2e, 0x02, 0x36, 0x46, 0x97, + 0x21, 0x1d, 0x8e, 0xf7, 0xf6, 0x9c, 0x43, 0x79, 0x13, 0xc8, 0x99, 0xf0, 0xf0, 0xa6, 0xfa, 0x25, + 0xf3, 0xf3, 0x97, 0x0a, 0x40, 0x8d, 0x5f, 0x56, 0xdc, 0xcd, 0x3e, 0xe4, 0x47, 0xc2, 0x25, 0x23, + 0x1c, 0x11, 0x4b, 0x3a, 0x7c, 0x69, 0xae, 0xc3, 0xb5, 0x62, 0x0c, 0xcf, 0x16, 0x65, 0xbd, 0x44, + 0x28, 0x96, 0x1b, 0xc5, 0x36, 0xff, 0x32, 0x14, 0x7e, 0x26, 0xd0, 0xc4, 0x70, 0x9d, 0xa1, 0x23, + 0x76, 0x54, 0xc0, 0x79, 0x49, 0x6c, 0x31, 0x5a, 0xf9, 0xef, 0x89, 0x18, 0x12, 0xbc, 0x0a, 0x19, + 0xc9, 0x94, 0x00, 0x9e, 0x8b, 0x63, 0x75, 0xc4, 0x43, 0x6b, 0x90, 0xda, 0x25, 0x03, 0x47, 0x00, + 0x75, 0xb2, 0x06, 0xdf, 0x1f, 0x97, 0xd2, 0x9d, 0xbd, 0xbd, 0x90, 0x50, 0x2c, 0x18, 0xe8, 0x45, + 0x48, 0x12, 0xcf, 0xe6, 0xa0, 0x7c, 0x92, 0xcf, 0xc8, 0xe8, 0x3a, 0x24, 0xc3, 0xf1, 0x50, 0x9e, + 0xc1, 0xe5, 0xe9, 0x2e, 0x7b, 0xb7, 0xab, 0x6f, 0xf7, 0xc6, 0x43, 0x99, 0x0f, 0x26, 0x83, 0x6e, + 0xcd, 0x03, 0x9b, 0xd4, 0x79, 0x60, 0x33, 0x07, 0x44, 0xde, 0x85, 0xc2, 0xae, 0x69, 0x1d, 0x38, + 0xde, 0xc0, 0xe0, 0xb0, 0xc0, 0x8f, 0x4d, 0xb6, 0xb6, 0x7c, 0x1a, 0x36, 0xf2, 0x52, 0x8e, 0xcf, + 0xd0, 0x55, 0xd0, 0x86, 0xbe, 0x6d, 0x50, 0x67, 0x28, 0x01, 0x17, 0x67, 0x86, 0xbe, 0xdd, 0x77, + 0x86, 0x04, 0xbd, 0x04, 0xf9, 0x78, 0xd1, 0xaf, 0x68, 0x3c, 0xdd, 0xb9, 0x58, 0x99, 0x97, 0x3f, + 0x82, 0x8c, 0xdc, 0x14, 0xeb, 0x0f, 0x46, 0x66, 0x40, 0xdf, 0xe6, 0x91, 0x4d, 0x63, 0x31, 0x89, + 0xa8, 0x9b, 0x3c, 0x94, 0x92, 0xba, 0x19, 0x51, 0xdf, 0xe1, 0x01, 0xcc, 0x08, 0xea, 0x3b, 0xe5, + 0x3f, 0x24, 0x20, 0x87, 0x89, 0x69, 0x63, 0xf2, 0xf3, 0x31, 0x09, 0x29, 0x5a, 0x87, 0xf4, 0x3e, + 0x31, 0x6d, 0x12, 0xc8, 0x7a, 0xd1, 0xa7, 0x01, 0xb9, 0xcd, 0xe9, 0x58, 0xf2, 0xe3, 0x79, 0x4d, + 0x3c, 0x21, 0xaf, 0x65, 0x48, 0xfb, 0x3c, 0x4d, 0x73, 0x12, 0x27, 0x39, 0xcc, 0xb5, 0x5d, 0xd7, + 0xb7, 0x0e, 0x78, 0xf6, 0x34, 0x2c, 0x26, 0x68, 0x0d, 0xf2, 0xb6, 0x6f, 0x78, 0x3e, 0x35, 0x46, + 0x81, 0x7f, 0x78, 0xc4, 0x33, 0xa4, 0x61, 0xb0, 0xfd, 0xb6, 0x4f, 0xbb, 0x8c, 0xc2, 0x8a, 0x71, + 0x48, 0xa8, 0x69, 0x9b, 0xd4, 0x34, 0x7c, 0xcf, 0x3d, 0xe2, 0xf1, 0xd7, 0x70, 0x3e, 0x22, 0x76, + 0x3c, 0xf7, 0x08, 0x5d, 0x07, 0x60, 0x97, 0x97, 0x74, 0x22, 0x73, 0xca, 0x89, 0x2c, 0xf1, 0x6c, + 0x31, 0x44, 0xaf, 0xc0, 0x22, 0x2f, 0x35, 0x63, 0x92, 0x1d, 0x8d, 0x67, 0x27, 0xcf, 0xa9, 0x77, + 0x45, 0x8a, 0xca, 0xbf, 0x4d, 0x40, 0x5e, 0x84, 0x2c, 0x1c, 0xf9, 0x5e, 0x48, 0x58, 0xcc, 0x42, + 0x6a, 0xd2, 0x71, 0xc8, 0x63, 0xb6, 0x18, 0x8f, 0x59, 0x8f, 0xd3, 0xb1, 0xe4, 0xc7, 0xa2, 0x9b, + 0x38, 0x27, 0xba, 0x4f, 0x13, 0xb6, 0xeb, 0x00, 0x9f, 0x05, 0x0e, 0x25, 0x06, 0xd3, 0xe1, 0xb1, + 0x9b, 0xd9, 0x19, 0xe7, 0x32, 0xc3, 0xa8, 0x12, 0xeb, 0x40, 0x52, 0xb3, 0x5d, 0x4d, 0x54, 0xaa, + 0xb1, 0xd6, 0xe2, 0x25, 0xc8, 0x47, 0x63, 0x63, 0x1c, 0x88, 0xfb, 0x20, 0x8b, 0x73, 0x11, 0x6d, + 0x27, 0x70, 0xd1, 0x0a, 0x64, 0x2c, 0xdf, 0x63, 0x57, 0x08, 0x0f, 0x6a, 0x1e, 0x47, 0xd3, 0xf2, + 0x97, 0x49, 0x28, 0xc8, 0xbe, 0xe0, 0xa2, 0xaa, 0x6a, 0xb6, 0x36, 0x92, 0xa7, 0x6a, 0x63, 0x1a, + 0xc0, 0xd4, 0x99, 0x01, 0xfc, 0x10, 0x96, 0xac, 0x7d, 0x62, 0x1d, 0x18, 0x01, 0x19, 0x38, 0x21, + 0x25, 0x41, 0x28, 0x2f, 0xbe, 0x2b, 0xa7, 0x5a, 0x3e, 0xd1, 0x0c, 0xe3, 0x45, 0x2e, 0x8f, 0x23, + 0x71, 0xf4, 0x23, 0x58, 0x1a, 0x7b, 0x0c, 0x44, 0xa6, 0x16, 0x32, 0x67, 0x35, 0x8d, 0x78, 0x91, + 0x8b, 0x4e, 0x95, 0xab, 0x80, 0xc2, 0xf1, 0x2e, 0x0d, 0x4c, 0x8b, 0xc6, 0xf4, 0xb5, 0x33, 0xf5, + 0x97, 0x23, 0xe9, 0xa9, 0x89, 0x58, 0x12, 0xd4, 0x13, 0x49, 0x90, 0x77, 0xd7, 0x6f, 0x12, 0xb0, + 0x18, 0xa5, 0xe2, 0x99, 0xab, 0xb5, 0x72, 0x5e, 0xb5, 0x4a, 0x50, 0x8d, 0x72, 0x77, 0x03, 0xd2, + 0x96, 0x3f, 0x64, 0x97, 0x42, 0xf2, 0xcc, 0x12, 0x93, 0x12, 0xe8, 0x2d, 0xd6, 0xca, 0x44, 0x5b, + 0x56, 0xcf, 0xdc, 0xf2, 0x54, 0x88, 0x95, 0x24, 0xf5, 0xa9, 0xe9, 0x1a, 0xd6, 0xfe, 0xd8, 0x3b, + 0x08, 0x45, 0x5a, 0x71, 0x8e, 0xd3, 0xb6, 0x38, 0x09, 0xbd, 0x0a, 0x8b, 0x36, 0x71, 0xcd, 0x23, + 0x62, 0x47, 0x42, 0x69, 0x2e, 0x54, 0x90, 0x54, 0x21, 0x56, 0xfe, 0x73, 0x02, 0x74, 0x2c, 0x1b, + 0x7e, 0xf2, 0xec, 0x25, 0x5a, 0x01, 0xf6, 0xe6, 0x1b, 0xf9, 0xa1, 0xe9, 0x3e, 0x61, 0xa3, 0x13, + 0x99, 0x93, 0x5b, 0xcd, 0x3c, 0xcd, 0x56, 0xd7, 0x20, 0x67, 0x5a, 0x07, 0x9e, 0xff, 0x99, 0x4b, + 0xec, 0x01, 0x91, 0xa8, 0x16, 0x27, 0xa1, 0x9b, 0x80, 0x6c, 0x32, 0x0a, 0x08, 0xdb, 0x81, 0x6d, + 0x3c, 0xe1, 0xc4, 0x2c, 0x4f, 0xc5, 0x24, 0xe9, 0xec, 0x9a, 0x61, 0x78, 0x2a, 0x87, 0x86, 0x4d, + 0x5c, 0x6a, 0xca, 0x18, 0xe7, 0x25, 0xb1, 0xce, 0x68, 0xe5, 0xbf, 0x2a, 0xb0, 0x1c, 0x8b, 0xde, + 0x05, 0x62, 0x60, 0x1c, 0xb4, 0x92, 0x4f, 0x01, 0x5a, 0xcf, 0x5c, 0x53, 0xe5, 0x3e, 0xe4, 0x5a, + 0x4e, 0x48, 0xa3, 0x1a, 0xf8, 0x21, 0x68, 0xa1, 0x3c, 0xe9, 0xb2, 0x0a, 0xce, 0x02, 0x02, 0x59, + 0xf9, 0x13, 0xf1, 0x3b, 0xaa, 0x96, 0xd0, 0x93, 0x77, 0x54, 0x2d, 0xa9, 0xab, 0xe5, 0xff, 0x24, + 0x20, 0x2f, 0xcc, 0x5e, 0xf8, 0x91, 0xfb, 0x10, 0x34, 0x99, 0x7c, 0xf1, 0x90, 0x39, 0xf1, 0xb2, + 0x8c, 0xfb, 0x10, 0x3d, 0x33, 0x23, 0xc7, 0x23, 0xad, 0xe2, 0x1f, 0x15, 0x88, 0x8a, 0x05, 0x6d, + 0x80, 0x3a, 0xbf, 0x55, 0x8c, 0x3d, 0x20, 0xa5, 0x01, 0x2e, 0xc8, 0xce, 0x24, 0xbb, 0x2a, 0x03, + 0xf2, 0xc0, 0x09, 0xa3, 0x47, 0x76, 0x12, 0xe7, 0x86, 0xbe, 0x8d, 0x25, 0x09, 0xbd, 0x0e, 0xa9, + 0xc0, 0x1f, 0x53, 0x22, 0x33, 0x18, 0xfb, 0x32, 0x81, 0x19, 0x59, 0x9a, 0x13, 0x32, 0xe8, 0xff, + 0x60, 0xc9, 0x0a, 0x88, 0x49, 0xc9, 0xd4, 0x24, 0xbf, 0xd6, 0xf0, 0xa2, 0x20, 0x47, 0x56, 0xef, + 0xa8, 0x9a, 0xaa, 0xa7, 0xca, 0xff, 0x50, 0x20, 0x5f, 0x1d, 0x8d, 0xdc, 0xa3, 0x28, 0x81, 0x1f, + 0x40, 0xc6, 0xda, 0x37, 0xbd, 0x01, 0x89, 0x3e, 0x84, 0x5c, 0x9b, 0x2e, 0x17, 0x17, 0xac, 0x6c, + 0x71, 0xa9, 0xe8, 0x13, 0x84, 0xd4, 0x29, 0x7e, 0xa5, 0x40, 0x5a, 0x70, 0x50, 0x05, 0x9e, 0x23, + 0x87, 0x23, 0x62, 0x51, 0xe3, 0xc4, 0x06, 0xf9, 0x63, 0x16, 0x2f, 0x0b, 0xd6, 0xdd, 0xd8, 0x36, + 0xdf, 0x84, 0xf4, 0x78, 0x14, 0x92, 0x80, 0xca, 0xc4, 0xcd, 0x0f, 0x1e, 0x96, 0x42, 0xe8, 0x65, + 0x48, 0xdb, 0xc4, 0x25, 0x32, 0x2c, 0x33, 0x67, 0x56, 0xb2, 0xca, 0x0e, 0xbf, 0x46, 0x99, 0xd3, + 0x17, 0x5d, 0x47, 0xe5, 0x7f, 0x26, 0x40, 0x8f, 0x4e, 0x54, 0x78, 0x61, 0xb7, 0xf6, 0xe9, 0xfe, + 0x2a, 0x79, 0xba, 0xbf, 0x62, 0x77, 0x3b, 0x6b, 0xd8, 0x26, 0x32, 0xa2, 0x02, 0x58, 0x13, 0x17, + 0x49, 0xbc, 0x06, 0x4b, 0x1e, 0x39, 0xa4, 0xc6, 0xc8, 0x1c, 0x10, 0x83, 0xfa, 0x07, 0xc4, 0x93, + 0x48, 0x55, 0x60, 0xe4, 0xae, 0x39, 0x20, 0x7d, 0x46, 0x44, 0xd7, 0x00, 0xb8, 0x88, 0x78, 0xa9, + 0x30, 0x18, 0x4d, 0xe1, 0x2c, 0xa3, 0xf0, 0x67, 0x0a, 0xba, 0x05, 0xf9, 0xd0, 0x19, 0x78, 0x26, + 0x1d, 0x07, 0xa4, 0xdf, 0x6f, 0x49, 0x6c, 0x7e, 0xc2, 0xa3, 0x57, 0x7b, 0x78, 0x5c, 0x52, 0xf8, + 0x8b, 0xf6, 0x84, 0xe2, 0xa9, 0x6e, 0x44, 0x9b, 0xed, 0x46, 0xca, 0x7f, 0x4a, 0xc0, 0x72, 0x2c, + 0xbe, 0x17, 0x8e, 0x0b, 0x4d, 0xc8, 0x46, 0xb0, 0x18, 0x01, 0xc3, 0xab, 0xa7, 0xb1, 0x73, 0xe2, + 0x49, 0xc5, 0x98, 0x7c, 0x79, 0x12, 0x76, 0xa6, 0xda, 0xf3, 0x82, 0xad, 0xce, 0x09, 0x76, 0xf1, + 0x13, 0xc8, 0x4e, 0xac, 0xa0, 0x37, 0x4e, 0x20, 0xc9, 0x1c, 0xd8, 0x3e, 0x01, 0x23, 0xd7, 0x00, + 0x58, 0x3c, 0x89, 0xcd, 0x7b, 0x4d, 0xf1, 0xc2, 0xcd, 0x0a, 0xca, 0x4e, 0xe0, 0x96, 0x7f, 0xa5, + 0x40, 0x8a, 0x83, 0x05, 0x7a, 0x1f, 0x32, 0x43, 0x32, 0xdc, 0x65, 0xf8, 0x2e, 0xce, 0xf7, 0x79, + 0xef, 0xef, 0x48, 0x9c, 0x5d, 0x7a, 0xa3, 0xc0, 0x19, 0x9a, 0xc1, 0x91, 0xf8, 0x12, 0x88, 0xa3, + 0x29, 0xba, 0x01, 0xd9, 0xe8, 0x01, 0x1e, 0x7d, 0x0c, 0x3a, 0xf9, 0x3e, 0x9f, 0xb2, 0x65, 0x53, + 0xf5, 0xfb, 0x04, 0xa4, 0x45, 0xd4, 0xd1, 0x07, 0x00, 0xd1, 0x23, 0xfb, 0xa9, 0xbf, 0x09, 0x64, + 0xa5, 0x46, 0xd3, 0x9e, 0x82, 0x63, 0xe2, 0x29, 0xc0, 0x71, 0x03, 0x54, 0x42, 0x2d, 0x5b, 0x02, + 0xe9, 0xa5, 0xd9, 0x0a, 0xa8, 0x34, 0xa8, 0x65, 0x47, 0x61, 0x65, 0x82, 0xc5, 0x2f, 0x14, 0x50, + 0x19, 0x91, 0xc5, 0xd7, 0x72, 0xc7, 0xec, 0xca, 0x8b, 0xbc, 0x54, 0x71, 0x56, 0x52, 0x9a, 0x36, + 0x7a, 0x01, 0xb2, 0x22, 0x4c, 0x8c, 0x9b, 0xe0, 0x5c, 0x4d, 0x10, 0x9a, 0x36, 0x2a, 0x82, 0x36, + 0x41, 0x3f, 0x71, 0x5a, 0x27, 0x73, 0xa6, 0x18, 0x98, 0x7b, 0xd4, 0xa0, 0x24, 0x10, 0x2f, 0x6f, + 0x15, 0x6b, 0x8c, 0xd0, 0x27, 0xc1, 0x30, 0xfa, 0x34, 0xc1, 0x7e, 0x6f, 0x7c, 0x97, 0x80, 0xb4, + 0xa8, 0x68, 0x94, 0x86, 0x44, 0xe7, 0x23, 0x7d, 0x01, 0x5d, 0x82, 0xe5, 0x3b, 0x9d, 0x1d, 0xdc, + 0xae, 0xb6, 0x8c, 0x76, 0xa7, 0x6f, 0x6c, 0x77, 0x76, 0xda, 0x75, 0x5d, 0x41, 0xd7, 0xe0, 0x6a, + 0xbb, 0x63, 0x44, 0x9c, 0x2e, 0x6e, 0xde, 0xad, 0xe2, 0xfb, 0x46, 0x0d, 0x77, 0x3e, 0x6a, 0x60, + 0x3d, 0x81, 0x56, 0xa1, 0xc8, 0xa4, 0xcf, 0xe0, 0x27, 0xd1, 0x65, 0x40, 0x71, 0xbe, 0xa4, 0xa7, + 0xd0, 0x1a, 0xbc, 0xd8, 0x6c, 0xf7, 0x76, 0xb6, 0xb7, 0x9b, 0x5b, 0xcd, 0x46, 0x7b, 0x56, 0xa0, + 0xa7, 0xab, 0xe8, 0x45, 0x58, 0xe9, 0x6c, 0x6f, 0xf7, 0x1a, 0x7d, 0xee, 0xce, 0xfd, 0x46, 0xdf, + 0xa8, 0x7e, 0x5c, 0x6d, 0xb6, 0xaa, 0xb5, 0x56, 0x43, 0x4f, 0xa3, 0x25, 0xc8, 0xdd, 0xc3, 0x9d, + 0xf6, 0x2d, 0x03, 0x77, 0x76, 0xfa, 0x0d, 0x3d, 0xc3, 0xdc, 0xef, 0xe2, 0x4e, 0xb7, 0xd3, 0xab, + 0xb6, 0x8c, 0xbb, 0xcd, 0xde, 0xdd, 0x6a, 0x7f, 0xeb, 0xb6, 0xae, 0xa1, 0x17, 0xe0, 0x4a, 0xa3, + 0xbf, 0x55, 0x37, 0xfa, 0xb8, 0xda, 0xee, 0x55, 0xb7, 0xfa, 0xcd, 0x4e, 0xdb, 0xd8, 0xae, 0x36, + 0x5b, 0x8d, 0xba, 0x9e, 0x65, 0x46, 0x98, 0xed, 0x6a, 0xab, 0xd5, 0xb9, 0xd7, 0xa8, 0xeb, 0x80, + 0xae, 0xc0, 0x73, 0xc2, 0x6a, 0xb5, 0xdb, 0x6d, 0xb4, 0xeb, 0x86, 0x70, 0x40, 0xcf, 0x31, 0x67, + 0x9a, 0xed, 0x7a, 0xe3, 0x13, 0xe3, 0x76, 0xb5, 0x67, 0xdc, 0xc2, 0x8d, 0x6a, 0xbf, 0x81, 0x23, + 0x6e, 0x9e, 0xad, 0x8d, 0x1b, 0xb7, 0x9a, 0x3d, 0x46, 0x9c, 0xac, 0x5d, 0xb8, 0xe1, 0x81, 0x3e, + 0xfb, 0xcd, 0x02, 0xe5, 0x20, 0xd3, 0x6c, 0x7f, 0x5c, 0x6d, 0x35, 0xeb, 0xfa, 0x02, 0xd2, 0x40, + 0x6d, 0x77, 0xda, 0x0d, 0x5d, 0x61, 0xa3, 0x5b, 0x9f, 0x36, 0xbb, 0x7a, 0x02, 0x15, 0x20, 0xfb, + 0x69, 0xaf, 0x5f, 0x6d, 0xd7, 0xab, 0xb8, 0xae, 0x27, 0x11, 0x40, 0xba, 0xd7, 0xae, 0x76, 0xbb, + 0xf7, 0x75, 0x95, 0xc5, 0x9a, 0x09, 0xb1, 0x75, 0x5b, 0x9d, 0x6a, 0xdd, 0xa8, 0x37, 0xb6, 0x3a, + 0x77, 0xbb, 0xb8, 0xd1, 0xeb, 0x35, 0x3b, 0x6d, 0x3d, 0xb5, 0xf9, 0x8b, 0xe4, 0xb4, 0x73, 0xf8, + 0x01, 0xa8, 0xac, 0xdb, 0x40, 0x97, 0x66, 0xbb, 0x0f, 0x7e, 0x93, 0x14, 0x2f, 0xcf, 0x6f, 0x4a, + 0xd0, 0xfb, 0x90, 0xe2, 0x37, 0x1c, 0xba, 0x3c, 0xff, 0x9e, 0x2e, 0x5e, 0x39, 0x45, 0x97, 0x9a, + 0xef, 0x81, 0xca, 0xde, 0xe0, 0xf1, 0x05, 0x63, 0x9f, 0x31, 0xe2, 0x0b, 0xc6, 0x9f, 0xea, 0x6f, + 0x29, 0xe8, 0x03, 0x48, 0x8b, 0x07, 0x11, 0x3a, 0x69, 0x7b, 0xfa, 0x5a, 0x2d, 0xae, 0x9c, 0x66, + 0x08, 0xf5, 0x75, 0x05, 0xdd, 0x86, 0xec, 0xa4, 0xf9, 0x45, 0xc5, 0xf8, 0x2a, 0x27, 0xdf, 0x13, + 0xc5, 0x17, 0xe6, 0xf2, 0x22, 0x3b, 0x6f, 0x31, 0x4b, 0x05, 0x16, 0x8b, 0x09, 0x16, 0xc7, 0xad, + 0xcd, 0x5e, 0xc5, 0x71, 0x6b, 0xa7, 0xc0, 0xbb, 0xd6, 0x78, 0xf8, 0xef, 0xd5, 0x85, 0x87, 0xdf, + 0xad, 0x2a, 0xdf, 0x7e, 0xb7, 0xaa, 0xfc, 0xfa, 0xd1, 0xea, 0xc2, 0x37, 0x8f, 0x56, 0x95, 0xbf, + 0x3c, 0x5a, 0x55, 0xbe, 0x7d, 0xb4, 0xba, 0xf0, 0xb7, 0x47, 0xab, 0x0b, 0x9f, 0xbe, 0x3c, 0xf0, + 0x2b, 0x03, 0xf3, 0x73, 0x42, 0x29, 0xa9, 0xd8, 0xe4, 0xc1, 0x86, 0xe5, 0x07, 0x64, 0x63, 0xe6, + 0x8f, 0xad, 0xdd, 0x34, 0x1f, 0xbd, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xe2, 0x70, + 0x4f, 0xf2, 0x1a, 0x00, 0x00, } func (this *Label) Equal(that interface{}) bool { @@ -3722,6 +3725,11 @@ func (m *ListResponse_Journal) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CreateRevision != 0 { + i = encodeVarintProtocol(dAtA, i, uint64(m.CreateRevision)) + i-- + dAtA[i] = 0x20 + } { size, err := m.Route.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -4649,6 +4657,9 @@ func (m *ListResponse_Journal) ProtoSize() (n int) { } l = m.Route.ProtoSize() n += 1 + l + sovProtocol(uint64(l)) + if m.CreateRevision != 0 { + n += 1 + sovProtocol(uint64(m.CreateRevision)) + } return n } @@ -8041,6 +8052,25 @@ func (m *ListResponse_Journal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CreateRevision", wireType) + } + m.CreateRevision = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtocol + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CreateRevision |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipProtocol(dAtA[iNdEx:]) diff --git a/broker/protocol/protocol.proto b/broker/protocol/protocol.proto index 2a163452..44fea2dd 100644 --- a/broker/protocol/protocol.proto +++ b/broker/protocol/protocol.proto @@ -584,10 +584,12 @@ message ListResponse { // Journals of the response. message Journal { JournalSpec spec = 1 [ (gogoproto.nullable) = false ]; - // Current ModRevision of the JournalSpec. + // Current Etcd ModRevision of the JournalSpec. int64 mod_revision = 2; // Route of the journal, including endpoints. Route route = 3 [ (gogoproto.nullable) = false ]; + // Etcd CreateRevision of the JournalSpec. + int64 create_revision = 4; } repeated Journal journals = 3 [ (gogoproto.nullable) = false ]; } diff --git a/consumer/protocol/protocol.pb.go b/consumer/protocol/protocol.pb.go index e5c0e584..0ca62489 100644 --- a/consumer/protocol/protocol.pb.go +++ b/consumer/protocol/protocol.pb.go @@ -688,12 +688,14 @@ var xxx_messageInfo_ListResponse proto.InternalMessageInfo // Shards of the response. type ListResponse_Shard struct { Spec ShardSpec `protobuf:"bytes,1,opt,name=spec,proto3" json:"spec"` - // Current ModRevision of the ShardSpec. + // Current Etcd ModRevision of the ShardSpec. ModRevision int64 `protobuf:"varint,2,opt,name=mod_revision,json=modRevision,proto3" json:"mod_revision,omitempty"` // Route of the shard, including endpoints. Route protocol.Route `protobuf:"bytes,3,opt,name=route,proto3" json:"route"` // Status of each replica. Cardinality and ordering matches |route|. Status []ReplicaStatus `protobuf:"bytes,4,rep,name=status,proto3" json:"status"` + // Etcd CreateRevision of the JournalSpec. + CreateRevision int64 `protobuf:"varint,5,opt,name=create_revision,json=createRevision,proto3" json:"create_revision,omitempty"` } func (m *ListResponse_Shard) Reset() { *m = ListResponse_Shard{} } @@ -1233,130 +1235,131 @@ func init() { } var fileDescriptor_6491fb50a1cefedd = []byte{ - // 1964 bytes of a gzipped FileDescriptorProto + // 1980 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4d, 0x6c, 0x1b, 0xc7, 0x15, 0xd6, 0xf2, 0x4f, 0xe4, 0x23, 0x25, 0x51, 0x63, 0x3b, 0xa6, 0x69, 0x87, 0x94, 0x18, 0xcb, - 0x65, 0xfe, 0x56, 0xa9, 0x82, 0x00, 0xa9, 0x91, 0x04, 0x25, 0x45, 0xc9, 0x56, 0xa3, 0xbf, 0x2e, + 0x61, 0xfe, 0x56, 0xa9, 0x82, 0x00, 0xa9, 0x91, 0x04, 0x25, 0x45, 0xc9, 0x56, 0xa3, 0xbf, 0x2e, 0x15, 0xa4, 0x09, 0x50, 0x2c, 0x96, 0xbb, 0x23, 0x6a, 0xab, 0xe5, 0xce, 0x76, 0x77, 0xa8, 0x8a, - 0x3e, 0x1a, 0x28, 0x0a, 0xa4, 0x97, 0xdc, 0xda, 0x63, 0xd0, 0x5e, 0x5a, 0xa0, 0xd7, 0xf6, 0x56, - 0xa0, 0xb7, 0xfa, 0xe8, 0x53, 0xd1, 0x13, 0x8d, 0x46, 0x97, 0x1e, 0x0b, 0xf5, 0x52, 0xf8, 0x54, - 0xcc, 0xcf, 0x72, 0x97, 0x34, 0xa5, 0x54, 0x05, 0xdc, 0x5e, 0x84, 0xd1, 0x7b, 0xdf, 0xfb, 0xde, - 0xcf, 0xbc, 0x79, 0x33, 0x4b, 0x58, 0x32, 0x89, 0x1b, 0xf4, 0x7b, 0xd8, 0x5f, 0xf5, 0x7c, 0x42, - 0x89, 0x49, 0x9c, 0xd1, 0x42, 0xe5, 0x0b, 0x94, 0x0d, 0x11, 0xe5, 0x4a, 0xc7, 0x27, 0xc7, 0x17, - 0x23, 0xcb, 0xf7, 0x46, 0x5c, 0x3e, 0x36, 0xc9, 0x09, 0xf6, 0x07, 0x0e, 0xe9, 0xf2, 0xb5, 0x6f, - 0x61, 0x4b, 0x27, 0x9e, 0xc4, 0x5d, 0xef, 0x92, 0x2e, 0xe1, 0xcb, 0x55, 0xb6, 0x92, 0xd2, 0x4a, - 0x97, 0x90, 0xae, 0x83, 0x05, 0x69, 0xa7, 0x7f, 0xb8, 0x6a, 0xf5, 0x7d, 0x83, 0xda, 0xc4, 0x15, - 0xfa, 0xda, 0x3f, 0x73, 0x90, 0x6b, 0x1f, 0x19, 0xbe, 0xd5, 0xf6, 0xb0, 0x89, 0xde, 0x81, 0x84, - 0x6d, 0x95, 0x94, 0x25, 0xa5, 0x9e, 0x6b, 0x2e, 0x9d, 0x0f, 0xab, 0x8b, 0x03, 0xa3, 0xe7, 0xdc, - 0xaf, 0xbd, 0x45, 0x7a, 0x36, 0xc5, 0x3d, 0x8f, 0x0e, 0x6a, 0xcf, 0x87, 0xd5, 0x59, 0x8e, 0xdf, - 0x6a, 0x69, 0x09, 0xdb, 0x42, 0x7b, 0x30, 0x1b, 0x90, 0xbe, 0x6f, 0xe2, 0xa0, 0x94, 0x58, 0x4a, - 0xd6, 0xf3, 0x6b, 0x65, 0x35, 0x8c, 0x57, 0x1d, 0xf1, 0xaa, 0x6d, 0x0e, 0x69, 0xde, 0x7a, 0x32, - 0xac, 0xce, 0x4c, 0xa5, 0xd5, 0x42, 0x16, 0xf4, 0x03, 0xb8, 0x16, 0xe6, 0xa9, 0x3b, 0xa4, 0xab, - 0x7b, 0x3e, 0x3e, 0xb4, 0x4f, 0x4b, 0x49, 0x1e, 0x53, 0xfd, 0x7c, 0x58, 0xbd, 0x2b, 0x8c, 0xa7, - 0x80, 0xe2, 0x7c, 0x8b, 0xa1, 0x7e, 0x9b, 0x74, 0xf7, 0xb9, 0x16, 0x35, 0x20, 0x7f, 0x64, 0xbb, - 0x34, 0x64, 0x4c, 0x8d, 0xb2, 0xbc, 0x23, 0x18, 0x63, 0xca, 0x38, 0x13, 0x30, 0xb9, 0xa4, 0x68, + 0x3e, 0x06, 0x28, 0x0a, 0xa4, 0x97, 0xdc, 0xda, 0x63, 0xd0, 0x5e, 0x5a, 0xb4, 0xd7, 0xf6, 0xdc, + 0x5b, 0x7d, 0xf4, 0xa9, 0xe8, 0x89, 0x46, 0x23, 0xa0, 0xe8, 0xb1, 0x50, 0x2f, 0x85, 0x4f, 0xc5, + 0xfc, 0x2c, 0x77, 0x49, 0x53, 0x4a, 0x55, 0xc0, 0xed, 0x45, 0x18, 0xbd, 0xf9, 0xde, 0xf7, 0x7e, + 0xe6, 0xcd, 0x7b, 0xb3, 0x84, 0x25, 0x93, 0xb8, 0x41, 0xbf, 0x87, 0xfd, 0x55, 0xcf, 0x27, 0x94, + 0x98, 0xc4, 0x19, 0x2d, 0x54, 0xbe, 0x40, 0xd9, 0x10, 0x51, 0xae, 0x74, 0x7c, 0x72, 0x7c, 0x31, + 0xb2, 0x7c, 0x6f, 0xc4, 0xe5, 0x63, 0x93, 0x9c, 0x60, 0x7f, 0xe0, 0x90, 0x2e, 0x5f, 0xfb, 0x16, + 0xb6, 0x74, 0xe2, 0x49, 0xdc, 0xf5, 0x2e, 0xe9, 0x12, 0xbe, 0x5c, 0x65, 0x2b, 0x29, 0xad, 0x74, + 0x09, 0xe9, 0x3a, 0x58, 0x90, 0x76, 0xfa, 0x87, 0xab, 0x56, 0xdf, 0x37, 0xa8, 0x4d, 0x5c, 0xb1, + 0x5f, 0xfb, 0x67, 0x0e, 0x72, 0xed, 0x23, 0xc3, 0xb7, 0xda, 0x1e, 0x36, 0xd1, 0xdb, 0x90, 0xb0, + 0xad, 0x92, 0xb2, 0xa4, 0xd4, 0x73, 0xcd, 0xa5, 0xf3, 0x61, 0x75, 0x71, 0x60, 0xf4, 0x9c, 0xfb, + 0xb5, 0x37, 0x49, 0xcf, 0xa6, 0xb8, 0xe7, 0xd1, 0x41, 0xed, 0xd9, 0xb0, 0x3a, 0xcb, 0xf1, 0x5b, + 0x2d, 0x2d, 0x61, 0x5b, 0x68, 0x0f, 0x66, 0x03, 0xd2, 0xf7, 0x4d, 0x1c, 0x94, 0x12, 0x4b, 0xc9, + 0x7a, 0x7e, 0xad, 0xac, 0x86, 0xfe, 0xaa, 0x23, 0x5e, 0xb5, 0xcd, 0x21, 0xcd, 0x5b, 0x8f, 0x87, + 0xd5, 0x99, 0xa9, 0xb4, 0x5a, 0xc8, 0x82, 0xbe, 0x0f, 0xd7, 0xc2, 0x38, 0x75, 0x87, 0x74, 0x75, + 0xcf, 0xc7, 0x87, 0xf6, 0x69, 0x29, 0xc9, 0x7d, 0xaa, 0x9f, 0x0f, 0xab, 0x77, 0x85, 0xf2, 0x14, + 0x50, 0x9c, 0x6f, 0x31, 0xdc, 0xdf, 0x26, 0xdd, 0x7d, 0xbe, 0x8b, 0x1a, 0x90, 0x3f, 0xb2, 0x5d, + 0x1a, 0x32, 0xa6, 0x46, 0x51, 0xde, 0x11, 0x8c, 0xb1, 0xcd, 0x38, 0x13, 0x30, 0xb9, 0xa4, 0x68, 0x41, 0x81, 0xa3, 0x3a, 0x86, 0x79, 0xdc, 0xf7, 0x82, 0x52, 0x7a, 0x49, 0xa9, 0xa7, 0x9b, 0xcb, - 0xe7, 0xc3, 0xea, 0xab, 0x31, 0x0e, 0xa9, 0x8d, 0x93, 0x70, 0xcf, 0x4d, 0x21, 0x47, 0x3e, 0x14, - 0x7b, 0xc6, 0xa9, 0x4e, 0x4f, 0x5d, 0x3d, 0xdc, 0x8d, 0x52, 0x66, 0x49, 0xa9, 0xe7, 0xd7, 0x6e, - 0xa9, 0x62, 0xbb, 0xd4, 0x70, 0xbb, 0xd4, 0x96, 0x04, 0x34, 0xdf, 0x96, 0xb5, 0x5b, 0x16, 0x8e, - 0x26, 0x09, 0x62, 0xce, 0x7e, 0xf9, 0xac, 0xaa, 0x68, 0xf3, 0x3d, 0xe3, 0xf4, 0xe0, 0xd4, 0x0d, - 0xcd, 0xb9, 0x4f, 0xdb, 0x1d, 0xf7, 0x39, 0x7b, 0x55, 0x9f, 0x13, 0x04, 0x2f, 0xfa, 0xb4, 0xdd, - 0xb8, 0xcf, 0x55, 0x98, 0xb5, 0xec, 0xc0, 0xe8, 0x38, 0xb8, 0x94, 0x5d, 0x52, 0xea, 0xd9, 0xe6, - 0x8d, 0x0b, 0xf6, 0x5e, 0xa2, 0x78, 0x79, 0x09, 0xd5, 0x03, 0x6a, 0xb8, 0x56, 0x67, 0x10, 0x94, - 0x72, 0x4b, 0x4a, 0x7d, 0x6e, 0xac, 0xbc, 0x31, 0xed, 0x78, 0x79, 0x09, 0x6d, 0x4b, 0x39, 0xda, - 0x87, 0x8c, 0x63, 0x74, 0xb0, 0x13, 0x94, 0x80, 0x27, 0x88, 0xd4, 0xd1, 0x89, 0xda, 0x66, 0xf2, - 0x36, 0xa6, 0xcd, 0xbb, 0x2c, 0xb3, 0xa7, 0xc3, 0xaa, 0x72, 0x3e, 0xac, 0x96, 0x26, 0x23, 0x7a, - 0xcb, 0x76, 0x1d, 0xdb, 0xc5, 0x35, 0x4d, 0xf2, 0xa0, 0xcf, 0xe1, 0xba, 0x0c, 0x51, 0xff, 0x89, - 0x61, 0x53, 0xfd, 0x90, 0xf8, 0xba, 0x61, 0x1e, 0x97, 0xf2, 0x3c, 0xab, 0xd7, 0xcf, 0x87, 0xd5, - 0x15, 0xc1, 0x31, 0x0d, 0x35, 0xd6, 0x95, 0x12, 0xf0, 0xa9, 0x61, 0xd3, 0x4d, 0xe2, 0x37, 0xcc, - 0x63, 0xb4, 0x07, 0x45, 0xdf, 0x76, 0xbb, 0x7a, 0xa7, 0x7f, 0x78, 0x88, 0x7d, 0x3d, 0xb0, 0x1f, - 0xe1, 0x52, 0x81, 0xe7, 0xbd, 0x12, 0x55, 0x7e, 0x12, 0x11, 0xe7, 0x9c, 0x67, 0xca, 0x26, 0xd7, - 0xb5, 0xed, 0x47, 0x18, 0x69, 0xb0, 0xe8, 0x63, 0xc3, 0xd2, 0xcd, 0x23, 0xc3, 0x75, 0xb1, 0x23, - 0x18, 0xe7, 0x38, 0xe3, 0xbd, 0xf3, 0x61, 0xb5, 0x16, 0x1e, 0x9f, 0x09, 0x48, 0x9c, 0x72, 0x81, - 0x69, 0xd7, 0x85, 0x92, 0x71, 0x96, 0xff, 0xac, 0x40, 0x46, 0x9c, 0x61, 0xb4, 0x05, 0xb3, 0x3f, - 0x22, 0x7d, 0xdf, 0x35, 0x1c, 0x39, 0x27, 0x56, 0x9f, 0x0f, 0xab, 0x6f, 0x76, 0x89, 0xda, 0x35, - 0x1e, 0x61, 0x4a, 0xb1, 0x6a, 0xe1, 0x93, 0x55, 0x93, 0xf8, 0x78, 0x75, 0x62, 0xae, 0xa9, 0xdf, - 0x13, 0x66, 0x5a, 0x68, 0x8f, 0x1c, 0x00, 0xd6, 0x52, 0xe4, 0xf0, 0x30, 0xc0, 0x94, 0x9f, 0xf0, - 0x64, 0x73, 0xe7, 0x7c, 0x58, 0xbd, 0x1d, 0xb5, 0x9b, 0xd0, 0x8d, 0xcf, 0x9f, 0x37, 0xfe, 0x13, - 0x67, 0x7b, 0xdc, 0x50, 0xcb, 0xf5, 0x6c, 0x57, 0x2c, 0xef, 0xa7, 0xfe, 0xfe, 0x55, 0x55, 0x11, - 0x7f, 0x6b, 0x3f, 0x55, 0xa0, 0xb0, 0x2e, 0xc7, 0x14, 0x1f, 0x7c, 0x07, 0x50, 0xf0, 0x7c, 0x62, - 0xe2, 0x20, 0xd0, 0x03, 0x0f, 0x9b, 0x3c, 0xb5, 0xfc, 0xda, 0x8d, 0xa8, 0x73, 0xf6, 0x85, 0x96, - 0x81, 0x9b, 0xe5, 0x58, 0xf3, 0xcc, 0xcb, 0xe6, 0x09, 0x5b, 0x26, 0xef, 0x45, 0x40, 0x54, 0x85, - 0x7c, 0xc0, 0x66, 0xa0, 0xee, 0xd8, 0x3d, 0x9b, 0x96, 0x12, 0x6c, 0x13, 0x34, 0xe0, 0xa2, 0x6d, - 0x26, 0xa9, 0xfd, 0x4a, 0x81, 0x39, 0x0d, 0x7b, 0x8e, 0x6d, 0x1a, 0x6d, 0x6a, 0xd0, 0x7e, 0x80, - 0xde, 0x81, 0x94, 0x49, 0x2c, 0xcc, 0x03, 0x98, 0x5f, 0xbb, 0x13, 0x0d, 0xd3, 0x31, 0x98, 0xba, - 0x4e, 0x2c, 0xac, 0x71, 0x24, 0x7a, 0x05, 0x32, 0xd8, 0xf7, 0x89, 0x2f, 0x06, 0x70, 0x4e, 0x93, - 0xff, 0xd5, 0x1e, 0x40, 0x8a, 0xa1, 0x50, 0x16, 0x52, 0x5b, 0xad, 0xed, 0x8d, 0xe2, 0x0c, 0x2a, - 0x40, 0xb6, 0xd9, 0x58, 0xff, 0x78, 0x73, 0x6b, 0x7b, 0xbb, 0x68, 0xa1, 0x02, 0xcc, 0xb6, 0x0f, - 0x1a, 0xbb, 0xad, 0xe6, 0x67, 0xc5, 0x27, 0x0a, 0xfb, 0x6f, 0x5f, 0xdb, 0xda, 0x69, 0x68, 0x9f, - 0x15, 0x7f, 0x97, 0x40, 0x79, 0xc8, 0x6c, 0x36, 0xb6, 0xb6, 0x37, 0x5a, 0xc5, 0x2f, 0x93, 0xb5, - 0x3f, 0x64, 0x00, 0xd6, 0x8f, 0xb0, 0x79, 0xec, 0x11, 0xdb, 0xa5, 0xc8, 0x8b, 0x26, 0xbe, 0xc2, - 0x27, 0xfe, 0x72, 0x14, 0x64, 0x04, 0x93, 0x23, 0x3f, 0xd8, 0x70, 0xa9, 0x3f, 0x68, 0xbe, 0xcb, - 0x2a, 0xf6, 0xf8, 0xd9, 0x15, 0xfb, 0x24, 0xbc, 0x12, 0x4e, 0x20, 0x6f, 0x98, 0xc7, 0xba, 0xed, - 0x52, 0xec, 0xd2, 0xf0, 0x9e, 0xb9, 0x3b, 0xd5, 0x6b, 0xc3, 0x3c, 0xde, 0x12, 0x30, 0xe1, 0x78, - 0xf5, 0xaa, 0x4e, 0xc1, 0x18, 0x31, 0x94, 0x7f, 0x9e, 0x18, 0x75, 0xfd, 0xf7, 0xa1, 0xc0, 0x4f, - 0x0c, 0x3d, 0xf2, 0x49, 0xbf, 0x7b, 0xc4, 0xb7, 0x27, 0xd9, 0x54, 0xaf, 0xd8, 0x8d, 0x79, 0xc6, - 0x71, 0x20, 0x28, 0xd0, 0x0e, 0xe4, 0x3c, 0x9f, 0x58, 0x7d, 0x13, 0xfb, 0x61, 0x4e, 0xaf, 0x5f, - 0x52, 0x49, 0xd6, 0x81, 0x1c, 0x2c, 0x12, 0x4b, 0xb1, 0x8a, 0x6a, 0x11, 0x43, 0x59, 0x87, 0xb9, - 0x31, 0x04, 0x9a, 0x1f, 0xdd, 0xe5, 0x05, 0x7e, 0x53, 0x7f, 0x04, 0xe9, 0x80, 0x1a, 0x14, 0xf3, - 0x36, 0xcc, 0xaf, 0xd5, 0xa6, 0xfa, 0x0a, 0x29, 0x58, 0x9b, 0x61, 0xe9, 0x44, 0x98, 0x95, 0x7f, - 0xa1, 0x44, 0x1e, 0xb8, 0x1a, 0x7d, 0x17, 0xb2, 0x8e, 0x11, 0x50, 0x3e, 0x0a, 0x99, 0x9f, 0x4c, - 0x73, 0xe5, 0xf9, 0xb0, 0xba, 0x3c, 0xad, 0x20, 0x3d, 0x1c, 0x04, 0x46, 0x17, 0xab, 0xeb, 0x0e, - 0x31, 0x8f, 0xb5, 0x59, 0x66, 0xc6, 0x86, 0x5f, 0x0b, 0xd2, 0x1d, 0xdc, 0xb5, 0x5d, 0x1e, 0xd3, - 0xd5, 0xeb, 0x29, 0x8c, 0xcb, 0x9f, 0x42, 0x21, 0xde, 0x6d, 0xa8, 0x08, 0xc9, 0x63, 0x3c, 0x10, - 0xe3, 0x49, 0x63, 0x4b, 0xf4, 0x6d, 0x48, 0x9f, 0x18, 0x4e, 0x3f, 0xcc, 0xfd, 0xf6, 0x25, 0x75, - 0xd6, 0x04, 0xf2, 0x7e, 0xe2, 0x7d, 0xa5, 0xfc, 0x21, 0x2c, 0x4c, 0x34, 0xd4, 0x14, 0xee, 0xeb, - 0x71, 0xee, 0x42, 0xcc, 0xbc, 0x76, 0x08, 0xf9, 0x6d, 0x3b, 0xa0, 0x1a, 0xfe, 0x71, 0x1f, 0x07, - 0x14, 0x7d, 0x07, 0xb2, 0x01, 0x76, 0xb0, 0x49, 0x89, 0x2f, 0xe7, 0xcb, 0xcd, 0x17, 0x6e, 0x26, - 0xa1, 0x96, 0x85, 0x1f, 0xc1, 0xd1, 0x1d, 0xc8, 0xe1, 0x53, 0x8a, 0xdd, 0x80, 0x5d, 0xdb, 0x16, - 0xf7, 0x13, 0x09, 0x6a, 0x8f, 0x93, 0x50, 0x10, 0x8e, 0x02, 0x8f, 0xb8, 0x01, 0x46, 0x75, 0xc8, - 0x04, 0x7c, 0x4e, 0xc8, 0x31, 0x52, 0x8c, 0xbd, 0xc9, 0xb8, 0x5c, 0x93, 0x7a, 0xa4, 0x42, 0xe6, - 0x08, 0x1b, 0x16, 0xf6, 0x65, 0x65, 0x8a, 0x51, 0x44, 0x0f, 0xb9, 0x5c, 0x86, 0x22, 0x51, 0xe8, - 0x3e, 0x64, 0xf8, 0xf8, 0x0a, 0x4a, 0x49, 0xde, 0xb1, 0xb1, 0x01, 0x15, 0x8f, 0x40, 0x3c, 0xfd, - 0x42, 0x5b, 0x61, 0x71, 0x79, 0x12, 0xe5, 0x3f, 0x2a, 0x90, 0xe6, 0x56, 0xe8, 0x6d, 0x48, 0xc5, - 0x66, 0xf0, 0xb5, 0x29, 0xef, 0x49, 0x49, 0xcc, 0x61, 0x68, 0x19, 0x0a, 0x3d, 0x62, 0xe9, 0x3e, - 0x3e, 0xb1, 0x39, 0x33, 0x6f, 0x25, 0x2d, 0xdf, 0x23, 0x96, 0x26, 0x45, 0xe8, 0x4d, 0x48, 0xfb, - 0xa4, 0x4f, 0x31, 0xbf, 0x63, 0xf2, 0x6b, 0x0b, 0x51, 0x92, 0x1a, 0x13, 0x87, 0x7d, 0xce, 0x31, - 0xe8, 0xbd, 0x51, 0xf1, 0x52, 0x3c, 0xc5, 0x9b, 0x17, 0xcc, 0xe0, 0x51, 0x76, 0xfc, 0xbf, 0xda, - 0xbf, 0x14, 0x28, 0x34, 0x3c, 0xcf, 0x19, 0x84, 0xdb, 0xfd, 0x21, 0xcc, 0xb2, 0xfb, 0xb5, 0x3b, - 0x9a, 0x93, 0xaf, 0x46, 0x44, 0x71, 0xa0, 0xba, 0xce, 0x51, 0x92, 0x2e, 0xb4, 0xf9, 0x86, 0x6a, - 0x7d, 0xa1, 0x40, 0x46, 0xd8, 0x21, 0x15, 0xae, 0xe1, 0x53, 0x0f, 0x9b, 0x54, 0x1f, 0x2b, 0x03, - 0x9f, 0x50, 0xda, 0xa2, 0x50, 0xed, 0x8c, 0x15, 0x23, 0xd3, 0xf7, 0x02, 0xec, 0x53, 0xb9, 0xe5, - 0xd3, 0x0a, 0xac, 0x49, 0x08, 0x7a, 0x0d, 0x32, 0x16, 0x76, 0xb0, 0x2c, 0x5d, 0xae, 0x99, 0x8f, - 0xbf, 0xff, 0xa5, 0xaa, 0xf6, 0x33, 0x05, 0xe6, 0x64, 0x46, 0x2f, 0xbd, 0x01, 0x2f, 0x3f, 0x09, - 0x67, 0x09, 0xc8, 0x33, 0x07, 0xe1, 0x1e, 0xd4, 0x47, 0xec, 0xca, 0x74, 0xf6, 0x11, 0xef, 0x32, - 0xa4, 0x79, 0x9b, 0xf2, 0x30, 0x26, 0xf2, 0x14, 0x1a, 0xf4, 0x1b, 0x65, 0xe2, 0x12, 0x10, 0x47, - 0xe0, 0xde, 0x78, 0x6e, 0xe1, 0xae, 0x6a, 0xd1, 0xa8, 0x17, 0x13, 0xfb, 0x87, 0x57, 0xbc, 0x8a, - 0xbe, 0x78, 0xf6, 0xdf, 0xdf, 0x2d, 0x97, 0x37, 0xcf, 0x47, 0x50, 0x9c, 0x8c, 0xee, 0x9b, 0xe6, - 0x5a, 0x32, 0x3e, 0xd7, 0xfe, 0x92, 0x82, 0x82, 0x48, 0xf5, 0xa5, 0x6f, 0xf7, 0x6f, 0xa7, 0xd7, - 0xfc, 0x5b, 0x93, 0x35, 0x97, 0x63, 0xe7, 0xff, 0x5a, 0xf4, 0x5f, 0x2b, 0x00, 0x5e, 0xbf, 0xe3, - 0xd8, 0xc1, 0x91, 0x6e, 0x50, 0x39, 0x3d, 0x56, 0x2e, 0x88, 0x74, 0x5f, 0x00, 0x1b, 0xf4, 0x7f, - 0x12, 0x67, 0xce, 0x0b, 0xdd, 0xbd, 0xdc, 0xd6, 0x28, 0x7f, 0x00, 0xf3, 0xe3, 0x99, 0x5d, 0xa9, - 0xb1, 0x34, 0x58, 0x78, 0x80, 0xe9, 0x43, 0xdb, 0xa5, 0x41, 0x78, 0x82, 0x47, 0xe7, 0x52, 0xb9, - 0xf0, 0x5c, 0x5e, 0x3e, 0x12, 0xfe, 0x91, 0x80, 0x62, 0x44, 0xfa, 0xd2, 0x1b, 0xb6, 0x0d, 0x73, - 0x9e, 0x6f, 0xf7, 0x0c, 0x7f, 0xa0, 0xb3, 0x4f, 0xfe, 0x40, 0x5e, 0x39, 0xf5, 0xc8, 0xc1, 0x64, - 0x30, 0x6a, 0xb8, 0xe0, 0x52, 0x49, 0x57, 0x90, 0x24, 0x5c, 0xc6, 0x5e, 0x9f, 0xe2, 0x37, 0x05, - 0xc9, 0x29, 0x5a, 0xeb, 0xaa, 0x9c, 0x79, 0xc1, 0x21, 0x28, 0x2f, 0x6f, 0x83, 0x0f, 0xd8, 0x67, - 0x49, 0x8c, 0x81, 0xdd, 0xa0, 0xc2, 0x75, 0xf8, 0x61, 0x14, 0xfb, 0x2d, 0x4a, 0xdd, 0x6c, 0xef, - 0x08, 0xef, 0x02, 0x53, 0xf3, 0x60, 0xe1, 0x13, 0xd7, 0x08, 0x02, 0xbb, 0xeb, 0x86, 0xdb, 0xf8, - 0xda, 0xe8, 0xdd, 0xc0, 0xee, 0xc2, 0xc9, 0x7b, 0x44, 0x3e, 0x10, 0xaa, 0x90, 0x27, 0xae, 0x33, - 0xd0, 0x0f, 0x0d, 0xdb, 0xc1, 0x62, 0x12, 0x67, 0x35, 0x60, 0xa2, 0x4d, 0x2e, 0x41, 0x37, 0x61, - 0xd6, 0xf2, 0x07, 0xba, 0xdf, 0x77, 0x79, 0x59, 0xb3, 0x5a, 0xc6, 0xf2, 0x07, 0x5a, 0xdf, 0xad, - 0x19, 0x50, 0x8c, 0x3c, 0x5e, 0x79, 0x8f, 0xa3, 0xe0, 0x12, 0x17, 0x06, 0xf7, 0xc6, 0x63, 0xf6, - 0x09, 0x2c, 0xf0, 0x19, 0x48, 0xec, 0x7d, 0x5c, 0x9c, 0x41, 0xd7, 0x60, 0xa1, 0xfd, 0xb0, 0xa1, - 0xb5, 0xf4, 0xdd, 0xbd, 0x03, 0x7d, 0x73, 0xef, 0x93, 0xdd, 0x56, 0x51, 0x41, 0xd7, 0xa1, 0xb8, - 0xbb, 0xa7, 0x0b, 0x79, 0xf8, 0x45, 0x95, 0x40, 0x37, 0x60, 0x91, 0x81, 0xc6, 0xc5, 0x49, 0x74, - 0x1b, 0x6e, 0x6e, 0x1c, 0xac, 0xb7, 0xf4, 0x03, 0xad, 0xb1, 0xdb, 0x6e, 0xac, 0x1f, 0x6c, 0xed, - 0xed, 0xea, 0xf2, 0xc3, 0x2b, 0x85, 0x16, 0x61, 0x4e, 0xe0, 0xdb, 0x07, 0x7b, 0xfb, 0xfb, 0x1b, - 0xad, 0x62, 0x7a, 0xed, 0xf7, 0x89, 0xf0, 0x91, 0xf4, 0x1e, 0xa4, 0x58, 0x34, 0xe8, 0xc6, 0xd4, - 0xdb, 0xa7, 0xfc, 0xca, 0xf4, 0xb1, 0xc3, 0xcc, 0xd8, 0x3b, 0x2d, 0x6e, 0x16, 0x7b, 0xa2, 0xc6, - 0xcd, 0xc6, 0x1e, 0x94, 0xef, 0x43, 0x9a, 0x5f, 0xf0, 0xe8, 0x95, 0xe9, 0x6f, 0x98, 0xf2, 0xcd, - 0x17, 0xe4, 0xd2, 0xb2, 0x01, 0xd9, 0xb0, 0x39, 0xd1, 0xad, 0x69, 0x0d, 0x2b, 0xec, 0xcb, 0x17, - 0xf7, 0x32, 0xa3, 0x08, 0x37, 0x37, 0x4e, 0x31, 0xd1, 0x62, 0x71, 0x8a, 0xc9, 0x5e, 0x68, 0x3e, - 0x78, 0xf2, 0xb7, 0xca, 0xcc, 0x93, 0xaf, 0x2b, 0xca, 0xd3, 0xaf, 0x2b, 0xca, 0x97, 0x67, 0x95, - 0x99, 0xaf, 0xce, 0x2a, 0xca, 0x9f, 0xce, 0x2a, 0xca, 0xd3, 0xb3, 0xca, 0xcc, 0x5f, 0xcf, 0x2a, - 0x33, 0x9f, 0xaf, 0x4c, 0x9b, 0xa6, 0x2f, 0xfc, 0x8a, 0xdb, 0xc9, 0xf0, 0xd5, 0xbb, 0xff, 0x0e, - 0x00, 0x00, 0xff, 0xff, 0x2d, 0x38, 0x62, 0xfa, 0xe1, 0x15, 0x00, 0x00, + 0xe7, 0xc3, 0xea, 0xcb, 0x31, 0x0e, 0xb9, 0x1b, 0x27, 0xe1, 0x96, 0x9b, 0x42, 0x8e, 0x7c, 0x28, + 0xf6, 0x8c, 0x53, 0x9d, 0x9e, 0xba, 0x7a, 0x78, 0x1a, 0xa5, 0xcc, 0x92, 0x52, 0xcf, 0xaf, 0xdd, + 0x52, 0xc5, 0x71, 0xa9, 0xe1, 0x71, 0xa9, 0x2d, 0x09, 0x68, 0xbe, 0x25, 0x73, 0xb7, 0x2c, 0x0c, + 0x4d, 0x12, 0xc4, 0x8c, 0xfd, 0xe2, 0x69, 0x55, 0xd1, 0xe6, 0x7b, 0xc6, 0xe9, 0xc1, 0xa9, 0x1b, + 0xaa, 0x73, 0x9b, 0xb6, 0x3b, 0x6e, 0x73, 0xf6, 0xaa, 0x36, 0x27, 0x08, 0x9e, 0xb7, 0x69, 0xbb, + 0x71, 0x9b, 0xab, 0x30, 0x6b, 0xd9, 0x81, 0xd1, 0x71, 0x70, 0x29, 0xbb, 0xa4, 0xd4, 0xb3, 0xcd, + 0x1b, 0x17, 0x9c, 0xbd, 0x44, 0xf1, 0xf4, 0x12, 0xaa, 0x07, 0xd4, 0x70, 0xad, 0xce, 0x20, 0x28, + 0xe5, 0x96, 0x94, 0xfa, 0xdc, 0x58, 0x7a, 0x63, 0xbb, 0xe3, 0xe9, 0x25, 0xb4, 0x2d, 0xe5, 0x68, + 0x1f, 0x32, 0x8e, 0xd1, 0xc1, 0x4e, 0x50, 0x02, 0x1e, 0x20, 0x52, 0x47, 0x37, 0x6a, 0x9b, 0xc9, + 0xdb, 0x98, 0x36, 0xef, 0xb2, 0xc8, 0x9e, 0x0c, 0xab, 0xca, 0xf9, 0xb0, 0x5a, 0x9a, 0xf4, 0xe8, + 0x4d, 0xdb, 0x75, 0x6c, 0x17, 0xd7, 0x34, 0xc9, 0x83, 0x3e, 0x83, 0xeb, 0xd2, 0x45, 0xfd, 0xc7, + 0x86, 0x4d, 0xf5, 0x43, 0xe2, 0xeb, 0x86, 0x79, 0x5c, 0xca, 0xf3, 0xa8, 0x5e, 0x3b, 0x1f, 0x56, + 0x57, 0x04, 0xc7, 0x34, 0xd4, 0x58, 0x55, 0x4a, 0xc0, 0x27, 0x86, 0x4d, 0x37, 0x89, 0xdf, 0x30, + 0x8f, 0xd1, 0x1e, 0x14, 0x7d, 0xdb, 0xed, 0xea, 0x9d, 0xfe, 0xe1, 0x21, 0xf6, 0xf5, 0xc0, 0x7e, + 0x84, 0x4b, 0x05, 0x1e, 0xf7, 0x4a, 0x94, 0xf9, 0x49, 0x44, 0x9c, 0x73, 0x9e, 0x6d, 0x36, 0xf9, + 0x5e, 0xdb, 0x7e, 0x84, 0x91, 0x06, 0x8b, 0x3e, 0x36, 0x2c, 0xdd, 0x3c, 0x32, 0x5c, 0x17, 0x3b, + 0x82, 0x71, 0x8e, 0x33, 0xde, 0x3b, 0x1f, 0x56, 0x6b, 0xe1, 0xf5, 0x99, 0x80, 0xc4, 0x29, 0x17, + 0xd8, 0xee, 0xba, 0xd8, 0x64, 0x9c, 0xe5, 0x3f, 0x29, 0x90, 0x11, 0x77, 0x18, 0x6d, 0xc1, 0xec, + 0x0f, 0x49, 0xdf, 0x77, 0x0d, 0x47, 0xf6, 0x89, 0xd5, 0x67, 0xc3, 0xea, 0x1b, 0x5d, 0xa2, 0x76, + 0x8d, 0x47, 0x98, 0x52, 0xac, 0x5a, 0xf8, 0x64, 0xd5, 0x24, 0x3e, 0x5e, 0x9d, 0xe8, 0x6b, 0xea, + 0x77, 0x85, 0x9a, 0x16, 0xea, 0x23, 0x07, 0x80, 0x95, 0x14, 0x39, 0x3c, 0x0c, 0x30, 0xe5, 0x37, + 0x3c, 0xd9, 0xdc, 0x39, 0x1f, 0x56, 0x6f, 0x47, 0xe5, 0x26, 0xf6, 0xc6, 0xfb, 0xcf, 0xeb, 0xff, + 0x89, 0xb1, 0x3d, 0xae, 0xa8, 0xe5, 0x7a, 0xb6, 0x2b, 0x96, 0xf7, 0x53, 0x7f, 0xff, 0xaa, 0xaa, + 0x88, 0xbf, 0xb5, 0x9f, 0x28, 0x50, 0x58, 0x97, 0x6d, 0x8a, 0x37, 0xbe, 0x03, 0x28, 0x78, 0x3e, + 0x31, 0x71, 0x10, 0xe8, 0x81, 0x87, 0x4d, 0x1e, 0x5a, 0x7e, 0xed, 0x46, 0x54, 0x39, 0xfb, 0x62, + 0x97, 0x81, 0x9b, 0xe5, 0x58, 0xf1, 0xcc, 0xcb, 0xe2, 0x09, 0x4b, 0x26, 0xef, 0x45, 0x40, 0x54, + 0x85, 0x7c, 0xc0, 0x7a, 0xa0, 0xee, 0xd8, 0x3d, 0x9b, 0x96, 0x12, 0xec, 0x10, 0x34, 0xe0, 0xa2, + 0x6d, 0x26, 0xa9, 0xfd, 0x52, 0x81, 0x39, 0x0d, 0x7b, 0x8e, 0x6d, 0x1a, 0x6d, 0x6a, 0xd0, 0x7e, + 0x80, 0xde, 0x86, 0x94, 0x49, 0x2c, 0xcc, 0x1d, 0x98, 0x5f, 0xbb, 0x13, 0x35, 0xd3, 0x31, 0x98, + 0xba, 0x4e, 0x2c, 0xac, 0x71, 0x24, 0x7a, 0x09, 0x32, 0xd8, 0xf7, 0x89, 0x2f, 0x1a, 0x70, 0x4e, + 0x93, 0xff, 0xd5, 0x1e, 0x40, 0x8a, 0xa1, 0x50, 0x16, 0x52, 0x5b, 0xad, 0xed, 0x8d, 0xe2, 0x0c, + 0x2a, 0x40, 0xb6, 0xd9, 0x58, 0xff, 0x68, 0x73, 0x6b, 0x7b, 0xbb, 0x68, 0xa1, 0x02, 0xcc, 0xb6, + 0x0f, 0x1a, 0xbb, 0xad, 0xe6, 0xa7, 0xc5, 0xc7, 0x0a, 0xfb, 0x6f, 0x5f, 0xdb, 0xda, 0x69, 0x68, + 0x9f, 0x16, 0x7f, 0x97, 0x40, 0x79, 0xc8, 0x6c, 0x36, 0xb6, 0xb6, 0x37, 0x5a, 0xc5, 0x2f, 0x93, + 0xb5, 0x3f, 0x64, 0x00, 0xd6, 0x8f, 0xb0, 0x79, 0xec, 0x11, 0xdb, 0xa5, 0xc8, 0x8b, 0x3a, 0xbe, + 0xc2, 0x3b, 0xfe, 0x72, 0xe4, 0x64, 0x04, 0x93, 0x2d, 0x3f, 0xd8, 0x70, 0xa9, 0x3f, 0x68, 0xbe, + 0xc3, 0x32, 0xf6, 0xf9, 0xd3, 0x2b, 0xd6, 0x49, 0x38, 0x12, 0x4e, 0x20, 0x6f, 0x98, 0xc7, 0xba, + 0xed, 0x52, 0xec, 0xd2, 0x70, 0xce, 0xdc, 0x9d, 0x6a, 0xb5, 0x61, 0x1e, 0x6f, 0x09, 0x98, 0x30, + 0xbc, 0x7a, 0x55, 0xa3, 0x60, 0x8c, 0x18, 0xca, 0x3f, 0x4b, 0x8c, 0xaa, 0xfe, 0x7b, 0x50, 0xe0, + 0x37, 0x86, 0x1e, 0xf9, 0xa4, 0xdf, 0x3d, 0xe2, 0xc7, 0x93, 0x6c, 0xaa, 0x57, 0xac, 0xc6, 0x3c, + 0xe3, 0x38, 0x10, 0x14, 0x68, 0x07, 0x72, 0x9e, 0x4f, 0xac, 0xbe, 0x89, 0xfd, 0x30, 0xa6, 0xd7, + 0x2e, 0xc9, 0x24, 0xab, 0x40, 0x0e, 0x16, 0x81, 0xa5, 0x58, 0x46, 0xb5, 0x88, 0xa1, 0xac, 0xc3, + 0xdc, 0x18, 0x02, 0xcd, 0x8f, 0x66, 0x79, 0x81, 0x4f, 0xea, 0x0f, 0x21, 0x1d, 0x50, 0x83, 0x62, + 0x5e, 0x86, 0xf9, 0xb5, 0xda, 0x54, 0x5b, 0x21, 0x05, 0x2b, 0x33, 0x2c, 0x8d, 0x08, 0xb5, 0xf2, + 0xcf, 0x95, 0xc8, 0x02, 0xdf, 0x46, 0xdf, 0x81, 0xac, 0x63, 0x04, 0x94, 0xb7, 0x42, 0x66, 0x27, + 0xd3, 0x5c, 0x79, 0x36, 0xac, 0x2e, 0x4f, 0x4b, 0x48, 0x0f, 0x07, 0x81, 0xd1, 0xc5, 0xea, 0xba, + 0x43, 0xcc, 0x63, 0x6d, 0x96, 0xa9, 0xb1, 0xe6, 0xd7, 0x82, 0x74, 0x07, 0x77, 0x6d, 0x97, 0xfb, + 0x74, 0xf5, 0x7c, 0x0a, 0xe5, 0xf2, 0x27, 0x50, 0x88, 0x57, 0x1b, 0x2a, 0x42, 0xf2, 0x18, 0x0f, + 0x44, 0x7b, 0xd2, 0xd8, 0x12, 0x7d, 0x0b, 0xd2, 0x27, 0x86, 0xd3, 0x0f, 0x63, 0xbf, 0x7d, 0x49, + 0x9e, 0x35, 0x81, 0xbc, 0x9f, 0x78, 0x4f, 0x29, 0x7f, 0x00, 0x0b, 0x13, 0x05, 0x35, 0x85, 0xfb, + 0x7a, 0x9c, 0xbb, 0x10, 0x53, 0xaf, 0x1d, 0x42, 0x7e, 0xdb, 0x0e, 0xa8, 0x86, 0x7f, 0xd4, 0xc7, + 0x01, 0x45, 0xdf, 0x86, 0x6c, 0x80, 0x1d, 0x6c, 0x52, 0xe2, 0xcb, 0xfe, 0x72, 0xf3, 0xb9, 0xc9, + 0x24, 0xb6, 0x65, 0xe2, 0x47, 0x70, 0x74, 0x07, 0x72, 0xf8, 0x94, 0x62, 0x37, 0x60, 0x63, 0xdb, + 0xe2, 0x76, 0x22, 0x41, 0xed, 0xb7, 0x49, 0x28, 0x08, 0x43, 0x81, 0x47, 0xdc, 0x00, 0xa3, 0x3a, + 0x64, 0x02, 0xde, 0x27, 0x64, 0x1b, 0x29, 0xc6, 0xde, 0x64, 0x5c, 0xae, 0xc9, 0x7d, 0xa4, 0x42, + 0xe6, 0x08, 0x1b, 0x16, 0xf6, 0x65, 0x66, 0x8a, 0x91, 0x47, 0x0f, 0xb9, 0x5c, 0xba, 0x22, 0x51, + 0xe8, 0x3e, 0x64, 0x78, 0xfb, 0x0a, 0x4a, 0x49, 0x5e, 0xb1, 0xb1, 0x06, 0x15, 0xf7, 0x40, 0x3c, + 0xfd, 0x42, 0x5d, 0xa1, 0x71, 0x79, 0x10, 0xe5, 0xbf, 0x29, 0x90, 0xe6, 0x5a, 0xe8, 0x2d, 0x48, + 0xc5, 0x7a, 0xf0, 0xb5, 0x29, 0xef, 0x49, 0x49, 0xcc, 0x61, 0x68, 0x19, 0x0a, 0x3d, 0x62, 0xe9, + 0x3e, 0x3e, 0xb1, 0x39, 0x33, 0x2f, 0x25, 0x2d, 0xdf, 0x23, 0x96, 0x26, 0x45, 0xe8, 0x0d, 0x48, + 0xfb, 0xa4, 0x4f, 0x31, 0x9f, 0x31, 0xf9, 0xb5, 0x85, 0x28, 0x48, 0x8d, 0x89, 0xc3, 0x3a, 0xe7, + 0x18, 0xf4, 0xee, 0x28, 0x79, 0x29, 0x1e, 0xe2, 0xcd, 0x0b, 0x7a, 0xf0, 0x28, 0x3a, 0x91, 0xc9, + 0x57, 0x61, 0xc1, 0xf4, 0xb1, 0x41, 0x71, 0xe4, 0x49, 0x9a, 0x7b, 0x32, 0x2f, 0xc4, 0xa1, 0x33, + 0xb5, 0x7f, 0x29, 0x50, 0x68, 0x78, 0x9e, 0x33, 0x08, 0xeb, 0xe2, 0x03, 0x98, 0x65, 0x83, 0xb8, + 0x3b, 0x6a, 0xa8, 0x2f, 0x47, 0x16, 0xe3, 0x40, 0x75, 0x9d, 0xa3, 0xa4, 0xdd, 0x50, 0xe7, 0x1b, + 0xd2, 0xfa, 0x85, 0x02, 0x19, 0xa1, 0x87, 0x54, 0xb8, 0x86, 0x4f, 0x3d, 0x6c, 0x52, 0x7d, 0x2c, + 0x5f, 0xbc, 0x95, 0x69, 0x8b, 0x62, 0x6b, 0x67, 0x2c, 0x6b, 0x99, 0xbe, 0x17, 0x60, 0x9f, 0xca, + 0xda, 0x98, 0x76, 0x12, 0x9a, 0x84, 0xa0, 0x57, 0x20, 0x63, 0x61, 0x07, 0xcb, 0x1c, 0xe7, 0x9a, + 0xf9, 0xf8, 0x87, 0x82, 0xdc, 0xaa, 0xfd, 0x54, 0x81, 0x39, 0x19, 0xd1, 0x0b, 0xaf, 0xd4, 0xcb, + 0xaf, 0xcc, 0x59, 0x02, 0xf2, 0xcc, 0x40, 0x78, 0x06, 0xf5, 0x11, 0xbb, 0x32, 0x9d, 0x7d, 0xc4, + 0xbb, 0x0c, 0x69, 0x5e, 0xcf, 0xdc, 0x8d, 0x89, 0x38, 0xc5, 0x0e, 0xfa, 0xb5, 0x32, 0x31, 0x2d, + 0xc4, 0x5d, 0xb9, 0x37, 0x1e, 0x5b, 0x78, 0xaa, 0x5a, 0x34, 0x13, 0x44, 0x6b, 0xff, 0xc1, 0x15, + 0x67, 0xd6, 0x17, 0x4f, 0xff, 0xfb, 0x21, 0x74, 0x79, 0xf1, 0x7c, 0x08, 0xc5, 0x49, 0xef, 0xbe, + 0xa9, 0x01, 0x26, 0xe3, 0x0d, 0xf0, 0xcf, 0x29, 0x28, 0x88, 0x50, 0x5f, 0xf8, 0x71, 0xff, 0x66, + 0x7a, 0xce, 0x5f, 0x9d, 0xcc, 0xb9, 0xec, 0x4f, 0xff, 0xd7, 0xa4, 0xff, 0x4a, 0x01, 0xf0, 0xfa, + 0x1d, 0xc7, 0x0e, 0x8e, 0x74, 0x83, 0xca, 0x36, 0xb3, 0x72, 0x81, 0xa7, 0xfb, 0x02, 0xd8, 0xa0, + 0xff, 0x13, 0x3f, 0x73, 0x5e, 0x68, 0xee, 0xc5, 0x96, 0x46, 0xf9, 0x7d, 0x98, 0x1f, 0x8f, 0xec, + 0x4a, 0x85, 0xa5, 0xc1, 0xc2, 0x03, 0x4c, 0x1f, 0xda, 0x2e, 0x0d, 0xc2, 0x1b, 0x3c, 0xba, 0x97, + 0xca, 0x85, 0xf7, 0xf2, 0xf2, 0x96, 0xf0, 0x8f, 0x04, 0x14, 0x23, 0xd2, 0x17, 0x5e, 0xb0, 0x6d, + 0x98, 0xf3, 0x7c, 0xbb, 0x67, 0xf8, 0x03, 0xfd, 0x88, 0x99, 0x94, 0xb3, 0xa9, 0x1e, 0x19, 0x98, + 0x74, 0x46, 0x0d, 0x17, 0x5c, 0x2a, 0xe9, 0x0a, 0x92, 0x84, 0xcb, 0xd8, 0x33, 0x55, 0xfc, 0xf8, + 0x20, 0x39, 0x45, 0x69, 0x5d, 0x95, 0x33, 0x2f, 0x38, 0x04, 0xe5, 0xe5, 0x65, 0xf0, 0x3e, 0xfb, + 0x7e, 0x89, 0x31, 0xb0, 0x51, 0x2b, 0x4c, 0x87, 0x5f, 0x50, 0xb1, 0x1f, 0xad, 0xd4, 0xcd, 0xf6, + 0x8e, 0xb0, 0x2e, 0x30, 0x35, 0x0f, 0x16, 0x3e, 0x76, 0x8d, 0x20, 0xb0, 0xbb, 0x6e, 0x78, 0x8c, + 0xaf, 0x8c, 0x1e, 0x18, 0x6c, 0x16, 0x4e, 0xce, 0x11, 0xf9, 0x92, 0xa8, 0x42, 0x9e, 0xb8, 0xce, + 0x40, 0x3f, 0x34, 0x6c, 0x07, 0x8b, 0x4e, 0x9c, 0xd5, 0x80, 0x89, 0x36, 0xb9, 0x04, 0xdd, 0x84, + 0x59, 0xcb, 0x1f, 0xe8, 0x7e, 0xdf, 0xe5, 0x69, 0xcd, 0x6a, 0x19, 0xcb, 0x1f, 0x68, 0x7d, 0xb7, + 0x66, 0x40, 0x31, 0xb2, 0x78, 0xe5, 0x33, 0x8e, 0x9c, 0x4b, 0x5c, 0xe8, 0xdc, 0xeb, 0x9f, 0xb3, + 0x6f, 0x65, 0x81, 0xcf, 0x40, 0x62, 0xef, 0xa3, 0xe2, 0x0c, 0xba, 0x06, 0x0b, 0xed, 0x87, 0x0d, + 0xad, 0xa5, 0xef, 0xee, 0x1d, 0xe8, 0x9b, 0x7b, 0x1f, 0xef, 0xb6, 0x8a, 0x0a, 0xba, 0x0e, 0xc5, + 0xdd, 0x3d, 0x5d, 0xc8, 0xc3, 0x4f, 0xaf, 0x04, 0xba, 0x01, 0x8b, 0x0c, 0x34, 0x2e, 0x4e, 0xa2, + 0xdb, 0x70, 0x73, 0xe3, 0x60, 0xbd, 0xa5, 0x1f, 0x68, 0x8d, 0xdd, 0x76, 0x63, 0xfd, 0x60, 0x6b, + 0x6f, 0x57, 0x97, 0x5f, 0x68, 0x29, 0xb4, 0x08, 0x73, 0x02, 0xdf, 0x3e, 0xd8, 0xdb, 0xdf, 0xdf, + 0x68, 0x15, 0xd3, 0x6b, 0xbf, 0x4f, 0x84, 0xaf, 0xa9, 0x77, 0x21, 0xc5, 0xbc, 0x41, 0x37, 0xa6, + 0x4e, 0x9f, 0xf2, 0x4b, 0xd3, 0xdb, 0x0e, 0x53, 0x63, 0x0f, 0xba, 0xb8, 0x5a, 0xec, 0x2d, 0x1b, + 0x57, 0x1b, 0x7b, 0x79, 0xbe, 0x07, 0x69, 0x3e, 0xe0, 0xd1, 0x4b, 0xd3, 0xdf, 0x30, 0xe5, 0x9b, + 0xcf, 0xc9, 0xa5, 0x66, 0x03, 0xb2, 0x61, 0x71, 0xa2, 0x5b, 0xd3, 0x0a, 0x56, 0xe8, 0x97, 0x2f, + 0xae, 0x65, 0x46, 0x11, 0x1e, 0x6e, 0x9c, 0x62, 0xa2, 0xc4, 0xe2, 0x14, 0x93, 0xb5, 0xd0, 0x7c, + 0xf0, 0xf8, 0xaf, 0x95, 0x99, 0xc7, 0x5f, 0x57, 0x94, 0x27, 0x5f, 0x57, 0x94, 0x2f, 0xcf, 0x2a, + 0x33, 0x5f, 0x9d, 0x55, 0x94, 0x3f, 0x9e, 0x55, 0x94, 0x27, 0x67, 0x95, 0x99, 0xbf, 0x9c, 0x55, + 0x66, 0x3e, 0x5b, 0x99, 0xd6, 0x4d, 0x9f, 0xfb, 0xb9, 0xb7, 0x93, 0xe1, 0xab, 0x77, 0xfe, 0x1d, + 0x00, 0x00, 0xff, 0xff, 0x2d, 0x5c, 0x17, 0x6a, 0x0a, 0x16, 0x00, 0x00, } func (this *ShardSpec) Equal(that interface{}) bool { @@ -2227,6 +2230,11 @@ func (m *ListResponse_Shard) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CreateRevision != 0 { + i = encodeVarintProtocol(dAtA, i, uint64(m.CreateRevision)) + i-- + dAtA[i] = 0x28 + } if len(m.Status) > 0 { for iNdEx := len(m.Status) - 1; iNdEx >= 0; iNdEx-- { { @@ -3038,6 +3046,9 @@ func (m *ListResponse_Shard) ProtoSize() (n int) { n += 1 + l + sovProtocol(uint64(l)) } } + if m.CreateRevision != 0 { + n += 1 + sovProtocol(uint64(m.CreateRevision)) + } return n } @@ -5002,6 +5013,25 @@ func (m *ListResponse_Shard) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CreateRevision", wireType) + } + m.CreateRevision = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtocol + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CreateRevision |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipProtocol(dAtA[iNdEx:]) diff --git a/consumer/protocol/protocol.proto b/consumer/protocol/protocol.proto index 26b5ecb6..42586c8b 100644 --- a/consumer/protocol/protocol.proto +++ b/consumer/protocol/protocol.proto @@ -332,12 +332,14 @@ message ListResponse { // Shards of the response. message Shard { ShardSpec spec = 1 [ (gogoproto.nullable) = false ]; - // Current ModRevision of the ShardSpec. + // Current Etcd ModRevision of the ShardSpec. int64 mod_revision = 2; // Route of the shard, including endpoints. protocol.Route route = 3 [ (gogoproto.nullable) = false ]; // Status of each replica. Cardinality and ordering matches |route|. repeated ReplicaStatus status = 4 [ (gogoproto.nullable) = false ]; + // Etcd CreateRevision of the JournalSpec. + int64 create_revision = 5; } repeated Shard shards = 3 [ (gogoproto.nullable) = false ]; // Optional extension of the ListResponse. diff --git a/consumer/shard_api.go b/consumer/shard_api.go index 1438211f..c969bc0e 100644 --- a/consumer/shard_api.go +++ b/consumer/shard_api.go @@ -82,6 +82,7 @@ func ShardList(ctx context.Context, srv *Service, req *pc.ListRequest) (*pc.List continue } shard.ModRevision = s.Items[cur.Left].Raw.ModRevision + shard.CreateRevision = s.Items[cur.Left].Raw.CreateRevision pbx.Init(&shard.Route, s.Assignments[cur.RightBegin:cur.RightEnd]) pbx.AttachEndpoints(&shard.Route, s.KS) diff --git a/consumer/shard_api_test.go b/consumer/shard_api_test.go index 12bbd1f3..ce29c9bf 100644 --- a/consumer/shard_api_test.go +++ b/consumer/shard_api_test.go @@ -69,6 +69,9 @@ func TestAPIListCases(t *testing.T) { for i, exp := range expect { require.Equal(t, *exp, resp.Shards[i].Spec) + require.NotZero(t, resp.Shards[i].ModRevision) + require.NotZero(t, resp.Shards[i].CreateRevision) + var numAsn int if exp == specB { numAsn = 1