From f6dba46760b0dd0291d71822022e7b8c2d1638f1 Mon Sep 17 00:00:00 2001 From: fzhedu Date: Wed, 23 Dec 2020 23:08:55 +0800 Subject: [PATCH 1/5] add final agg label --- go-tipb/executor.pb.go | 181 +++++++++++++++++++++++++++++++---------- proto/executor.proto | 5 +- 2 files changed, 142 insertions(+), 44 deletions(-) diff --git a/go-tipb/executor.pb.go b/go-tipb/executor.pb.go index 166ba362a..6776f1647 100644 --- a/go-tipb/executor.pb.go +++ b/go-tipb/executor.pb.go @@ -706,9 +706,11 @@ type Aggregation struct { AggFunc []*Expr `protobuf:"bytes,2,rep,name=agg_func,json=aggFunc" json:"agg_func,omitempty"` RpnAggFunc []*RpnExpr `protobuf:"bytes,5,rep,name=rpn_agg_func,json=rpnAggFunc" json:"rpn_agg_func,omitempty"` // If it is a stream aggregation. - Streamed bool `protobuf:"varint,3,opt,name=streamed" json:"streamed"` - Child *Executor `protobuf:"bytes,6,opt,name=child" json:"child,omitempty"` - XXX_unrecognized []byte `json:"-"` + Streamed bool `protobuf:"varint,3,opt,name=streamed" json:"streamed"` + Child *Executor `protobuf:"bytes,6,opt,name=child" json:"child,omitempty"` + // If it is a final aggregation. + Final bool `protobuf:"varint,7,opt,name=final" json:"final"` + XXX_unrecognized []byte `json:"-"` } func (m *Aggregation) Reset() { *m = Aggregation{} } @@ -758,6 +760,13 @@ func (m *Aggregation) GetChild() *Executor { return nil } +func (m *Aggregation) GetFinal() bool { + if m != nil { + return m.Final + } + return false +} + type TopN struct { // Order by clause. OrderBy []*ByItem `protobuf:"bytes,1,rep,name=order_by,json=orderBy" json:"order_by,omitempty"` @@ -855,9 +864,7 @@ type ExecutorExecutionSummary struct { // How many times executor's `next()` is called. NumIterations *uint64 `protobuf:"varint,3,opt,name=num_iterations,json=numIterations" json:"num_iterations,omitempty"` // Coresponding executor id - ExecutorId *string `protobuf:"bytes,4,opt,name=executor_id,json=executorId" json:"executor_id,omitempty"` - // The execution concurrency for this executor - Concurrency *uint64 `protobuf:"varint,5,opt,name=concurrency" json:"concurrency,omitempty"` + ExecutorId *string `protobuf:"bytes,4,opt,name=executor_id,json=executorId" json:"executor_id,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -896,13 +903,6 @@ func (m *ExecutorExecutionSummary) GetExecutorId() string { return "" } -func (m *ExecutorExecutionSummary) GetConcurrency() uint64 { - if m != nil && m.Concurrency != nil { - return *m.Concurrency - } - return 0 -} - func init() { proto.RegisterType((*Executor)(nil), "tipb.Executor") proto.RegisterType((*ExchangeSender)(nil), "tipb.ExchangeSender") @@ -1605,6 +1605,14 @@ func (m *Aggregation) MarshalTo(dAtA []byte) (int, error) { } i += n15 } + dAtA[i] = 0x38 + i++ + if m.Final { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1759,11 +1767,6 @@ func (m *ExecutorExecutionSummary) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintExecutor(dAtA, i, uint64(len(*m.ExecutorId))) i += copy(dAtA[i:], *m.ExecutorId) } - if m.Concurrency != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintExecutor(dAtA, i, uint64(*m.Concurrency)) - } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2081,6 +2084,7 @@ func (m *Aggregation) Size() (n int) { l = m.Child.Size() n += 1 + l + sovExecutor(uint64(l)) } + n += 2 if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2148,9 +2152,6 @@ func (m *ExecutorExecutionSummary) Size() (n int) { l = len(*m.ExecutorId) n += 1 + l + sovExecutor(uint64(l)) } - if m.Concurrency != nil { - n += 1 + sovExecutor(uint64(*m.Concurrency)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4217,6 +4218,26 @@ func (m *Aggregation) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Final", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowExecutor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Final = bool(v != 0) default: iNdEx = preIndex skippy, err := skipExecutor(dAtA[iNdEx:]) @@ -4685,26 +4706,6 @@ func (m *ExecutorExecutionSummary) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.ExecutorId = &s iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Concurrency", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowExecutor - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Concurrency = &v default: iNdEx = preIndex skippy, err := skipExecutor(dAtA[iNdEx:]) @@ -4835,6 +4836,7 @@ var ( func init() { proto.RegisterFile("executor.proto", fileDescriptorExecutor) } var fileDescriptorExecutor = []byte{ +<<<<<<< HEAD // 1523 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0xdb, 0xc6, 0x12, 0x37, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0xef, 0x73, 0x02, 0x26, 0x78, 0xcf, 0x56, 0x84, @@ -4932,4 +4934,101 @@ var fileDescriptorExecutor = []byte{ 0x9f, 0x5b, 0x6b, 0x70, 0x23, 0x60, 0xd3, 0xdd, 0x98, 0xd0, 0x28, 0xf0, 0xe3, 0xdd, 0x94, 0x84, 0x23, 0xd9, 0x83, 0x47, 0xc6, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x00, 0xad, 0xc6, 0x45, 0x0e, 0x00, 0x00, +======= + // 1498 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x6e, 0xdb, 0x46, + 0x13, 0x37, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0xef, 0xe7, 0x04, 0x4c, 0xf0, 0xd5, 0x56, 0x84, + 0x04, 0x75, 0x85, 0xd4, 0xf9, 0xd7, 0x02, 0xbd, 0xb4, 0x48, 0x9c, 0x26, 0xad, 0xea, 0xd4, 0x35, + 0x68, 0xa3, 0x57, 0x82, 0x22, 0xd7, 0xd4, 0xda, 0xe4, 0x2e, 0xb3, 0x24, 0x1b, 0xe9, 0xd6, 0x47, + 0x28, 0xd0, 0x1e, 0x7a, 0xed, 0x0b, 0xf4, 0xd6, 0x4b, 0x2f, 0xbd, 0xe6, 0xd8, 0x53, 0x81, 0x5e, + 0x8a, 0x22, 0x7d, 0x91, 0x62, 0x77, 0x49, 0x8a, 0xb2, 0x6c, 0x37, 0x27, 0x72, 0x7f, 0xf3, 0x9b, + 0xd9, 0x99, 0xd9, 0x99, 0xdd, 0x81, 0x1e, 0x9e, 0x61, 0x2f, 0x4b, 0x19, 0xdf, 0x8d, 0x39, 0x4b, + 0x19, 0xd2, 0x53, 0x12, 0x4f, 0x6e, 0x9a, 0x78, 0x16, 0x73, 0x9c, 0x24, 0x84, 0x51, 0x85, 0xdf, + 0xec, 0x26, 0xde, 0x14, 0x47, 0x6e, 0xbe, 0xda, 0x0c, 0x58, 0xc0, 0xe4, 0xef, 0x3d, 0xf1, 0xa7, + 0xd0, 0xe1, 0x0f, 0x3a, 0x18, 0xcf, 0x72, 0x73, 0xe8, 0x36, 0xd4, 0xd2, 0xd8, 0xd2, 0x06, 0xda, + 0x4e, 0xef, 0x61, 0x6f, 0x57, 0x58, 0xdd, 0x15, 0xb2, 0xe3, 0x79, 0x8c, 0xf7, 0xf4, 0xd7, 0x7f, + 0x6d, 0xaf, 0xd9, 0xb5, 0x34, 0x46, 0x23, 0x30, 0xd2, 0x49, 0xe8, 0x24, 0x9e, 0x4b, 0xad, 0xda, + 0x40, 0xdb, 0xe9, 0x3c, 0xec, 0x2b, 0xee, 0xb1, 0x3b, 0x09, 0xf1, 0x91, 0xe7, 0x52, 0xbb, 0x95, + 0x4e, 0x42, 0xf1, 0x23, 0xb8, 0xc4, 0x9f, 0x29, 0x6e, 0xbd, 0xca, 0x1d, 0x53, 0x1f, 0xcf, 0x14, + 0x97, 0xf8, 0xf2, 0x07, 0xbd, 0x0f, 0xed, 0x04, 0x87, 0xd8, 0x4b, 0x09, 0xa3, 0x96, 0x5e, 0x25, + 0x1f, 0x15, 0xb0, 0xbd, 0x60, 0xa0, 0x47, 0xd0, 0x71, 0x83, 0x80, 0xe3, 0xc0, 0x95, 0x0a, 0x0d, + 0xa9, 0xb0, 0xa1, 0x14, 0x9e, 0x2c, 0x04, 0x76, 0x95, 0x85, 0xb6, 0x40, 0x4f, 0x59, 0x7c, 0x60, + 0x35, 0x25, 0x1b, 0x72, 0xbf, 0x59, 0x7c, 0x60, 0x4b, 0x1c, 0xdd, 0x82, 0x46, 0x48, 0x22, 0x92, + 0x5a, 0x2d, 0x49, 0xe8, 0x28, 0xc2, 0x0b, 0x01, 0xd9, 0x4a, 0x82, 0x9e, 0xc2, 0x06, 0x9e, 0x79, + 0x53, 0x97, 0x06, 0xd8, 0xe1, 0xd8, 0xc3, 0xe4, 0x1b, 0xcc, 0x2d, 0x43, 0xd2, 0xaf, 0x17, 0x39, + 0x53, 0x62, 0x3b, 0x97, 0xda, 0x26, 0x3e, 0x87, 0x08, 0x3f, 0x4e, 0x19, 0xa1, 0x56, 0xbb, 0xea, + 0xc7, 0x17, 0x8c, 0x50, 0x5b, 0xe2, 0x68, 0x1b, 0x3a, 0xc5, 0x21, 0x3b, 0xc4, 0xb7, 0x60, 0xa0, + 0xed, 0xb4, 0x6d, 0x28, 0xa0, 0xb1, 0x2f, 0x0c, 0x9c, 0x91, 0x30, 0xb4, 0x3a, 0x55, 0x03, 0xfb, + 0x24, 0x0c, 0x6d, 0x89, 0xa3, 0x8f, 0xa1, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, 0x75, 0x25, + 0x75, 0x73, 0xd9, 0xc7, 0x23, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x4d, 0x83, 0xde, 0x32, + 0x05, 0xed, 0x54, 0x8a, 0x03, 0x2d, 0x1b, 0x59, 0x29, 0x90, 0x0d, 0x4c, 0x3d, 0xe6, 0x63, 0xdf, + 0x49, 0xdd, 0xe4, 0xcc, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xa7, 0x6b, 0xf7, 0x73, 0xc1, + 0xb1, 0x9b, 0x9c, 0x7d, 0x89, 0x53, 0x17, 0x3d, 0x80, 0x5e, 0xec, 0xf2, 0x94, 0x88, 0xd3, 0x71, + 0xce, 0xf0, 0x3c, 0xb1, 0xea, 0x83, 0xfa, 0x22, 0xa2, 0x67, 0xb3, 0x98, 0xdb, 0xeb, 0x25, 0x63, + 0x1f, 0xcf, 0x13, 0x74, 0x1b, 0x1a, 0xde, 0x94, 0x84, 0x7e, 0x5e, 0x23, 0x95, 0x42, 0x15, 0xb9, + 0xb1, 0x95, 0x70, 0x18, 0x83, 0x79, 0xfe, 0x1c, 0x2e, 0x76, 0x4c, 0xbb, 0xd8, 0xb1, 0xfb, 0xd0, + 0x39, 0x21, 0x38, 0xf4, 0x9d, 0x74, 0x1e, 0xe3, 0x44, 0xba, 0x5f, 0xd6, 0xe3, 0x73, 0x21, 0x10, + 0x41, 0xdb, 0x70, 0x52, 0xfc, 0x26, 0xc3, 0xef, 0x6a, 0xd0, 0x2e, 0x5b, 0x00, 0x6d, 0x83, 0x91, + 0x8a, 0x85, 0x38, 0x3e, 0x91, 0xb4, 0x7a, 0x9e, 0xa0, 0x96, 0x44, 0xc7, 0x3e, 0x1a, 0x41, 0xcb, + 0x63, 0x61, 0x16, 0xd1, 0xc2, 0xb8, 0xa9, 0x8c, 0x3f, 0x95, 0xe0, 0x98, 0x9e, 0x30, 0xbb, 0x20, + 0x20, 0x0b, 0x74, 0x1f, 0x27, 0x9e, 0x6c, 0x21, 0x23, 0x37, 0x24, 0x11, 0x74, 0x17, 0x50, 0xcc, + 0x49, 0xe4, 0xf2, 0xb9, 0xa3, 0xc8, 0x0e, 0xf1, 0x13, 0x4b, 0x1f, 0xd4, 0x77, 0xea, 0xb6, 0x99, + 0x4b, 0x72, 0x8b, 0x7e, 0x82, 0x1e, 0x83, 0x49, 0xf1, 0x2c, 0x75, 0x38, 0x76, 0x7d, 0x07, 0xd3, + 0x80, 0x50, 0x2c, 0x1b, 0xa7, 0x57, 0x6c, 0xfe, 0x4c, 0x62, 0x95, 0xf3, 0xec, 0x09, 0xbe, 0x8d, + 0x5d, 0x5f, 0x49, 0xd0, 0x5d, 0x68, 0x72, 0x91, 0xd3, 0xc4, 0x6a, 0x4a, 0xa7, 0xf3, 0xec, 0xef, + 0xe3, 0xb9, 0x2d, 0xe0, 0x5c, 0x2b, 0xe7, 0x0c, 0x7f, 0xd1, 0x41, 0x17, 0x55, 0x8d, 0x1e, 0x40, + 0x5b, 0xd4, 0xb5, 0x4c, 0xe6, 0xf2, 0x05, 0x23, 0xc4, 0x95, 0xfd, 0x8c, 0xd3, 0x7c, 0x8d, 0x3e, + 0x81, 0x9e, 0x54, 0x11, 0x45, 0xaf, 0xf4, 0x6a, 0xd5, 0xda, 0x13, 0x7a, 0xe7, 0x2e, 0xa7, 0xee, + 0x69, 0x05, 0x13, 0x57, 0x8f, 0xac, 0x04, 0x8e, 0x69, 0x5e, 0x53, 0xe7, 0x2b, 0xa5, 0x94, 0xa3, + 0x5b, 0xd0, 0x26, 0x94, 0x62, 0xd1, 0x6b, 0x33, 0x59, 0x56, 0xc5, 0x69, 0x19, 0x12, 0x1e, 0xfb, + 0x33, 0x74, 0x1f, 0x7a, 0x21, 0x3e, 0x49, 0x1d, 0xe9, 0x93, 0x2c, 0xd4, 0xc6, 0x4a, 0xa1, 0x76, + 0x05, 0x43, 0x38, 0x26, 0xeb, 0xf4, 0x21, 0xf4, 0x39, 0x09, 0xa6, 0x55, 0x95, 0xe6, 0x6a, 0x6d, + 0x4b, 0x4a, 0xa9, 0x73, 0x1f, 0x3a, 0x31, 0x67, 0x13, 0x9c, 0x57, 0x5d, 0xeb, 0x92, 0xaa, 0x93, + 0x1c, 0x59, 0x75, 0x42, 0x63, 0x92, 0x91, 0xb2, 0x4e, 0x8d, 0x4b, 0x34, 0x24, 0x47, 0x69, 0x3c, + 0x82, 0xbe, 0x8c, 0xc4, 0x63, 0xd4, 0x97, 0x5d, 0x95, 0x58, 0xed, 0x15, 0xbf, 0x64, 0xb0, 0x4f, + 0x4b, 0x06, 0xfa, 0x10, 0x4c, 0x15, 0x4c, 0x45, 0x0b, 0x56, 0xb4, 0x54, 0xc0, 0xcb, 0x6a, 0x2c, + 0x9d, 0x62, 0x5e, 0x55, 0xeb, 0xac, 0xaa, 0x49, 0xce, 0x42, 0x6d, 0xf8, 0xa7, 0x06, 0xed, 0xf2, + 0x85, 0xf8, 0xef, 0x56, 0xda, 0x06, 0x83, 0x08, 0xb6, 0x20, 0xd4, 0xaa, 0x04, 0x89, 0x2e, 0xf7, + 0x5a, 0xfd, 0x6d, 0x7b, 0x4d, 0x5f, 0xe9, 0xb5, 0xeb, 0xd0, 0xcc, 0x28, 0x79, 0x99, 0xa9, 0x9e, + 0x31, 0xec, 0x7c, 0x75, 0x49, 0x0f, 0x36, 0x2f, 0xee, 0xc1, 0xe1, 0xf7, 0x1a, 0xb4, 0xcb, 0x07, + 0x0d, 0x8d, 0x00, 0x2a, 0xa9, 0xd1, 0x56, 0x52, 0x53, 0x91, 0xa2, 0x0f, 0xa0, 0xc7, 0x63, 0x5a, + 0x4d, 0xa5, 0xba, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x5e, 0x52, 0x31, 0xad, 0x1c, 0x41, 0x79, + 0x5d, 0xd6, 0xaf, 0xba, 0x2e, 0xbf, 0xd5, 0x00, 0x0e, 0x39, 0x3b, 0xcd, 0xdd, 0x1a, 0x40, 0x43, + 0x8c, 0x13, 0x17, 0x79, 0xa4, 0x04, 0x68, 0x04, 0x6d, 0xe1, 0x8c, 0x62, 0x5d, 0xe8, 0x87, 0xc1, + 0xd5, 0xcf, 0xdb, 0xba, 0xf0, 0x53, 0x0d, 0x3a, 0x95, 0x87, 0x1b, 0xdd, 0x01, 0x23, 0xe0, 0x2c, + 0x8b, 0x9d, 0xc9, 0xfc, 0x02, 0x37, 0x5a, 0x52, 0xb6, 0x37, 0x17, 0x34, 0x37, 0x08, 0x9c, 0x93, + 0x8c, 0x7a, 0xb9, 0x1f, 0x4b, 0x34, 0x37, 0x08, 0x9e, 0x67, 0xd4, 0x43, 0x03, 0x30, 0x92, 0x94, + 0x63, 0x37, 0xc2, 0xfe, 0xd2, 0x35, 0x5a, 0xa2, 0xe8, 0x1e, 0x74, 0x45, 0x44, 0xe5, 0x9e, 0xfa, + 0x45, 0x41, 0x01, 0x8f, 0xe9, 0x67, 0xf9, 0xce, 0xb9, 0x42, 0xb9, 0x7b, 0xe3, 0x32, 0x85, 0x27, + 0xb9, 0x0f, 0x65, 0x1e, 0x9a, 0x57, 0xe4, 0x01, 0xdd, 0x84, 0xc6, 0x09, 0xa1, 0x6e, 0x28, 0x67, + 0x90, 0xc2, 0x4d, 0x05, 0x0d, 0x5f, 0x82, 0x2e, 0xa6, 0x15, 0xf4, 0x2e, 0x18, 0x8c, 0xfb, 0x98, + 0x2f, 0x72, 0xd3, 0x55, 0xc6, 0xf6, 0xe6, 0xe3, 0x14, 0x47, 0x76, 0x4b, 0x4a, 0xf7, 0xe6, 0xc2, + 0x98, 0x1a, 0x68, 0x44, 0x5f, 0xe8, 0x85, 0x31, 0x35, 0xc9, 0xbc, 0xdd, 0xb1, 0x8c, 0xa1, 0x21, + 0xe7, 0x9f, 0x85, 0x29, 0xed, 0x0a, 0x53, 0xb5, 0xab, 0x4c, 0x3d, 0x06, 0x5d, 0x8c, 0x28, 0xe8, + 0xff, 0xd0, 0xf4, 0x18, 0xa5, 0xe3, 0x4f, 0x97, 0x4c, 0xe5, 0x98, 0xd8, 0xe7, 0x65, 0x86, 0xf9, + 0x5c, 0xda, 0x2a, 0xe3, 0x97, 0xd0, 0xf0, 0x57, 0x0d, 0xac, 0xc2, 0xaa, 0xfa, 0x12, 0x46, 0x8f, + 0xb2, 0x48, 0xb4, 0x98, 0x78, 0xde, 0x53, 0x12, 0x61, 0x27, 0xe6, 0xcc, 0xc3, 0x49, 0x82, 0x7d, + 0x47, 0xb6, 0x94, 0xb6, 0xa3, 0xdb, 0x7d, 0x21, 0x38, 0x2c, 0xf0, 0x03, 0x51, 0xbe, 0x1b, 0x34, + 0x8b, 0x04, 0xd5, 0xcf, 0x3c, 0xec, 0x3b, 0x9c, 0xbd, 0x4a, 0x54, 0x8e, 0xec, 0x3e, 0xcd, 0xa2, + 0xc3, 0x1c, 0xb7, 0xd9, 0xab, 0x04, 0xdd, 0x81, 0x9e, 0xe0, 0x92, 0x14, 0x73, 0x57, 0xf5, 0x5d, + 0x5d, 0x12, 0xd7, 0x69, 0x16, 0x8d, 0x4b, 0xf0, 0xfc, 0xcc, 0xa6, 0x9f, 0x9f, 0xd9, 0x46, 0x7f, + 0x68, 0x6a, 0xd6, 0x96, 0xcf, 0xd3, 0x06, 0xac, 0x8b, 0x6f, 0x39, 0x30, 0x98, 0x6b, 0x05, 0x54, + 0x5e, 0x7c, 0xa6, 0x56, 0x40, 0xe5, 0x7d, 0x61, 0xd6, 0xd0, 0xff, 0xa0, 0x2f, 0xa0, 0x4a, 0xa7, + 0x98, 0x75, 0xd4, 0x05, 0x43, 0x5a, 0x63, 0xf1, 0x81, 0xa9, 0xa3, 0x75, 0x68, 0x8b, 0x95, 0x3c, + 0x36, 0xb3, 0x51, 0x1a, 0x91, 0x85, 0xfe, 0x24, 0x08, 0xcc, 0x66, 0xc1, 0x17, 0xef, 0x8e, 0xd9, + 0x2a, 0x56, 0xe2, 0x6c, 0x4c, 0x03, 0x5d, 0x07, 0x24, 0x56, 0xcb, 0xe3, 0x9f, 0xd9, 0x46, 0x16, + 0x6c, 0x56, 0xf1, 0x62, 0xaa, 0x32, 0x61, 0xf4, 0x11, 0x74, 0xab, 0xa3, 0x20, 0xea, 0x43, 0xe7, + 0xd0, 0x4d, 0x92, 0xe3, 0x29, 0x67, 0x59, 0x30, 0x35, 0xd7, 0x84, 0x43, 0x7b, 0x9c, 0xb9, 0xbe, + 0xe7, 0x26, 0xa9, 0xa9, 0x21, 0x03, 0xf4, 0xcf, 0xdd, 0x64, 0x6a, 0xd6, 0x46, 0xbb, 0x00, 0x8b, + 0x91, 0x03, 0xb5, 0xa1, 0xf1, 0x82, 0x79, 0x6e, 0x68, 0xae, 0x09, 0xca, 0x31, 0xd9, 0xff, 0xda, + 0xd4, 0x50, 0x07, 0x5a, 0xc7, 0xe4, 0x79, 0xa8, 0xf8, 0x3f, 0x6b, 0x60, 0x14, 0x13, 0xc3, 0x22, + 0x5f, 0x14, 0x73, 0x19, 0xc9, 0x1a, 0xba, 0x06, 0x1b, 0x32, 0x72, 0x7c, 0x92, 0x7e, 0x95, 0xa5, + 0x39, 0xac, 0x15, 0x21, 0xd9, 0xe2, 0x75, 0x5a, 0xe0, 0x35, 0x64, 0x42, 0x57, 0xa5, 0x37, 0x22, + 0x12, 0xa9, 0xa3, 0x4d, 0x30, 0x65, 0x76, 0x69, 0x4a, 0x4a, 0x54, 0x47, 0x37, 0xe0, 0xda, 0x92, + 0xd9, 0x52, 0xd4, 0x40, 0xef, 0xc0, 0x8d, 0x42, 0x61, 0x55, 0xdc, 0x1c, 0x0d, 0xa0, 0x5b, 0x9d, + 0x54, 0x8a, 0x1d, 0x45, 0xf8, 0xca, 0xe5, 0xbd, 0xf7, 0x5e, 0xbf, 0xd9, 0xd2, 0x7e, 0x7f, 0xb3, + 0xa5, 0xfd, 0xfd, 0x66, 0x4b, 0xfb, 0xf1, 0x9f, 0xad, 0x35, 0xb8, 0xe6, 0xb1, 0x68, 0x37, 0x26, + 0x34, 0xf0, 0xdc, 0x78, 0x37, 0x25, 0xfe, 0x44, 0x76, 0xd3, 0xa1, 0xf6, 0x6f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x77, 0xed, 0x17, 0x15, 0xf9, 0x0d, 0x00, 0x00, +>>>>>>> add final agg label } diff --git a/proto/executor.proto b/proto/executor.proto index b74e4c04c..bc7a97169 100644 --- a/proto/executor.proto +++ b/proto/executor.proto @@ -142,6 +142,8 @@ message Aggregation { // If it is a stream aggregation. optional bool streamed = 3 [(gogoproto.nullable) = false]; optional Executor child = 6; + // If it is a final aggregation. + optional bool final = 7 [(gogoproto.nullable) = false]; } message TopN { @@ -179,7 +181,4 @@ message ExecutorExecutionSummary { // Coresponding executor id optional string executor_id = 4; - - // The execution concurrency for this executor - optional uint64 concurrency = 5; } From e9555de8c9d0714c4224e11e95a32d6dd8d56acb Mon Sep 17 00:00:00 2001 From: fzhedu Date: Wed, 23 Dec 2020 23:29:49 +0800 Subject: [PATCH 2/5] add agg mode --- go-tipb/executor.pb.go | 183 ++++++++++++++++++++++++++++++++++++----- proto/executor.proto | 12 ++- 2 files changed, 174 insertions(+), 21 deletions(-) diff --git a/go-tipb/executor.pb.go b/go-tipb/executor.pb.go index 6776f1647..b882805f1 100644 --- a/go-tipb/executor.pb.go +++ b/go-tipb/executor.pb.go @@ -236,6 +236,49 @@ func (x *JoinExecType) UnmarshalJSON(data []byte) error { } func (JoinExecType) EnumDescriptor() ([]byte, []int) { return fileDescriptorExecutor, []int{4} } +type AggFunctionMode int32 + +const ( + AggFunctionMode_CompleteMode AggFunctionMode = 0 + AggFunctionMode_FinalMode AggFunctionMode = 1 + AggFunctionMode_Partial1Mode AggFunctionMode = 2 + AggFunctionMode_Partial2Mode AggFunctionMode = 3 + AggFunctionMode_DedupMode AggFunctionMode = 4 +) + +var AggFunctionMode_name = map[int32]string{ + 0: "CompleteMode", + 1: "FinalMode", + 2: "Partial1Mode", + 3: "Partial2Mode", + 4: "DedupMode", +} +var AggFunctionMode_value = map[string]int32{ + "CompleteMode": 0, + "FinalMode": 1, + "Partial1Mode": 2, + "Partial2Mode": 3, + "DedupMode": 4, +} + +func (x AggFunctionMode) Enum() *AggFunctionMode { + p := new(AggFunctionMode) + *p = x + return p +} +func (x AggFunctionMode) String() string { + return proto.EnumName(AggFunctionMode_name, int32(x)) +} +func (x *AggFunctionMode) UnmarshalJSON(data []byte) error { + value, err := proto.UnmarshalJSONEnum(AggFunctionMode_value, data, "AggFunctionMode") + if err != nil { + return err + } + *x = AggFunctionMode(value) + return nil +} +func (AggFunctionMode) EnumDescriptor() ([]byte, []int) { return fileDescriptorExecutor, []int{5} } + // It represents a Executor. type Executor struct { Tp ExecType `protobuf:"varint,1,opt,name=tp,enum=tipb.ExecType" json:"tp"` @@ -708,9 +751,9 @@ type Aggregation struct { // If it is a stream aggregation. Streamed bool `protobuf:"varint,3,opt,name=streamed" json:"streamed"` Child *Executor `protobuf:"bytes,6,opt,name=child" json:"child,omitempty"` - // If it is a final aggregation. - Final bool `protobuf:"varint,7,opt,name=final" json:"final"` - XXX_unrecognized []byte `json:"-"` + // aggregation function mode. + Mode *AggFunctionMode `protobuf:"varint,7,opt,name=mode,enum=tipb.AggFunctionMode" json:"mode,omitempty"` + XXX_unrecognized []byte `json:"-"` } func (m *Aggregation) Reset() { *m = Aggregation{} } @@ -760,11 +803,11 @@ func (m *Aggregation) GetChild() *Executor { return nil } -func (m *Aggregation) GetFinal() bool { - if m != nil { - return m.Final +func (m *Aggregation) GetMode() AggFunctionMode { + if m != nil && m.Mode != nil { + return *m.Mode } - return false + return AggFunctionMode_CompleteMode } type TopN struct { @@ -922,6 +965,7 @@ func init() { proto.RegisterEnum("tipb.EngineType", EngineType_name, EngineType_value) proto.RegisterEnum("tipb.JoinType", JoinType_name, JoinType_value) proto.RegisterEnum("tipb.JoinExecType", JoinExecType_name, JoinExecType_value) + proto.RegisterEnum("tipb.AggFunctionMode", AggFunctionMode_name, AggFunctionMode_value) } func (m *Executor) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -1605,14 +1649,11 @@ func (m *Aggregation) MarshalTo(dAtA []byte) (int, error) { } i += n15 } - dAtA[i] = 0x38 - i++ - if m.Final { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.Mode != nil { + dAtA[i] = 0x38 + i++ + i = encodeVarintExecutor(dAtA, i, uint64(*m.Mode)) } - i++ if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2084,7 +2125,9 @@ func (m *Aggregation) Size() (n int) { l = m.Child.Size() n += 1 + l + sovExecutor(uint64(l)) } - n += 2 + if m.Mode != nil { + n += 1 + sovExecutor(uint64(*m.Mode)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4220,9 +4263,9 @@ func (m *Aggregation) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 7: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Final", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Mode", wireType) } - var v int + var v AggFunctionMode for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecutor @@ -4232,12 +4275,12 @@ func (m *Aggregation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= (AggFunctionMode(b) & 0x7F) << shift if b < 0x80 { break } } - m.Final = bool(v != 0) + m.Mode = &v default: iNdEx = preIndex skippy, err := skipExecutor(dAtA[iNdEx:]) @@ -4836,6 +4879,7 @@ var ( func init() { proto.RegisterFile("executor.proto", fileDescriptorExecutor) } var fileDescriptorExecutor = []byte{ +<<<<<<< HEAD <<<<<<< HEAD // 1523 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0xdb, 0xc6, @@ -5031,4 +5075,105 @@ var fileDescriptorExecutor = []byte{ 0x34, 0xf0, 0xdc, 0x78, 0x37, 0x25, 0xfe, 0x44, 0x76, 0xd3, 0xa1, 0xf6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0xed, 0x17, 0x15, 0xf9, 0x0d, 0x00, 0x00, >>>>>>> add final agg label +======= + // 1556 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0xc8, + 0x15, 0x36, 0x25, 0x4a, 0xa2, 0x9e, 0x64, 0x89, 0x9e, 0xda, 0x01, 0x13, 0xb4, 0xb6, 0x22, 0x24, + 0xa8, 0x23, 0xa4, 0x4e, 0xe2, 0xb4, 0x40, 0x2f, 0x2d, 0x12, 0x3b, 0x71, 0xab, 0x3a, 0x71, 0x0d, + 0xda, 0xe8, 0x95, 0xa0, 0xc8, 0x31, 0x35, 0x36, 0x39, 0xc3, 0x0c, 0xc9, 0x46, 0xba, 0xf5, 0x27, + 0x14, 0x68, 0x0f, 0xfd, 0x15, 0x45, 0x2f, 0xbd, 0xec, 0x65, 0xaf, 0x39, 0xee, 0x69, 0x81, 0xbd, + 0x2c, 0x16, 0xd9, 0x3f, 0xb2, 0x98, 0x19, 0x92, 0xa2, 0x2c, 0xdb, 0x9b, 0x13, 0x39, 0xdf, 0xfb, + 0xde, 0x9b, 0xf7, 0xde, 0xbc, 0x37, 0xf3, 0xa0, 0x87, 0x67, 0xd8, 0xcb, 0x52, 0xc6, 0xf7, 0x62, + 0xce, 0x52, 0x86, 0xf4, 0x94, 0xc4, 0x93, 0x07, 0x26, 0x9e, 0xc5, 0x1c, 0x27, 0x09, 0x61, 0x54, + 0xe1, 0x0f, 0xba, 0x89, 0x37, 0xc5, 0x91, 0x9b, 0xaf, 0x36, 0x03, 0x16, 0x30, 0xf9, 0xfb, 0x4c, + 0xfc, 0x29, 0x74, 0xf8, 0x6f, 0x1d, 0x8c, 0xb7, 0xb9, 0x39, 0xf4, 0x08, 0x6a, 0x69, 0x6c, 0x69, + 0x03, 0x6d, 0xb7, 0xb7, 0xdf, 0xdb, 0x13, 0x56, 0xf7, 0x84, 0xec, 0x7c, 0x1e, 0xe3, 0x03, 0xfd, + 0xd3, 0xf7, 0x3b, 0x6b, 0x76, 0x2d, 0x8d, 0xd1, 0x08, 0x8c, 0x74, 0x12, 0x3a, 0x89, 0xe7, 0x52, + 0xab, 0x36, 0xd0, 0x76, 0x3b, 0xfb, 0x7d, 0xc5, 0x3d, 0x77, 0x27, 0x21, 0x3e, 0xf3, 0x5c, 0x6a, + 0xb7, 0xd2, 0x49, 0x28, 0x7e, 0x04, 0x97, 0xf8, 0x33, 0xc5, 0xad, 0x57, 0xb9, 0x63, 0xea, 0xe3, + 0x99, 0xe2, 0x12, 0x5f, 0xfe, 0xa0, 0xdf, 0x40, 0x3b, 0xc1, 0x21, 0xf6, 0x52, 0xc2, 0xa8, 0xa5, + 0x57, 0xc9, 0x67, 0x05, 0x6c, 0x2f, 0x18, 0xe8, 0x25, 0x74, 0xdc, 0x20, 0xe0, 0x38, 0x70, 0xa5, + 0x42, 0x43, 0x2a, 0x6c, 0x28, 0x85, 0xd7, 0x0b, 0x81, 0x5d, 0x65, 0xa1, 0x6d, 0xd0, 0x53, 0x16, + 0x9f, 0x58, 0x4d, 0xc9, 0x86, 0xdc, 0x6f, 0x16, 0x9f, 0xd8, 0x12, 0x47, 0x0f, 0xa1, 0x11, 0x92, + 0x88, 0xa4, 0x56, 0x4b, 0x12, 0x3a, 0x8a, 0xf0, 0x4e, 0x40, 0xb6, 0x92, 0xa0, 0x43, 0xd8, 0xc0, + 0x33, 0x6f, 0xea, 0xd2, 0x00, 0x3b, 0x1c, 0x7b, 0x98, 0xfc, 0x1d, 0x73, 0xcb, 0x90, 0xf4, 0x7b, + 0x45, 0xce, 0x94, 0xd8, 0xce, 0xa5, 0xb6, 0x89, 0xaf, 0x21, 0xc2, 0x8f, 0x4b, 0x46, 0xa8, 0xd5, + 0xae, 0xfa, 0xf1, 0x17, 0x46, 0xa8, 0x2d, 0x71, 0xb4, 0x03, 0x9d, 0xe2, 0x90, 0x1d, 0xe2, 0x5b, + 0x30, 0xd0, 0x76, 0xdb, 0x36, 0x14, 0xd0, 0xd8, 0x17, 0x06, 0xae, 0x48, 0x18, 0x5a, 0x9d, 0xaa, + 0x81, 0x63, 0x12, 0x86, 0xb6, 0xc4, 0xd1, 0x1f, 0xa0, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, + 0x75, 0x25, 0x75, 0x73, 0xd9, 0xc7, 0x33, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x5a, 0x83, + 0xde, 0x32, 0x05, 0xed, 0x56, 0x8a, 0x03, 0x2d, 0x1b, 0x59, 0x29, 0x90, 0x0d, 0x4c, 0x3d, 0xe6, + 0x63, 0xdf, 0x49, 0xdd, 0xe4, 0xca, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xb7, 0x6b, 0xf7, + 0x73, 0xc1, 0xb9, 0x9b, 0x5c, 0xbd, 0xc7, 0xa9, 0x8b, 0x5e, 0x40, 0x2f, 0x76, 0x79, 0x4a, 0xc4, + 0xe9, 0x38, 0x57, 0x78, 0x9e, 0x58, 0xf5, 0x41, 0x7d, 0x11, 0xd1, 0xdb, 0x59, 0xcc, 0xed, 0xf5, + 0x92, 0x71, 0x8c, 0xe7, 0x09, 0x7a, 0x04, 0x0d, 0x6f, 0x4a, 0x42, 0x3f, 0xaf, 0x91, 0x4a, 0xa1, + 0x8a, 0xdc, 0xd8, 0x4a, 0x38, 0x8c, 0xc1, 0xbc, 0x7e, 0x0e, 0x37, 0x3b, 0xa6, 0xdd, 0xec, 0xd8, + 0x73, 0xe8, 0x5c, 0x10, 0x1c, 0xfa, 0x4e, 0x3a, 0x8f, 0x71, 0x22, 0xdd, 0x2f, 0xeb, 0xf1, 0x48, + 0x08, 0x44, 0xd0, 0x36, 0x5c, 0x14, 0xbf, 0xc9, 0xf0, 0x9f, 0x35, 0x68, 0x97, 0x2d, 0x80, 0x76, + 0xc0, 0x48, 0xc5, 0x42, 0x1c, 0x9f, 0x48, 0x5a, 0x3d, 0x4f, 0x50, 0x4b, 0xa2, 0x63, 0x1f, 0x8d, + 0xa0, 0xe5, 0xb1, 0x30, 0x8b, 0x68, 0x61, 0xdc, 0x54, 0xc6, 0x0f, 0x25, 0x38, 0xa6, 0x17, 0xcc, + 0x2e, 0x08, 0xc8, 0x02, 0xdd, 0xc7, 0x89, 0x27, 0x5b, 0xc8, 0xc8, 0x0d, 0x49, 0x04, 0x3d, 0x05, + 0x14, 0x73, 0x12, 0xb9, 0x7c, 0xee, 0x28, 0xb2, 0x43, 0xfc, 0xc4, 0xd2, 0x07, 0xf5, 0xdd, 0xba, + 0x6d, 0xe6, 0x92, 0xdc, 0xa2, 0x9f, 0xa0, 0x57, 0x60, 0x52, 0x3c, 0x4b, 0x1d, 0x8e, 0x5d, 0xdf, + 0xc1, 0x34, 0x20, 0x14, 0xcb, 0xc6, 0xe9, 0x15, 0x9b, 0xbf, 0x95, 0x58, 0xe5, 0x3c, 0x7b, 0x82, + 0x6f, 0x63, 0xd7, 0x57, 0x12, 0xf4, 0x14, 0x9a, 0x5c, 0xe4, 0x34, 0xb1, 0x9a, 0xd2, 0xe9, 0x3c, + 0xfb, 0xc7, 0x78, 0x6e, 0x0b, 0x38, 0xd7, 0xca, 0x39, 0xc3, 0xff, 0xeb, 0xa0, 0x8b, 0xaa, 0x46, + 0x2f, 0xa0, 0x2d, 0xea, 0x5a, 0x26, 0x73, 0xf9, 0x82, 0x11, 0xe2, 0xca, 0x7e, 0xc6, 0x65, 0xbe, + 0x46, 0x7f, 0x84, 0x9e, 0x54, 0x11, 0x45, 0xaf, 0xf4, 0x6a, 0xd5, 0xda, 0x13, 0x7a, 0xd7, 0x2e, + 0xa7, 0xee, 0x65, 0x05, 0x13, 0x57, 0x8f, 0xac, 0x04, 0x8e, 0x69, 0x5e, 0x53, 0xd7, 0x2b, 0xa5, + 0x94, 0xa3, 0x87, 0xd0, 0x26, 0x94, 0x62, 0xd1, 0x6b, 0x33, 0x59, 0x56, 0xc5, 0x69, 0x19, 0x12, + 0x1e, 0xfb, 0x33, 0xf4, 0x1c, 0x7a, 0x21, 0xbe, 0x48, 0x1d, 0xe9, 0x93, 0x2c, 0xd4, 0xc6, 0x4a, + 0xa1, 0x76, 0x05, 0x43, 0x38, 0x26, 0xeb, 0x74, 0x1f, 0xfa, 0x9c, 0x04, 0xd3, 0xaa, 0x4a, 0x73, + 0xb5, 0xb6, 0x25, 0xa5, 0xd4, 0x79, 0x0e, 0x9d, 0x98, 0xb3, 0x09, 0xce, 0xab, 0xae, 0x75, 0x4b, + 0xd5, 0x49, 0x8e, 0xac, 0x3a, 0xa1, 0x31, 0xc9, 0x48, 0x59, 0xa7, 0xc6, 0x2d, 0x1a, 0x92, 0xa3, + 0x34, 0x5e, 0x42, 0x5f, 0x46, 0xe2, 0x31, 0xea, 0xcb, 0xae, 0x4a, 0xac, 0xf6, 0x8a, 0x5f, 0x32, + 0xd8, 0xc3, 0x92, 0x81, 0x7e, 0x07, 0xa6, 0x0a, 0xa6, 0xa2, 0x05, 0x2b, 0x5a, 0x2a, 0xe0, 0x65, + 0x35, 0x96, 0x4e, 0x31, 0xaf, 0xaa, 0x75, 0x56, 0xd5, 0x24, 0x67, 0xa1, 0x36, 0xfc, 0x4e, 0x83, + 0x76, 0xf9, 0x42, 0xfc, 0x7c, 0x2b, 0xed, 0x80, 0x41, 0x04, 0x5b, 0x10, 0x6a, 0x55, 0x82, 0x44, + 0x97, 0x7b, 0xad, 0xfe, 0xa5, 0xbd, 0xa6, 0xaf, 0xf4, 0xda, 0x3d, 0x68, 0x66, 0x94, 0x7c, 0xc8, + 0x54, 0xcf, 0x18, 0x76, 0xbe, 0xba, 0xa5, 0x07, 0x9b, 0x37, 0xf7, 0xe0, 0xf0, 0x5f, 0x1a, 0xb4, + 0xcb, 0x07, 0x0d, 0x8d, 0x00, 0x2a, 0xa9, 0xd1, 0x56, 0x52, 0x53, 0x91, 0xa2, 0xdf, 0x42, 0x8f, + 0xc7, 0xb4, 0x9a, 0x4a, 0x75, 0x71, 0xac, 0x2b, 0xbe, 0x1d, 0xd3, 0xbc, 0xa4, 0x62, 0x5a, 0x39, + 0x82, 0xf2, 0xba, 0xac, 0xdf, 0x75, 0x5d, 0xfe, 0x43, 0x03, 0x38, 0xe5, 0xec, 0x32, 0x77, 0x6b, + 0x00, 0x0d, 0x31, 0x4e, 0xdc, 0xe4, 0x91, 0x12, 0xa0, 0x11, 0xb4, 0x85, 0x33, 0x8a, 0x75, 0xa3, + 0x1f, 0x06, 0x57, 0x3f, 0x5f, 0xea, 0xc2, 0xff, 0x6a, 0xd0, 0xa9, 0x3c, 0xdc, 0xe8, 0x31, 0x18, + 0x01, 0x67, 0x59, 0xec, 0x4c, 0xe6, 0x37, 0xb8, 0xd1, 0x92, 0xb2, 0x83, 0xb9, 0xa0, 0xb9, 0x41, + 0xe0, 0x5c, 0x64, 0xd4, 0xcb, 0xfd, 0x58, 0xa2, 0xb9, 0x41, 0x70, 0x94, 0x51, 0x0f, 0x0d, 0xc0, + 0x48, 0x52, 0x8e, 0xdd, 0x08, 0xfb, 0x4b, 0xd7, 0x68, 0x89, 0xa2, 0x67, 0xd0, 0x15, 0x11, 0x95, + 0x7b, 0xea, 0x37, 0x05, 0x05, 0x3c, 0xa6, 0x7f, 0xca, 0x77, 0xce, 0x15, 0xca, 0xdd, 0x1b, 0xb7, + 0x29, 0xbc, 0xce, 0x7d, 0x28, 0xf3, 0xd0, 0xbc, 0x23, 0x0f, 0xe8, 0x09, 0xe8, 0x11, 0xf3, 0xb1, + 0x1c, 0x41, 0x7a, 0xfb, 0x5b, 0xe5, 0x44, 0x23, 0x4c, 0x88, 0xc4, 0xbc, 0x67, 0x3e, 0xb6, 0x25, + 0x65, 0xf8, 0x01, 0x74, 0x31, 0xbc, 0xa0, 0x5f, 0x83, 0xc1, 0xb8, 0x8f, 0xf9, 0x22, 0x55, 0x5d, + 0xa5, 0x76, 0x30, 0x1f, 0xa7, 0x38, 0xb2, 0x5b, 0x52, 0x7a, 0x30, 0x47, 0x0f, 0x8a, 0xf9, 0x46, + 0xb4, 0x89, 0x9e, 0xa7, 0x20, 0x1f, 0x6c, 0xbe, 0xec, 0x94, 0xc6, 0xd0, 0x90, 0xe3, 0xd0, 0xc2, + 0x94, 0x76, 0x87, 0xa9, 0xda, 0x5d, 0xa6, 0x5e, 0x81, 0x2e, 0x26, 0x16, 0xf4, 0x4b, 0x68, 0x7a, + 0x8c, 0xd2, 0xf1, 0x9b, 0x25, 0x53, 0x39, 0x26, 0xf6, 0xf9, 0x90, 0x61, 0x3e, 0x97, 0xb6, 0x8a, + 0x53, 0x53, 0xd0, 0xf0, 0x2b, 0x0d, 0xac, 0xc2, 0xaa, 0xfa, 0x12, 0x46, 0xcf, 0xb2, 0x48, 0x74, + 0x9c, 0x78, 0xed, 0x53, 0x12, 0x61, 0x27, 0xe6, 0xcc, 0xc3, 0x49, 0x82, 0x7d, 0x47, 0x76, 0x98, + 0xb6, 0xab, 0xdb, 0x7d, 0x21, 0x38, 0x2d, 0xf0, 0x13, 0x51, 0xcd, 0x1b, 0x34, 0x8b, 0x04, 0xd5, + 0xcf, 0x3c, 0xec, 0x3b, 0x9c, 0x7d, 0x4c, 0x54, 0x8e, 0xec, 0x3e, 0xcd, 0xa2, 0xd3, 0x1c, 0xb7, + 0xd9, 0xc7, 0x04, 0x3d, 0x86, 0x9e, 0xe0, 0x92, 0x14, 0x73, 0x57, 0xb5, 0x61, 0x5d, 0x12, 0xd7, + 0x69, 0x16, 0x8d, 0x4b, 0xf0, 0xfa, 0x08, 0xa7, 0x5f, 0x1f, 0xe1, 0x46, 0xdf, 0x6a, 0x6a, 0xf4, + 0x96, 0xaf, 0xd5, 0x06, 0xac, 0x8b, 0x6f, 0x39, 0x3f, 0x98, 0x6b, 0x05, 0x54, 0xde, 0x83, 0xa6, + 0x56, 0x40, 0xe5, 0xf5, 0x61, 0xd6, 0xd0, 0x2f, 0xa0, 0x2f, 0xa0, 0x4a, 0xe3, 0x98, 0x75, 0xd4, + 0x05, 0x43, 0x5a, 0x63, 0xf1, 0x89, 0xa9, 0xa3, 0x75, 0x68, 0x8b, 0x95, 0x3c, 0x36, 0xb3, 0x51, + 0x1a, 0x91, 0x75, 0xff, 0x3a, 0x08, 0xcc, 0x66, 0xc1, 0x17, 0xcf, 0x90, 0xd9, 0x2a, 0x56, 0xe2, + 0x6c, 0x4c, 0x03, 0xdd, 0x03, 0x24, 0x56, 0xcb, 0xd3, 0xa0, 0xd9, 0x46, 0x16, 0x6c, 0x56, 0xf1, + 0x62, 0xc8, 0x32, 0x61, 0xf4, 0x7b, 0xe8, 0x56, 0x27, 0x43, 0xd4, 0x87, 0xce, 0xa9, 0x9b, 0x24, + 0xe7, 0x53, 0xce, 0xb2, 0x60, 0x6a, 0xae, 0x09, 0x87, 0x0e, 0x38, 0x73, 0x7d, 0xcf, 0x4d, 0x52, + 0x53, 0x43, 0x06, 0xe8, 0x7f, 0x76, 0x93, 0xa9, 0x59, 0x1b, 0xed, 0x01, 0x2c, 0x26, 0x10, 0xd4, + 0x86, 0xc6, 0x3b, 0xe6, 0xb9, 0xa1, 0xb9, 0x26, 0x28, 0xe7, 0xe4, 0xf8, 0x6f, 0xa6, 0x86, 0x3a, + 0xd0, 0x3a, 0x27, 0x47, 0xa1, 0xe2, 0xff, 0x57, 0x03, 0xa3, 0x18, 0x20, 0x16, 0xf9, 0xa2, 0x98, + 0xcb, 0x48, 0xd6, 0xd0, 0x16, 0x6c, 0xc8, 0xc8, 0xf1, 0x45, 0xfa, 0xd7, 0x2c, 0xcd, 0x61, 0xad, + 0x08, 0xc9, 0x16, 0x8f, 0xd5, 0x02, 0xaf, 0x21, 0x13, 0xba, 0x2a, 0xbd, 0x11, 0x91, 0x48, 0x1d, + 0x6d, 0x82, 0x29, 0xb3, 0x4b, 0x53, 0x52, 0xa2, 0x3a, 0xba, 0x0f, 0x5b, 0x4b, 0x66, 0x4b, 0x51, + 0x03, 0xfd, 0x0a, 0xee, 0x17, 0x0a, 0xab, 0xe2, 0xe6, 0x68, 0x00, 0xdd, 0xea, 0xe0, 0x52, 0xec, + 0x28, 0xc2, 0x57, 0x2e, 0x8f, 0x30, 0xf4, 0xaf, 0xf5, 0xba, 0x20, 0x1d, 0xb2, 0x28, 0x0e, 0x71, + 0x8a, 0xc5, 0x5a, 0x25, 0xf0, 0x88, 0x50, 0x37, 0x94, 0x4b, 0x4d, 0x10, 0x4e, 0xc5, 0x88, 0xec, + 0x86, 0x2f, 0x24, 0x52, 0xab, 0x20, 0xfb, 0x12, 0xa9, 0x0b, 0x95, 0x37, 0xd8, 0xcf, 0x62, 0xb9, + 0xd4, 0x0f, 0x9e, 0x7c, 0xfa, 0xbc, 0xad, 0x7d, 0xf3, 0x79, 0x5b, 0xfb, 0xe1, 0xf3, 0xb6, 0xf6, + 0x9f, 0x1f, 0xb7, 0xd7, 0x60, 0xcb, 0x63, 0xd1, 0x5e, 0x4c, 0x68, 0xe0, 0xb9, 0xf1, 0x5e, 0x4a, + 0xfc, 0x89, 0x6c, 0xda, 0x53, 0xed, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xab, 0xc5, 0x8d, + 0x6f, 0x0e, 0x00, 0x00, +>>>>>>> add agg mode } diff --git a/proto/executor.proto b/proto/executor.proto index bc7a97169..500c1e639 100644 --- a/proto/executor.proto +++ b/proto/executor.proto @@ -94,6 +94,14 @@ enum JoinExecType { TypeHashJoin = 0; } +enum AggFunctionMode { + CompleteMode = 0; + FinalMode = 1; + Partial1Mode = 2; + Partial2Mode = 3; + DedupMode = 4; +} + message Join { optional JoinType join_type = 1 [(gogoproto.nullable) = false]; optional JoinExecType join_exec_type = 2 [(gogoproto.nullable) = false]; @@ -142,8 +150,8 @@ message Aggregation { // If it is a stream aggregation. optional bool streamed = 3 [(gogoproto.nullable) = false]; optional Executor child = 6; - // If it is a final aggregation. - optional bool final = 7 [(gogoproto.nullable) = false]; + // aggregation function mode. + optional AggFunctionMode mode = 7; } message TopN { From b69bbf38e02c8fe69cb43f4e9dee3058eb7b8d03 Mon Sep 17 00:00:00 2001 From: fzhedu Date: Wed, 23 Dec 2020 23:45:01 +0800 Subject: [PATCH 3/5] update agg mode --- go-tipb/executor.pb.go | 125 ++++++++++++++++++++++++++++++----------- proto/executor.proto | 2 +- 2 files changed, 93 insertions(+), 34 deletions(-) diff --git a/go-tipb/executor.pb.go b/go-tipb/executor.pb.go index b882805f1..bc6d759cb 100644 --- a/go-tipb/executor.pb.go +++ b/go-tipb/executor.pb.go @@ -752,8 +752,8 @@ type Aggregation struct { Streamed bool `protobuf:"varint,3,opt,name=streamed" json:"streamed"` Child *Executor `protobuf:"bytes,6,opt,name=child" json:"child,omitempty"` // aggregation function mode. - Mode *AggFunctionMode `protobuf:"varint,7,opt,name=mode,enum=tipb.AggFunctionMode" json:"mode,omitempty"` - XXX_unrecognized []byte `json:"-"` + Mode AggFunctionMode `protobuf:"varint,7,opt,name=mode,enum=tipb.AggFunctionMode" json:"mode"` + XXX_unrecognized []byte `json:"-"` } func (m *Aggregation) Reset() { *m = Aggregation{} } @@ -804,8 +804,8 @@ func (m *Aggregation) GetChild() *Executor { } func (m *Aggregation) GetMode() AggFunctionMode { - if m != nil && m.Mode != nil { - return *m.Mode + if m != nil { + return m.Mode } return AggFunctionMode_CompleteMode } @@ -1649,11 +1649,9 @@ func (m *Aggregation) MarshalTo(dAtA []byte) (int, error) { } i += n15 } - if m.Mode != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintExecutor(dAtA, i, uint64(*m.Mode)) - } + dAtA[i] = 0x38 + i++ + i = encodeVarintExecutor(dAtA, i, uint64(m.Mode)) if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2125,9 +2123,7 @@ func (m *Aggregation) Size() (n int) { l = m.Child.Size() n += 1 + l + sovExecutor(uint64(l)) } - if m.Mode != nil { - n += 1 + sovExecutor(uint64(*m.Mode)) - } + n += 1 + sovExecutor(uint64(m.Mode)) if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4265,7 +4261,7 @@ func (m *Aggregation) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Mode", wireType) } - var v AggFunctionMode + m.Mode = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowExecutor @@ -4275,12 +4271,11 @@ func (m *Aggregation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (AggFunctionMode(b) & 0x7F) << shift + m.Mode |= (AggFunctionMode(b) & 0x7F) << shift if b < 0x80 { break } } - m.Mode = &v default: iNdEx = preIndex skippy, err := skipExecutor(dAtA[iNdEx:]) @@ -5079,41 +5074,42 @@ var fileDescriptorExecutor = []byte{ // 1556 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0xc8, 0x15, 0x36, 0x25, 0x4a, 0xa2, 0x9e, 0x64, 0x89, 0x9e, 0xda, 0x01, 0x13, 0xb4, 0xb6, 0x22, 0x24, - 0xa8, 0x23, 0xa4, 0x4e, 0xe2, 0xb4, 0x40, 0x2f, 0x2d, 0x12, 0x3b, 0x71, 0xab, 0x3a, 0x71, 0x0d, + 0xa8, 0x2b, 0xa4, 0x4e, 0xe2, 0xb4, 0x40, 0x2f, 0x2d, 0x12, 0x3b, 0x71, 0xab, 0x3a, 0x71, 0x0d, 0xda, 0xe8, 0x95, 0xa0, 0xc8, 0x31, 0x35, 0x36, 0x39, 0xc3, 0x0c, 0xc9, 0x46, 0xba, 0xf5, 0x27, - 0x14, 0x68, 0x0f, 0xfd, 0x15, 0x45, 0x2f, 0xbd, 0xec, 0x65, 0xaf, 0x39, 0xee, 0x69, 0x81, 0xbd, + 0x14, 0x68, 0x0f, 0xfd, 0x15, 0x7b, 0xdb, 0x3d, 0xec, 0x65, 0xaf, 0x39, 0xee, 0x69, 0x81, 0xbd, 0x2c, 0x16, 0xd9, 0x3f, 0xb2, 0x98, 0x19, 0x92, 0xa2, 0x2c, 0xdb, 0x9b, 0x13, 0x39, 0xdf, 0xfb, 0xde, 0x9b, 0xf7, 0xde, 0xbc, 0x37, 0xf3, 0xa0, 0x87, 0x67, 0xd8, 0xcb, 0x52, 0xc6, 0xf7, 0x62, 0xce, 0x52, 0x86, 0xf4, 0x94, 0xc4, 0x93, 0x07, 0x26, 0x9e, 0xc5, 0x1c, 0x27, 0x09, 0x61, 0x54, - 0xe1, 0x0f, 0xba, 0x89, 0x37, 0xc5, 0x91, 0x9b, 0xaf, 0x36, 0x03, 0x16, 0x30, 0xf9, 0xfb, 0x4c, - 0xfc, 0x29, 0x74, 0xf8, 0x6f, 0x1d, 0x8c, 0xb7, 0xb9, 0x39, 0xf4, 0x08, 0x6a, 0x69, 0x6c, 0x69, + 0xe1, 0x0f, 0xba, 0x89, 0x37, 0xc5, 0x91, 0x9b, 0xaf, 0x36, 0x03, 0x16, 0x30, 0xf9, 0xfb, 0x54, + 0xfc, 0x29, 0x74, 0xf8, 0x3f, 0x1d, 0x8c, 0x37, 0xb9, 0x39, 0xf4, 0x08, 0x6a, 0x69, 0x6c, 0x69, 0x03, 0x6d, 0xb7, 0xb7, 0xdf, 0xdb, 0x13, 0x56, 0xf7, 0x84, 0xec, 0x7c, 0x1e, 0xe3, 0x03, 0xfd, - 0xd3, 0xf7, 0x3b, 0x6b, 0x76, 0x2d, 0x8d, 0xd1, 0x08, 0x8c, 0x74, 0x12, 0x3a, 0x89, 0xe7, 0x52, + 0xe3, 0x0f, 0x3b, 0x6b, 0x76, 0x2d, 0x8d, 0xd1, 0x08, 0x8c, 0x74, 0x12, 0x3a, 0x89, 0xe7, 0x52, 0xab, 0x36, 0xd0, 0x76, 0x3b, 0xfb, 0x7d, 0xc5, 0x3d, 0x77, 0x27, 0x21, 0x3e, 0xf3, 0x5c, 0x6a, 0xb7, 0xd2, 0x49, 0x28, 0x7e, 0x04, 0x97, 0xf8, 0x33, 0xc5, 0xad, 0x57, 0xb9, 0x63, 0xea, 0xe3, - 0x99, 0xe2, 0x12, 0x5f, 0xfe, 0xa0, 0xdf, 0x40, 0x3b, 0xc1, 0x21, 0xf6, 0x52, 0xc2, 0xa8, 0xa5, - 0x57, 0xc9, 0x67, 0x05, 0x6c, 0x2f, 0x18, 0xe8, 0x25, 0x74, 0xdc, 0x20, 0xe0, 0x38, 0x70, 0xa5, - 0x42, 0x43, 0x2a, 0x6c, 0x28, 0x85, 0xd7, 0x0b, 0x81, 0x5d, 0x65, 0xa1, 0x6d, 0xd0, 0x53, 0x16, + 0x99, 0xe2, 0x12, 0x5f, 0xfe, 0xa0, 0xdf, 0x43, 0x3b, 0xc1, 0x21, 0xf6, 0x52, 0xc2, 0xa8, 0xa5, + 0x57, 0xc9, 0x67, 0x05, 0x6c, 0x2f, 0x18, 0xe8, 0x05, 0x74, 0xdc, 0x20, 0xe0, 0x38, 0x70, 0xa5, + 0x42, 0x43, 0x2a, 0x6c, 0x28, 0x85, 0x57, 0x0b, 0x81, 0x5d, 0x65, 0xa1, 0x6d, 0xd0, 0x53, 0x16, 0x9f, 0x58, 0x4d, 0xc9, 0x86, 0xdc, 0x6f, 0x16, 0x9f, 0xd8, 0x12, 0x47, 0x0f, 0xa1, 0x11, 0x92, - 0x88, 0xa4, 0x56, 0x4b, 0x12, 0x3a, 0x8a, 0xf0, 0x4e, 0x40, 0xb6, 0x92, 0xa0, 0x43, 0xd8, 0xc0, - 0x33, 0x6f, 0xea, 0xd2, 0x00, 0x3b, 0x1c, 0x7b, 0x98, 0xfc, 0x1d, 0x73, 0xcb, 0x90, 0xf4, 0x7b, + 0x88, 0xa4, 0x56, 0x4b, 0x12, 0x3a, 0x8a, 0xf0, 0x56, 0x40, 0xb6, 0x92, 0xa0, 0x43, 0xd8, 0xc0, + 0x33, 0x6f, 0xea, 0xd2, 0x00, 0x3b, 0x1c, 0x7b, 0x98, 0xfc, 0x0b, 0x73, 0xcb, 0x90, 0xf4, 0x7b, 0x45, 0xce, 0x94, 0xd8, 0xce, 0xa5, 0xb6, 0x89, 0xaf, 0x21, 0xc2, 0x8f, 0x4b, 0x46, 0xa8, 0xd5, - 0xae, 0xfa, 0xf1, 0x17, 0x46, 0xa8, 0x2d, 0x71, 0xb4, 0x03, 0x9d, 0xe2, 0x90, 0x1d, 0xe2, 0x5b, + 0xae, 0xfa, 0xf1, 0x77, 0x46, 0xa8, 0x2d, 0x71, 0xb4, 0x03, 0x9d, 0xe2, 0x90, 0x1d, 0xe2, 0x5b, 0x30, 0xd0, 0x76, 0xdb, 0x36, 0x14, 0xd0, 0xd8, 0x17, 0x06, 0xae, 0x48, 0x18, 0x5a, 0x9d, 0xaa, - 0x81, 0x63, 0x12, 0x86, 0xb6, 0xc4, 0xd1, 0x1f, 0xa0, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, - 0x75, 0x25, 0x75, 0x73, 0xd9, 0xc7, 0x33, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x5a, 0x83, + 0x81, 0x63, 0x12, 0x86, 0xb6, 0xc4, 0xd1, 0x9f, 0xa1, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, + 0x75, 0x25, 0x75, 0x73, 0xd9, 0xc7, 0x33, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x46, 0x83, 0xde, 0x32, 0x05, 0xed, 0x56, 0x8a, 0x03, 0x2d, 0x1b, 0x59, 0x29, 0x90, 0x0d, 0x4c, 0x3d, 0xe6, 0x63, 0xdf, 0x49, 0xdd, 0xe4, 0xca, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xb7, 0x6b, 0xf7, - 0x73, 0xc1, 0xb9, 0x9b, 0x5c, 0xbd, 0xc7, 0xa9, 0x8b, 0x5e, 0x40, 0x2f, 0x76, 0x79, 0x4a, 0xc4, - 0xe9, 0x38, 0x57, 0x78, 0x9e, 0x58, 0xf5, 0x41, 0x7d, 0x11, 0xd1, 0xdb, 0x59, 0xcc, 0xed, 0xf5, + 0x73, 0xc1, 0xb9, 0x9b, 0x5c, 0xbd, 0xc3, 0xa9, 0x8b, 0x9e, 0x43, 0x2f, 0x76, 0x79, 0x4a, 0xc4, + 0xe9, 0x38, 0x57, 0x78, 0x9e, 0x58, 0xf5, 0x41, 0x7d, 0x11, 0xd1, 0x9b, 0x59, 0xcc, 0xed, 0xf5, 0x92, 0x71, 0x8c, 0xe7, 0x09, 0x7a, 0x04, 0x0d, 0x6f, 0x4a, 0x42, 0x3f, 0xaf, 0x91, 0x4a, 0xa1, 0x8a, 0xdc, 0xd8, 0x4a, 0x38, 0x8c, 0xc1, 0xbc, 0x7e, 0x0e, 0x37, 0x3b, 0xa6, 0xdd, 0xec, 0xd8, - 0x73, 0xe8, 0x5c, 0x10, 0x1c, 0xfa, 0x4e, 0x3a, 0x8f, 0x71, 0x22, 0xdd, 0x2f, 0xeb, 0xf1, 0x48, - 0x08, 0x44, 0xd0, 0x36, 0x5c, 0x14, 0xbf, 0xc9, 0xf0, 0x9f, 0x35, 0x68, 0x97, 0x2d, 0x80, 0x76, + 0x33, 0xe8, 0x5c, 0x10, 0x1c, 0xfa, 0x4e, 0x3a, 0x8f, 0x71, 0x22, 0xdd, 0x2f, 0xeb, 0xf1, 0x48, + 0x08, 0x44, 0xd0, 0x36, 0x5c, 0x14, 0xbf, 0xc9, 0xf0, 0x3f, 0x35, 0x68, 0x97, 0x2d, 0x80, 0x76, 0xc0, 0x48, 0xc5, 0x42, 0x1c, 0x9f, 0x48, 0x5a, 0x3d, 0x4f, 0x50, 0x4b, 0xa2, 0x63, 0x1f, 0x8d, 0xa0, 0xe5, 0xb1, 0x30, 0x8b, 0x68, 0x61, 0xdc, 0x54, 0xc6, 0x0f, 0x25, 0x38, 0xa6, 0x17, 0xcc, - 0x2e, 0x08, 0xc8, 0x02, 0xdd, 0xc7, 0x89, 0x27, 0x5b, 0xc8, 0xc8, 0x0d, 0x49, 0x04, 0x3d, 0x05, + 0x2e, 0x08, 0xc8, 0x02, 0xdd, 0xc7, 0x89, 0x27, 0x5b, 0xc8, 0xc8, 0x0d, 0x49, 0x04, 0x3d, 0x01, 0x14, 0x73, 0x12, 0xb9, 0x7c, 0xee, 0x28, 0xb2, 0x43, 0xfc, 0xc4, 0xd2, 0x07, 0xf5, 0xdd, 0xba, +<<<<<<< HEAD 0x6d, 0xe6, 0x92, 0xdc, 0xa2, 0x9f, 0xa0, 0x57, 0x60, 0x52, 0x3c, 0x4b, 0x1d, 0x8e, 0x5d, 0xdf, 0xc1, 0x34, 0x20, 0x14, 0xcb, 0xc6, 0xe9, 0x15, 0x9b, 0xbf, 0x95, 0x58, 0xe5, 0x3c, 0x7b, 0x82, 0x6f, 0x63, 0xd7, 0x57, 0x12, 0xf4, 0x14, 0x9a, 0x5c, 0xe4, 0x34, 0xb1, 0x9a, 0xd2, 0xe9, 0x3c, @@ -5176,4 +5172,67 @@ var fileDescriptorExecutor = []byte{ 0xfc, 0x89, 0x6c, 0xda, 0x53, 0xed, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xab, 0xc5, 0x8d, 0x6f, 0x0e, 0x00, 0x00, >>>>>>> add agg mode +======= + 0x6d, 0xe6, 0x92, 0xdc, 0xa2, 0x9f, 0xa0, 0x97, 0x60, 0x52, 0x3c, 0x4b, 0x1d, 0x8e, 0x5d, 0xdf, + 0xc1, 0x34, 0x20, 0x14, 0xcb, 0xc6, 0xe9, 0x15, 0x9b, 0xbf, 0x91, 0x58, 0xe5, 0x3c, 0x7b, 0x82, + 0x6f, 0x63, 0xd7, 0x57, 0x12, 0xf4, 0x04, 0x9a, 0x5c, 0xe4, 0x34, 0xb1, 0x9a, 0xd2, 0xe9, 0x3c, + 0xfb, 0xc7, 0x78, 0x6e, 0x0b, 0x38, 0xd7, 0xca, 0x39, 0xc3, 0x2f, 0x75, 0xd0, 0x45, 0x55, 0xa3, + 0xe7, 0xd0, 0x16, 0x75, 0x2d, 0x93, 0xb9, 0x7c, 0xc1, 0x08, 0x71, 0x65, 0x3f, 0xe3, 0x32, 0x5f, + 0xa3, 0xbf, 0x40, 0x4f, 0xaa, 0x88, 0xa2, 0x57, 0x7a, 0xb5, 0x6a, 0xed, 0x09, 0xbd, 0x6b, 0x97, + 0x53, 0xf7, 0xb2, 0x82, 0x89, 0xab, 0x47, 0x56, 0x02, 0xc7, 0x34, 0xaf, 0xa9, 0xeb, 0x95, 0x52, + 0xca, 0xd1, 0x43, 0x68, 0x13, 0x4a, 0xb1, 0xe8, 0xb5, 0x99, 0x2c, 0xab, 0xe2, 0xb4, 0x0c, 0x09, + 0x8f, 0xfd, 0x19, 0x7a, 0x06, 0xbd, 0x10, 0x5f, 0xa4, 0x8e, 0xf4, 0x49, 0x16, 0x6a, 0x63, 0xa5, + 0x50, 0xbb, 0x82, 0x21, 0x1c, 0x93, 0x75, 0xba, 0x0f, 0x7d, 0x4e, 0x82, 0x69, 0x55, 0xa5, 0xb9, + 0x5a, 0xdb, 0x92, 0x52, 0xea, 0x3c, 0x83, 0x4e, 0xcc, 0xd9, 0x04, 0xe7, 0x55, 0xd7, 0xba, 0xa5, + 0xea, 0x24, 0x47, 0x56, 0x9d, 0xd0, 0x98, 0x64, 0xa4, 0xac, 0x53, 0xe3, 0x16, 0x0d, 0xc9, 0x51, + 0x1a, 0x2f, 0xa0, 0x2f, 0x23, 0xf1, 0x18, 0xf5, 0x65, 0x57, 0x25, 0x56, 0x7b, 0xc5, 0x2f, 0x19, + 0xec, 0x61, 0xc9, 0x40, 0x7f, 0x04, 0x53, 0x05, 0x53, 0xd1, 0x82, 0x15, 0x2d, 0x15, 0xf0, 0xb2, + 0x1a, 0x4b, 0xa7, 0x98, 0x57, 0xd5, 0x3a, 0xab, 0x6a, 0x92, 0xb3, 0x50, 0x1b, 0x7e, 0xaf, 0x41, + 0xbb, 0x7c, 0x21, 0x7e, 0xb9, 0x95, 0x76, 0xc0, 0x20, 0x82, 0x2d, 0x08, 0xb5, 0x2a, 0x41, 0xa2, + 0xcb, 0xbd, 0x56, 0xff, 0xdc, 0x5e, 0xd3, 0x57, 0x7a, 0xed, 0x1e, 0x34, 0x33, 0x4a, 0xde, 0x67, + 0xaa, 0x67, 0x0c, 0x3b, 0x5f, 0xdd, 0xd2, 0x83, 0xcd, 0x9b, 0x7b, 0x70, 0xf8, 0x5f, 0x0d, 0xda, + 0xe5, 0x83, 0x86, 0x46, 0x00, 0x95, 0xd4, 0x68, 0x2b, 0xa9, 0xa9, 0x48, 0xd1, 0x1f, 0xa0, 0xc7, + 0x63, 0x5a, 0x4d, 0xa5, 0xba, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x5e, 0x52, 0x31, 0xad, 0x1c, + 0x41, 0x79, 0x5d, 0xd6, 0xef, 0xba, 0x2e, 0xff, 0xad, 0x01, 0x9c, 0x72, 0x76, 0x99, 0xbb, 0x35, + 0x80, 0x86, 0x18, 0x27, 0x6e, 0xf2, 0x48, 0x09, 0xd0, 0x08, 0xda, 0xc2, 0x19, 0xc5, 0xba, 0xd1, + 0x0f, 0x83, 0xab, 0x9f, 0xcf, 0x75, 0xe1, 0xab, 0x1a, 0x74, 0x2a, 0x0f, 0x37, 0x7a, 0x0c, 0x46, + 0xc0, 0x59, 0x16, 0x3b, 0x93, 0xf9, 0x0d, 0x6e, 0xb4, 0xa4, 0xec, 0x60, 0x2e, 0x68, 0x6e, 0x10, + 0x38, 0x17, 0x19, 0xf5, 0x72, 0x3f, 0x96, 0x68, 0x6e, 0x10, 0x1c, 0x65, 0xd4, 0x43, 0x03, 0x30, + 0x92, 0x94, 0x63, 0x37, 0xc2, 0xfe, 0xd2, 0x35, 0x5a, 0xa2, 0xe8, 0x29, 0x74, 0x45, 0x44, 0xe5, + 0x9e, 0xfa, 0x4d, 0x41, 0x01, 0x8f, 0xe9, 0x5f, 0xf3, 0x9d, 0x73, 0x85, 0x72, 0xf7, 0xc6, 0x6d, + 0x0a, 0xaf, 0x72, 0x1f, 0xca, 0x3c, 0x34, 0xef, 0xc8, 0x03, 0x7a, 0x0a, 0x7a, 0xc4, 0x7c, 0x2c, + 0x47, 0x90, 0xde, 0xfe, 0x56, 0x39, 0xd1, 0x08, 0x13, 0x22, 0x31, 0xef, 0x98, 0x5f, 0xdc, 0x78, + 0x92, 0x38, 0x7c, 0x0f, 0xba, 0x18, 0x61, 0xd0, 0x6f, 0xc1, 0x60, 0xdc, 0xc7, 0x7c, 0x91, 0xb0, + 0xae, 0x52, 0x3e, 0x98, 0x8f, 0x53, 0x1c, 0xd9, 0x2d, 0x29, 0x3d, 0x98, 0xa3, 0x07, 0xc5, 0x94, + 0x23, 0x9a, 0x45, 0xcf, 0x6d, 0xe5, 0xe3, 0xcd, 0xe7, 0x9d, 0xd5, 0x18, 0x1a, 0x72, 0x28, 0x5a, + 0x98, 0xd2, 0xee, 0x30, 0x55, 0xbb, 0xcb, 0xd4, 0x4b, 0xd0, 0xc5, 0xdc, 0x82, 0x7e, 0x0d, 0x4d, + 0x8f, 0x51, 0x3a, 0x7e, 0xbd, 0x64, 0x2a, 0xc7, 0xc4, 0x3e, 0xef, 0x33, 0xcc, 0xe7, 0xd2, 0x56, + 0x71, 0x76, 0x0a, 0x1a, 0x7e, 0xad, 0x81, 0x55, 0x58, 0x55, 0x5f, 0xc2, 0xe8, 0x59, 0x16, 0x89, + 0xbe, 0x13, 0x6f, 0x7e, 0x4a, 0x22, 0xec, 0xc4, 0x9c, 0x79, 0x38, 0x49, 0xb0, 0xef, 0xc8, 0x3e, + 0xd3, 0x76, 0x75, 0xbb, 0x2f, 0x04, 0xa7, 0x05, 0x7e, 0x22, 0x6a, 0x7a, 0x83, 0x66, 0x91, 0xa0, + 0xfa, 0x99, 0x87, 0x7d, 0x87, 0xb3, 0x0f, 0x89, 0xca, 0x91, 0xdd, 0xa7, 0x59, 0x74, 0x9a, 0xe3, + 0x36, 0xfb, 0x90, 0xa0, 0xc7, 0xd0, 0x13, 0x5c, 0x92, 0x62, 0xee, 0xaa, 0x66, 0xac, 0x4b, 0xe2, + 0x3a, 0xcd, 0xa2, 0x71, 0x09, 0x5e, 0x1f, 0xe4, 0xf4, 0xeb, 0x83, 0xdc, 0xe8, 0x3b, 0x4d, 0x0d, + 0xe0, 0xf2, 0xcd, 0xda, 0x80, 0x75, 0xf1, 0x2d, 0xa7, 0x08, 0x73, 0xad, 0x80, 0xca, 0xdb, 0xd0, + 0xd4, 0x0a, 0xa8, 0xbc, 0x44, 0xcc, 0x1a, 0xfa, 0x15, 0xf4, 0x05, 0x54, 0x69, 0x1f, 0xb3, 0x8e, + 0xba, 0x60, 0x48, 0x6b, 0x2c, 0x3e, 0x31, 0x75, 0xb4, 0x0e, 0x6d, 0xb1, 0x92, 0xc7, 0x66, 0x36, + 0x4a, 0x23, 0xb2, 0xfa, 0x5f, 0x05, 0x81, 0xd9, 0x2c, 0xf8, 0xe2, 0x31, 0x32, 0x5b, 0xc5, 0x4a, + 0x9c, 0x8d, 0x69, 0xa0, 0x7b, 0x80, 0xc4, 0x6a, 0x79, 0x26, 0x34, 0xdb, 0xc8, 0x82, 0xcd, 0x2a, + 0x5e, 0x8c, 0x5a, 0x26, 0x8c, 0xfe, 0x04, 0xdd, 0xea, 0x7c, 0x88, 0xfa, 0xd0, 0x39, 0x75, 0x93, + 0xe4, 0x7c, 0xca, 0x59, 0x16, 0x4c, 0xcd, 0x35, 0xe1, 0xd0, 0x01, 0x67, 0xae, 0xef, 0xb9, 0x49, + 0x6a, 0x6a, 0xc8, 0x00, 0xfd, 0x6f, 0x6e, 0x32, 0x35, 0x6b, 0xa3, 0x3d, 0x80, 0xc5, 0x1c, 0x82, + 0xda, 0xd0, 0x78, 0xcb, 0x3c, 0x37, 0x34, 0xd7, 0x04, 0xe5, 0x9c, 0x1c, 0xff, 0xd3, 0xd4, 0x50, + 0x07, 0x5a, 0xe7, 0xe4, 0x28, 0x54, 0xfc, 0x2f, 0x34, 0x30, 0x8a, 0x31, 0x62, 0x91, 0x2f, 0x8a, + 0xb9, 0x8c, 0x64, 0x0d, 0x6d, 0xc1, 0x86, 0x8c, 0x1c, 0x5f, 0xa4, 0xff, 0xc8, 0xd2, 0x1c, 0xd6, + 0x8a, 0x90, 0x6c, 0xf1, 0x64, 0x2d, 0xf0, 0x1a, 0x32, 0xa1, 0xab, 0xd2, 0x1b, 0x11, 0x89, 0xd4, + 0xd1, 0x26, 0x98, 0x32, 0xbb, 0x34, 0x25, 0x25, 0xaa, 0xa3, 0xfb, 0xb0, 0xb5, 0x64, 0xb6, 0x14, + 0x35, 0xd0, 0x6f, 0xe0, 0x7e, 0xa1, 0xb0, 0x2a, 0x6e, 0x8e, 0x06, 0xd0, 0xad, 0x8e, 0x2f, 0xc5, + 0x8e, 0x22, 0x7c, 0xe5, 0xf2, 0x08, 0x43, 0xff, 0x5a, 0xc7, 0x0b, 0xd2, 0x21, 0x8b, 0xe2, 0x10, + 0xa7, 0x58, 0xac, 0x55, 0x02, 0x8f, 0x08, 0x75, 0x43, 0xb9, 0xd4, 0x04, 0xe1, 0x54, 0x0c, 0xca, + 0x6e, 0xf8, 0x5c, 0x22, 0xb5, 0x0a, 0xb2, 0x2f, 0x91, 0xba, 0x50, 0x79, 0x8d, 0xfd, 0x2c, 0x96, + 0x4b, 0xfd, 0xe0, 0x77, 0x1f, 0x3f, 0x6d, 0x6b, 0xdf, 0x7e, 0xda, 0xd6, 0x7e, 0xfc, 0xb4, 0xad, + 0xfd, 0xff, 0xa7, 0xed, 0x35, 0xd8, 0xf2, 0x58, 0xb4, 0x17, 0x13, 0x1a, 0x78, 0x6e, 0xbc, 0x97, + 0x12, 0x7f, 0x22, 0x9b, 0xf6, 0x54, 0xfb, 0x39, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x1e, 0xf3, 0x88, + 0x75, 0x0e, 0x00, 0x00, +>>>>>>> update agg mode } diff --git a/proto/executor.proto b/proto/executor.proto index 500c1e639..f0dac204c 100644 --- a/proto/executor.proto +++ b/proto/executor.proto @@ -151,7 +151,7 @@ message Aggregation { optional bool streamed = 3 [(gogoproto.nullable) = false]; optional Executor child = 6; // aggregation function mode. - optional AggFunctionMode mode = 7; + optional AggFunctionMode mode = 7 [(gogoproto.nullable) = false]; } message TopN { From 354200c1b444e56d78e6b424b4a5adfafd11c9c9 Mon Sep 17 00:00:00 2001 From: fzhedu Date: Wed, 13 Jan 2021 11:17:15 +0800 Subject: [PATCH 4/5] rebased master --- go-tipb/executor.pb.go | 461 +++++++++-------------------------------- 1 file changed, 100 insertions(+), 361 deletions(-) diff --git a/go-tipb/executor.pb.go b/go-tipb/executor.pb.go index bc6d759cb..b7d6ab499 100644 --- a/go-tipb/executor.pb.go +++ b/go-tipb/executor.pb.go @@ -4874,365 +4874,104 @@ var ( func init() { proto.RegisterFile("executor.proto", fileDescriptorExecutor) } var fileDescriptorExecutor = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 1523 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0xdb, 0xc6, - 0x12, 0x37, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0xef, 0x73, 0x02, 0x26, 0x78, 0xcf, 0x56, 0x84, - 0x04, 0xcf, 0x4f, 0xc8, 0x73, 0x9c, 0xa4, 0x05, 0x7a, 0x69, 0x91, 0x38, 0x4d, 0x5a, 0xd5, 0xa9, - 0x6b, 0xd0, 0x46, 0xaf, 0x04, 0x45, 0xae, 0xa9, 0xb5, 0xa5, 0x5d, 0x66, 0x49, 0x36, 0xd2, 0xad, - 0x97, 0xde, 0x0b, 0xf4, 0xd2, 0x4f, 0xd1, 0x5b, 0xcf, 0xbd, 0x15, 0x39, 0xf6, 0x5a, 0xa0, 0x28, - 0x8a, 0xf4, 0xd6, 0x4f, 0x51, 0xec, 0x1f, 0x52, 0x94, 0x65, 0xbb, 0x39, 0x91, 0xfb, 0x9b, 0xdf, - 0xcc, 0xce, 0xcc, 0xce, 0xec, 0x0e, 0x74, 0xf0, 0x0c, 0x07, 0x59, 0xca, 0xf8, 0x6e, 0xcc, 0x59, - 0xca, 0x90, 0x99, 0x92, 0x78, 0x74, 0xdb, 0xc6, 0xb3, 0x98, 0xe3, 0x24, 0x21, 0x8c, 0x2a, 0xfc, - 0x76, 0x3b, 0x09, 0xc6, 0x78, 0xea, 0xeb, 0xd5, 0x66, 0xc4, 0x22, 0x26, 0x7f, 0x1f, 0x88, 0x3f, - 0x85, 0xf6, 0x7f, 0x36, 0xc1, 0x7a, 0xae, 0xcd, 0xa1, 0xbb, 0x50, 0x49, 0x63, 0xc7, 0xe8, 0x19, - 0x3b, 0x9d, 0x47, 0x9d, 0x5d, 0x61, 0x75, 0x57, 0xc8, 0x4e, 0xe6, 0x31, 0xde, 0x37, 0xdf, 0xfc, - 0xbe, 0xbd, 0xe6, 0x56, 0xd2, 0x18, 0x0d, 0xc0, 0x4a, 0x47, 0x13, 0x2f, 0x09, 0x7c, 0xea, 0x54, - 0x7a, 0xc6, 0x4e, 0xeb, 0x51, 0x57, 0x71, 0x4f, 0xfc, 0xd1, 0x04, 0x1f, 0x07, 0x3e, 0x75, 0x1b, - 0xe9, 0x68, 0x22, 0x7e, 0x04, 0x97, 0x84, 0x33, 0xc5, 0xad, 0x96, 0xb9, 0x43, 0x1a, 0xe2, 0x99, - 0xe2, 0x92, 0x50, 0xfe, 0xa0, 0xff, 0x43, 0x33, 0xc1, 0x13, 0x1c, 0xa4, 0x84, 0x51, 0xc7, 0x2c, - 0x93, 0x8f, 0x73, 0xd8, 0x5d, 0x30, 0xd0, 0x63, 0x68, 0xf9, 0x51, 0xc4, 0x71, 0xe4, 0x4b, 0x85, - 0x9a, 0x54, 0xd8, 0x50, 0x0a, 0x4f, 0x17, 0x02, 0xb7, 0xcc, 0x42, 0x5b, 0x60, 0xa6, 0x2c, 0x3e, - 0x74, 0xea, 0x92, 0x0d, 0xda, 0x6f, 0x16, 0x1f, 0xba, 0x12, 0x47, 0x77, 0xa0, 0x36, 0x21, 0x53, - 0x92, 0x3a, 0x0d, 0x49, 0x68, 0x29, 0xc2, 0x4b, 0x01, 0xb9, 0x4a, 0x82, 0x9e, 0xc1, 0x06, 0x9e, - 0x05, 0x63, 0x9f, 0x46, 0xd8, 0xe3, 0x38, 0xc0, 0xe4, 0x2b, 0xcc, 0x1d, 0x4b, 0xd2, 0x6f, 0xe6, - 0x39, 0x53, 0x62, 0x57, 0x4b, 0x5d, 0x1b, 0x5f, 0x40, 0x84, 0x1f, 0x67, 0x8c, 0x50, 0xa7, 0x59, - 0xf6, 0xe3, 0x33, 0x46, 0xa8, 0x2b, 0x71, 0xb4, 0x0d, 0xad, 0xfc, 0x90, 0x3d, 0x12, 0x3a, 0xd0, - 0x33, 0x76, 0x9a, 0x2e, 0xe4, 0xd0, 0x30, 0x14, 0x06, 0xce, 0xc9, 0x64, 0xe2, 0xb4, 0xca, 0x06, - 0x0e, 0xc8, 0x64, 0xe2, 0x4a, 0x1c, 0x7d, 0x08, 0xdd, 0xc2, 0xcb, 0x04, 0xd3, 0x10, 0x73, 0xa7, - 0x2d, 0xa9, 0x9b, 0xcb, 0x3e, 0x1e, 0x4b, 0x99, 0xdb, 0xc1, 0x4b, 0x6b, 0xb4, 0x07, 0x70, 0xc4, - 0xd9, 0x99, 0x3e, 0x8c, 0x75, 0xa9, 0x69, 0x2b, 0xcd, 0x05, 0xee, 0x96, 0x38, 0xfd, 0x9f, 0x0c, - 0xe8, 0x2c, 0x1b, 0x45, 0x3b, 0xa5, 0x72, 0x42, 0xcb, 0xdb, 0xae, 0x94, 0xd4, 0x06, 0xa6, 0x01, - 0x0b, 0x71, 0xe8, 0xa5, 0x7e, 0x72, 0xee, 0x4d, 0x71, 0xea, 0x3b, 0x95, 0x5e, 0x75, 0xa7, 0xed, - 0x76, 0xb5, 0xe0, 0xc4, 0x4f, 0xce, 0x3f, 0xc7, 0xa9, 0x8f, 0x1e, 0x42, 0x27, 0xf6, 0x79, 0x4a, - 0xc4, 0xae, 0xde, 0x39, 0x9e, 0x27, 0x4e, 0xb5, 0x57, 0x5d, 0xe4, 0xe0, 0xf9, 0x2c, 0xe6, 0xee, - 0x7a, 0xc1, 0x38, 0xc0, 0xf3, 0x04, 0xdd, 0x85, 0x5a, 0x30, 0x26, 0x93, 0x50, 0x57, 0x55, 0xa9, - 0xb4, 0x45, 0x36, 0x5d, 0x25, 0xec, 0xc7, 0x60, 0x5f, 0x3c, 0xb9, 0xcb, 0x1d, 0x33, 0x2e, 0x77, - 0x6c, 0x0f, 0x5a, 0xa7, 0x04, 0x4f, 0x42, 0x2f, 0x9d, 0xc7, 0x38, 0x91, 0xee, 0x17, 0x15, 0xfc, - 0x42, 0x08, 0x44, 0xd0, 0x2e, 0x9c, 0xe6, 0xbf, 0x49, 0xff, 0xdb, 0x0a, 0x34, 0x8b, 0xa6, 0x41, - 0xdb, 0x60, 0xa5, 0x62, 0x21, 0x0e, 0x5c, 0x24, 0xad, 0xaa, 0x13, 0xd4, 0x90, 0xe8, 0x30, 0x44, - 0x03, 0x68, 0x04, 0x6c, 0x92, 0x4d, 0x69, 0x6e, 0x5c, 0x9f, 0xc8, 0x33, 0x09, 0x0e, 0xe9, 0x29, - 0x73, 0x73, 0x02, 0x72, 0xc0, 0x0c, 0x71, 0x12, 0xc8, 0xa6, 0xb3, 0xb4, 0x21, 0x89, 0xa0, 0xfb, - 0x80, 0x62, 0x4e, 0xa6, 0x3e, 0x9f, 0x7b, 0x8a, 0xec, 0x91, 0x30, 0x71, 0xcc, 0x5e, 0x75, 0xa7, - 0xea, 0xda, 0x5a, 0xa2, 0x2d, 0x86, 0x09, 0x7a, 0x02, 0x36, 0xc5, 0xb3, 0xd4, 0xe3, 0xd8, 0x0f, - 0x3d, 0x4c, 0x23, 0x42, 0xb1, 0x6c, 0xb5, 0x4e, 0xbe, 0xf9, 0x73, 0x89, 0x95, 0xce, 0xb3, 0x23, - 0xf8, 0x2e, 0xf6, 0x43, 0x25, 0x41, 0xf7, 0xa1, 0xce, 0x45, 0x4e, 0x13, 0xa7, 0x2e, 0x9d, 0xd6, - 0xd9, 0x3f, 0xc0, 0x73, 0x57, 0xc0, 0x5a, 0x4b, 0x73, 0xfa, 0x3f, 0x9a, 0x60, 0x8a, 0x3e, 0x40, - 0x0f, 0xa1, 0x29, 0x3a, 0x41, 0x26, 0x73, 0xf9, 0x4a, 0x12, 0xe2, 0xd2, 0x7e, 0xd6, 0x99, 0x5e, - 0xa3, 0x8f, 0xa0, 0x23, 0x55, 0x44, 0x9b, 0x28, 0xbd, 0x4a, 0xb9, 0xf6, 0x84, 0xde, 0x85, 0xeb, - 0xac, 0x7d, 0x56, 0xc2, 0xc4, 0x65, 0x25, 0x2b, 0x81, 0x63, 0xaa, 0x6b, 0xea, 0x62, 0xa5, 0x14, - 0x72, 0x74, 0x07, 0x9a, 0x84, 0x52, 0x2c, 0xba, 0x73, 0x26, 0xcb, 0x2a, 0x3f, 0x2d, 0x4b, 0xc2, - 0xc3, 0x70, 0x86, 0xf6, 0xa0, 0x33, 0xc1, 0xa7, 0xa9, 0x27, 0x7d, 0x92, 0x85, 0x5a, 0x5b, 0x29, - 0xd4, 0xb6, 0x60, 0x08, 0xc7, 0x64, 0x9d, 0x3e, 0x82, 0x2e, 0x27, 0xd1, 0xb8, 0xac, 0x52, 0x5f, - 0xad, 0x6d, 0x49, 0x29, 0x74, 0xf6, 0xa0, 0x15, 0x73, 0x36, 0xc2, 0xba, 0xea, 0x1a, 0x57, 0x54, - 0x9d, 0xe4, 0xc8, 0xaa, 0x13, 0x1a, 0xa3, 0x8c, 0x14, 0x75, 0x6a, 0x5d, 0xa1, 0x21, 0x39, 0x4a, - 0xe3, 0x31, 0x74, 0x65, 0x24, 0x01, 0xa3, 0xa1, 0xec, 0xaa, 0xc4, 0x69, 0xae, 0xf8, 0x25, 0x83, - 0x7d, 0x56, 0x30, 0xd0, 0xfb, 0x60, 0xab, 0x60, 0x4a, 0x5a, 0xb0, 0xa2, 0xa5, 0x02, 0x5e, 0x56, - 0x63, 0xe9, 0x18, 0xf3, 0xb2, 0x5a, 0x6b, 0x55, 0x4d, 0x72, 0x16, 0x6a, 0xfd, 0x5f, 0x0d, 0x68, - 0x16, 0x6f, 0xca, 0x3f, 0xb7, 0xd2, 0x36, 0x58, 0x44, 0xb0, 0x05, 0xa1, 0x52, 0x26, 0x48, 0x74, - 0xb9, 0xd7, 0xaa, 0xef, 0xda, 0x6b, 0xe6, 0x4a, 0xaf, 0xdd, 0x84, 0x7a, 0x46, 0xc9, 0xab, 0x4c, - 0xf5, 0x8c, 0xe5, 0xea, 0xd5, 0x15, 0x3d, 0x58, 0xbf, 0xbc, 0x07, 0xfb, 0xdf, 0x19, 0xd0, 0x2c, - 0x9e, 0x40, 0x34, 0x00, 0x28, 0xa5, 0xc6, 0x58, 0x49, 0x4d, 0x49, 0x8a, 0xde, 0x83, 0x0e, 0x8f, - 0x69, 0x39, 0x95, 0xea, 0xe2, 0x58, 0x57, 0x7c, 0x37, 0xa6, 0xba, 0xa4, 0x62, 0x5a, 0x3a, 0x82, - 0xe2, 0xba, 0xac, 0x5e, 0x77, 0x5d, 0x7e, 0x6d, 0x94, 0xdf, 0x08, 0xd4, 0x83, 0x9a, 0x18, 0x40, - 0x2e, 0xf3, 0x48, 0x09, 0xd0, 0x00, 0x9a, 0xc2, 0x19, 0xc5, 0xba, 0xd4, 0x0f, 0x8b, 0xab, 0x9f, - 0x77, 0x75, 0xe1, 0x9b, 0x0a, 0xb4, 0x4a, 0x4f, 0x3d, 0xba, 0x07, 0x56, 0xc4, 0x59, 0x16, 0x7b, - 0xa3, 0xf9, 0x25, 0x6e, 0x34, 0xa4, 0x6c, 0x7f, 0x2e, 0x68, 0x7e, 0x14, 0x79, 0xa7, 0x19, 0x0d, - 0xb4, 0x1f, 0x4b, 0x34, 0x3f, 0x8a, 0x5e, 0x64, 0x34, 0x40, 0x3d, 0xb0, 0x92, 0x94, 0x63, 0x7f, - 0x8a, 0xc3, 0xa5, 0x6b, 0xb4, 0x40, 0xd1, 0x03, 0x68, 0x8b, 0x88, 0x8a, 0x3d, 0xcd, 0xcb, 0x82, - 0x02, 0x1e, 0xd3, 0x4f, 0xf4, 0xce, 0x5a, 0xa1, 0xd8, 0xbd, 0x76, 0x95, 0xc2, 0x53, 0xed, 0x43, - 0x91, 0x87, 0xfa, 0x75, 0x79, 0x78, 0x05, 0xa6, 0x98, 0x61, 0xd0, 0x7f, 0xc1, 0x62, 0x3c, 0xc4, - 0x7c, 0x11, 0x7f, 0x5b, 0x29, 0xec, 0xcf, 0x87, 0x29, 0x9e, 0xba, 0x0d, 0x29, 0xdd, 0x9f, 0xa3, - 0xdb, 0xf9, 0x98, 0x23, 0x6a, 0xdf, 0xd4, 0x71, 0xe9, 0xf9, 0xe6, 0xdd, 0x52, 0x3f, 0x84, 0x9a, - 0x9c, 0x8a, 0x16, 0xa6, 0x8c, 0x6b, 0x4c, 0x55, 0xae, 0x33, 0xf5, 0x04, 0x4c, 0x31, 0xb8, 0xa0, - 0x7f, 0x43, 0x3d, 0x60, 0x94, 0x0e, 0x3f, 0x5e, 0x32, 0xa5, 0x31, 0xb1, 0xcf, 0xab, 0x0c, 0xf3, - 0xb9, 0xb4, 0x95, 0x1f, 0x85, 0x82, 0xfa, 0xbf, 0x19, 0xe0, 0xe4, 0x56, 0xd5, 0x97, 0x30, 0x7a, - 0x9c, 0x4d, 0x45, 0x1b, 0x89, 0x27, 0x3c, 0x25, 0x53, 0xec, 0xc5, 0x9c, 0x05, 0x38, 0x49, 0x70, - 0xe8, 0xc9, 0xb6, 0x31, 0x76, 0x4c, 0xb7, 0x2b, 0x04, 0x47, 0x39, 0x7e, 0x28, 0x4a, 0x74, 0x83, - 0x66, 0x53, 0x41, 0x0d, 0xb3, 0x00, 0x87, 0x1e, 0x67, 0xaf, 0x13, 0x95, 0x23, 0xb7, 0x4b, 0xb3, - 0xe9, 0x91, 0xc6, 0x5d, 0xf6, 0x3a, 0x41, 0xf7, 0xa0, 0x23, 0xb8, 0x24, 0xc5, 0xdc, 0x57, 0xbd, - 0x55, 0x95, 0xc4, 0x75, 0x9a, 0x4d, 0x87, 0x05, 0x78, 0x71, 0x92, 0x33, 0x57, 0x26, 0xb9, 0x1e, - 0xb4, 0x02, 0x46, 0x83, 0x8c, 0x73, 0x4c, 0x83, 0xb9, 0xbc, 0x28, 0x4c, 0xb7, 0x0c, 0x0d, 0xfe, - 0x32, 0xd4, 0x8c, 0x2e, 0x1f, 0xa9, 0x0d, 0x58, 0x17, 0xdf, 0x62, 0x6c, 0xb0, 0xd7, 0x72, 0xa8, - 0xb8, 0xfe, 0x6c, 0x23, 0x87, 0x8a, 0x5b, 0xc3, 0xae, 0xa0, 0x7f, 0x41, 0x57, 0x40, 0xa5, 0x7e, - 0xb1, 0xab, 0xa8, 0x0d, 0x96, 0xb4, 0xc6, 0xe2, 0x43, 0xdb, 0x44, 0xeb, 0xd0, 0x14, 0x2b, 0x79, - 0xb0, 0x76, 0xad, 0x30, 0x22, 0xcb, 0xfd, 0x69, 0x14, 0xd9, 0xf5, 0x9c, 0x2f, 0x5e, 0x1f, 0xbb, - 0x91, 0xaf, 0xc4, 0xe9, 0xd9, 0x16, 0xba, 0x09, 0x48, 0xac, 0x96, 0x87, 0x40, 0xbb, 0x89, 0x1c, - 0xd8, 0x2c, 0xe3, 0xf9, 0x6c, 0x65, 0x03, 0x42, 0xd0, 0x11, 0x92, 0xc5, 0x2d, 0x62, 0xb7, 0x06, - 0x1f, 0x40, 0xbb, 0x3c, 0x24, 0xa2, 0x2e, 0xb4, 0x8e, 0xfc, 0x24, 0x39, 0x19, 0x73, 0x96, 0x45, - 0x63, 0x7b, 0x4d, 0x38, 0xb9, 0xcf, 0x99, 0x1f, 0x06, 0x7e, 0x92, 0xda, 0x06, 0xb2, 0xc0, 0xfc, - 0xd4, 0x4f, 0xc6, 0x76, 0x65, 0xb0, 0x0b, 0xb0, 0x18, 0x46, 0x50, 0x13, 0x6a, 0x2f, 0x59, 0xe0, - 0x4f, 0xec, 0x35, 0x41, 0x39, 0x21, 0x07, 0x5f, 0xda, 0x06, 0x6a, 0x41, 0xe3, 0x84, 0xbc, 0x98, - 0x28, 0xfe, 0x0f, 0x06, 0x58, 0xf9, 0x2c, 0xb1, 0xc8, 0x21, 0xc5, 0x5c, 0x46, 0xb7, 0x86, 0x6e, - 0xc0, 0x86, 0xcc, 0x06, 0x3e, 0x4d, 0xbf, 0xc8, 0x52, 0x0d, 0x1b, 0x79, 0x98, 0xae, 0x78, 0xb7, - 0x16, 0x78, 0x05, 0xd9, 0xd0, 0x56, 0x29, 0x9f, 0x12, 0x89, 0x54, 0xd1, 0x26, 0xd8, 0x32, 0xe3, - 0x34, 0x25, 0x05, 0x6a, 0xa2, 0x5b, 0x70, 0x63, 0xc9, 0x6c, 0x21, 0xaa, 0xa1, 0xff, 0xc0, 0xad, - 0x5c, 0x61, 0x55, 0x5c, 0x1f, 0xf4, 0xa0, 0x5d, 0x9e, 0x61, 0xf2, 0x1d, 0x45, 0xf8, 0xca, 0xe5, - 0xfd, 0xff, 0xbd, 0x79, 0xbb, 0x65, 0xfc, 0xf2, 0x76, 0xcb, 0xf8, 0xe3, 0xed, 0x96, 0xf1, 0xfd, - 0x9f, 0x5b, 0x6b, 0x70, 0x23, 0x60, 0xd3, 0xdd, 0x98, 0xd0, 0x28, 0xf0, 0xe3, 0xdd, 0x94, 0x84, - 0x23, 0xd9, 0x83, 0x47, 0xc6, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x00, 0xad, 0xc6, 0x45, - 0x0e, 0x00, 0x00, -======= - // 1498 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x6e, 0xdb, 0x46, - 0x13, 0x37, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0xef, 0xe7, 0x04, 0x4c, 0xf0, 0xd5, 0x56, 0x84, - 0x04, 0x75, 0x85, 0xd4, 0xf9, 0xd7, 0x02, 0xbd, 0xb4, 0x48, 0x9c, 0x26, 0xad, 0xea, 0xd4, 0x35, - 0x68, 0xa3, 0x57, 0x82, 0x22, 0xd7, 0xd4, 0xda, 0xe4, 0x2e, 0xb3, 0x24, 0x1b, 0xe9, 0xd6, 0x47, - 0x28, 0xd0, 0x1e, 0x7a, 0xed, 0x0b, 0xf4, 0xd6, 0x4b, 0x2f, 0xbd, 0xe6, 0xd8, 0x53, 0x81, 0x5e, - 0x8a, 0x22, 0x7d, 0x91, 0x62, 0x77, 0x49, 0x8a, 0xb2, 0x6c, 0x37, 0x27, 0x72, 0x7f, 0xf3, 0x9b, - 0xd9, 0x99, 0xd9, 0x99, 0xdd, 0x81, 0x1e, 0x9e, 0x61, 0x2f, 0x4b, 0x19, 0xdf, 0x8d, 0x39, 0x4b, - 0x19, 0xd2, 0x53, 0x12, 0x4f, 0x6e, 0x9a, 0x78, 0x16, 0x73, 0x9c, 0x24, 0x84, 0x51, 0x85, 0xdf, - 0xec, 0x26, 0xde, 0x14, 0x47, 0x6e, 0xbe, 0xda, 0x0c, 0x58, 0xc0, 0xe4, 0xef, 0x3d, 0xf1, 0xa7, - 0xd0, 0xe1, 0x0f, 0x3a, 0x18, 0xcf, 0x72, 0x73, 0xe8, 0x36, 0xd4, 0xd2, 0xd8, 0xd2, 0x06, 0xda, - 0x4e, 0xef, 0x61, 0x6f, 0x57, 0x58, 0xdd, 0x15, 0xb2, 0xe3, 0x79, 0x8c, 0xf7, 0xf4, 0xd7, 0x7f, - 0x6d, 0xaf, 0xd9, 0xb5, 0x34, 0x46, 0x23, 0x30, 0xd2, 0x49, 0xe8, 0x24, 0x9e, 0x4b, 0xad, 0xda, - 0x40, 0xdb, 0xe9, 0x3c, 0xec, 0x2b, 0xee, 0xb1, 0x3b, 0x09, 0xf1, 0x91, 0xe7, 0x52, 0xbb, 0x95, - 0x4e, 0x42, 0xf1, 0x23, 0xb8, 0xc4, 0x9f, 0x29, 0x6e, 0xbd, 0xca, 0x1d, 0x53, 0x1f, 0xcf, 0x14, - 0x97, 0xf8, 0xf2, 0x07, 0xbd, 0x0f, 0xed, 0x04, 0x87, 0xd8, 0x4b, 0x09, 0xa3, 0x96, 0x5e, 0x25, - 0x1f, 0x15, 0xb0, 0xbd, 0x60, 0xa0, 0x47, 0xd0, 0x71, 0x83, 0x80, 0xe3, 0xc0, 0x95, 0x0a, 0x0d, - 0xa9, 0xb0, 0xa1, 0x14, 0x9e, 0x2c, 0x04, 0x76, 0x95, 0x85, 0xb6, 0x40, 0x4f, 0x59, 0x7c, 0x60, - 0x35, 0x25, 0x1b, 0x72, 0xbf, 0x59, 0x7c, 0x60, 0x4b, 0x1c, 0xdd, 0x82, 0x46, 0x48, 0x22, 0x92, - 0x5a, 0x2d, 0x49, 0xe8, 0x28, 0xc2, 0x0b, 0x01, 0xd9, 0x4a, 0x82, 0x9e, 0xc2, 0x06, 0x9e, 0x79, - 0x53, 0x97, 0x06, 0xd8, 0xe1, 0xd8, 0xc3, 0xe4, 0x1b, 0xcc, 0x2d, 0x43, 0xd2, 0xaf, 0x17, 0x39, - 0x53, 0x62, 0x3b, 0x97, 0xda, 0x26, 0x3e, 0x87, 0x08, 0x3f, 0x4e, 0x19, 0xa1, 0x56, 0xbb, 0xea, - 0xc7, 0x17, 0x8c, 0x50, 0x5b, 0xe2, 0x68, 0x1b, 0x3a, 0xc5, 0x21, 0x3b, 0xc4, 0xb7, 0x60, 0xa0, - 0xed, 0xb4, 0x6d, 0x28, 0xa0, 0xb1, 0x2f, 0x0c, 0x9c, 0x91, 0x30, 0xb4, 0x3a, 0x55, 0x03, 0xfb, - 0x24, 0x0c, 0x6d, 0x89, 0xa3, 0x8f, 0xa1, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, 0x75, 0x25, - 0x75, 0x73, 0xd9, 0xc7, 0x23, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x4d, 0x83, 0xde, 0x32, - 0x05, 0xed, 0x54, 0x8a, 0x03, 0x2d, 0x1b, 0x59, 0x29, 0x90, 0x0d, 0x4c, 0x3d, 0xe6, 0x63, 0xdf, - 0x49, 0xdd, 0xe4, 0xcc, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xa7, 0x6b, 0xf7, 0x73, 0xc1, - 0xb1, 0x9b, 0x9c, 0x7d, 0x89, 0x53, 0x17, 0x3d, 0x80, 0x5e, 0xec, 0xf2, 0x94, 0x88, 0xd3, 0x71, - 0xce, 0xf0, 0x3c, 0xb1, 0xea, 0x83, 0xfa, 0x22, 0xa2, 0x67, 0xb3, 0x98, 0xdb, 0xeb, 0x25, 0x63, - 0x1f, 0xcf, 0x13, 0x74, 0x1b, 0x1a, 0xde, 0x94, 0x84, 0x7e, 0x5e, 0x23, 0x95, 0x42, 0x15, 0xb9, - 0xb1, 0x95, 0x70, 0x18, 0x83, 0x79, 0xfe, 0x1c, 0x2e, 0x76, 0x4c, 0xbb, 0xd8, 0xb1, 0xfb, 0xd0, - 0x39, 0x21, 0x38, 0xf4, 0x9d, 0x74, 0x1e, 0xe3, 0x44, 0xba, 0x5f, 0xd6, 0xe3, 0x73, 0x21, 0x10, - 0x41, 0xdb, 0x70, 0x52, 0xfc, 0x26, 0xc3, 0xef, 0x6a, 0xd0, 0x2e, 0x5b, 0x00, 0x6d, 0x83, 0x91, - 0x8a, 0x85, 0x38, 0x3e, 0x91, 0xb4, 0x7a, 0x9e, 0xa0, 0x96, 0x44, 0xc7, 0x3e, 0x1a, 0x41, 0xcb, - 0x63, 0x61, 0x16, 0xd1, 0xc2, 0xb8, 0xa9, 0x8c, 0x3f, 0x95, 0xe0, 0x98, 0x9e, 0x30, 0xbb, 0x20, - 0x20, 0x0b, 0x74, 0x1f, 0x27, 0x9e, 0x6c, 0x21, 0x23, 0x37, 0x24, 0x11, 0x74, 0x17, 0x50, 0xcc, - 0x49, 0xe4, 0xf2, 0xb9, 0xa3, 0xc8, 0x0e, 0xf1, 0x13, 0x4b, 0x1f, 0xd4, 0x77, 0xea, 0xb6, 0x99, - 0x4b, 0x72, 0x8b, 0x7e, 0x82, 0x1e, 0x83, 0x49, 0xf1, 0x2c, 0x75, 0x38, 0x76, 0x7d, 0x07, 0xd3, - 0x80, 0x50, 0x2c, 0x1b, 0xa7, 0x57, 0x6c, 0xfe, 0x4c, 0x62, 0x95, 0xf3, 0xec, 0x09, 0xbe, 0x8d, - 0x5d, 0x5f, 0x49, 0xd0, 0x5d, 0x68, 0x72, 0x91, 0xd3, 0xc4, 0x6a, 0x4a, 0xa7, 0xf3, 0xec, 0xef, - 0xe3, 0xb9, 0x2d, 0xe0, 0x5c, 0x2b, 0xe7, 0x0c, 0x7f, 0xd1, 0x41, 0x17, 0x55, 0x8d, 0x1e, 0x40, - 0x5b, 0xd4, 0xb5, 0x4c, 0xe6, 0xf2, 0x05, 0x23, 0xc4, 0x95, 0xfd, 0x8c, 0xd3, 0x7c, 0x8d, 0x3e, - 0x81, 0x9e, 0x54, 0x11, 0x45, 0xaf, 0xf4, 0x6a, 0xd5, 0xda, 0x13, 0x7a, 0xe7, 0x2e, 0xa7, 0xee, - 0x69, 0x05, 0x13, 0x57, 0x8f, 0xac, 0x04, 0x8e, 0x69, 0x5e, 0x53, 0xe7, 0x2b, 0xa5, 0x94, 0xa3, - 0x5b, 0xd0, 0x26, 0x94, 0x62, 0xd1, 0x6b, 0x33, 0x59, 0x56, 0xc5, 0x69, 0x19, 0x12, 0x1e, 0xfb, - 0x33, 0x74, 0x1f, 0x7a, 0x21, 0x3e, 0x49, 0x1d, 0xe9, 0x93, 0x2c, 0xd4, 0xc6, 0x4a, 0xa1, 0x76, - 0x05, 0x43, 0x38, 0x26, 0xeb, 0xf4, 0x21, 0xf4, 0x39, 0x09, 0xa6, 0x55, 0x95, 0xe6, 0x6a, 0x6d, - 0x4b, 0x4a, 0xa9, 0x73, 0x1f, 0x3a, 0x31, 0x67, 0x13, 0x9c, 0x57, 0x5d, 0xeb, 0x92, 0xaa, 0x93, - 0x1c, 0x59, 0x75, 0x42, 0x63, 0x92, 0x91, 0xb2, 0x4e, 0x8d, 0x4b, 0x34, 0x24, 0x47, 0x69, 0x3c, - 0x82, 0xbe, 0x8c, 0xc4, 0x63, 0xd4, 0x97, 0x5d, 0x95, 0x58, 0xed, 0x15, 0xbf, 0x64, 0xb0, 0x4f, - 0x4b, 0x06, 0xfa, 0x10, 0x4c, 0x15, 0x4c, 0x45, 0x0b, 0x56, 0xb4, 0x54, 0xc0, 0xcb, 0x6a, 0x2c, - 0x9d, 0x62, 0x5e, 0x55, 0xeb, 0xac, 0xaa, 0x49, 0xce, 0x42, 0x6d, 0xf8, 0xa7, 0x06, 0xed, 0xf2, - 0x85, 0xf8, 0xef, 0x56, 0xda, 0x06, 0x83, 0x08, 0xb6, 0x20, 0xd4, 0xaa, 0x04, 0x89, 0x2e, 0xf7, - 0x5a, 0xfd, 0x6d, 0x7b, 0x4d, 0x5f, 0xe9, 0xb5, 0xeb, 0xd0, 0xcc, 0x28, 0x79, 0x99, 0xa9, 0x9e, - 0x31, 0xec, 0x7c, 0x75, 0x49, 0x0f, 0x36, 0x2f, 0xee, 0xc1, 0xe1, 0xf7, 0x1a, 0xb4, 0xcb, 0x07, - 0x0d, 0x8d, 0x00, 0x2a, 0xa9, 0xd1, 0x56, 0x52, 0x53, 0x91, 0xa2, 0x0f, 0xa0, 0xc7, 0x63, 0x5a, - 0x4d, 0xa5, 0xba, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x5e, 0x52, 0x31, 0xad, 0x1c, 0x41, 0x79, - 0x5d, 0xd6, 0xaf, 0xba, 0x2e, 0xbf, 0xd5, 0x00, 0x0e, 0x39, 0x3b, 0xcd, 0xdd, 0x1a, 0x40, 0x43, - 0x8c, 0x13, 0x17, 0x79, 0xa4, 0x04, 0x68, 0x04, 0x6d, 0xe1, 0x8c, 0x62, 0x5d, 0xe8, 0x87, 0xc1, - 0xd5, 0xcf, 0xdb, 0xba, 0xf0, 0x53, 0x0d, 0x3a, 0x95, 0x87, 0x1b, 0xdd, 0x01, 0x23, 0xe0, 0x2c, - 0x8b, 0x9d, 0xc9, 0xfc, 0x02, 0x37, 0x5a, 0x52, 0xb6, 0x37, 0x17, 0x34, 0x37, 0x08, 0x9c, 0x93, - 0x8c, 0x7a, 0xb9, 0x1f, 0x4b, 0x34, 0x37, 0x08, 0x9e, 0x67, 0xd4, 0x43, 0x03, 0x30, 0x92, 0x94, - 0x63, 0x37, 0xc2, 0xfe, 0xd2, 0x35, 0x5a, 0xa2, 0xe8, 0x1e, 0x74, 0x45, 0x44, 0xe5, 0x9e, 0xfa, - 0x45, 0x41, 0x01, 0x8f, 0xe9, 0x67, 0xf9, 0xce, 0xb9, 0x42, 0xb9, 0x7b, 0xe3, 0x32, 0x85, 0x27, - 0xb9, 0x0f, 0x65, 0x1e, 0x9a, 0x57, 0xe4, 0x01, 0xdd, 0x84, 0xc6, 0x09, 0xa1, 0x6e, 0x28, 0x67, - 0x90, 0xc2, 0x4d, 0x05, 0x0d, 0x5f, 0x82, 0x2e, 0xa6, 0x15, 0xf4, 0x2e, 0x18, 0x8c, 0xfb, 0x98, - 0x2f, 0x72, 0xd3, 0x55, 0xc6, 0xf6, 0xe6, 0xe3, 0x14, 0x47, 0x76, 0x4b, 0x4a, 0xf7, 0xe6, 0xc2, - 0x98, 0x1a, 0x68, 0x44, 0x5f, 0xe8, 0x85, 0x31, 0x35, 0xc9, 0xbc, 0xdd, 0xb1, 0x8c, 0xa1, 0x21, - 0xe7, 0x9f, 0x85, 0x29, 0xed, 0x0a, 0x53, 0xb5, 0xab, 0x4c, 0x3d, 0x06, 0x5d, 0x8c, 0x28, 0xe8, - 0xff, 0xd0, 0xf4, 0x18, 0xa5, 0xe3, 0x4f, 0x97, 0x4c, 0xe5, 0x98, 0xd8, 0xe7, 0x65, 0x86, 0xf9, - 0x5c, 0xda, 0x2a, 0xe3, 0x97, 0xd0, 0xf0, 0x57, 0x0d, 0xac, 0xc2, 0xaa, 0xfa, 0x12, 0x46, 0x8f, - 0xb2, 0x48, 0xb4, 0x98, 0x78, 0xde, 0x53, 0x12, 0x61, 0x27, 0xe6, 0xcc, 0xc3, 0x49, 0x82, 0x7d, - 0x47, 0xb6, 0x94, 0xb6, 0xa3, 0xdb, 0x7d, 0x21, 0x38, 0x2c, 0xf0, 0x03, 0x51, 0xbe, 0x1b, 0x34, - 0x8b, 0x04, 0xd5, 0xcf, 0x3c, 0xec, 0x3b, 0x9c, 0xbd, 0x4a, 0x54, 0x8e, 0xec, 0x3e, 0xcd, 0xa2, - 0xc3, 0x1c, 0xb7, 0xd9, 0xab, 0x04, 0xdd, 0x81, 0x9e, 0xe0, 0x92, 0x14, 0x73, 0x57, 0xf5, 0x5d, - 0x5d, 0x12, 0xd7, 0x69, 0x16, 0x8d, 0x4b, 0xf0, 0xfc, 0xcc, 0xa6, 0x9f, 0x9f, 0xd9, 0x46, 0x7f, - 0x68, 0x6a, 0xd6, 0x96, 0xcf, 0xd3, 0x06, 0xac, 0x8b, 0x6f, 0x39, 0x30, 0x98, 0x6b, 0x05, 0x54, - 0x5e, 0x7c, 0xa6, 0x56, 0x40, 0xe5, 0x7d, 0x61, 0xd6, 0xd0, 0xff, 0xa0, 0x2f, 0xa0, 0x4a, 0xa7, - 0x98, 0x75, 0xd4, 0x05, 0x43, 0x5a, 0x63, 0xf1, 0x81, 0xa9, 0xa3, 0x75, 0x68, 0x8b, 0x95, 0x3c, - 0x36, 0xb3, 0x51, 0x1a, 0x91, 0x85, 0xfe, 0x24, 0x08, 0xcc, 0x66, 0xc1, 0x17, 0xef, 0x8e, 0xd9, - 0x2a, 0x56, 0xe2, 0x6c, 0x4c, 0x03, 0x5d, 0x07, 0x24, 0x56, 0xcb, 0xe3, 0x9f, 0xd9, 0x46, 0x16, - 0x6c, 0x56, 0xf1, 0x62, 0xaa, 0x32, 0x61, 0xf4, 0x11, 0x74, 0xab, 0xa3, 0x20, 0xea, 0x43, 0xe7, - 0xd0, 0x4d, 0x92, 0xe3, 0x29, 0x67, 0x59, 0x30, 0x35, 0xd7, 0x84, 0x43, 0x7b, 0x9c, 0xb9, 0xbe, - 0xe7, 0x26, 0xa9, 0xa9, 0x21, 0x03, 0xf4, 0xcf, 0xdd, 0x64, 0x6a, 0xd6, 0x46, 0xbb, 0x00, 0x8b, - 0x91, 0x03, 0xb5, 0xa1, 0xf1, 0x82, 0x79, 0x6e, 0x68, 0xae, 0x09, 0xca, 0x31, 0xd9, 0xff, 0xda, - 0xd4, 0x50, 0x07, 0x5a, 0xc7, 0xe4, 0x79, 0xa8, 0xf8, 0x3f, 0x6b, 0x60, 0x14, 0x13, 0xc3, 0x22, - 0x5f, 0x14, 0x73, 0x19, 0xc9, 0x1a, 0xba, 0x06, 0x1b, 0x32, 0x72, 0x7c, 0x92, 0x7e, 0x95, 0xa5, - 0x39, 0xac, 0x15, 0x21, 0xd9, 0xe2, 0x75, 0x5a, 0xe0, 0x35, 0x64, 0x42, 0x57, 0xa5, 0x37, 0x22, - 0x12, 0xa9, 0xa3, 0x4d, 0x30, 0x65, 0x76, 0x69, 0x4a, 0x4a, 0x54, 0x47, 0x37, 0xe0, 0xda, 0x92, - 0xd9, 0x52, 0xd4, 0x40, 0xef, 0xc0, 0x8d, 0x42, 0x61, 0x55, 0xdc, 0x1c, 0x0d, 0xa0, 0x5b, 0x9d, - 0x54, 0x8a, 0x1d, 0x45, 0xf8, 0xca, 0xe5, 0xbd, 0xf7, 0x5e, 0xbf, 0xd9, 0xd2, 0x7e, 0x7f, 0xb3, - 0xa5, 0xfd, 0xfd, 0x66, 0x4b, 0xfb, 0xf1, 0x9f, 0xad, 0x35, 0xb8, 0xe6, 0xb1, 0x68, 0x37, 0x26, - 0x34, 0xf0, 0xdc, 0x78, 0x37, 0x25, 0xfe, 0x44, 0x76, 0xd3, 0xa1, 0xf6, 0x6f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x77, 0xed, 0x17, 0x15, 0xf9, 0x0d, 0x00, 0x00, ->>>>>>> add final agg label -======= - // 1556 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0xc8, - 0x15, 0x36, 0x25, 0x4a, 0xa2, 0x9e, 0x64, 0x89, 0x9e, 0xda, 0x01, 0x13, 0xb4, 0xb6, 0x22, 0x24, - 0xa8, 0x2b, 0xa4, 0x4e, 0xe2, 0xb4, 0x40, 0x2f, 0x2d, 0x12, 0x3b, 0x71, 0xab, 0x3a, 0x71, 0x0d, - 0xda, 0xe8, 0x95, 0xa0, 0xc8, 0x31, 0x35, 0x36, 0x39, 0xc3, 0x0c, 0xc9, 0x46, 0xba, 0xf5, 0x27, - 0x14, 0x68, 0x0f, 0xfd, 0x15, 0x7b, 0xdb, 0x3d, 0xec, 0x65, 0xaf, 0x39, 0xee, 0x69, 0x81, 0xbd, - 0x2c, 0x16, 0xd9, 0x3f, 0xb2, 0x98, 0x19, 0x92, 0xa2, 0x2c, 0xdb, 0x9b, 0x13, 0x39, 0xdf, 0xfb, - 0xde, 0x9b, 0xf7, 0xde, 0xbc, 0x37, 0xf3, 0xa0, 0x87, 0x67, 0xd8, 0xcb, 0x52, 0xc6, 0xf7, 0x62, - 0xce, 0x52, 0x86, 0xf4, 0x94, 0xc4, 0x93, 0x07, 0x26, 0x9e, 0xc5, 0x1c, 0x27, 0x09, 0x61, 0x54, - 0xe1, 0x0f, 0xba, 0x89, 0x37, 0xc5, 0x91, 0x9b, 0xaf, 0x36, 0x03, 0x16, 0x30, 0xf9, 0xfb, 0x54, - 0xfc, 0x29, 0x74, 0xf8, 0x3f, 0x1d, 0x8c, 0x37, 0xb9, 0x39, 0xf4, 0x08, 0x6a, 0x69, 0x6c, 0x69, - 0x03, 0x6d, 0xb7, 0xb7, 0xdf, 0xdb, 0x13, 0x56, 0xf7, 0x84, 0xec, 0x7c, 0x1e, 0xe3, 0x03, 0xfd, - 0xe3, 0x0f, 0x3b, 0x6b, 0x76, 0x2d, 0x8d, 0xd1, 0x08, 0x8c, 0x74, 0x12, 0x3a, 0x89, 0xe7, 0x52, - 0xab, 0x36, 0xd0, 0x76, 0x3b, 0xfb, 0x7d, 0xc5, 0x3d, 0x77, 0x27, 0x21, 0x3e, 0xf3, 0x5c, 0x6a, - 0xb7, 0xd2, 0x49, 0x28, 0x7e, 0x04, 0x97, 0xf8, 0x33, 0xc5, 0xad, 0x57, 0xb9, 0x63, 0xea, 0xe3, - 0x99, 0xe2, 0x12, 0x5f, 0xfe, 0xa0, 0xdf, 0x43, 0x3b, 0xc1, 0x21, 0xf6, 0x52, 0xc2, 0xa8, 0xa5, - 0x57, 0xc9, 0x67, 0x05, 0x6c, 0x2f, 0x18, 0xe8, 0x05, 0x74, 0xdc, 0x20, 0xe0, 0x38, 0x70, 0xa5, - 0x42, 0x43, 0x2a, 0x6c, 0x28, 0x85, 0x57, 0x0b, 0x81, 0x5d, 0x65, 0xa1, 0x6d, 0xd0, 0x53, 0x16, - 0x9f, 0x58, 0x4d, 0xc9, 0x86, 0xdc, 0x6f, 0x16, 0x9f, 0xd8, 0x12, 0x47, 0x0f, 0xa1, 0x11, 0x92, - 0x88, 0xa4, 0x56, 0x4b, 0x12, 0x3a, 0x8a, 0xf0, 0x56, 0x40, 0xb6, 0x92, 0xa0, 0x43, 0xd8, 0xc0, - 0x33, 0x6f, 0xea, 0xd2, 0x00, 0x3b, 0x1c, 0x7b, 0x98, 0xfc, 0x0b, 0x73, 0xcb, 0x90, 0xf4, 0x7b, - 0x45, 0xce, 0x94, 0xd8, 0xce, 0xa5, 0xb6, 0x89, 0xaf, 0x21, 0xc2, 0x8f, 0x4b, 0x46, 0xa8, 0xd5, - 0xae, 0xfa, 0xf1, 0x77, 0x46, 0xa8, 0x2d, 0x71, 0xb4, 0x03, 0x9d, 0xe2, 0x90, 0x1d, 0xe2, 0x5b, - 0x30, 0xd0, 0x76, 0xdb, 0x36, 0x14, 0xd0, 0xd8, 0x17, 0x06, 0xae, 0x48, 0x18, 0x5a, 0x9d, 0xaa, - 0x81, 0x63, 0x12, 0x86, 0xb6, 0xc4, 0xd1, 0x9f, 0xa1, 0x5f, 0x7a, 0x99, 0x60, 0xea, 0x63, 0x6e, - 0x75, 0x25, 0x75, 0x73, 0xd9, 0xc7, 0x33, 0x29, 0xb3, 0x7b, 0x78, 0x69, 0x3d, 0xfc, 0x46, 0x83, - 0xde, 0x32, 0x05, 0xed, 0x56, 0x8a, 0x03, 0x2d, 0x1b, 0x59, 0x29, 0x90, 0x0d, 0x4c, 0x3d, 0xe6, - 0x63, 0xdf, 0x49, 0xdd, 0xe4, 0xca, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xb7, 0x6b, 0xf7, - 0x73, 0xc1, 0xb9, 0x9b, 0x5c, 0xbd, 0xc3, 0xa9, 0x8b, 0x9e, 0x43, 0x2f, 0x76, 0x79, 0x4a, 0xc4, - 0xe9, 0x38, 0x57, 0x78, 0x9e, 0x58, 0xf5, 0x41, 0x7d, 0x11, 0xd1, 0x9b, 0x59, 0xcc, 0xed, 0xf5, - 0x92, 0x71, 0x8c, 0xe7, 0x09, 0x7a, 0x04, 0x0d, 0x6f, 0x4a, 0x42, 0x3f, 0xaf, 0x91, 0x4a, 0xa1, - 0x8a, 0xdc, 0xd8, 0x4a, 0x38, 0x8c, 0xc1, 0xbc, 0x7e, 0x0e, 0x37, 0x3b, 0xa6, 0xdd, 0xec, 0xd8, - 0x33, 0xe8, 0x5c, 0x10, 0x1c, 0xfa, 0x4e, 0x3a, 0x8f, 0x71, 0x22, 0xdd, 0x2f, 0xeb, 0xf1, 0x48, - 0x08, 0x44, 0xd0, 0x36, 0x5c, 0x14, 0xbf, 0xc9, 0xf0, 0x3f, 0x35, 0x68, 0x97, 0x2d, 0x80, 0x76, - 0xc0, 0x48, 0xc5, 0x42, 0x1c, 0x9f, 0x48, 0x5a, 0x3d, 0x4f, 0x50, 0x4b, 0xa2, 0x63, 0x1f, 0x8d, - 0xa0, 0xe5, 0xb1, 0x30, 0x8b, 0x68, 0x61, 0xdc, 0x54, 0xc6, 0x0f, 0x25, 0x38, 0xa6, 0x17, 0xcc, - 0x2e, 0x08, 0xc8, 0x02, 0xdd, 0xc7, 0x89, 0x27, 0x5b, 0xc8, 0xc8, 0x0d, 0x49, 0x04, 0x3d, 0x01, - 0x14, 0x73, 0x12, 0xb9, 0x7c, 0xee, 0x28, 0xb2, 0x43, 0xfc, 0xc4, 0xd2, 0x07, 0xf5, 0xdd, 0xba, -<<<<<<< HEAD - 0x6d, 0xe6, 0x92, 0xdc, 0xa2, 0x9f, 0xa0, 0x57, 0x60, 0x52, 0x3c, 0x4b, 0x1d, 0x8e, 0x5d, 0xdf, - 0xc1, 0x34, 0x20, 0x14, 0xcb, 0xc6, 0xe9, 0x15, 0x9b, 0xbf, 0x95, 0x58, 0xe5, 0x3c, 0x7b, 0x82, - 0x6f, 0x63, 0xd7, 0x57, 0x12, 0xf4, 0x14, 0x9a, 0x5c, 0xe4, 0x34, 0xb1, 0x9a, 0xd2, 0xe9, 0x3c, - 0xfb, 0xc7, 0x78, 0x6e, 0x0b, 0x38, 0xd7, 0xca, 0x39, 0xc3, 0xff, 0xeb, 0xa0, 0x8b, 0xaa, 0x46, - 0x2f, 0xa0, 0x2d, 0xea, 0x5a, 0x26, 0x73, 0xf9, 0x82, 0x11, 0xe2, 0xca, 0x7e, 0xc6, 0x65, 0xbe, - 0x46, 0x7f, 0x84, 0x9e, 0x54, 0x11, 0x45, 0xaf, 0xf4, 0x6a, 0xd5, 0xda, 0x13, 0x7a, 0xd7, 0x2e, - 0xa7, 0xee, 0x65, 0x05, 0x13, 0x57, 0x8f, 0xac, 0x04, 0x8e, 0x69, 0x5e, 0x53, 0xd7, 0x2b, 0xa5, - 0x94, 0xa3, 0x87, 0xd0, 0x26, 0x94, 0x62, 0xd1, 0x6b, 0x33, 0x59, 0x56, 0xc5, 0x69, 0x19, 0x12, - 0x1e, 0xfb, 0x33, 0xf4, 0x1c, 0x7a, 0x21, 0xbe, 0x48, 0x1d, 0xe9, 0x93, 0x2c, 0xd4, 0xc6, 0x4a, - 0xa1, 0x76, 0x05, 0x43, 0x38, 0x26, 0xeb, 0x74, 0x1f, 0xfa, 0x9c, 0x04, 0xd3, 0xaa, 0x4a, 0x73, - 0xb5, 0xb6, 0x25, 0xa5, 0xd4, 0x79, 0x0e, 0x9d, 0x98, 0xb3, 0x09, 0xce, 0xab, 0xae, 0x75, 0x4b, - 0xd5, 0x49, 0x8e, 0xac, 0x3a, 0xa1, 0x31, 0xc9, 0x48, 0x59, 0xa7, 0xc6, 0x2d, 0x1a, 0x92, 0xa3, - 0x34, 0x5e, 0x42, 0x5f, 0x46, 0xe2, 0x31, 0xea, 0xcb, 0xae, 0x4a, 0xac, 0xf6, 0x8a, 0x5f, 0x32, - 0xd8, 0xc3, 0x92, 0x81, 0x7e, 0x07, 0xa6, 0x0a, 0xa6, 0xa2, 0x05, 0x2b, 0x5a, 0x2a, 0xe0, 0x65, - 0x35, 0x96, 0x4e, 0x31, 0xaf, 0xaa, 0x75, 0x56, 0xd5, 0x24, 0x67, 0xa1, 0x36, 0xfc, 0x4e, 0x83, - 0x76, 0xf9, 0x42, 0xfc, 0x7c, 0x2b, 0xed, 0x80, 0x41, 0x04, 0x5b, 0x10, 0x6a, 0x55, 0x82, 0x44, - 0x97, 0x7b, 0xad, 0xfe, 0xa5, 0xbd, 0xa6, 0xaf, 0xf4, 0xda, 0x3d, 0x68, 0x66, 0x94, 0x7c, 0xc8, - 0x54, 0xcf, 0x18, 0x76, 0xbe, 0xba, 0xa5, 0x07, 0x9b, 0x37, 0xf7, 0xe0, 0xf0, 0x5f, 0x1a, 0xb4, - 0xcb, 0x07, 0x0d, 0x8d, 0x00, 0x2a, 0xa9, 0xd1, 0x56, 0x52, 0x53, 0x91, 0xa2, 0xdf, 0x42, 0x8f, - 0xc7, 0xb4, 0x9a, 0x4a, 0x75, 0x71, 0xac, 0x2b, 0xbe, 0x1d, 0xd3, 0xbc, 0xa4, 0x62, 0x5a, 0x39, - 0x82, 0xf2, 0xba, 0xac, 0xdf, 0x75, 0x5d, 0xfe, 0x43, 0x03, 0x38, 0xe5, 0xec, 0x32, 0x77, 0x6b, - 0x00, 0x0d, 0x31, 0x4e, 0xdc, 0xe4, 0x91, 0x12, 0xa0, 0x11, 0xb4, 0x85, 0x33, 0x8a, 0x75, 0xa3, - 0x1f, 0x06, 0x57, 0x3f, 0x5f, 0xea, 0xc2, 0xff, 0x6a, 0xd0, 0xa9, 0x3c, 0xdc, 0xe8, 0x31, 0x18, - 0x01, 0x67, 0x59, 0xec, 0x4c, 0xe6, 0x37, 0xb8, 0xd1, 0x92, 0xb2, 0x83, 0xb9, 0xa0, 0xb9, 0x41, - 0xe0, 0x5c, 0x64, 0xd4, 0xcb, 0xfd, 0x58, 0xa2, 0xb9, 0x41, 0x70, 0x94, 0x51, 0x0f, 0x0d, 0xc0, - 0x48, 0x52, 0x8e, 0xdd, 0x08, 0xfb, 0x4b, 0xd7, 0x68, 0x89, 0xa2, 0x67, 0xd0, 0x15, 0x11, 0x95, - 0x7b, 0xea, 0x37, 0x05, 0x05, 0x3c, 0xa6, 0x7f, 0xca, 0x77, 0xce, 0x15, 0xca, 0xdd, 0x1b, 0xb7, - 0x29, 0xbc, 0xce, 0x7d, 0x28, 0xf3, 0xd0, 0xbc, 0x23, 0x0f, 0xe8, 0x09, 0xe8, 0x11, 0xf3, 0xb1, - 0x1c, 0x41, 0x7a, 0xfb, 0x5b, 0xe5, 0x44, 0x23, 0x4c, 0x88, 0xc4, 0xbc, 0x67, 0x3e, 0xb6, 0x25, - 0x65, 0xf8, 0x01, 0x74, 0x31, 0xbc, 0xa0, 0x5f, 0x83, 0xc1, 0xb8, 0x8f, 0xf9, 0x22, 0x55, 0x5d, - 0xa5, 0x76, 0x30, 0x1f, 0xa7, 0x38, 0xb2, 0x5b, 0x52, 0x7a, 0x30, 0x47, 0x0f, 0x8a, 0xf9, 0x46, - 0xb4, 0x89, 0x9e, 0xa7, 0x20, 0x1f, 0x6c, 0xbe, 0xec, 0x94, 0xc6, 0xd0, 0x90, 0xe3, 0xd0, 0xc2, - 0x94, 0x76, 0x87, 0xa9, 0xda, 0x5d, 0xa6, 0x5e, 0x81, 0x2e, 0x26, 0x16, 0xf4, 0x4b, 0x68, 0x7a, - 0x8c, 0xd2, 0xf1, 0x9b, 0x25, 0x53, 0x39, 0x26, 0xf6, 0xf9, 0x90, 0x61, 0x3e, 0x97, 0xb6, 0x8a, - 0x53, 0x53, 0xd0, 0xf0, 0x2b, 0x0d, 0xac, 0xc2, 0xaa, 0xfa, 0x12, 0x46, 0xcf, 0xb2, 0x48, 0x74, - 0x9c, 0x78, 0xed, 0x53, 0x12, 0x61, 0x27, 0xe6, 0xcc, 0xc3, 0x49, 0x82, 0x7d, 0x47, 0x76, 0x98, - 0xb6, 0xab, 0xdb, 0x7d, 0x21, 0x38, 0x2d, 0xf0, 0x13, 0x51, 0xcd, 0x1b, 0x34, 0x8b, 0x04, 0xd5, - 0xcf, 0x3c, 0xec, 0x3b, 0x9c, 0x7d, 0x4c, 0x54, 0x8e, 0xec, 0x3e, 0xcd, 0xa2, 0xd3, 0x1c, 0xb7, - 0xd9, 0xc7, 0x04, 0x3d, 0x86, 0x9e, 0xe0, 0x92, 0x14, 0x73, 0x57, 0xb5, 0x61, 0x5d, 0x12, 0xd7, - 0x69, 0x16, 0x8d, 0x4b, 0xf0, 0xfa, 0x08, 0xa7, 0x5f, 0x1f, 0xe1, 0x46, 0xdf, 0x6a, 0x6a, 0xf4, - 0x96, 0xaf, 0xd5, 0x06, 0xac, 0x8b, 0x6f, 0x39, 0x3f, 0x98, 0x6b, 0x05, 0x54, 0xde, 0x83, 0xa6, - 0x56, 0x40, 0xe5, 0xf5, 0x61, 0xd6, 0xd0, 0x2f, 0xa0, 0x2f, 0xa0, 0x4a, 0xe3, 0x98, 0x75, 0xd4, - 0x05, 0x43, 0x5a, 0x63, 0xf1, 0x89, 0xa9, 0xa3, 0x75, 0x68, 0x8b, 0x95, 0x3c, 0x36, 0xb3, 0x51, - 0x1a, 0x91, 0x75, 0xff, 0x3a, 0x08, 0xcc, 0x66, 0xc1, 0x17, 0xcf, 0x90, 0xd9, 0x2a, 0x56, 0xe2, - 0x6c, 0x4c, 0x03, 0xdd, 0x03, 0x24, 0x56, 0xcb, 0xd3, 0xa0, 0xd9, 0x46, 0x16, 0x6c, 0x56, 0xf1, - 0x62, 0xc8, 0x32, 0x61, 0xf4, 0x7b, 0xe8, 0x56, 0x27, 0x43, 0xd4, 0x87, 0xce, 0xa9, 0x9b, 0x24, - 0xe7, 0x53, 0xce, 0xb2, 0x60, 0x6a, 0xae, 0x09, 0x87, 0x0e, 0x38, 0x73, 0x7d, 0xcf, 0x4d, 0x52, - 0x53, 0x43, 0x06, 0xe8, 0x7f, 0x76, 0x93, 0xa9, 0x59, 0x1b, 0xed, 0x01, 0x2c, 0x26, 0x10, 0xd4, - 0x86, 0xc6, 0x3b, 0xe6, 0xb9, 0xa1, 0xb9, 0x26, 0x28, 0xe7, 0xe4, 0xf8, 0x6f, 0xa6, 0x86, 0x3a, - 0xd0, 0x3a, 0x27, 0x47, 0xa1, 0xe2, 0xff, 0x57, 0x03, 0xa3, 0x18, 0x20, 0x16, 0xf9, 0xa2, 0x98, - 0xcb, 0x48, 0xd6, 0xd0, 0x16, 0x6c, 0xc8, 0xc8, 0xf1, 0x45, 0xfa, 0xd7, 0x2c, 0xcd, 0x61, 0xad, - 0x08, 0xc9, 0x16, 0x8f, 0xd5, 0x02, 0xaf, 0x21, 0x13, 0xba, 0x2a, 0xbd, 0x11, 0x91, 0x48, 0x1d, - 0x6d, 0x82, 0x29, 0xb3, 0x4b, 0x53, 0x52, 0xa2, 0x3a, 0xba, 0x0f, 0x5b, 0x4b, 0x66, 0x4b, 0x51, - 0x03, 0xfd, 0x0a, 0xee, 0x17, 0x0a, 0xab, 0xe2, 0xe6, 0x68, 0x00, 0xdd, 0xea, 0xe0, 0x52, 0xec, - 0x28, 0xc2, 0x57, 0x2e, 0x8f, 0x30, 0xf4, 0xaf, 0xf5, 0xba, 0x20, 0x1d, 0xb2, 0x28, 0x0e, 0x71, - 0x8a, 0xc5, 0x5a, 0x25, 0xf0, 0x88, 0x50, 0x37, 0x94, 0x4b, 0x4d, 0x10, 0x4e, 0xc5, 0x88, 0xec, - 0x86, 0x2f, 0x24, 0x52, 0xab, 0x20, 0xfb, 0x12, 0xa9, 0x0b, 0x95, 0x37, 0xd8, 0xcf, 0x62, 0xb9, - 0xd4, 0x0f, 0x9e, 0x7c, 0xfa, 0xbc, 0xad, 0x7d, 0xf3, 0x79, 0x5b, 0xfb, 0xe1, 0xf3, 0xb6, 0xf6, - 0x9f, 0x1f, 0xb7, 0xd7, 0x60, 0xcb, 0x63, 0xd1, 0x5e, 0x4c, 0x68, 0xe0, 0xb9, 0xf1, 0x5e, 0x4a, - 0xfc, 0x89, 0x6c, 0xda, 0x53, 0xed, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xab, 0xc5, 0x8d, - 0x6f, 0x0e, 0x00, 0x00, ->>>>>>> add agg mode -======= - 0x6d, 0xe6, 0x92, 0xdc, 0xa2, 0x9f, 0xa0, 0x97, 0x60, 0x52, 0x3c, 0x4b, 0x1d, 0x8e, 0x5d, 0xdf, - 0xc1, 0x34, 0x20, 0x14, 0xcb, 0xc6, 0xe9, 0x15, 0x9b, 0xbf, 0x91, 0x58, 0xe5, 0x3c, 0x7b, 0x82, - 0x6f, 0x63, 0xd7, 0x57, 0x12, 0xf4, 0x04, 0x9a, 0x5c, 0xe4, 0x34, 0xb1, 0x9a, 0xd2, 0xe9, 0x3c, - 0xfb, 0xc7, 0x78, 0x6e, 0x0b, 0x38, 0xd7, 0xca, 0x39, 0xc3, 0x2f, 0x75, 0xd0, 0x45, 0x55, 0xa3, - 0xe7, 0xd0, 0x16, 0x75, 0x2d, 0x93, 0xb9, 0x7c, 0xc1, 0x08, 0x71, 0x65, 0x3f, 0xe3, 0x32, 0x5f, - 0xa3, 0xbf, 0x40, 0x4f, 0xaa, 0x88, 0xa2, 0x57, 0x7a, 0xb5, 0x6a, 0xed, 0x09, 0xbd, 0x6b, 0x97, - 0x53, 0xf7, 0xb2, 0x82, 0x89, 0xab, 0x47, 0x56, 0x02, 0xc7, 0x34, 0xaf, 0xa9, 0xeb, 0x95, 0x52, - 0xca, 0xd1, 0x43, 0x68, 0x13, 0x4a, 0xb1, 0xe8, 0xb5, 0x99, 0x2c, 0xab, 0xe2, 0xb4, 0x0c, 0x09, - 0x8f, 0xfd, 0x19, 0x7a, 0x06, 0xbd, 0x10, 0x5f, 0xa4, 0x8e, 0xf4, 0x49, 0x16, 0x6a, 0x63, 0xa5, - 0x50, 0xbb, 0x82, 0x21, 0x1c, 0x93, 0x75, 0xba, 0x0f, 0x7d, 0x4e, 0x82, 0x69, 0x55, 0xa5, 0xb9, - 0x5a, 0xdb, 0x92, 0x52, 0xea, 0x3c, 0x83, 0x4e, 0xcc, 0xd9, 0x04, 0xe7, 0x55, 0xd7, 0xba, 0xa5, - 0xea, 0x24, 0x47, 0x56, 0x9d, 0xd0, 0x98, 0x64, 0xa4, 0xac, 0x53, 0xe3, 0x16, 0x0d, 0xc9, 0x51, - 0x1a, 0x2f, 0xa0, 0x2f, 0x23, 0xf1, 0x18, 0xf5, 0x65, 0x57, 0x25, 0x56, 0x7b, 0xc5, 0x2f, 0x19, - 0xec, 0x61, 0xc9, 0x40, 0x7f, 0x04, 0x53, 0x05, 0x53, 0xd1, 0x82, 0x15, 0x2d, 0x15, 0xf0, 0xb2, - 0x1a, 0x4b, 0xa7, 0x98, 0x57, 0xd5, 0x3a, 0xab, 0x6a, 0x92, 0xb3, 0x50, 0x1b, 0x7e, 0xaf, 0x41, - 0xbb, 0x7c, 0x21, 0x7e, 0xb9, 0x95, 0x76, 0xc0, 0x20, 0x82, 0x2d, 0x08, 0xb5, 0x2a, 0x41, 0xa2, - 0xcb, 0xbd, 0x56, 0xff, 0xdc, 0x5e, 0xd3, 0x57, 0x7a, 0xed, 0x1e, 0x34, 0x33, 0x4a, 0xde, 0x67, - 0xaa, 0x67, 0x0c, 0x3b, 0x5f, 0xdd, 0xd2, 0x83, 0xcd, 0x9b, 0x7b, 0x70, 0xf8, 0x5f, 0x0d, 0xda, - 0xe5, 0x83, 0x86, 0x46, 0x00, 0x95, 0xd4, 0x68, 0x2b, 0xa9, 0xa9, 0x48, 0xd1, 0x1f, 0xa0, 0xc7, - 0x63, 0x5a, 0x4d, 0xa5, 0xba, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x5e, 0x52, 0x31, 0xad, 0x1c, - 0x41, 0x79, 0x5d, 0xd6, 0xef, 0xba, 0x2e, 0xff, 0xad, 0x01, 0x9c, 0x72, 0x76, 0x99, 0xbb, 0x35, - 0x80, 0x86, 0x18, 0x27, 0x6e, 0xf2, 0x48, 0x09, 0xd0, 0x08, 0xda, 0xc2, 0x19, 0xc5, 0xba, 0xd1, - 0x0f, 0x83, 0xab, 0x9f, 0xcf, 0x75, 0xe1, 0xab, 0x1a, 0x74, 0x2a, 0x0f, 0x37, 0x7a, 0x0c, 0x46, - 0xc0, 0x59, 0x16, 0x3b, 0x93, 0xf9, 0x0d, 0x6e, 0xb4, 0xa4, 0xec, 0x60, 0x2e, 0x68, 0x6e, 0x10, - 0x38, 0x17, 0x19, 0xf5, 0x72, 0x3f, 0x96, 0x68, 0x6e, 0x10, 0x1c, 0x65, 0xd4, 0x43, 0x03, 0x30, - 0x92, 0x94, 0x63, 0x37, 0xc2, 0xfe, 0xd2, 0x35, 0x5a, 0xa2, 0xe8, 0x29, 0x74, 0x45, 0x44, 0xe5, - 0x9e, 0xfa, 0x4d, 0x41, 0x01, 0x8f, 0xe9, 0x5f, 0xf3, 0x9d, 0x73, 0x85, 0x72, 0xf7, 0xc6, 0x6d, - 0x0a, 0xaf, 0x72, 0x1f, 0xca, 0x3c, 0x34, 0xef, 0xc8, 0x03, 0x7a, 0x0a, 0x7a, 0xc4, 0x7c, 0x2c, - 0x47, 0x90, 0xde, 0xfe, 0x56, 0x39, 0xd1, 0x08, 0x13, 0x22, 0x31, 0xef, 0x98, 0x5f, 0xdc, 0x78, - 0x92, 0x38, 0x7c, 0x0f, 0xba, 0x18, 0x61, 0xd0, 0x6f, 0xc1, 0x60, 0xdc, 0xc7, 0x7c, 0x91, 0xb0, - 0xae, 0x52, 0x3e, 0x98, 0x8f, 0x53, 0x1c, 0xd9, 0x2d, 0x29, 0x3d, 0x98, 0xa3, 0x07, 0xc5, 0x94, - 0x23, 0x9a, 0x45, 0xcf, 0x6d, 0xe5, 0xe3, 0xcd, 0xe7, 0x9d, 0xd5, 0x18, 0x1a, 0x72, 0x28, 0x5a, - 0x98, 0xd2, 0xee, 0x30, 0x55, 0xbb, 0xcb, 0xd4, 0x4b, 0xd0, 0xc5, 0xdc, 0x82, 0x7e, 0x0d, 0x4d, - 0x8f, 0x51, 0x3a, 0x7e, 0xbd, 0x64, 0x2a, 0xc7, 0xc4, 0x3e, 0xef, 0x33, 0xcc, 0xe7, 0xd2, 0x56, - 0x71, 0x76, 0x0a, 0x1a, 0x7e, 0xad, 0x81, 0x55, 0x58, 0x55, 0x5f, 0xc2, 0xe8, 0x59, 0x16, 0x89, - 0xbe, 0x13, 0x6f, 0x7e, 0x4a, 0x22, 0xec, 0xc4, 0x9c, 0x79, 0x38, 0x49, 0xb0, 0xef, 0xc8, 0x3e, - 0xd3, 0x76, 0x75, 0xbb, 0x2f, 0x04, 0xa7, 0x05, 0x7e, 0x22, 0x6a, 0x7a, 0x83, 0x66, 0x91, 0xa0, - 0xfa, 0x99, 0x87, 0x7d, 0x87, 0xb3, 0x0f, 0x89, 0xca, 0x91, 0xdd, 0xa7, 0x59, 0x74, 0x9a, 0xe3, - 0x36, 0xfb, 0x90, 0xa0, 0xc7, 0xd0, 0x13, 0x5c, 0x92, 0x62, 0xee, 0xaa, 0x66, 0xac, 0x4b, 0xe2, - 0x3a, 0xcd, 0xa2, 0x71, 0x09, 0x5e, 0x1f, 0xe4, 0xf4, 0xeb, 0x83, 0xdc, 0xe8, 0x3b, 0x4d, 0x0d, - 0xe0, 0xf2, 0xcd, 0xda, 0x80, 0x75, 0xf1, 0x2d, 0xa7, 0x08, 0x73, 0xad, 0x80, 0xca, 0xdb, 0xd0, - 0xd4, 0x0a, 0xa8, 0xbc, 0x44, 0xcc, 0x1a, 0xfa, 0x15, 0xf4, 0x05, 0x54, 0x69, 0x1f, 0xb3, 0x8e, - 0xba, 0x60, 0x48, 0x6b, 0x2c, 0x3e, 0x31, 0x75, 0xb4, 0x0e, 0x6d, 0xb1, 0x92, 0xc7, 0x66, 0x36, - 0x4a, 0x23, 0xb2, 0xfa, 0x5f, 0x05, 0x81, 0xd9, 0x2c, 0xf8, 0xe2, 0x31, 0x32, 0x5b, 0xc5, 0x4a, - 0x9c, 0x8d, 0x69, 0xa0, 0x7b, 0x80, 0xc4, 0x6a, 0x79, 0x26, 0x34, 0xdb, 0xc8, 0x82, 0xcd, 0x2a, - 0x5e, 0x8c, 0x5a, 0x26, 0x8c, 0xfe, 0x04, 0xdd, 0xea, 0x7c, 0x88, 0xfa, 0xd0, 0x39, 0x75, 0x93, - 0xe4, 0x7c, 0xca, 0x59, 0x16, 0x4c, 0xcd, 0x35, 0xe1, 0xd0, 0x01, 0x67, 0xae, 0xef, 0xb9, 0x49, - 0x6a, 0x6a, 0xc8, 0x00, 0xfd, 0x6f, 0x6e, 0x32, 0x35, 0x6b, 0xa3, 0x3d, 0x80, 0xc5, 0x1c, 0x82, - 0xda, 0xd0, 0x78, 0xcb, 0x3c, 0x37, 0x34, 0xd7, 0x04, 0xe5, 0x9c, 0x1c, 0xff, 0xd3, 0xd4, 0x50, - 0x07, 0x5a, 0xe7, 0xe4, 0x28, 0x54, 0xfc, 0x2f, 0x34, 0x30, 0x8a, 0x31, 0x62, 0x91, 0x2f, 0x8a, - 0xb9, 0x8c, 0x64, 0x0d, 0x6d, 0xc1, 0x86, 0x8c, 0x1c, 0x5f, 0xa4, 0xff, 0xc8, 0xd2, 0x1c, 0xd6, - 0x8a, 0x90, 0x6c, 0xf1, 0x64, 0x2d, 0xf0, 0x1a, 0x32, 0xa1, 0xab, 0xd2, 0x1b, 0x11, 0x89, 0xd4, - 0xd1, 0x26, 0x98, 0x32, 0xbb, 0x34, 0x25, 0x25, 0xaa, 0xa3, 0xfb, 0xb0, 0xb5, 0x64, 0xb6, 0x14, - 0x35, 0xd0, 0x6f, 0xe0, 0x7e, 0xa1, 0xb0, 0x2a, 0x6e, 0x8e, 0x06, 0xd0, 0xad, 0x8e, 0x2f, 0xc5, - 0x8e, 0x22, 0x7c, 0xe5, 0xf2, 0x08, 0x43, 0xff, 0x5a, 0xc7, 0x0b, 0xd2, 0x21, 0x8b, 0xe2, 0x10, - 0xa7, 0x58, 0xac, 0x55, 0x02, 0x8f, 0x08, 0x75, 0x43, 0xb9, 0xd4, 0x04, 0xe1, 0x54, 0x0c, 0xca, - 0x6e, 0xf8, 0x5c, 0x22, 0xb5, 0x0a, 0xb2, 0x2f, 0x91, 0xba, 0x50, 0x79, 0x8d, 0xfd, 0x2c, 0x96, - 0x4b, 0xfd, 0xe0, 0x77, 0x1f, 0x3f, 0x6d, 0x6b, 0xdf, 0x7e, 0xda, 0xd6, 0x7e, 0xfc, 0xb4, 0xad, - 0xfd, 0xff, 0xa7, 0xed, 0x35, 0xd8, 0xf2, 0x58, 0xb4, 0x17, 0x13, 0x1a, 0x78, 0x6e, 0xbc, 0x97, - 0x12, 0x7f, 0x22, 0x9b, 0xf6, 0x54, 0xfb, 0x39, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x1e, 0xf3, 0x88, - 0x75, 0x0e, 0x00, 0x00, ->>>>>>> update agg mode + // 1579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0xca, + 0x11, 0x36, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0x6f, 0xed, 0x80, 0x09, 0x5a, 0x5b, 0x11, 0x12, + 0xd4, 0x15, 0x52, 0xc7, 0x71, 0x5a, 0xa0, 0x97, 0x16, 0x89, 0x9d, 0xb8, 0x55, 0x9d, 0xb8, 0x06, + 0x6d, 0xf4, 0x4a, 0x50, 0xe4, 0x9a, 0x5a, 0x9b, 0xdc, 0x65, 0x96, 0x64, 0x23, 0xdd, 0xfa, 0x13, + 0x0a, 0xf4, 0xd2, 0x5f, 0xd1, 0x5b, 0x7b, 0xe8, 0xa5, 0xb7, 0x87, 0x1c, 0xdf, 0xf5, 0x5d, 0x1e, + 0x1e, 0xf2, 0x6e, 0xef, 0x57, 0x3c, 0xec, 0x2e, 0x49, 0x51, 0x96, 0xed, 0x97, 0x13, 0xb9, 0xdf, + 0x7c, 0x33, 0x3b, 0x3b, 0x3b, 0x33, 0x3b, 0xd0, 0xc3, 0x33, 0xec, 0x65, 0x29, 0xe3, 0x7b, 0x31, + 0x67, 0x29, 0x43, 0x7a, 0x4a, 0xe2, 0xc9, 0x23, 0x13, 0xcf, 0x62, 0x8e, 0x93, 0x84, 0x30, 0xaa, + 0xf0, 0x47, 0xdd, 0xc4, 0x9b, 0xe2, 0xc8, 0xcd, 0x57, 0x9b, 0x01, 0x0b, 0x98, 0xfc, 0x7d, 0x2e, + 0xfe, 0x14, 0x3a, 0xfc, 0x4a, 0x07, 0xe3, 0x6d, 0x6e, 0x0e, 0x3d, 0x81, 0x5a, 0x1a, 0x5b, 0xda, + 0x40, 0xdb, 0xed, 0x1d, 0xf4, 0xf6, 0x84, 0xd5, 0x3d, 0x21, 0xbb, 0x98, 0xc7, 0xf8, 0x50, 0xff, + 0xf4, 0xed, 0xce, 0x9a, 0x5d, 0x4b, 0x63, 0x34, 0x02, 0x23, 0x9d, 0x84, 0x4e, 0xe2, 0xb9, 0xd4, + 0xaa, 0x0d, 0xb4, 0xdd, 0xce, 0x41, 0x5f, 0x71, 0x2f, 0xdc, 0x49, 0x88, 0xcf, 0x3d, 0x97, 0xda, + 0xad, 0x74, 0x12, 0x8a, 0x1f, 0xc1, 0x25, 0xfe, 0x4c, 0x71, 0xeb, 0x55, 0xee, 0x98, 0xfa, 0x78, + 0xa6, 0xb8, 0xc4, 0x97, 0x3f, 0xe8, 0xd7, 0xd0, 0x4e, 0x70, 0x88, 0xbd, 0x94, 0x30, 0x6a, 0xe9, + 0x55, 0xf2, 0x79, 0x01, 0xdb, 0x0b, 0x06, 0x7a, 0x09, 0x1d, 0x37, 0x08, 0x38, 0x0e, 0x5c, 0xa9, + 0xd0, 0x90, 0x0a, 0x1b, 0x4a, 0xe1, 0xf5, 0x42, 0x60, 0x57, 0x59, 0x68, 0x1b, 0xf4, 0x94, 0xc5, + 0xa7, 0x56, 0x53, 0xb2, 0x21, 0xf7, 0x9b, 0xc5, 0xa7, 0xb6, 0xc4, 0xd1, 0x63, 0x68, 0x84, 0x24, + 0x22, 0xa9, 0xd5, 0x92, 0x84, 0x8e, 0x22, 0xbc, 0x13, 0x90, 0xad, 0x24, 0xe8, 0x08, 0x36, 0xf0, + 0xcc, 0x9b, 0xba, 0x34, 0xc0, 0x0e, 0xc7, 0x1e, 0x26, 0x7f, 0xc3, 0xdc, 0x32, 0x24, 0xfd, 0x41, + 0x11, 0x33, 0x25, 0xb6, 0x73, 0xa9, 0x6d, 0xe2, 0x1b, 0x88, 0xf0, 0xe3, 0x8a, 0x11, 0x6a, 0xb5, + 0xab, 0x7e, 0xfc, 0x99, 0x11, 0x6a, 0x4b, 0x1c, 0xed, 0x40, 0xa7, 0xb8, 0x64, 0x87, 0xf8, 0x16, + 0x0c, 0xb4, 0xdd, 0xb6, 0x0d, 0x05, 0x34, 0xf6, 0x85, 0x81, 0x6b, 0x12, 0x86, 0x56, 0xa7, 0x6a, + 0xe0, 0x84, 0x84, 0xa1, 0x2d, 0x71, 0xf4, 0x7b, 0xe8, 0x97, 0x5e, 0x26, 0x98, 0xfa, 0x98, 0x5b, + 0x5d, 0x49, 0xdd, 0x5c, 0xf6, 0xf1, 0x5c, 0xca, 0xec, 0x1e, 0x5e, 0x5a, 0xa3, 0x7d, 0x80, 0x33, + 0xce, 0xae, 0xf2, 0xcb, 0x58, 0x97, 0x9a, 0xa6, 0xd2, 0x5c, 0xe0, 0x76, 0x85, 0x33, 0xfc, 0xbf, + 0x06, 0xbd, 0x65, 0xa3, 0x68, 0xb7, 0x92, 0x4e, 0x68, 0x79, 0xdb, 0x95, 0x94, 0xda, 0xc0, 0xd4, + 0x63, 0x3e, 0xf6, 0x9d, 0xd4, 0x4d, 0xae, 0x9d, 0x08, 0xa7, 0xae, 0x55, 0x1b, 0xd4, 0x77, 0xbb, + 0x76, 0x3f, 0x17, 0x5c, 0xb8, 0xc9, 0xf5, 0x7b, 0x9c, 0xba, 0xe8, 0x05, 0xf4, 0x62, 0x97, 0xa7, + 0x44, 0xec, 0xea, 0x5c, 0xe3, 0x79, 0x62, 0xd5, 0x07, 0xf5, 0x45, 0x0c, 0xde, 0xce, 0x62, 0x6e, + 0xaf, 0x97, 0x8c, 0x13, 0x3c, 0x4f, 0xd0, 0x13, 0x68, 0x78, 0x53, 0x12, 0xfa, 0x79, 0x56, 0x55, + 0x52, 0x5b, 0x44, 0xd3, 0x56, 0xc2, 0x61, 0x0c, 0xe6, 0xcd, 0x9b, 0xbb, 0xdd, 0x31, 0xed, 0x76, + 0xc7, 0xf6, 0xa1, 0x73, 0x49, 0x70, 0xe8, 0x3b, 0xe9, 0x3c, 0xc6, 0x89, 0x74, 0xbf, 0xcc, 0xe0, + 0x63, 0x21, 0x10, 0x87, 0xb6, 0xe1, 0xb2, 0xf8, 0x4d, 0x86, 0xff, 0xa8, 0x41, 0xbb, 0x2c, 0x1a, + 0xb4, 0x03, 0x46, 0x2a, 0x16, 0xe2, 0xc2, 0x45, 0xd0, 0xea, 0x79, 0x80, 0x5a, 0x12, 0x1d, 0xfb, + 0x68, 0x04, 0x2d, 0x8f, 0x85, 0x59, 0x44, 0x0b, 0xe3, 0xf9, 0x8d, 0x1c, 0x49, 0x70, 0x4c, 0x2f, + 0x99, 0x5d, 0x10, 0x90, 0x05, 0xba, 0x8f, 0x13, 0x4f, 0x16, 0x9d, 0x91, 0x1b, 0x92, 0x08, 0x7a, + 0x06, 0x28, 0xe6, 0x24, 0x72, 0xf9, 0xdc, 0x51, 0x64, 0x87, 0xf8, 0x89, 0xa5, 0x0f, 0xea, 0xbb, + 0x75, 0xdb, 0xcc, 0x25, 0xb9, 0x45, 0x3f, 0x41, 0xaf, 0xc0, 0xa4, 0x78, 0x96, 0x3a, 0x1c, 0xbb, + 0xbe, 0x83, 0x69, 0x40, 0x28, 0x96, 0xa5, 0xd6, 0x2b, 0x36, 0x7f, 0x2b, 0xb1, 0xca, 0x7d, 0xf6, + 0x04, 0xdf, 0xc6, 0xae, 0xaf, 0x24, 0xe8, 0x19, 0x34, 0xb9, 0x88, 0x69, 0x62, 0x35, 0xa5, 0xd3, + 0x79, 0xf4, 0x4f, 0xf0, 0xdc, 0x16, 0x70, 0xae, 0x95, 0x73, 0x86, 0xff, 0xd1, 0x41, 0x17, 0x75, + 0x80, 0x5e, 0x40, 0x5b, 0x54, 0x82, 0x0c, 0xe6, 0x72, 0x4b, 0x12, 0xe2, 0xca, 0x7e, 0xc6, 0x55, + 0xbe, 0x46, 0x7f, 0x80, 0x9e, 0x54, 0x11, 0x65, 0xa2, 0xf4, 0x6a, 0xd5, 0xdc, 0x13, 0x7a, 0x37, + 0xda, 0x59, 0xf7, 0xaa, 0x82, 0x89, 0x66, 0x25, 0x33, 0x81, 0x63, 0x9a, 0xe7, 0xd4, 0xcd, 0x4c, + 0x29, 0xe5, 0xe8, 0x31, 0xb4, 0x09, 0xa5, 0x58, 0x54, 0xe7, 0x4c, 0xa6, 0x55, 0x71, 0x5b, 0x86, + 0x84, 0xc7, 0xfe, 0x0c, 0xed, 0x43, 0x2f, 0xc4, 0x97, 0xa9, 0x23, 0x7d, 0x92, 0x89, 0xda, 0x58, + 0x49, 0xd4, 0xae, 0x60, 0x08, 0xc7, 0x64, 0x9e, 0x1e, 0x40, 0x9f, 0x93, 0x60, 0x5a, 0x55, 0x69, + 0xae, 0xe6, 0xb6, 0xa4, 0x94, 0x3a, 0xfb, 0xd0, 0x89, 0x39, 0x9b, 0xe0, 0x3c, 0xeb, 0x5a, 0x77, + 0x64, 0x9d, 0xe4, 0xc8, 0xac, 0x13, 0x1a, 0x93, 0x8c, 0x94, 0x79, 0x6a, 0xdc, 0xa1, 0x21, 0x39, + 0x4a, 0xe3, 0x25, 0xf4, 0xe5, 0x49, 0x3c, 0x46, 0x7d, 0x59, 0x55, 0x89, 0xd5, 0x5e, 0xf1, 0x4b, + 0x1e, 0xf6, 0xa8, 0x64, 0xa0, 0xdf, 0x82, 0xa9, 0x0e, 0x53, 0xd1, 0x82, 0x15, 0x2d, 0x75, 0xe0, + 0x65, 0x35, 0x96, 0x4e, 0x31, 0xaf, 0xaa, 0x75, 0x56, 0xd5, 0x24, 0x67, 0xa1, 0x36, 0xfc, 0x46, + 0x83, 0x76, 0xf9, 0xa6, 0xfc, 0x74, 0x29, 0xed, 0x80, 0x41, 0x04, 0x5b, 0x10, 0x6a, 0x55, 0x82, + 0x44, 0x97, 0x6b, 0xad, 0xfe, 0xa5, 0xb5, 0xa6, 0xaf, 0xd4, 0xda, 0x03, 0x68, 0x66, 0x94, 0x7c, + 0xc8, 0x54, 0xcd, 0x18, 0x76, 0xbe, 0xba, 0xa3, 0x06, 0x9b, 0xb7, 0xd7, 0xe0, 0xf0, 0x9f, 0x1a, + 0xb4, 0xcb, 0x27, 0x10, 0x8d, 0x00, 0x2a, 0xa1, 0xd1, 0x56, 0x42, 0x53, 0x91, 0xa2, 0xdf, 0x40, + 0x8f, 0xc7, 0xb4, 0x1a, 0x4a, 0xd5, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x9e, 0x52, 0x31, 0xad, + 0x5c, 0x41, 0xd9, 0x2e, 0xeb, 0xf7, 0xb5, 0xcb, 0xbf, 0x6b, 0xd5, 0x37, 0x02, 0x0d, 0xa0, 0x21, + 0x06, 0x90, 0xdb, 0x3c, 0x52, 0x02, 0x34, 0x82, 0xb6, 0x70, 0x46, 0xb1, 0x6e, 0xf5, 0xc3, 0xe0, + 0xea, 0xe7, 0x4b, 0x5d, 0xf8, 0x6f, 0x0d, 0x3a, 0x95, 0xa7, 0x1e, 0x3d, 0x05, 0x23, 0xe0, 0x2c, + 0x8b, 0x9d, 0xc9, 0xfc, 0x16, 0x37, 0x5a, 0x52, 0x76, 0x38, 0x17, 0x34, 0x37, 0x08, 0x9c, 0xcb, + 0x8c, 0x7a, 0xb9, 0x1f, 0x4b, 0x34, 0x37, 0x08, 0x8e, 0x33, 0xea, 0xa1, 0x01, 0x18, 0x49, 0xca, + 0xb1, 0x1b, 0x61, 0x7f, 0xa9, 0x8d, 0x96, 0x28, 0x7a, 0x0e, 0x5d, 0x71, 0xa2, 0x72, 0x4f, 0xfd, + 0xb6, 0x43, 0x01, 0x8f, 0xe9, 0x1f, 0xf3, 0x9d, 0x73, 0x85, 0x72, 0xf7, 0xc6, 0x5d, 0x0a, 0xaf, + 0x73, 0x1f, 0xca, 0x38, 0x34, 0xef, 0x89, 0x03, 0x7a, 0x0e, 0x7a, 0xc4, 0x7c, 0x2c, 0x87, 0x96, + 0xde, 0xc1, 0x56, 0x39, 0x03, 0x09, 0x13, 0x22, 0x30, 0xef, 0x99, 0x5f, 0x74, 0x3c, 0x49, 0x1c, + 0x7e, 0x00, 0x5d, 0x0c, 0x3d, 0xe8, 0x97, 0x60, 0x30, 0xee, 0x63, 0xbe, 0x08, 0x58, 0x57, 0x29, + 0x1f, 0xce, 0xc7, 0x29, 0x8e, 0xec, 0x96, 0x94, 0x1e, 0xce, 0xd1, 0xa3, 0x62, 0x2e, 0x12, 0xc5, + 0xa2, 0xe7, 0xb6, 0xf2, 0x81, 0xe8, 0xcb, 0xee, 0x6a, 0x0c, 0x0d, 0x39, 0x46, 0x2d, 0x4c, 0x69, + 0xf7, 0x98, 0xaa, 0xdd, 0x67, 0xea, 0x15, 0xe8, 0x62, 0xd2, 0x41, 0x3f, 0x87, 0xa6, 0xc7, 0x28, + 0x1d, 0xbf, 0x59, 0x32, 0x95, 0x63, 0x62, 0x9f, 0x0f, 0x19, 0xe6, 0x73, 0x69, 0xab, 0xb8, 0x3b, + 0x05, 0x0d, 0xff, 0xa7, 0x81, 0x55, 0x58, 0x55, 0x5f, 0xc2, 0xe8, 0x79, 0x16, 0x89, 0xba, 0x13, + 0x6f, 0x7e, 0x4a, 0x22, 0xec, 0xc4, 0x9c, 0x79, 0x38, 0x49, 0xb0, 0xef, 0xc8, 0x3a, 0xd3, 0x76, + 0x75, 0xbb, 0x2f, 0x04, 0x67, 0x05, 0x7e, 0x2a, 0x72, 0x7a, 0x83, 0x66, 0x91, 0xa0, 0xfa, 0x99, + 0x87, 0x7d, 0x87, 0xb3, 0x8f, 0x89, 0x8a, 0x91, 0xdd, 0xa7, 0x59, 0x74, 0x96, 0xe3, 0x36, 0xfb, + 0x98, 0xa0, 0xa7, 0xd0, 0x13, 0x5c, 0x92, 0x62, 0xee, 0xaa, 0x62, 0xac, 0x4b, 0xe2, 0x3a, 0xcd, + 0xa2, 0x71, 0x09, 0xde, 0x1c, 0xfd, 0xf4, 0x9b, 0xa3, 0xdf, 0xe8, 0x07, 0x4d, 0x8d, 0xec, 0xf2, + 0xcd, 0xda, 0x80, 0x75, 0xf1, 0x2d, 0xa7, 0x08, 0x73, 0xad, 0x80, 0xca, 0x6e, 0x68, 0x6a, 0x05, + 0x54, 0x36, 0x11, 0xb3, 0x86, 0x7e, 0x06, 0x7d, 0x01, 0x55, 0xca, 0xc7, 0xac, 0xa3, 0x2e, 0x18, + 0xd2, 0x1a, 0x8b, 0x4f, 0x4d, 0x1d, 0xad, 0x43, 0x5b, 0xac, 0xe4, 0xb5, 0x99, 0x8d, 0xd2, 0x88, + 0xcc, 0xfe, 0xd7, 0x41, 0x60, 0x36, 0x0b, 0xbe, 0x78, 0x8c, 0xcc, 0x56, 0xb1, 0x12, 0x77, 0x63, + 0x1a, 0xe8, 0x01, 0x20, 0xb1, 0x5a, 0x9e, 0x09, 0xcd, 0x36, 0xb2, 0x60, 0xb3, 0x8a, 0x17, 0xa3, + 0x96, 0x09, 0x08, 0x41, 0x4f, 0x48, 0x16, 0x4d, 0xc5, 0xec, 0x8c, 0x7e, 0x07, 0xdd, 0xea, 0xcc, + 0x88, 0xfa, 0xd0, 0x39, 0x73, 0x93, 0xe4, 0x62, 0xca, 0x59, 0x16, 0x4c, 0xcd, 0x35, 0xe1, 0xe4, + 0x21, 0x67, 0xae, 0xef, 0xb9, 0x49, 0x6a, 0x6a, 0xc8, 0x00, 0xfd, 0x4f, 0x6e, 0x32, 0x35, 0x6b, + 0xa3, 0x3d, 0x80, 0xc5, 0x6c, 0x82, 0xda, 0xd0, 0x78, 0xc7, 0x3c, 0x37, 0x34, 0xd7, 0x04, 0xe5, + 0x82, 0x9c, 0xfc, 0xd5, 0xd4, 0x50, 0x07, 0x5a, 0x17, 0xe4, 0x38, 0x54, 0xfc, 0x7f, 0x6b, 0x60, + 0x14, 0xa3, 0xc5, 0x22, 0x86, 0x14, 0x73, 0x79, 0xba, 0x35, 0xb4, 0x05, 0x1b, 0x32, 0x1a, 0xf8, + 0x32, 0xfd, 0x4b, 0x96, 0xe6, 0xb0, 0x56, 0x1c, 0xd3, 0x16, 0xcf, 0xd8, 0x02, 0xaf, 0x21, 0x13, + 0xba, 0x2a, 0xe4, 0x11, 0x91, 0x48, 0x1d, 0x6d, 0x82, 0x29, 0x23, 0x4e, 0x53, 0x52, 0xa2, 0x3a, + 0x7a, 0x08, 0x5b, 0x4b, 0x66, 0x4b, 0x51, 0x03, 0xfd, 0x02, 0x1e, 0x16, 0x0a, 0xab, 0xe2, 0xe6, + 0x68, 0x00, 0xdd, 0xea, 0x48, 0x53, 0xec, 0x28, 0x8e, 0xaf, 0x5c, 0x1e, 0x61, 0xe8, 0xdf, 0xe8, + 0x02, 0x82, 0x74, 0xc4, 0xa2, 0x38, 0xc4, 0x29, 0x16, 0x6b, 0x15, 0xc0, 0x63, 0x42, 0xdd, 0x50, + 0x2e, 0x35, 0x41, 0x38, 0x13, 0xc3, 0xb3, 0x1b, 0xbe, 0x90, 0x48, 0xad, 0x82, 0x1c, 0x48, 0xa4, + 0x2e, 0x54, 0xde, 0x60, 0x3f, 0x8b, 0xe5, 0x52, 0x3f, 0xfc, 0xd5, 0xa7, 0xcf, 0xdb, 0xda, 0xd7, + 0x9f, 0xb7, 0xb5, 0xef, 0x3e, 0x6f, 0x6b, 0xff, 0xfa, 0x7e, 0x7b, 0x0d, 0xb6, 0x3c, 0x16, 0xed, + 0xc5, 0x84, 0x06, 0x9e, 0x1b, 0xef, 0xa5, 0xc4, 0x9f, 0xc8, 0x42, 0x3e, 0xd3, 0x7e, 0x0c, 0x00, + 0x00, 0xff, 0xff, 0x79, 0x40, 0x8e, 0xad, 0xbb, 0x0e, 0x00, 0x00, } From af15fe231237b49b16cfce4d8f6b964d9c0eb7f3 Mon Sep 17 00:00:00 2001 From: fzhedu Date: Wed, 13 Jan 2021 11:26:43 +0800 Subject: [PATCH 5/5] update --- go-tipb/executor.pb.go | 232 ++++++++++++++++++++++++----------------- proto/executor.proto | 3 + 2 files changed, 138 insertions(+), 97 deletions(-) diff --git a/go-tipb/executor.pb.go b/go-tipb/executor.pb.go index b7d6ab499..18babc239 100644 --- a/go-tipb/executor.pb.go +++ b/go-tipb/executor.pb.go @@ -907,7 +907,9 @@ type ExecutorExecutionSummary struct { // How many times executor's `next()` is called. NumIterations *uint64 `protobuf:"varint,3,opt,name=num_iterations,json=numIterations" json:"num_iterations,omitempty"` // Coresponding executor id - ExecutorId *string `protobuf:"bytes,4,opt,name=executor_id,json=executorId" json:"executor_id,omitempty"` + ExecutorId *string `protobuf:"bytes,4,opt,name=executor_id,json=executorId" json:"executor_id,omitempty"` + // The execution concurrency for this executor + Concurrency *uint64 `protobuf:"varint,5,opt,name=concurrency" json:"concurrency,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -946,6 +948,13 @@ func (m *ExecutorExecutionSummary) GetExecutorId() string { return "" } +func (m *ExecutorExecutionSummary) GetConcurrency() uint64 { + if m != nil && m.Concurrency != nil { + return *m.Concurrency + } + return 0 +} + func init() { proto.RegisterType((*Executor)(nil), "tipb.Executor") proto.RegisterType((*ExchangeSender)(nil), "tipb.ExchangeSender") @@ -1806,6 +1815,11 @@ func (m *ExecutorExecutionSummary) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintExecutor(dAtA, i, uint64(len(*m.ExecutorId))) i += copy(dAtA[i:], *m.ExecutorId) } + if m.Concurrency != nil { + dAtA[i] = 0x28 + i++ + i = encodeVarintExecutor(dAtA, i, uint64(*m.Concurrency)) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2191,6 +2205,9 @@ func (m *ExecutorExecutionSummary) Size() (n int) { l = len(*m.ExecutorId) n += 1 + l + sovExecutor(uint64(l)) } + if m.Concurrency != nil { + n += 1 + sovExecutor(uint64(*m.Concurrency)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4744,6 +4761,26 @@ func (m *ExecutorExecutionSummary) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.ExecutorId = &s iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Concurrency", wireType) + } + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowExecutor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.Concurrency = &v default: iNdEx = preIndex skippy, err := skipExecutor(dAtA[iNdEx:]) @@ -4874,104 +4911,105 @@ var ( func init() { proto.RegisterFile("executor.proto", fileDescriptorExecutor) } var fileDescriptorExecutor = []byte{ - // 1579 bytes of a gzipped FileDescriptorProto + // 1594 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xdb, 0xca, 0x11, 0x36, 0x25, 0x4a, 0xa2, 0x46, 0xb2, 0x44, 0x6f, 0xed, 0x80, 0x09, 0x5a, 0x5b, 0x11, 0x12, 0xd4, 0x15, 0x52, 0xc7, 0x71, 0x5a, 0xa0, 0x97, 0x16, 0x89, 0x9d, 0xb8, 0x55, 0x9d, 0xb8, 0x06, 0x6d, 0xf4, 0x4a, 0x50, 0xe4, 0x9a, 0x5a, 0x9b, 0xdc, 0x65, 0x96, 0x64, 0x23, 0xdd, 0xfa, 0x13, - 0x0a, 0xf4, 0xd2, 0x5f, 0xd1, 0x5b, 0x7b, 0xe8, 0xa5, 0xb7, 0x87, 0x1c, 0xdf, 0xf5, 0x5d, 0x1e, - 0x1e, 0xf2, 0x6e, 0xef, 0x57, 0x3c, 0xec, 0x2e, 0x49, 0x51, 0x96, 0xed, 0x97, 0x13, 0xb9, 0xdf, - 0x7c, 0x33, 0x3b, 0x3b, 0x3b, 0x33, 0x3b, 0xd0, 0xc3, 0x33, 0xec, 0x65, 0x29, 0xe3, 0x7b, 0x31, - 0x67, 0x29, 0x43, 0x7a, 0x4a, 0xe2, 0xc9, 0x23, 0x13, 0xcf, 0x62, 0x8e, 0x93, 0x84, 0x30, 0xaa, - 0xf0, 0x47, 0xdd, 0xc4, 0x9b, 0xe2, 0xc8, 0xcd, 0x57, 0x9b, 0x01, 0x0b, 0x98, 0xfc, 0x7d, 0x2e, - 0xfe, 0x14, 0x3a, 0xfc, 0x4a, 0x07, 0xe3, 0x6d, 0x6e, 0x0e, 0x3d, 0x81, 0x5a, 0x1a, 0x5b, 0xda, - 0x40, 0xdb, 0xed, 0x1d, 0xf4, 0xf6, 0x84, 0xd5, 0x3d, 0x21, 0xbb, 0x98, 0xc7, 0xf8, 0x50, 0xff, - 0xf4, 0xed, 0xce, 0x9a, 0x5d, 0x4b, 0x63, 0x34, 0x02, 0x23, 0x9d, 0x84, 0x4e, 0xe2, 0xb9, 0xd4, - 0xaa, 0x0d, 0xb4, 0xdd, 0xce, 0x41, 0x5f, 0x71, 0x2f, 0xdc, 0x49, 0x88, 0xcf, 0x3d, 0x97, 0xda, - 0xad, 0x74, 0x12, 0x8a, 0x1f, 0xc1, 0x25, 0xfe, 0x4c, 0x71, 0xeb, 0x55, 0xee, 0x98, 0xfa, 0x78, - 0xa6, 0xb8, 0xc4, 0x97, 0x3f, 0xe8, 0xd7, 0xd0, 0x4e, 0x70, 0x88, 0xbd, 0x94, 0x30, 0x6a, 0xe9, - 0x55, 0xf2, 0x79, 0x01, 0xdb, 0x0b, 0x06, 0x7a, 0x09, 0x1d, 0x37, 0x08, 0x38, 0x0e, 0x5c, 0xa9, - 0xd0, 0x90, 0x0a, 0x1b, 0x4a, 0xe1, 0xf5, 0x42, 0x60, 0x57, 0x59, 0x68, 0x1b, 0xf4, 0x94, 0xc5, - 0xa7, 0x56, 0x53, 0xb2, 0x21, 0xf7, 0x9b, 0xc5, 0xa7, 0xb6, 0xc4, 0xd1, 0x63, 0x68, 0x84, 0x24, - 0x22, 0xa9, 0xd5, 0x92, 0x84, 0x8e, 0x22, 0xbc, 0x13, 0x90, 0xad, 0x24, 0xe8, 0x08, 0x36, 0xf0, - 0xcc, 0x9b, 0xba, 0x34, 0xc0, 0x0e, 0xc7, 0x1e, 0x26, 0x7f, 0xc3, 0xdc, 0x32, 0x24, 0xfd, 0x41, - 0x11, 0x33, 0x25, 0xb6, 0x73, 0xa9, 0x6d, 0xe2, 0x1b, 0x88, 0xf0, 0xe3, 0x8a, 0x11, 0x6a, 0xb5, - 0xab, 0x7e, 0xfc, 0x99, 0x11, 0x6a, 0x4b, 0x1c, 0xed, 0x40, 0xa7, 0xb8, 0x64, 0x87, 0xf8, 0x16, - 0x0c, 0xb4, 0xdd, 0xb6, 0x0d, 0x05, 0x34, 0xf6, 0x85, 0x81, 0x6b, 0x12, 0x86, 0x56, 0xa7, 0x6a, - 0xe0, 0x84, 0x84, 0xa1, 0x2d, 0x71, 0xf4, 0x7b, 0xe8, 0x97, 0x5e, 0x26, 0x98, 0xfa, 0x98, 0x5b, - 0x5d, 0x49, 0xdd, 0x5c, 0xf6, 0xf1, 0x5c, 0xca, 0xec, 0x1e, 0x5e, 0x5a, 0xa3, 0x7d, 0x80, 0x33, - 0xce, 0xae, 0xf2, 0xcb, 0x58, 0x97, 0x9a, 0xa6, 0xd2, 0x5c, 0xe0, 0x76, 0x85, 0x33, 0xfc, 0xbf, - 0x06, 0xbd, 0x65, 0xa3, 0x68, 0xb7, 0x92, 0x4e, 0x68, 0x79, 0xdb, 0x95, 0x94, 0xda, 0xc0, 0xd4, - 0x63, 0x3e, 0xf6, 0x9d, 0xd4, 0x4d, 0xae, 0x9d, 0x08, 0xa7, 0xae, 0x55, 0x1b, 0xd4, 0x77, 0xbb, - 0x76, 0x3f, 0x17, 0x5c, 0xb8, 0xc9, 0xf5, 0x7b, 0x9c, 0xba, 0xe8, 0x05, 0xf4, 0x62, 0x97, 0xa7, - 0x44, 0xec, 0xea, 0x5c, 0xe3, 0x79, 0x62, 0xd5, 0x07, 0xf5, 0x45, 0x0c, 0xde, 0xce, 0x62, 0x6e, - 0xaf, 0x97, 0x8c, 0x13, 0x3c, 0x4f, 0xd0, 0x13, 0x68, 0x78, 0x53, 0x12, 0xfa, 0x79, 0x56, 0x55, - 0x52, 0x5b, 0x44, 0xd3, 0x56, 0xc2, 0x61, 0x0c, 0xe6, 0xcd, 0x9b, 0xbb, 0xdd, 0x31, 0xed, 0x76, - 0xc7, 0xf6, 0xa1, 0x73, 0x49, 0x70, 0xe8, 0x3b, 0xe9, 0x3c, 0xc6, 0x89, 0x74, 0xbf, 0xcc, 0xe0, - 0x63, 0x21, 0x10, 0x87, 0xb6, 0xe1, 0xb2, 0xf8, 0x4d, 0x86, 0xff, 0xa8, 0x41, 0xbb, 0x2c, 0x1a, - 0xb4, 0x03, 0x46, 0x2a, 0x16, 0xe2, 0xc2, 0x45, 0xd0, 0xea, 0x79, 0x80, 0x5a, 0x12, 0x1d, 0xfb, - 0x68, 0x04, 0x2d, 0x8f, 0x85, 0x59, 0x44, 0x0b, 0xe3, 0xf9, 0x8d, 0x1c, 0x49, 0x70, 0x4c, 0x2f, - 0x99, 0x5d, 0x10, 0x90, 0x05, 0xba, 0x8f, 0x13, 0x4f, 0x16, 0x9d, 0x91, 0x1b, 0x92, 0x08, 0x7a, - 0x06, 0x28, 0xe6, 0x24, 0x72, 0xf9, 0xdc, 0x51, 0x64, 0x87, 0xf8, 0x89, 0xa5, 0x0f, 0xea, 0xbb, - 0x75, 0xdb, 0xcc, 0x25, 0xb9, 0x45, 0x3f, 0x41, 0xaf, 0xc0, 0xa4, 0x78, 0x96, 0x3a, 0x1c, 0xbb, - 0xbe, 0x83, 0x69, 0x40, 0x28, 0x96, 0xa5, 0xd6, 0x2b, 0x36, 0x7f, 0x2b, 0xb1, 0xca, 0x7d, 0xf6, - 0x04, 0xdf, 0xc6, 0xae, 0xaf, 0x24, 0xe8, 0x19, 0x34, 0xb9, 0x88, 0x69, 0x62, 0x35, 0xa5, 0xd3, - 0x79, 0xf4, 0x4f, 0xf0, 0xdc, 0x16, 0x70, 0xae, 0x95, 0x73, 0x86, 0xff, 0xd1, 0x41, 0x17, 0x75, - 0x80, 0x5e, 0x40, 0x5b, 0x54, 0x82, 0x0c, 0xe6, 0x72, 0x4b, 0x12, 0xe2, 0xca, 0x7e, 0xc6, 0x55, - 0xbe, 0x46, 0x7f, 0x80, 0x9e, 0x54, 0x11, 0x65, 0xa2, 0xf4, 0x6a, 0xd5, 0xdc, 0x13, 0x7a, 0x37, - 0xda, 0x59, 0xf7, 0xaa, 0x82, 0x89, 0x66, 0x25, 0x33, 0x81, 0x63, 0x9a, 0xe7, 0xd4, 0xcd, 0x4c, - 0x29, 0xe5, 0xe8, 0x31, 0xb4, 0x09, 0xa5, 0x58, 0x54, 0xe7, 0x4c, 0xa6, 0x55, 0x71, 0x5b, 0x86, - 0x84, 0xc7, 0xfe, 0x0c, 0xed, 0x43, 0x2f, 0xc4, 0x97, 0xa9, 0x23, 0x7d, 0x92, 0x89, 0xda, 0x58, - 0x49, 0xd4, 0xae, 0x60, 0x08, 0xc7, 0x64, 0x9e, 0x1e, 0x40, 0x9f, 0x93, 0x60, 0x5a, 0x55, 0x69, - 0xae, 0xe6, 0xb6, 0xa4, 0x94, 0x3a, 0xfb, 0xd0, 0x89, 0x39, 0x9b, 0xe0, 0x3c, 0xeb, 0x5a, 0x77, - 0x64, 0x9d, 0xe4, 0xc8, 0xac, 0x13, 0x1a, 0x93, 0x8c, 0x94, 0x79, 0x6a, 0xdc, 0xa1, 0x21, 0x39, - 0x4a, 0xe3, 0x25, 0xf4, 0xe5, 0x49, 0x3c, 0x46, 0x7d, 0x59, 0x55, 0x89, 0xd5, 0x5e, 0xf1, 0x4b, - 0x1e, 0xf6, 0xa8, 0x64, 0xa0, 0xdf, 0x82, 0xa9, 0x0e, 0x53, 0xd1, 0x82, 0x15, 0x2d, 0x75, 0xe0, - 0x65, 0x35, 0x96, 0x4e, 0x31, 0xaf, 0xaa, 0x75, 0x56, 0xd5, 0x24, 0x67, 0xa1, 0x36, 0xfc, 0x46, - 0x83, 0x76, 0xf9, 0xa6, 0xfc, 0x74, 0x29, 0xed, 0x80, 0x41, 0x04, 0x5b, 0x10, 0x6a, 0x55, 0x82, - 0x44, 0x97, 0x6b, 0xad, 0xfe, 0xa5, 0xb5, 0xa6, 0xaf, 0xd4, 0xda, 0x03, 0x68, 0x66, 0x94, 0x7c, - 0xc8, 0x54, 0xcd, 0x18, 0x76, 0xbe, 0xba, 0xa3, 0x06, 0x9b, 0xb7, 0xd7, 0xe0, 0xf0, 0x9f, 0x1a, - 0xb4, 0xcb, 0x27, 0x10, 0x8d, 0x00, 0x2a, 0xa1, 0xd1, 0x56, 0x42, 0x53, 0x91, 0xa2, 0xdf, 0x40, - 0x8f, 0xc7, 0xb4, 0x1a, 0x4a, 0xd5, 0x38, 0xd6, 0x15, 0xdf, 0x8e, 0x69, 0x9e, 0x52, 0x31, 0xad, - 0x5c, 0x41, 0xd9, 0x2e, 0xeb, 0xf7, 0xb5, 0xcb, 0xbf, 0x6b, 0xd5, 0x37, 0x02, 0x0d, 0xa0, 0x21, - 0x06, 0x90, 0xdb, 0x3c, 0x52, 0x02, 0x34, 0x82, 0xb6, 0x70, 0x46, 0xb1, 0x6e, 0xf5, 0xc3, 0xe0, - 0xea, 0xe7, 0x4b, 0x5d, 0xf8, 0x6f, 0x0d, 0x3a, 0x95, 0xa7, 0x1e, 0x3d, 0x05, 0x23, 0xe0, 0x2c, - 0x8b, 0x9d, 0xc9, 0xfc, 0x16, 0x37, 0x5a, 0x52, 0x76, 0x38, 0x17, 0x34, 0x37, 0x08, 0x9c, 0xcb, - 0x8c, 0x7a, 0xb9, 0x1f, 0x4b, 0x34, 0x37, 0x08, 0x8e, 0x33, 0xea, 0xa1, 0x01, 0x18, 0x49, 0xca, - 0xb1, 0x1b, 0x61, 0x7f, 0xa9, 0x8d, 0x96, 0x28, 0x7a, 0x0e, 0x5d, 0x71, 0xa2, 0x72, 0x4f, 0xfd, - 0xb6, 0x43, 0x01, 0x8f, 0xe9, 0x1f, 0xf3, 0x9d, 0x73, 0x85, 0x72, 0xf7, 0xc6, 0x5d, 0x0a, 0xaf, - 0x73, 0x1f, 0xca, 0x38, 0x34, 0xef, 0x89, 0x03, 0x7a, 0x0e, 0x7a, 0xc4, 0x7c, 0x2c, 0x87, 0x96, - 0xde, 0xc1, 0x56, 0x39, 0x03, 0x09, 0x13, 0x22, 0x30, 0xef, 0x99, 0x5f, 0x74, 0x3c, 0x49, 0x1c, - 0x7e, 0x00, 0x5d, 0x0c, 0x3d, 0xe8, 0x97, 0x60, 0x30, 0xee, 0x63, 0xbe, 0x08, 0x58, 0x57, 0x29, - 0x1f, 0xce, 0xc7, 0x29, 0x8e, 0xec, 0x96, 0x94, 0x1e, 0xce, 0xd1, 0xa3, 0x62, 0x2e, 0x12, 0xc5, - 0xa2, 0xe7, 0xb6, 0xf2, 0x81, 0xe8, 0xcb, 0xee, 0x6a, 0x0c, 0x0d, 0x39, 0x46, 0x2d, 0x4c, 0x69, - 0xf7, 0x98, 0xaa, 0xdd, 0x67, 0xea, 0x15, 0xe8, 0x62, 0xd2, 0x41, 0x3f, 0x87, 0xa6, 0xc7, 0x28, - 0x1d, 0xbf, 0x59, 0x32, 0x95, 0x63, 0x62, 0x9f, 0x0f, 0x19, 0xe6, 0x73, 0x69, 0xab, 0xb8, 0x3b, - 0x05, 0x0d, 0xff, 0xa7, 0x81, 0x55, 0x58, 0x55, 0x5f, 0xc2, 0xe8, 0x79, 0x16, 0x89, 0xba, 0x13, - 0x6f, 0x7e, 0x4a, 0x22, 0xec, 0xc4, 0x9c, 0x79, 0x38, 0x49, 0xb0, 0xef, 0xc8, 0x3a, 0xd3, 0x76, - 0x75, 0xbb, 0x2f, 0x04, 0x67, 0x05, 0x7e, 0x2a, 0x72, 0x7a, 0x83, 0x66, 0x91, 0xa0, 0xfa, 0x99, - 0x87, 0x7d, 0x87, 0xb3, 0x8f, 0x89, 0x8a, 0x91, 0xdd, 0xa7, 0x59, 0x74, 0x96, 0xe3, 0x36, 0xfb, - 0x98, 0xa0, 0xa7, 0xd0, 0x13, 0x5c, 0x92, 0x62, 0xee, 0xaa, 0x62, 0xac, 0x4b, 0xe2, 0x3a, 0xcd, - 0xa2, 0x71, 0x09, 0xde, 0x1c, 0xfd, 0xf4, 0x9b, 0xa3, 0xdf, 0xe8, 0x07, 0x4d, 0x8d, 0xec, 0xf2, - 0xcd, 0xda, 0x80, 0x75, 0xf1, 0x2d, 0xa7, 0x08, 0x73, 0xad, 0x80, 0xca, 0x6e, 0x68, 0x6a, 0x05, - 0x54, 0x36, 0x11, 0xb3, 0x86, 0x7e, 0x06, 0x7d, 0x01, 0x55, 0xca, 0xc7, 0xac, 0xa3, 0x2e, 0x18, - 0xd2, 0x1a, 0x8b, 0x4f, 0x4d, 0x1d, 0xad, 0x43, 0x5b, 0xac, 0xe4, 0xb5, 0x99, 0x8d, 0xd2, 0x88, - 0xcc, 0xfe, 0xd7, 0x41, 0x60, 0x36, 0x0b, 0xbe, 0x78, 0x8c, 0xcc, 0x56, 0xb1, 0x12, 0x77, 0x63, - 0x1a, 0xe8, 0x01, 0x20, 0xb1, 0x5a, 0x9e, 0x09, 0xcd, 0x36, 0xb2, 0x60, 0xb3, 0x8a, 0x17, 0xa3, - 0x96, 0x09, 0x08, 0x41, 0x4f, 0x48, 0x16, 0x4d, 0xc5, 0xec, 0x8c, 0x7e, 0x07, 0xdd, 0xea, 0xcc, - 0x88, 0xfa, 0xd0, 0x39, 0x73, 0x93, 0xe4, 0x62, 0xca, 0x59, 0x16, 0x4c, 0xcd, 0x35, 0xe1, 0xe4, - 0x21, 0x67, 0xae, 0xef, 0xb9, 0x49, 0x6a, 0x6a, 0xc8, 0x00, 0xfd, 0x4f, 0x6e, 0x32, 0x35, 0x6b, - 0xa3, 0x3d, 0x80, 0xc5, 0x6c, 0x82, 0xda, 0xd0, 0x78, 0xc7, 0x3c, 0x37, 0x34, 0xd7, 0x04, 0xe5, - 0x82, 0x9c, 0xfc, 0xd5, 0xd4, 0x50, 0x07, 0x5a, 0x17, 0xe4, 0x38, 0x54, 0xfc, 0x7f, 0x6b, 0x60, - 0x14, 0xa3, 0xc5, 0x22, 0x86, 0x14, 0x73, 0x79, 0xba, 0x35, 0xb4, 0x05, 0x1b, 0x32, 0x1a, 0xf8, - 0x32, 0xfd, 0x4b, 0x96, 0xe6, 0xb0, 0x56, 0x1c, 0xd3, 0x16, 0xcf, 0xd8, 0x02, 0xaf, 0x21, 0x13, - 0xba, 0x2a, 0xe4, 0x11, 0x91, 0x48, 0x1d, 0x6d, 0x82, 0x29, 0x23, 0x4e, 0x53, 0x52, 0xa2, 0x3a, - 0x7a, 0x08, 0x5b, 0x4b, 0x66, 0x4b, 0x51, 0x03, 0xfd, 0x02, 0x1e, 0x16, 0x0a, 0xab, 0xe2, 0xe6, - 0x68, 0x00, 0xdd, 0xea, 0x48, 0x53, 0xec, 0x28, 0x8e, 0xaf, 0x5c, 0x1e, 0x61, 0xe8, 0xdf, 0xe8, - 0x02, 0x82, 0x74, 0xc4, 0xa2, 0x38, 0xc4, 0x29, 0x16, 0x6b, 0x15, 0xc0, 0x63, 0x42, 0xdd, 0x50, - 0x2e, 0x35, 0x41, 0x38, 0x13, 0xc3, 0xb3, 0x1b, 0xbe, 0x90, 0x48, 0xad, 0x82, 0x1c, 0x48, 0xa4, - 0x2e, 0x54, 0xde, 0x60, 0x3f, 0x8b, 0xe5, 0x52, 0x3f, 0xfc, 0xd5, 0xa7, 0xcf, 0xdb, 0xda, 0xd7, - 0x9f, 0xb7, 0xb5, 0xef, 0x3e, 0x6f, 0x6b, 0xff, 0xfa, 0x7e, 0x7b, 0x0d, 0xb6, 0x3c, 0x16, 0xed, - 0xc5, 0x84, 0x06, 0x9e, 0x1b, 0xef, 0xa5, 0xc4, 0x9f, 0xc8, 0x42, 0x3e, 0xd3, 0x7e, 0x0c, 0x00, - 0x00, 0xff, 0xff, 0x79, 0x40, 0x8e, 0xad, 0xbb, 0x0e, 0x00, 0x00, + 0x0a, 0xf4, 0xd2, 0x5f, 0xd1, 0x5b, 0x7b, 0xed, 0xad, 0xc8, 0xf1, 0x5d, 0x1f, 0xf0, 0xf0, 0xf0, + 0x90, 0x77, 0x7b, 0xbf, 0xe2, 0x61, 0x77, 0x49, 0x8a, 0xb2, 0x6c, 0xbf, 0x9c, 0xc8, 0xfd, 0xe6, + 0x9b, 0xd9, 0xd9, 0xd9, 0x99, 0xd9, 0x81, 0x1e, 0x9e, 0x61, 0x2f, 0x4b, 0x19, 0xdf, 0x8b, 0x39, + 0x4b, 0x19, 0xd2, 0x53, 0x12, 0x4f, 0x1e, 0x99, 0x78, 0x16, 0x73, 0x9c, 0x24, 0x84, 0x51, 0x85, + 0x3f, 0xea, 0x26, 0xde, 0x14, 0x47, 0x6e, 0xbe, 0xda, 0x0c, 0x58, 0xc0, 0xe4, 0xef, 0x73, 0xf1, + 0xa7, 0xd0, 0xe1, 0xff, 0x75, 0x30, 0xde, 0xe6, 0xe6, 0xd0, 0x13, 0xa8, 0xa5, 0xb1, 0xa5, 0x0d, + 0xb4, 0xdd, 0xde, 0x41, 0x6f, 0x4f, 0x58, 0xdd, 0x13, 0xb2, 0x8b, 0x79, 0x8c, 0x0f, 0xf5, 0x4f, + 0xdf, 0xee, 0xac, 0xd9, 0xb5, 0x34, 0x46, 0x23, 0x30, 0xd2, 0x49, 0xe8, 0x24, 0x9e, 0x4b, 0xad, + 0xda, 0x40, 0xdb, 0xed, 0x1c, 0xf4, 0x15, 0xf7, 0xc2, 0x9d, 0x84, 0xf8, 0xdc, 0x73, 0xa9, 0xdd, + 0x4a, 0x27, 0xa1, 0xf8, 0x11, 0x5c, 0xe2, 0xcf, 0x14, 0xb7, 0x5e, 0xe5, 0x8e, 0xa9, 0x8f, 0x67, + 0x8a, 0x4b, 0x7c, 0xf9, 0x83, 0x7e, 0x0d, 0xed, 0x04, 0x87, 0xd8, 0x4b, 0x09, 0xa3, 0x96, 0x5e, + 0x25, 0x9f, 0x17, 0xb0, 0xbd, 0x60, 0xa0, 0x97, 0xd0, 0x71, 0x83, 0x80, 0xe3, 0xc0, 0x95, 0x0a, + 0x0d, 0xa9, 0xb0, 0xa1, 0x14, 0x5e, 0x2f, 0x04, 0x76, 0x95, 0x85, 0xb6, 0x41, 0x4f, 0x59, 0x7c, + 0x6a, 0x35, 0x25, 0x1b, 0x72, 0xbf, 0x59, 0x7c, 0x6a, 0x4b, 0x1c, 0x3d, 0x86, 0x46, 0x48, 0x22, + 0x92, 0x5a, 0x2d, 0x49, 0xe8, 0x28, 0xc2, 0x3b, 0x01, 0xd9, 0x4a, 0x82, 0x8e, 0x60, 0x03, 0xcf, + 0xbc, 0xa9, 0x4b, 0x03, 0xec, 0x70, 0xec, 0x61, 0xf2, 0x37, 0xcc, 0x2d, 0x43, 0xd2, 0x1f, 0x14, + 0x31, 0x53, 0x62, 0x3b, 0x97, 0xda, 0x26, 0xbe, 0x81, 0x08, 0x3f, 0xae, 0x18, 0xa1, 0x56, 0xbb, + 0xea, 0xc7, 0x9f, 0x19, 0xa1, 0xb6, 0xc4, 0xd1, 0x0e, 0x74, 0x8a, 0x4b, 0x76, 0x88, 0x6f, 0xc1, + 0x40, 0xdb, 0x6d, 0xdb, 0x50, 0x40, 0x63, 0x5f, 0x18, 0xb8, 0x26, 0x61, 0x68, 0x75, 0xaa, 0x06, + 0x4e, 0x48, 0x18, 0xda, 0x12, 0x47, 0xbf, 0x87, 0x7e, 0xe9, 0x65, 0x82, 0xa9, 0x8f, 0xb9, 0xd5, + 0x95, 0xd4, 0xcd, 0x65, 0x1f, 0xcf, 0xa5, 0xcc, 0xee, 0xe1, 0xa5, 0x35, 0xda, 0x07, 0x38, 0xe3, + 0xec, 0x2a, 0xbf, 0x8c, 0x75, 0xa9, 0x69, 0x2a, 0xcd, 0x05, 0x6e, 0x57, 0x38, 0xc3, 0xff, 0x69, + 0xd0, 0x5b, 0x36, 0x8a, 0x76, 0x2b, 0xe9, 0x84, 0x96, 0xb7, 0x5d, 0x49, 0xa9, 0x0d, 0x4c, 0x3d, + 0xe6, 0x63, 0xdf, 0x49, 0xdd, 0xe4, 0xda, 0x89, 0x70, 0xea, 0x5a, 0xb5, 0x41, 0x7d, 0xb7, 0x6b, + 0xf7, 0x73, 0xc1, 0x85, 0x9b, 0x5c, 0xbf, 0xc7, 0xa9, 0x8b, 0x5e, 0x40, 0x2f, 0x76, 0x79, 0x4a, + 0xc4, 0xae, 0xce, 0x35, 0x9e, 0x27, 0x56, 0x7d, 0x50, 0x5f, 0xc4, 0xe0, 0xed, 0x2c, 0xe6, 0xf6, + 0x7a, 0xc9, 0x38, 0xc1, 0xf3, 0x04, 0x3d, 0x81, 0x86, 0x37, 0x25, 0xa1, 0x9f, 0x67, 0x55, 0x25, + 0xb5, 0x45, 0x34, 0x6d, 0x25, 0x1c, 0xc6, 0x60, 0xde, 0xbc, 0xb9, 0xdb, 0x1d, 0xd3, 0x6e, 0x77, + 0x6c, 0x1f, 0x3a, 0x97, 0x04, 0x87, 0xbe, 0x93, 0xce, 0x63, 0x9c, 0x48, 0xf7, 0xcb, 0x0c, 0x3e, + 0x16, 0x02, 0x71, 0x68, 0x1b, 0x2e, 0x8b, 0xdf, 0x64, 0xf8, 0x8f, 0x1a, 0xb4, 0xcb, 0xa2, 0x41, + 0x3b, 0x60, 0xa4, 0x62, 0x21, 0x2e, 0x5c, 0x04, 0xad, 0x9e, 0x07, 0xa8, 0x25, 0xd1, 0xb1, 0x8f, + 0x46, 0xd0, 0xf2, 0x58, 0x98, 0x45, 0xb4, 0x30, 0x9e, 0xdf, 0xc8, 0x91, 0x04, 0xc7, 0xf4, 0x92, + 0xd9, 0x05, 0x01, 0x59, 0xa0, 0xfb, 0x38, 0xf1, 0x64, 0xd1, 0x19, 0xb9, 0x21, 0x89, 0xa0, 0x67, + 0x80, 0x62, 0x4e, 0x22, 0x97, 0xcf, 0x1d, 0x45, 0x76, 0x88, 0x9f, 0x58, 0xfa, 0xa0, 0xbe, 0x5b, + 0xb7, 0xcd, 0x5c, 0x92, 0x5b, 0xf4, 0x13, 0xf4, 0x0a, 0x4c, 0x8a, 0x67, 0xa9, 0xc3, 0xb1, 0xeb, + 0x3b, 0x98, 0x06, 0x84, 0x62, 0x59, 0x6a, 0xbd, 0x62, 0xf3, 0xb7, 0x12, 0xab, 0xdc, 0x67, 0x4f, + 0xf0, 0x6d, 0xec, 0xfa, 0x4a, 0x82, 0x9e, 0x41, 0x93, 0x8b, 0x98, 0x26, 0x56, 0x53, 0x3a, 0x9d, + 0x47, 0xff, 0x04, 0xcf, 0x6d, 0x01, 0xe7, 0x5a, 0x39, 0x67, 0xf8, 0x1f, 0x1d, 0x74, 0x51, 0x07, + 0xe8, 0x05, 0xb4, 0x45, 0x25, 0xc8, 0x60, 0x2e, 0xb7, 0x24, 0x21, 0xae, 0xec, 0x67, 0x5c, 0xe5, + 0x6b, 0xf4, 0x07, 0xe8, 0x49, 0x15, 0x51, 0x26, 0x4a, 0xaf, 0x56, 0xcd, 0x3d, 0xa1, 0x77, 0xa3, + 0x9d, 0x75, 0xaf, 0x2a, 0x98, 0x68, 0x56, 0x32, 0x13, 0x38, 0xa6, 0x79, 0x4e, 0xdd, 0xcc, 0x94, + 0x52, 0x8e, 0x1e, 0x43, 0x9b, 0x50, 0x8a, 0x45, 0x75, 0xce, 0x64, 0x5a, 0x15, 0xb7, 0x65, 0x48, + 0x78, 0xec, 0xcf, 0xd0, 0x3e, 0xf4, 0x42, 0x7c, 0x99, 0x3a, 0xd2, 0x27, 0x99, 0xa8, 0x8d, 0x95, + 0x44, 0xed, 0x0a, 0x86, 0x70, 0x4c, 0xe6, 0xe9, 0x01, 0xf4, 0x39, 0x09, 0xa6, 0x55, 0x95, 0xe6, + 0x6a, 0x6e, 0x4b, 0x4a, 0xa9, 0xb3, 0x0f, 0x9d, 0x98, 0xb3, 0x09, 0xce, 0xb3, 0xae, 0x75, 0x47, + 0xd6, 0x49, 0x8e, 0xcc, 0x3a, 0xa1, 0x31, 0xc9, 0x48, 0x99, 0xa7, 0xc6, 0x1d, 0x1a, 0x92, 0xa3, + 0x34, 0x5e, 0x42, 0x5f, 0x9e, 0xc4, 0x63, 0xd4, 0x97, 0x55, 0x95, 0x58, 0xed, 0x15, 0xbf, 0xe4, + 0x61, 0x8f, 0x4a, 0x06, 0xfa, 0x2d, 0x98, 0xea, 0x30, 0x15, 0x2d, 0x58, 0xd1, 0x52, 0x07, 0x5e, + 0x56, 0x63, 0xe9, 0x14, 0xf3, 0xaa, 0x5a, 0x67, 0x55, 0x4d, 0x72, 0x16, 0x6a, 0xc3, 0xaf, 0x35, + 0x68, 0x97, 0x6f, 0xca, 0x4f, 0x97, 0xd2, 0x0e, 0x18, 0x44, 0xb0, 0x05, 0xa1, 0x56, 0x25, 0x48, + 0x74, 0xb9, 0xd6, 0xea, 0x5f, 0x5a, 0x6b, 0xfa, 0x4a, 0xad, 0x3d, 0x80, 0x66, 0x46, 0xc9, 0x87, + 0x4c, 0xd5, 0x8c, 0x61, 0xe7, 0xab, 0x3b, 0x6a, 0xb0, 0x79, 0x7b, 0x0d, 0x0e, 0xff, 0xa9, 0x41, + 0xbb, 0x7c, 0x02, 0xd1, 0x08, 0xa0, 0x12, 0x1a, 0x6d, 0x25, 0x34, 0x15, 0x29, 0xfa, 0x0d, 0xf4, + 0x78, 0x4c, 0xab, 0xa1, 0x54, 0x8d, 0x63, 0x5d, 0xf1, 0xed, 0x98, 0xe6, 0x29, 0x15, 0xd3, 0xca, + 0x15, 0x94, 0xed, 0xb2, 0x7e, 0x5f, 0xbb, 0xfc, 0xbb, 0x56, 0x7d, 0x23, 0xd0, 0x00, 0x1a, 0x62, + 0x00, 0xb9, 0xcd, 0x23, 0x25, 0x40, 0x23, 0x68, 0x0b, 0x67, 0x14, 0xeb, 0x56, 0x3f, 0x0c, 0xae, + 0x7e, 0xbe, 0xd4, 0x85, 0xff, 0xd6, 0xa0, 0x53, 0x79, 0xea, 0xd1, 0x53, 0x30, 0x02, 0xce, 0xb2, + 0xd8, 0x99, 0xcc, 0x6f, 0x71, 0xa3, 0x25, 0x65, 0x87, 0x73, 0x41, 0x73, 0x83, 0xc0, 0xb9, 0xcc, + 0xa8, 0x97, 0xfb, 0xb1, 0x44, 0x73, 0x83, 0xe0, 0x38, 0xa3, 0x1e, 0x1a, 0x80, 0x91, 0xa4, 0x1c, + 0xbb, 0x11, 0xf6, 0x97, 0xda, 0x68, 0x89, 0xa2, 0xe7, 0xd0, 0x15, 0x27, 0x2a, 0xf7, 0xd4, 0x6f, + 0x3b, 0x14, 0xf0, 0x98, 0xfe, 0x31, 0xdf, 0x39, 0x57, 0x28, 0x77, 0x6f, 0xdc, 0xa5, 0xf0, 0x3a, + 0xf7, 0xa1, 0x8c, 0x43, 0xf3, 0x9e, 0x38, 0xa0, 0xe7, 0xa0, 0x47, 0xcc, 0xc7, 0x72, 0x68, 0xe9, + 0x1d, 0x6c, 0x95, 0x33, 0x90, 0x30, 0x21, 0x02, 0xf3, 0x9e, 0xf9, 0x45, 0xc7, 0x93, 0xc4, 0xe1, + 0x07, 0xd0, 0xc5, 0xd0, 0x83, 0x7e, 0x09, 0x06, 0xe3, 0x3e, 0xe6, 0x8b, 0x80, 0x75, 0x95, 0xf2, + 0xe1, 0x7c, 0x9c, 0xe2, 0xc8, 0x6e, 0x49, 0xe9, 0xe1, 0x1c, 0x3d, 0x2a, 0xe6, 0x22, 0x51, 0x2c, + 0x7a, 0x6e, 0x2b, 0x1f, 0x88, 0xbe, 0xec, 0xae, 0xc6, 0xd0, 0x90, 0x63, 0xd4, 0xc2, 0x94, 0x76, + 0x8f, 0xa9, 0xda, 0x7d, 0xa6, 0x5e, 0x81, 0x2e, 0x26, 0x1d, 0xf4, 0x73, 0x68, 0x7a, 0x8c, 0xd2, + 0xf1, 0x9b, 0x25, 0x53, 0x39, 0x26, 0xf6, 0xf9, 0x90, 0x61, 0x3e, 0x97, 0xb6, 0x8a, 0xbb, 0x53, + 0xd0, 0xf0, 0x1b, 0x0d, 0xac, 0xc2, 0xaa, 0xfa, 0x12, 0x46, 0xcf, 0xb3, 0x48, 0xd4, 0x9d, 0x78, + 0xf3, 0x53, 0x12, 0x61, 0x27, 0xe6, 0xcc, 0xc3, 0x49, 0x82, 0x7d, 0x47, 0xd6, 0x99, 0xb6, 0xab, + 0xdb, 0x7d, 0x21, 0x38, 0x2b, 0xf0, 0x53, 0x91, 0xd3, 0x1b, 0x34, 0x8b, 0x04, 0xd5, 0xcf, 0x3c, + 0xec, 0x3b, 0x9c, 0x7d, 0x4c, 0x54, 0x8c, 0xec, 0x3e, 0xcd, 0xa2, 0xb3, 0x1c, 0xb7, 0xd9, 0xc7, + 0x04, 0x3d, 0x85, 0x9e, 0xe0, 0x92, 0x14, 0x73, 0x57, 0x15, 0x63, 0x5d, 0x12, 0xd7, 0x69, 0x16, + 0x8d, 0x4b, 0xf0, 0xe6, 0xe8, 0xa7, 0xaf, 0x8c, 0x7e, 0x03, 0xe8, 0x78, 0x8c, 0x7a, 0x19, 0xe7, + 0x98, 0x7a, 0x73, 0xd9, 0x59, 0x74, 0xbb, 0x0a, 0x8d, 0x7e, 0xd0, 0xd4, 0x50, 0x2f, 0x5f, 0xb5, + 0x0d, 0x58, 0x17, 0xdf, 0x72, 0xce, 0x30, 0xd7, 0x0a, 0xa8, 0xec, 0x97, 0xa6, 0x56, 0x40, 0x65, + 0x9b, 0x31, 0x6b, 0xe8, 0x67, 0xd0, 0x17, 0x50, 0xa5, 0xc0, 0xcc, 0x3a, 0xea, 0x82, 0x21, 0xad, + 0xb1, 0xf8, 0xd4, 0xd4, 0xd1, 0x3a, 0xb4, 0xc5, 0x4a, 0x5e, 0xac, 0xd9, 0x28, 0x8d, 0xc8, 0xfa, + 0x78, 0x1d, 0x04, 0x66, 0xb3, 0xe0, 0x8b, 0xe7, 0xca, 0x6c, 0x15, 0x2b, 0x71, 0x7b, 0xa6, 0x81, + 0x1e, 0x00, 0x12, 0xab, 0xe5, 0xa9, 0xd1, 0x6c, 0x23, 0x0b, 0x36, 0xab, 0x78, 0x31, 0x8c, 0x99, + 0x80, 0x10, 0xf4, 0x84, 0x64, 0xd1, 0x76, 0xcc, 0xce, 0xe8, 0x77, 0xd0, 0xad, 0x4e, 0x95, 0xa8, + 0x0f, 0x9d, 0x33, 0x37, 0x49, 0x2e, 0xa6, 0x9c, 0x65, 0xc1, 0xd4, 0x5c, 0x13, 0x4e, 0x1e, 0x72, + 0xe6, 0xfa, 0x9e, 0x9b, 0xa4, 0xa6, 0x86, 0x0c, 0xd0, 0xff, 0xe4, 0x26, 0x53, 0xb3, 0x36, 0xda, + 0x03, 0x58, 0x4c, 0x2f, 0xa8, 0x0d, 0x8d, 0x77, 0xcc, 0x73, 0x43, 0x73, 0x4d, 0x50, 0x2e, 0xc8, + 0xc9, 0x5f, 0x4d, 0x0d, 0x75, 0xa0, 0x75, 0x41, 0x8e, 0x43, 0xc5, 0xff, 0xb7, 0x06, 0x46, 0x31, + 0x7c, 0x2c, 0x62, 0x48, 0x31, 0x97, 0xa7, 0x5b, 0x43, 0x5b, 0xb0, 0x21, 0xa3, 0x81, 0x2f, 0xd3, + 0xbf, 0x64, 0x69, 0x0e, 0x6b, 0xc5, 0x31, 0x6d, 0xf1, 0xd0, 0x2d, 0xf0, 0x1a, 0x32, 0xa1, 0xab, + 0x42, 0x1e, 0x11, 0x89, 0xd4, 0xd1, 0x26, 0x98, 0x32, 0xe2, 0x34, 0x25, 0x25, 0xaa, 0xa3, 0x87, + 0xb0, 0xb5, 0x64, 0xb6, 0x14, 0x35, 0xd0, 0x2f, 0xe0, 0x61, 0xa1, 0xb0, 0x2a, 0x6e, 0x8e, 0x06, + 0xd0, 0xad, 0x0e, 0x3d, 0xc5, 0x8e, 0xe2, 0xf8, 0xca, 0xe5, 0x11, 0x86, 0xfe, 0x8d, 0x3e, 0x21, + 0x48, 0x47, 0x2c, 0x8a, 0x43, 0x9c, 0x62, 0xb1, 0x56, 0x01, 0x3c, 0x26, 0xd4, 0x0d, 0xe5, 0x52, + 0x13, 0x84, 0x33, 0x31, 0x5e, 0xbb, 0xe1, 0x0b, 0x89, 0xd4, 0x2a, 0xc8, 0x81, 0x44, 0xea, 0x42, + 0xe5, 0x0d, 0xf6, 0xb3, 0x58, 0x2e, 0xf5, 0xc3, 0x5f, 0x7d, 0xfa, 0xbc, 0xad, 0x7d, 0xf5, 0x79, + 0x5b, 0xfb, 0xee, 0xf3, 0xb6, 0xf6, 0xaf, 0xef, 0xb7, 0xd7, 0x60, 0xcb, 0x63, 0xd1, 0x5e, 0x4c, + 0x68, 0xe0, 0xb9, 0xf1, 0x5e, 0x4a, 0xfc, 0x89, 0x2c, 0xf5, 0x33, 0xed, 0xc7, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x90, 0x20, 0x18, 0xcb, 0xdd, 0x0e, 0x00, 0x00, } diff --git a/proto/executor.proto b/proto/executor.proto index f0dac204c..b8b5a9eb7 100644 --- a/proto/executor.proto +++ b/proto/executor.proto @@ -189,4 +189,7 @@ message ExecutorExecutionSummary { // Coresponding executor id optional string executor_id = 4; + + // The execution concurrency for this executor + optional uint64 concurrency = 5; }