From 3c298e6a7c814ed69b78293a0b2d6fc01140c8b1 Mon Sep 17 00:00:00 2001 From: Dongpo Liu Date: Fri, 15 May 2026 16:22:22 +0200 Subject: [PATCH 1/2] proto: add NDV rate to analyze request (#410) Signed-off-by: 0xPoe --- go-tipb/analyze.pb.go | 191 ++++++++++++++++++++++++------------------ proto/analyze.proto | 3 + scripts/proto.lock | 6 ++ 3 files changed, 120 insertions(+), 80 deletions(-) diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index f0083270..b742d9c8 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -333,7 +333,9 @@ type AnalyzeColumnsReq struct { ColumnGroups []*AnalyzeColumnGroup `protobuf:"bytes,10,rep,name=column_groups,json=columnGroups" json:"column_groups,omitempty"` // sample_rate is the sampling rate that how many samples will collected. // There must be one non-zero value in sample_rate and sample_size. - SampleRate *float64 `protobuf:"fixed64,11,opt,name=sample_rate,json=sampleRate" json:"sample_rate,omitempty"` + SampleRate *float64 `protobuf:"fixed64,11,opt,name=sample_rate,json=sampleRate" json:"sample_rate,omitempty"` + // ndv_rate is the sampling rate that determines how many samples will be used to calculate the NDV. + NdvRate *float64 `protobuf:"fixed64,12,opt,name=ndv_rate,json=ndvRate" json:"ndv_rate,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -419,6 +421,13 @@ func (m *AnalyzeColumnsReq) GetSampleRate() float64 { return 0 } +func (m *AnalyzeColumnsReq) GetNdvRate() float64 { + if m != nil && m.NdvRate != nil { + return *m.NdvRate + } + return 0 +} + type AnalyzeMixedResp struct { ColumnsResp *AnalyzeColumnsResp `protobuf:"bytes,1,opt,name=columns_resp,json=columnsResp" json:"columns_resp,omitempty"` IndexResp *AnalyzeIndexResp `protobuf:"bytes,2,opt,name=index_resp,json=indexResp" json:"index_resp,omitempty"` @@ -1057,6 +1066,12 @@ func (m *AnalyzeColumnsReq) MarshalTo(dAtA []byte) (int, error) { encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.SampleRate)))) i += 8 } + if m.NdvRate != nil { + dAtA[i] = 0x61 + i++ + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.NdvRate)))) + i += 8 + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1711,6 +1726,9 @@ func (m *AnalyzeColumnsReq) Size() (n int) { if m.SampleRate != nil { n += 9 } + if m.NdvRate != nil { + n += 9 + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2734,6 +2752,18 @@ func (m *AnalyzeColumnsReq) Unmarshal(dAtA []byte) error { iNdEx += 8 v2 := float64(math.Float64frombits(v)) m.SampleRate = &v2 + case 12: + if wireType != 1 { + return fmt.Errorf("proto: wrong wireType = %d for field NdvRate", wireType) + } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + v2 := float64(math.Float64frombits(v)) + m.NdvRate = &v2 default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) @@ -4763,83 +4793,84 @@ var ( func init() { proto.RegisterFile("analyze.proto", fileDescriptorAnalyze) } var fileDescriptorAnalyze = []byte{ - // 1244 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5f, 0x6f, 0xdc, 0x44, - 0x10, 0xaf, 0xcf, 0xf7, 0x77, 0xee, 0x92, 0x5c, 0x96, 0xb6, 0x98, 0xa8, 0xa4, 0x27, 0x57, 0xa5, - 0x97, 0x16, 0x1d, 0x28, 0x15, 0x0f, 0xa8, 0xa2, 0x12, 0x29, 0x2a, 0xad, 0xa0, 0xa5, 0xda, 0x56, - 0x20, 0xf1, 0x62, 0x39, 0xf6, 0xde, 0x9d, 0x15, 0xdb, 0xeb, 0x78, 0xd7, 0xbd, 0x34, 0xe2, 0x15, - 0x1e, 0xe1, 0xb5, 0xdf, 0x03, 0x3e, 0x44, 0x9f, 0x10, 0x9f, 0x00, 0xa1, 0x22, 0x5e, 0xf9, 0x0c, - 0x68, 0x67, 0xd7, 0xbe, 0x3f, 0xb9, 0xa0, 0xf6, 0xc9, 0x3b, 0x33, 0xbf, 0x9d, 0x9d, 0xf9, 0xcd, - 0xec, 0xac, 0x61, 0xc3, 0x4f, 0xfd, 0xf8, 0xc5, 0x29, 0x1b, 0x65, 0x39, 0x97, 0x9c, 0xd4, 0x65, - 0x94, 0x1d, 0xee, 0xf4, 0x44, 0x30, 0x65, 0x89, 0xaf, 0x75, 0x3b, 0x17, 0x27, 0x7c, 0xc2, 0x71, - 0xf9, 0x91, 0x5a, 0x69, 0xad, 0xfb, 0x4b, 0x0d, 0xe0, 0x73, 0xbd, 0x97, 0xb2, 0x63, 0x72, 0x03, - 0x6a, 0x32, 0x73, 0xac, 0x81, 0x35, 0xdc, 0xdc, 0xdf, 0x1e, 0x29, 0x2f, 0x23, 0x63, 0x7d, 0xf6, - 0x22, 0x63, 0x07, 0xf5, 0x57, 0x7f, 0x5e, 0xbd, 0x40, 0x6b, 0x32, 0x23, 0x37, 0x61, 0x5b, 0x48, - 0x3f, 0x97, 0x9e, 0x14, 0xde, 0xd8, 0x8f, 0xe3, 0x43, 0x3f, 0x38, 0x72, 0x6a, 0x03, 0x6b, 0x58, - 0xa7, 0x5b, 0x68, 0x78, 0x26, 0xee, 0x1b, 0x35, 0xd9, 0x81, 0xc6, 0x38, 0xf6, 0x27, 0xc2, 0xb1, - 0x95, 0xdd, 0x38, 0xd1, 0x2a, 0x32, 0x82, 0xbe, 0x8c, 0x12, 0xe6, 0x9d, 0xf2, 0x94, 0x79, 0x7c, - 0x3c, 0x16, 0x4c, 0x3a, 0xf5, 0x81, 0x35, 0xb4, 0x0d, 0x6c, 0x53, 0x59, 0xbf, 0xe7, 0x29, 0xfb, - 0x06, 0x6d, 0x64, 0x04, 0xad, 0x28, 0x3c, 0xf1, 0x72, 0x76, 0xec, 0x34, 0x06, 0xd6, 0xb0, 0xbb, - 0x7f, 0x69, 0x29, 0xca, 0x87, 0x69, 0xc8, 0x4e, 0x28, 0x3b, 0xa6, 0xcd, 0x28, 0x54, 0x5f, 0xf2, - 0x31, 0xb4, 0x02, 0x1e, 0x23, 0xbe, 0x89, 0xf8, 0x77, 0x97, 0xf0, 0xf7, 0x78, 0x5c, 0x24, 0xa9, - 0xc0, 0x1d, 0x01, 0x8f, 0x29, 0x3b, 0x76, 0x7f, 0xad, 0xc1, 0xd6, 0x8a, 0x37, 0x72, 0x1d, 0xba, - 0x87, 0x45, 0x70, 0xc4, 0xa4, 0x27, 0xa2, 0x53, 0x86, 0xfc, 0x94, 0x01, 0x82, 0x36, 0x3c, 0x8d, - 0x4e, 0x99, 0x82, 0xa5, 0x45, 0xe2, 0x05, 0xda, 0x29, 0xd2, 0xd1, 0x28, 0x61, 0x69, 0x91, 0x98, - 0xc3, 0xc8, 0x75, 0xd8, 0x0c, 0x12, 0x71, 0xc4, 0x64, 0x30, 0xf5, 0x42, 0x96, 0xc9, 0x29, 0x12, - 0xd3, 0xa0, 0x1b, 0xa5, 0xf6, 0x0b, 0xa5, 0x5c, 0x82, 0xcd, 0xa2, 0x50, 0x4e, 0x91, 0x98, 0x05, - 0xd8, 0x77, 0x4a, 0xa9, 0x0e, 0x15, 0x7e, 0x92, 0xc5, 0x4c, 0xc7, 0xd6, 0x58, 0x8c, 0x4d, 0x1b, - 0xca, 0xd8, 0x8c, 0x2f, 0x84, 0x35, 0x97, 0x60, 0x68, 0x40, 0xd8, 0x15, 0x00, 0xc9, 0x33, 0x2f, - 0xd5, 0xa8, 0x16, 0x1e, 0xd8, 0x96, 0x3c, 0x7b, 0x8c, 0x56, 0x07, 0x5a, 0xcf, 0x59, 0x2e, 0x22, - 0x9e, 0x3a, 0x6d, 0x34, 0x95, 0xa2, 0xfb, 0xaf, 0x0d, 0xdb, 0x67, 0x38, 0x7d, 0x0b, 0xde, 0x16, - 0x53, 0xa8, 0xbd, 0x59, 0x0a, 0xf6, 0x39, 0x29, 0xdc, 0x86, 0x9e, 0xa9, 0x80, 0x17, 0xa5, 0x63, - 0xee, 0xd4, 0x07, 0xf6, 0xb0, 0xbb, 0xdf, 0xd7, 0x75, 0xd7, 0xc1, 0x3d, 0x4c, 0xc7, 0x9c, 0x76, - 0x0d, 0x4a, 0x09, 0x6b, 0x6a, 0xd2, 0x78, 0xb3, 0x9a, 0x34, 0xd7, 0xd5, 0xe4, 0x43, 0x20, 0x59, - 0x1e, 0x25, 0x7e, 0xfe, 0xc2, 0x34, 0x83, 0x17, 0x85, 0xc2, 0x69, 0x0d, 0xec, 0xa1, 0x4d, 0xfb, - 0xc6, 0x62, 0x22, 0x09, 0xc5, 0xf9, 0xac, 0x92, 0x4f, 0xe1, 0xbd, 0xd2, 0x4f, 0x96, 0xb3, 0x71, - 0x74, 0xb2, 0xe8, 0xae, 0x83, 0xee, 0x2e, 0x1b, 0xc0, 0x13, 0xb4, 0xcf, 0x9d, 0x7e, 0x06, 0x1b, - 0x06, 0x3b, 0xc9, 0x79, 0x91, 0x09, 0x07, 0x90, 0x06, 0x67, 0x4d, 0xfb, 0x7f, 0xa9, 0x00, 0xd4, - 0x90, 0x86, 0x82, 0x20, 0x57, 0xab, 0x92, 0xe4, 0xbe, 0x64, 0x4e, 0x77, 0x60, 0x0d, 0xad, 0xb2, - 0x18, 0xd4, 0x97, 0xcc, 0xfd, 0xc9, 0x82, 0xbe, 0xf1, 0xf2, 0x28, 0x3a, 0x61, 0x21, 0x65, 0x22, - 0x23, 0x77, 0xe6, 0xd4, 0xe7, 0x4c, 0xe8, 0x41, 0xb2, 0xfe, 0x4c, 0xa1, 0xf0, 0x55, 0x09, 0x70, - 0xf3, 0x27, 0x00, 0x91, 0xba, 0x70, 0x7a, 0x6b, 0x0d, 0xb7, 0x5e, 0x5e, 0x77, 0xbb, 0x45, 0x46, - 0x3b, 0x51, 0xb9, 0x74, 0x0f, 0x81, 0x9c, 0xcd, 0x06, 0x0b, 0xa5, 0xd3, 0xd7, 0x43, 0x45, 0x38, - 0x16, 0xd2, 0x65, 0x48, 0xd1, 0xd3, 0x04, 0xaf, 0xa2, 0x21, 0x36, 0x66, 0xe9, 0x44, 0x4e, 0xd5, - 0xa5, 0x45, 0x98, 0xd6, 0x7e, 0xad, 0x95, 0xee, 0x6f, 0xd6, 0xca, 0x21, 0x55, 0xc4, 0x01, 0x8f, - 0x63, 0x16, 0x48, 0x9e, 0xeb, 0x03, 0xaa, 0x79, 0xf4, 0x14, 0x99, 0xba, 0x57, 0x5a, 0xe9, 0x02, - 0x90, 0x0c, 0xa1, 0x95, 0x1d, 0x79, 0xd3, 0x48, 0x48, 0x93, 0xe5, 0x96, 0xde, 0xf3, 0x20, 0x12, - 0x92, 0x4f, 0x72, 0x3f, 0xa1, 0xcd, 0xec, 0x48, 0x09, 0xaa, 0x88, 0x39, 0x9f, 0x79, 0xd5, 0x5e, - 0xec, 0xf9, 0x8a, 0x50, 0xca, 0x67, 0xab, 0xc7, 0xf4, 0x72, 0x3e, 0xab, 0x24, 0xf7, 0xe7, 0x79, - 0x8d, 0x2a, 0xea, 0xc8, 0x35, 0xa8, 0xe3, 0xd1, 0xd6, 0xfa, 0xa3, 0xd1, 0x48, 0x06, 0x60, 0x07, - 0x89, 0x30, 0xe1, 0x6d, 0x9a, 0xab, 0xf3, 0xe8, 0x29, 0xb6, 0x38, 0x55, 0x26, 0x72, 0x1b, 0x3a, - 0xab, 0x61, 0x9d, 0x93, 0xfa, 0x1c, 0xe7, 0xbe, 0xb4, 0xa0, 0x79, 0x80, 0xf7, 0x5e, 0x3d, 0x0a, - 0x01, 0x2f, 0x52, 0xb9, 0x34, 0x14, 0xb4, 0x4a, 0x35, 0x5f, 0xcc, 0x67, 0x2c, 0xf7, 0x0e, 0x79, - 0x91, 0x86, 0x18, 0x45, 0x8f, 0x02, 0xaa, 0x0e, 0x94, 0x46, 0x01, 0x8a, 0x2c, 0xab, 0x00, 0xb6, - 0x06, 0xa0, 0x4a, 0x03, 0x76, 0xa1, 0x95, 0xb3, 0x8c, 0xf9, 0x52, 0x2c, 0xbd, 0x26, 0xa5, 0x92, - 0xf4, 0xc1, 0x4e, 0xc3, 0xe7, 0x7a, 0x58, 0x52, 0xb5, 0x74, 0xbf, 0x82, 0x4e, 0x45, 0x02, 0xb9, - 0xac, 0xcd, 0x8b, 0xa1, 0x29, 0x05, 0xf9, 0x00, 0x5a, 0x7a, 0x6c, 0xe9, 0x3e, 0xe9, 0xee, 0xf7, - 0x74, 0xca, 0x3a, 0x27, 0x5a, 0x1a, 0xdd, 0xbb, 0xd0, 0xbe, 0x6f, 0xd8, 0x22, 0x0e, 0xd4, 0x13, - 0x5f, 0x1c, 0xa1, 0xb3, 0xf2, 0xf1, 0x43, 0x8d, 0xba, 0xf7, 0x53, 0x5f, 0x4c, 0xd5, 0x93, 0xa7, - 0xbc, 0xd5, 0x69, 0x29, 0xba, 0xff, 0x58, 0xb0, 0xb5, 0x42, 0xa3, 0x42, 0xeb, 0xeb, 0xa7, 0x3b, - 0xad, 0x47, 0x4b, 0x91, 0x5c, 0x03, 0x48, 0x8b, 0x38, 0xf6, 0x34, 0x9f, 0x8b, 0xd3, 0xb3, 0xa3, - 0xf4, 0xf7, 0x90, 0xd3, 0x8a, 0x6f, 0xfb, 0x2c, 0xdf, 0xb7, 0xa0, 0x33, 0x4e, 0x3c, 0x3d, 0xc0, - 0x90, 0xaf, 0xaa, 0xe6, 0x65, 0x16, 0xb4, 0x3d, 0x4e, 0x4c, 0x3e, 0xb7, 0xa0, 0x13, 0x54, 0xe0, - 0xc6, 0xda, 0x06, 0x69, 0x07, 0x25, 0xf8, 0x7d, 0xf5, 0x9c, 0x48, 0x3f, 0x5e, 0x78, 0x74, 0x68, - 0x07, 0x35, 0x6a, 0x54, 0xbb, 0xbf, 0x5b, 0x40, 0xce, 0x76, 0x31, 0xd9, 0x5b, 0x4e, 0xb5, 0xea, - 0xd2, 0x0a, 0x3a, 0xcf, 0x1d, 0x9f, 0xdc, 0x32, 0x77, 0x73, 0x7b, 0xe7, 0x4f, 0xae, 0x49, 0x5e, - 0xbc, 0x4d, 0xf6, 0xf6, 0xff, 0x66, 0xbf, 0x9c, 0x50, 0x03, 0x87, 0xc5, 0x42, 0x42, 0x77, 0xa0, - 0x53, 0x05, 0xa9, 0x9a, 0x2c, 0xe7, 0x33, 0x53, 0x2d, 0xb5, 0x24, 0x57, 0xa0, 0x39, 0x63, 0xd1, - 0x64, 0xba, 0x5c, 0x25, 0xa3, 0x73, 0xf7, 0xa0, 0x5b, 0x51, 0xc8, 0x67, 0x64, 0x07, 0xda, 0x18, - 0x20, 0x33, 0xb3, 0x65, 0x83, 0x56, 0xb2, 0x7b, 0x17, 0x7a, 0x25, 0xf4, 0x19, 0xcf, 0x1e, 0x13, - 0x02, 0xf5, 0xd0, 0x97, 0x3e, 0x36, 0x59, 0x8f, 0xe2, 0x7a, 0x9e, 0x73, 0x6d, 0xf1, 0xb7, 0x0b, - 0x55, 0xee, 0x8f, 0x16, 0xb4, 0x4b, 0x07, 0xe4, 0x3a, 0xd4, 0x73, 0x3e, 0x2b, 0xb9, 0xde, 0x5e, - 0x29, 0x26, 0x9f, 0x51, 0x34, 0x93, 0x1b, 0xd0, 0xc0, 0x5f, 0x03, 0xd3, 0xfa, 0x64, 0x19, 0xa7, - 0xc2, 0xa0, 0x75, 0xf5, 0xa7, 0x40, 0xf6, 0x60, 0x23, 0x64, 0x63, 0xbf, 0x88, 0xa5, 0xf7, 0xdc, - 0x8f, 0x0b, 0xb6, 0xf4, 0xdf, 0xd7, 0x33, 0xa6, 0x6f, 0x95, 0xe5, 0xe6, 0x0f, 0xd0, 0x5d, 0xf8, - 0xbf, 0x24, 0x1b, 0xd0, 0x51, 0x5f, 0x1c, 0x56, 0xfd, 0x0b, 0x64, 0x13, 0x40, 0x89, 0x7a, 0xe4, - 0xf6, 0x2d, 0x72, 0x11, 0xfa, 0x5a, 0x4e, 0x12, 0x9e, 0x3e, 0xf0, 0xd3, 0x30, 0x66, 0xfd, 0x1a, - 0x79, 0x07, 0xb6, 0x94, 0x56, 0x93, 0xae, 0xb7, 0xda, 0xa5, 0x27, 0x7c, 0x9a, 0xfa, 0xf5, 0x72, - 0xe7, 0xfd, 0x22, 0x8e, 0x11, 0x17, 0xa5, 0x93, 0x7e, 0xe3, 0x60, 0xef, 0xd5, 0xeb, 0x5d, 0xeb, - 0x8f, 0xd7, 0xbb, 0xd6, 0x5f, 0xaf, 0x77, 0xad, 0x97, 0x7f, 0xef, 0x5e, 0x80, 0x4b, 0x01, 0x4f, - 0x46, 0x59, 0x94, 0x4e, 0x02, 0x3f, 0x1b, 0xc9, 0x28, 0x3c, 0xc4, 0x24, 0x9f, 0x58, 0xff, 0x05, - 0x00, 0x00, 0xff, 0xff, 0x3c, 0xd9, 0x10, 0xfc, 0x61, 0x0b, 0x00, 0x00, + // 1261 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdf, 0x6e, 0xdc, 0xc4, + 0x17, 0xae, 0x77, 0xbd, 0xff, 0xce, 0x6e, 0x92, 0xcd, 0xfc, 0xda, 0xfe, 0xdc, 0xa8, 0xa4, 0x2b, + 0x57, 0xa5, 0x9b, 0x16, 0x2d, 0x28, 0x15, 0x17, 0xa8, 0xa2, 0x12, 0x29, 0x2a, 0xad, 0xa0, 0xa5, + 0x9a, 0x56, 0x20, 0x71, 0x63, 0x39, 0xf6, 0xec, 0xae, 0x15, 0xdb, 0xe3, 0x78, 0xc6, 0xd9, 0x34, + 0xe2, 0x16, 0x24, 0x6e, 0xe0, 0xb6, 0xef, 0x01, 0x0f, 0xd1, 0x2b, 0xc4, 0x13, 0x20, 0x54, 0xc4, + 0x7b, 0xa0, 0x39, 0x33, 0xf6, 0xfe, 0xc9, 0x16, 0xb5, 0x57, 0x9e, 0x39, 0xdf, 0x37, 0x67, 0xce, + 0xf9, 0xce, 0xcc, 0x19, 0xc3, 0x86, 0x9f, 0xfa, 0xf1, 0x8b, 0x33, 0x36, 0xca, 0x72, 0x2e, 0x39, + 0xb1, 0x65, 0x94, 0x1d, 0xee, 0xf4, 0x44, 0x30, 0x65, 0x89, 0xaf, 0x6d, 0x3b, 0x17, 0x27, 0x7c, + 0xc2, 0x71, 0xf8, 0xa1, 0x1a, 0x69, 0xab, 0xfb, 0x4b, 0x0d, 0xe0, 0x33, 0xbd, 0x96, 0xb2, 0x63, + 0x72, 0x13, 0x6a, 0x32, 0x73, 0xac, 0x81, 0x35, 0xdc, 0xdc, 0xdf, 0x1e, 0x29, 0x2f, 0x23, 0x83, + 0x3e, 0x7f, 0x91, 0xb1, 0x03, 0xfb, 0xd5, 0x9f, 0xd7, 0x2e, 0xd0, 0x9a, 0xcc, 0xc8, 0x2d, 0xd8, + 0x16, 0xd2, 0xcf, 0xa5, 0x27, 0x85, 0x37, 0xf6, 0xe3, 0xf8, 0xd0, 0x0f, 0x8e, 0x9c, 0xda, 0xc0, + 0x1a, 0xda, 0x74, 0x0b, 0x81, 0xe7, 0xe2, 0x81, 0x31, 0x93, 0x1d, 0x68, 0x8c, 0x63, 0x7f, 0x22, + 0x9c, 0xba, 0xc2, 0x8d, 0x13, 0x6d, 0x22, 0x23, 0xe8, 0xcb, 0x28, 0x61, 0xde, 0x19, 0x4f, 0x99, + 0xc7, 0xc7, 0x63, 0xc1, 0xa4, 0x63, 0x0f, 0xac, 0x61, 0xdd, 0xd0, 0x36, 0x15, 0xfa, 0x1d, 0x4f, + 0xd9, 0xd7, 0x88, 0x91, 0x11, 0xb4, 0xa2, 0xf0, 0xd4, 0xcb, 0xd9, 0xb1, 0xd3, 0x18, 0x58, 0xc3, + 0xee, 0xfe, 0xa5, 0xa5, 0x28, 0x1f, 0xa5, 0x21, 0x3b, 0xa5, 0xec, 0x98, 0x36, 0xa3, 0x50, 0x7d, + 0xc9, 0x47, 0xd0, 0x0a, 0x78, 0x8c, 0xfc, 0x26, 0xf2, 0xff, 0xbf, 0xc4, 0xbf, 0xcf, 0xe3, 0x22, + 0x49, 0x05, 0xae, 0x08, 0x78, 0x4c, 0xd9, 0xb1, 0xfb, 0x6b, 0x0d, 0xb6, 0x56, 0xbc, 0x91, 0x1b, + 0xd0, 0x3d, 0x2c, 0x82, 0x23, 0x26, 0x3d, 0x11, 0x9d, 0x31, 0xd4, 0xa7, 0x0c, 0x10, 0x34, 0xf0, + 0x2c, 0x3a, 0x63, 0x8a, 0x96, 0x16, 0x89, 0x17, 0x68, 0xa7, 0x28, 0x47, 0xa3, 0xa4, 0xa5, 0x45, + 0x62, 0x36, 0x23, 0x37, 0x60, 0x33, 0x48, 0xc4, 0x11, 0x93, 0xc1, 0xd4, 0x0b, 0x59, 0x26, 0xa7, + 0x28, 0x4c, 0x83, 0x6e, 0x94, 0xd6, 0xcf, 0x95, 0x71, 0x89, 0x36, 0x8b, 0x42, 0x39, 0x45, 0x61, + 0x16, 0x68, 0xdf, 0x2a, 0xa3, 0xda, 0x54, 0xf8, 0x49, 0x16, 0x33, 0x1d, 0x5b, 0x63, 0x31, 0x36, + 0x0d, 0x94, 0xb1, 0x19, 0x5f, 0x48, 0x6b, 0x2e, 0xd1, 0x10, 0x40, 0xda, 0x55, 0x00, 0xc9, 0x33, + 0x2f, 0xd5, 0xac, 0x16, 0x6e, 0xd8, 0x96, 0x3c, 0x7b, 0x82, 0xa8, 0x03, 0xad, 0x13, 0x96, 0x8b, + 0x88, 0xa7, 0x4e, 0x1b, 0xa1, 0x72, 0xea, 0xfe, 0x64, 0xc3, 0xf6, 0x39, 0x4d, 0xdf, 0x41, 0xb7, + 0xc5, 0x14, 0x6a, 0x6f, 0x97, 0x42, 0xfd, 0x0d, 0x29, 0xdc, 0x81, 0x9e, 0xa9, 0x80, 0x17, 0xa5, + 0x63, 0xee, 0xd8, 0x83, 0xfa, 0xb0, 0xbb, 0xdf, 0xd7, 0x75, 0xd7, 0xc1, 0x3d, 0x4a, 0xc7, 0x9c, + 0x76, 0x0d, 0x4b, 0x4d, 0xd6, 0xd4, 0xa4, 0xf1, 0x76, 0x35, 0x69, 0xae, 0xab, 0xc9, 0x07, 0x40, + 0xb2, 0x3c, 0x4a, 0xfc, 0xfc, 0x85, 0x39, 0x0c, 0x5e, 0x14, 0x0a, 0xa7, 0x35, 0xa8, 0x0f, 0xeb, + 0xb4, 0x6f, 0x10, 0x13, 0x49, 0x28, 0xde, 0xac, 0x2a, 0xf9, 0x04, 0xae, 0x94, 0x7e, 0xb2, 0x9c, + 0x8d, 0xa3, 0xd3, 0x45, 0x77, 0x1d, 0x74, 0x77, 0xd9, 0x10, 0x9e, 0x22, 0x3e, 0x77, 0xfa, 0x29, + 0x6c, 0x18, 0xee, 0x24, 0xe7, 0x45, 0x26, 0x1c, 0x40, 0x19, 0x9c, 0x35, 0xc7, 0xff, 0x0b, 0x45, + 0xa0, 0x46, 0x34, 0x9c, 0x08, 0x72, 0xad, 0x2a, 0x49, 0xee, 0x4b, 0xe6, 0x74, 0x07, 0xd6, 0xd0, + 0x2a, 0x8b, 0x41, 0x7d, 0xc9, 0xc8, 0x15, 0x68, 0xa7, 0xe1, 0x89, 0x46, 0x7b, 0x88, 0xb6, 0xd2, + 0xf0, 0x44, 0x41, 0xee, 0x8f, 0x16, 0xf4, 0xcd, 0x06, 0x8f, 0xa3, 0x53, 0x16, 0x52, 0x26, 0x32, + 0x72, 0x77, 0x5e, 0x95, 0x9c, 0x09, 0xdd, 0x63, 0xd6, 0x87, 0x23, 0x14, 0xbf, 0xaa, 0x0e, 0x2e, + 0xfe, 0x18, 0x20, 0x52, 0x77, 0x51, 0x2f, 0xad, 0xe1, 0xd2, 0xcb, 0xeb, 0x2e, 0xbe, 0xc8, 0x68, + 0x27, 0x2a, 0x87, 0xee, 0x21, 0x90, 0xf3, 0x89, 0x62, 0x0d, 0xb5, 0x32, 0xba, 0xdf, 0x08, 0xc7, + 0x42, 0x25, 0x8d, 0x5e, 0xba, 0xd1, 0xe0, 0x2d, 0x35, 0x9a, 0xc7, 0x2c, 0x9d, 0xc8, 0xa9, 0xba, + 0xcf, 0x48, 0xd3, 0xd6, 0xaf, 0xb4, 0xd1, 0xfd, 0xcd, 0x5a, 0xd9, 0xa4, 0x8a, 0x38, 0xe0, 0x71, + 0xcc, 0x02, 0xc9, 0x73, 0xbd, 0x41, 0xd5, 0xaa, 0x9e, 0xa1, 0x88, 0xf7, 0x4b, 0x94, 0x2e, 0x10, + 0xc9, 0x10, 0x5a, 0xd9, 0x91, 0x37, 0x8d, 0x84, 0x34, 0x59, 0x6e, 0xe9, 0x35, 0x0f, 0x23, 0x21, + 0xf9, 0x24, 0xf7, 0x13, 0xda, 0xcc, 0x8e, 0xd4, 0x44, 0xd5, 0x37, 0xe7, 0x33, 0xaf, 0x5a, 0x8b, + 0xd7, 0xa1, 0x12, 0x94, 0xf2, 0xd9, 0xea, 0x36, 0xbd, 0x9c, 0xcf, 0xaa, 0x99, 0xfb, 0xf3, 0xbc, + 0x46, 0x95, 0x74, 0xe4, 0x3a, 0xd8, 0xb8, 0xb5, 0xb5, 0x7e, 0x6b, 0x04, 0xc9, 0x00, 0xea, 0x41, + 0x22, 0x4c, 0x78, 0x9b, 0xe6, 0x56, 0x3d, 0x7e, 0x86, 0xa7, 0x9f, 0x2a, 0x88, 0xdc, 0x81, 0xce, + 0x6a, 0x58, 0x6f, 0x48, 0x7d, 0xce, 0x73, 0x5f, 0x5a, 0xd0, 0x3c, 0xc0, 0x96, 0xa0, 0xde, 0x8b, + 0x80, 0x17, 0xa9, 0x5c, 0xea, 0x17, 0xda, 0xa4, 0xce, 0x65, 0xcc, 0x67, 0x2c, 0xf7, 0x0e, 0x79, + 0x91, 0x86, 0x18, 0x45, 0x8f, 0x02, 0x9a, 0x0e, 0x94, 0x45, 0x11, 0x8a, 0x2c, 0xab, 0x08, 0x75, + 0x4d, 0x40, 0x93, 0x26, 0xec, 0x42, 0x2b, 0x67, 0x19, 0xf3, 0xa5, 0x58, 0x7a, 0x68, 0x4a, 0x23, + 0xe9, 0x43, 0x3d, 0x0d, 0x4f, 0x74, 0x1f, 0xa5, 0x6a, 0xe8, 0x7e, 0x09, 0x9d, 0x4a, 0x04, 0x72, + 0x59, 0xc3, 0x8b, 0xa1, 0x29, 0x03, 0x79, 0x1f, 0x5a, 0xba, 0xa3, 0xe9, 0x73, 0xd2, 0xdd, 0xef, + 0xe9, 0x94, 0x75, 0x4e, 0xb4, 0x04, 0xdd, 0x7b, 0xd0, 0x7e, 0x60, 0xd4, 0x22, 0x0e, 0xd8, 0x89, + 0x2f, 0x8e, 0xd0, 0x59, 0xf9, 0x2e, 0xa2, 0x45, 0xb5, 0x84, 0xa9, 0x2f, 0xa6, 0xea, 0x35, 0x54, + 0xde, 0x6c, 0x5a, 0x4e, 0xdd, 0x7f, 0x2c, 0xd8, 0x5a, 0x91, 0x51, 0xb1, 0xf5, 0xcd, 0xd4, 0x27, + 0xad, 0x47, 0xcb, 0x29, 0xb9, 0x0e, 0x90, 0x16, 0x71, 0xec, 0x69, 0x3d, 0x17, 0x1b, 0x6b, 0x47, + 0xd9, 0xef, 0xa3, 0xa6, 0x95, 0xde, 0xf5, 0xf3, 0x7a, 0xdf, 0x86, 0xce, 0x38, 0xf1, 0x74, 0x6f, + 0x43, 0xbd, 0xaa, 0x9a, 0x97, 0x59, 0xd0, 0xf6, 0x38, 0x31, 0xf9, 0xdc, 0x86, 0x4e, 0x50, 0x91, + 0x1b, 0x6b, 0x0f, 0x48, 0x3b, 0x28, 0xc9, 0xef, 0xa9, 0x97, 0x46, 0xfa, 0xf1, 0xc2, 0x7b, 0x44, + 0x3b, 0x68, 0x51, 0x5d, 0xdc, 0xfd, 0xdd, 0x02, 0x72, 0xfe, 0x14, 0x93, 0xbd, 0xe5, 0x54, 0xab, + 0x53, 0x5a, 0x51, 0xe7, 0xb9, 0xe3, 0x6b, 0x5c, 0xe6, 0x6e, 0x6e, 0xef, 0xfc, 0x35, 0x36, 0xc9, + 0x8b, 0x77, 0xc9, 0xbe, 0xfe, 0x9f, 0xd9, 0x2f, 0x27, 0xd4, 0xc0, 0x66, 0xb1, 0x90, 0xd0, 0x5d, + 0xe8, 0x54, 0x41, 0xaa, 0x43, 0x96, 0xf3, 0x99, 0xa9, 0x96, 0x1a, 0x92, 0xab, 0xd0, 0x9c, 0xb1, + 0x68, 0x32, 0x5d, 0xae, 0x92, 0xb1, 0xb9, 0x7b, 0xd0, 0xad, 0x24, 0xe4, 0x33, 0xb2, 0x03, 0x6d, + 0x0c, 0x90, 0x99, 0xde, 0xb2, 0x41, 0xab, 0xb9, 0x7b, 0x0f, 0x7a, 0x25, 0xf5, 0x39, 0xcf, 0x9e, + 0x10, 0x02, 0x76, 0xe8, 0x4b, 0x1f, 0x0f, 0x59, 0x8f, 0xe2, 0x78, 0x9e, 0x73, 0x6d, 0xf1, 0x8f, + 0x0c, 0x4d, 0xee, 0x0f, 0x16, 0xb4, 0x4b, 0x07, 0xe4, 0x06, 0xd8, 0x39, 0x9f, 0x95, 0x5a, 0x6f, + 0xaf, 0x14, 0x93, 0xcf, 0x28, 0xc2, 0xe4, 0x26, 0x34, 0xf0, 0xaf, 0xc1, 0x1c, 0x7d, 0xb2, 0xcc, + 0x53, 0x61, 0x50, 0x5b, 0xfd, 0x44, 0x90, 0x3d, 0xd8, 0x08, 0xd9, 0xd8, 0x2f, 0x62, 0xe9, 0x9d, + 0xf8, 0x71, 0xc1, 0x96, 0x7e, 0x09, 0x7b, 0x06, 0xfa, 0x46, 0x21, 0xb7, 0xbe, 0x87, 0xee, 0xc2, + 0xaf, 0x27, 0xd9, 0x80, 0x8e, 0xfa, 0x62, 0xb3, 0xea, 0x5f, 0x20, 0x9b, 0x00, 0x6a, 0xaa, 0x5b, + 0x6e, 0xdf, 0x22, 0x17, 0xa1, 0xaf, 0xe7, 0x49, 0xc2, 0xd3, 0x87, 0x7e, 0x1a, 0xc6, 0xac, 0x5f, + 0x23, 0xff, 0x83, 0x2d, 0x65, 0xd5, 0xa2, 0xeb, 0xa5, 0xf5, 0xd2, 0x13, 0x3e, 0x4d, 0x7d, 0xbb, + 0x5c, 0xf9, 0xa0, 0x88, 0x63, 0xe4, 0x45, 0xe9, 0xa4, 0xdf, 0x38, 0xd8, 0x7b, 0xf5, 0x7a, 0xd7, + 0xfa, 0xe3, 0xf5, 0xae, 0xf5, 0xd7, 0xeb, 0x5d, 0xeb, 0xe5, 0xdf, 0xbb, 0x17, 0xe0, 0x52, 0xc0, + 0x93, 0x51, 0x16, 0xa5, 0x93, 0xc0, 0xcf, 0x46, 0x32, 0x0a, 0x0f, 0x31, 0xc9, 0xa7, 0xd6, 0xbf, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x85, 0xd4, 0x5c, 0x7c, 0x0b, 0x00, 0x00, } diff --git a/proto/analyze.proto b/proto/analyze.proto index 2280106f..c26a59b5 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -79,6 +79,9 @@ message AnalyzeColumnsReq { // sample_rate is the sampling rate that how many samples will collected. // There must be one non-zero value in sample_rate and sample_size. optional double sample_rate = 11; + + // ndv_rate is the sampling rate that determines how many samples will be used to calculate the NDV. + optional double ndv_rate = 12; } message AnalyzeMixedResp { diff --git a/scripts/proto.lock b/scripts/proto.lock index bb4b8c8a..071cc592 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -256,6 +256,12 @@ "name": "sample_rate", "type": "double", "optional": true + }, + { + "id": 12, + "name": "ndv_rate", + "type": "double", + "optional": true } ] }, From 3af26b370e33f7e0e17e149c634e17cc8179d401 Mon Sep 17 00:00:00 2001 From: Dongpo Liu Date: Tue, 6 Oct 2026 17:56:59 +0200 Subject: [PATCH 2/2] analyze: carry sampled NDV summaries (#430) Signed-off-by: 0xPoe --- go-tipb/analyze.pb.go | 311 ++++++++++++++++++++++++++++++------------ proto/analyze.proto | 17 ++- scripts/proto.lock | 16 +++ 3 files changed, 254 insertions(+), 90 deletions(-) diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index b742d9c8..2876690d 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -334,7 +334,10 @@ type AnalyzeColumnsReq struct { // sample_rate is the sampling rate that how many samples will collected. // There must be one non-zero value in sample_rate and sample_size. SampleRate *float64 `protobuf:"fixed64,11,opt,name=sample_rate,json=sampleRate" json:"sample_rate,omitempty"` - // ndv_rate is the sampling rate that determines how many samples will be used to calculate the NDV. + // ndv_rate is the probability that the server keeps a row for NDV. If it is + // absent, the server keeps all rows. The server takes samples only from the + // kept rows, so ndv_rate must not be less than sample_rate. A server that + // does not support ndv_rate ignores it. NdvRate *float64 `protobuf:"fixed64,12,opt,name=ndv_rate,json=ndvRate" json:"ndv_rate,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -625,8 +628,12 @@ func (m *Histogram) GetBuckets() []*Bucket { // FMSketch is used to count distinct values for columns. type FMSketch struct { - Mask uint64 `protobuf:"varint,1,opt,name=mask" json:"mask"` - Hashset []uint64 `protobuf:"varint,2,rep,name=hashset" json:"hashset,omitempty"` + Mask uint64 `protobuf:"varint,1,opt,name=mask" json:"mask"` + Hashset []uint64 `protobuf:"varint,2,rep,name=hashset" json:"hashset,omitempty"` + // multi_hashset is used only when RowSampleCollector.ndv_sample_count is + // set. It has the hashes seen more than once, and hashset then has only the + // hashes seen once, because the NDV estimate scales up only those. + MultiHashset []uint64 `protobuf:"varint,3,rep,name=multi_hashset,json=multiHashset" json:"multi_hashset,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -649,6 +656,13 @@ func (m *FMSketch) GetHashset() []uint64 { return nil } +func (m *FMSketch) GetMultiHashset() []uint64 { + if m != nil { + return m.MultiHashset + } + return nil +} + // SampleCollector is used for collect samples and calculate the count and ndv of an column. type SampleCollector struct { Samples [][]byte `protobuf:"bytes,1,rep,name=samples" json:"samples,omitempty"` @@ -708,12 +722,19 @@ func (m *SampleCollector) GetTotalSize() int64 { } type RowSampleCollector struct { - Samples []*RowSample `protobuf:"bytes,1,rep,name=samples" json:"samples,omitempty"` - NullCounts []int64 `protobuf:"varint,2,rep,name=null_counts,json=nullCounts" json:"null_counts,omitempty"` - Count int64 `protobuf:"varint,3,opt,name=count" json:"count"` - FmSketch []*FMSketch `protobuf:"bytes,4,rep,name=fm_sketch,json=fmSketch" json:"fm_sketch,omitempty"` - TotalSize []int64 `protobuf:"varint,5,rep,name=total_size,json=totalSize" json:"total_size,omitempty"` - XXX_unrecognized []byte `json:"-"` + Samples []*RowSample `protobuf:"bytes,1,rep,name=samples" json:"samples,omitempty"` + NullCounts []int64 `protobuf:"varint,2,rep,name=null_counts,json=nullCounts" json:"null_counts,omitempty"` + Count int64 `protobuf:"varint,3,opt,name=count" json:"count"` + FmSketch []*FMSketch `protobuf:"bytes,4,rep,name=fm_sketch,json=fmSketch" json:"fm_sketch,omitempty"` + TotalSize []int64 `protobuf:"varint,5,rep,name=total_size,json=totalSize" json:"total_size,omitempty"` + // ndv_sample_count is the number of rows that the server kept for NDV. The + // server sets it only when AnalyzeColumnsReq.ndv_rate is less than 1, even + // if it kept no rows. The count field includes the rows that were not kept, + // and the server scales null_counts and total_size up to match count. If + // ndv_sample_count is 0, there is nothing to scale: null_counts and + // total_size are 0 and do not describe the rows in count. + NdvSampleCount *int64 `protobuf:"varint,8,opt,name=ndv_sample_count,json=ndvSampleCount" json:"ndv_sample_count,omitempty"` + XXX_unrecognized []byte `json:"-"` } func (m *RowSampleCollector) Reset() { *m = RowSampleCollector{} } @@ -756,6 +777,13 @@ func (m *RowSampleCollector) GetTotalSize() []int64 { return nil } +func (m *RowSampleCollector) GetNdvSampleCount() int64 { + if m != nil && m.NdvSampleCount != nil { + return *m.NdvSampleCount + } + return 0 +} + type RowSample struct { Row [][]byte `protobuf:"bytes,1,rep,name=row" json:"row,omitempty"` Weight int64 `protobuf:"varint,2,opt,name=weight" json:"weight"` @@ -1363,6 +1391,13 @@ func (m *FMSketch) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintAnalyze(dAtA, i, uint64(num)) } } + if len(m.MultiHashset) > 0 { + for _, num := range m.MultiHashset { + dAtA[i] = 0x18 + i++ + i = encodeVarintAnalyze(dAtA, i, uint64(num)) + } + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1485,6 +1520,11 @@ func (m *RowSampleCollector) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintAnalyze(dAtA, i, uint64(num)) } } + if m.NdvSampleCount != nil { + dAtA[i] = 0x40 + i++ + i = encodeVarintAnalyze(dAtA, i, uint64(*m.NdvSampleCount)) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -1862,6 +1902,11 @@ func (m *FMSketch) Size() (n int) { n += 1 + sovAnalyze(uint64(e)) } } + if len(m.MultiHashset) > 0 { + for _, e := range m.MultiHashset { + n += 1 + sovAnalyze(uint64(e)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1922,6 +1967,9 @@ func (m *RowSampleCollector) Size() (n int) { n += 1 + sovAnalyze(uint64(e)) } } + if m.NdvSampleCount != nil { + n += 1 + sovAnalyze(uint64(*m.NdvSampleCount)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3758,6 +3806,68 @@ func (m *FMSketch) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field Hashset", wireType) } + case 3: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.MultiHashset = append(m.MultiHashset, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthAnalyze + } + postIndex := iNdEx + packedLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.MultiHashset = append(m.MultiHashset, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field MultiHashset", wireType) + } default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) @@ -4218,6 +4328,26 @@ func (m *RowSampleCollector) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field TotalSize", wireType) } + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NdvSampleCount", wireType) + } + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.NdvSampleCount = &v default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) @@ -4793,84 +4923,87 @@ var ( func init() { proto.RegisterFile("analyze.proto", fileDescriptorAnalyze) } var fileDescriptorAnalyze = []byte{ - // 1261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdf, 0x6e, 0xdc, 0xc4, - 0x17, 0xae, 0x77, 0xbd, 0xff, 0xce, 0x6e, 0x92, 0xcd, 0xfc, 0xda, 0xfe, 0xdc, 0xa8, 0xa4, 0x2b, - 0x57, 0xa5, 0x9b, 0x16, 0x2d, 0x28, 0x15, 0x17, 0xa8, 0xa2, 0x12, 0x29, 0x2a, 0xad, 0xa0, 0xa5, - 0x9a, 0x56, 0x20, 0x71, 0x63, 0x39, 0xf6, 0xec, 0xae, 0x15, 0xdb, 0xe3, 0x78, 0xc6, 0xd9, 0x34, - 0xe2, 0x16, 0x24, 0x6e, 0xe0, 0xb6, 0xef, 0x01, 0x0f, 0xd1, 0x2b, 0xc4, 0x13, 0x20, 0x54, 0xc4, - 0x7b, 0xa0, 0x39, 0x33, 0xf6, 0xfe, 0xc9, 0x16, 0xb5, 0x57, 0x9e, 0x39, 0xdf, 0x37, 0x67, 0xce, - 0xf9, 0xce, 0xcc, 0x19, 0xc3, 0x86, 0x9f, 0xfa, 0xf1, 0x8b, 0x33, 0x36, 0xca, 0x72, 0x2e, 0x39, - 0xb1, 0x65, 0x94, 0x1d, 0xee, 0xf4, 0x44, 0x30, 0x65, 0x89, 0xaf, 0x6d, 0x3b, 0x17, 0x27, 0x7c, - 0xc2, 0x71, 0xf8, 0xa1, 0x1a, 0x69, 0xab, 0xfb, 0x4b, 0x0d, 0xe0, 0x33, 0xbd, 0x96, 0xb2, 0x63, - 0x72, 0x13, 0x6a, 0x32, 0x73, 0xac, 0x81, 0x35, 0xdc, 0xdc, 0xdf, 0x1e, 0x29, 0x2f, 0x23, 0x83, - 0x3e, 0x7f, 0x91, 0xb1, 0x03, 0xfb, 0xd5, 0x9f, 0xd7, 0x2e, 0xd0, 0x9a, 0xcc, 0xc8, 0x2d, 0xd8, - 0x16, 0xd2, 0xcf, 0xa5, 0x27, 0x85, 0x37, 0xf6, 0xe3, 0xf8, 0xd0, 0x0f, 0x8e, 0x9c, 0xda, 0xc0, - 0x1a, 0xda, 0x74, 0x0b, 0x81, 0xe7, 0xe2, 0x81, 0x31, 0x93, 0x1d, 0x68, 0x8c, 0x63, 0x7f, 0x22, - 0x9c, 0xba, 0xc2, 0x8d, 0x13, 0x6d, 0x22, 0x23, 0xe8, 0xcb, 0x28, 0x61, 0xde, 0x19, 0x4f, 0x99, - 0xc7, 0xc7, 0x63, 0xc1, 0xa4, 0x63, 0x0f, 0xac, 0x61, 0xdd, 0xd0, 0x36, 0x15, 0xfa, 0x1d, 0x4f, - 0xd9, 0xd7, 0x88, 0x91, 0x11, 0xb4, 0xa2, 0xf0, 0xd4, 0xcb, 0xd9, 0xb1, 0xd3, 0x18, 0x58, 0xc3, - 0xee, 0xfe, 0xa5, 0xa5, 0x28, 0x1f, 0xa5, 0x21, 0x3b, 0xa5, 0xec, 0x98, 0x36, 0xa3, 0x50, 0x7d, - 0xc9, 0x47, 0xd0, 0x0a, 0x78, 0x8c, 0xfc, 0x26, 0xf2, 0xff, 0xbf, 0xc4, 0xbf, 0xcf, 0xe3, 0x22, - 0x49, 0x05, 0xae, 0x08, 0x78, 0x4c, 0xd9, 0xb1, 0xfb, 0x6b, 0x0d, 0xb6, 0x56, 0xbc, 0x91, 0x1b, - 0xd0, 0x3d, 0x2c, 0x82, 0x23, 0x26, 0x3d, 0x11, 0x9d, 0x31, 0xd4, 0xa7, 0x0c, 0x10, 0x34, 0xf0, - 0x2c, 0x3a, 0x63, 0x8a, 0x96, 0x16, 0x89, 0x17, 0x68, 0xa7, 0x28, 0x47, 0xa3, 0xa4, 0xa5, 0x45, - 0x62, 0x36, 0x23, 0x37, 0x60, 0x33, 0x48, 0xc4, 0x11, 0x93, 0xc1, 0xd4, 0x0b, 0x59, 0x26, 0xa7, - 0x28, 0x4c, 0x83, 0x6e, 0x94, 0xd6, 0xcf, 0x95, 0x71, 0x89, 0x36, 0x8b, 0x42, 0x39, 0x45, 0x61, - 0x16, 0x68, 0xdf, 0x2a, 0xa3, 0xda, 0x54, 0xf8, 0x49, 0x16, 0x33, 0x1d, 0x5b, 0x63, 0x31, 0x36, - 0x0d, 0x94, 0xb1, 0x19, 0x5f, 0x48, 0x6b, 0x2e, 0xd1, 0x10, 0x40, 0xda, 0x55, 0x00, 0xc9, 0x33, - 0x2f, 0xd5, 0xac, 0x16, 0x6e, 0xd8, 0x96, 0x3c, 0x7b, 0x82, 0xa8, 0x03, 0xad, 0x13, 0x96, 0x8b, - 0x88, 0xa7, 0x4e, 0x1b, 0xa1, 0x72, 0xea, 0xfe, 0x64, 0xc3, 0xf6, 0x39, 0x4d, 0xdf, 0x41, 0xb7, - 0xc5, 0x14, 0x6a, 0x6f, 0x97, 0x42, 0xfd, 0x0d, 0x29, 0xdc, 0x81, 0x9e, 0xa9, 0x80, 0x17, 0xa5, - 0x63, 0xee, 0xd8, 0x83, 0xfa, 0xb0, 0xbb, 0xdf, 0xd7, 0x75, 0xd7, 0xc1, 0x3d, 0x4a, 0xc7, 0x9c, - 0x76, 0x0d, 0x4b, 0x4d, 0xd6, 0xd4, 0xa4, 0xf1, 0x76, 0x35, 0x69, 0xae, 0xab, 0xc9, 0x07, 0x40, - 0xb2, 0x3c, 0x4a, 0xfc, 0xfc, 0x85, 0x39, 0x0c, 0x5e, 0x14, 0x0a, 0xa7, 0x35, 0xa8, 0x0f, 0xeb, - 0xb4, 0x6f, 0x10, 0x13, 0x49, 0x28, 0xde, 0xac, 0x2a, 0xf9, 0x04, 0xae, 0x94, 0x7e, 0xb2, 0x9c, - 0x8d, 0xa3, 0xd3, 0x45, 0x77, 0x1d, 0x74, 0x77, 0xd9, 0x10, 0x9e, 0x22, 0x3e, 0x77, 0xfa, 0x29, - 0x6c, 0x18, 0xee, 0x24, 0xe7, 0x45, 0x26, 0x1c, 0x40, 0x19, 0x9c, 0x35, 0xc7, 0xff, 0x0b, 0x45, - 0xa0, 0x46, 0x34, 0x9c, 0x08, 0x72, 0xad, 0x2a, 0x49, 0xee, 0x4b, 0xe6, 0x74, 0x07, 0xd6, 0xd0, - 0x2a, 0x8b, 0x41, 0x7d, 0xc9, 0xc8, 0x15, 0x68, 0xa7, 0xe1, 0x89, 0x46, 0x7b, 0x88, 0xb6, 0xd2, - 0xf0, 0x44, 0x41, 0xee, 0x8f, 0x16, 0xf4, 0xcd, 0x06, 0x8f, 0xa3, 0x53, 0x16, 0x52, 0x26, 0x32, - 0x72, 0x77, 0x5e, 0x95, 0x9c, 0x09, 0xdd, 0x63, 0xd6, 0x87, 0x23, 0x14, 0xbf, 0xaa, 0x0e, 0x2e, - 0xfe, 0x18, 0x20, 0x52, 0x77, 0x51, 0x2f, 0xad, 0xe1, 0xd2, 0xcb, 0xeb, 0x2e, 0xbe, 0xc8, 0x68, - 0x27, 0x2a, 0x87, 0xee, 0x21, 0x90, 0xf3, 0x89, 0x62, 0x0d, 0xb5, 0x32, 0xba, 0xdf, 0x08, 0xc7, - 0x42, 0x25, 0x8d, 0x5e, 0xba, 0xd1, 0xe0, 0x2d, 0x35, 0x9a, 0xc7, 0x2c, 0x9d, 0xc8, 0xa9, 0xba, - 0xcf, 0x48, 0xd3, 0xd6, 0xaf, 0xb4, 0xd1, 0xfd, 0xcd, 0x5a, 0xd9, 0xa4, 0x8a, 0x38, 0xe0, 0x71, - 0xcc, 0x02, 0xc9, 0x73, 0xbd, 0x41, 0xd5, 0xaa, 0x9e, 0xa1, 0x88, 0xf7, 0x4b, 0x94, 0x2e, 0x10, - 0xc9, 0x10, 0x5a, 0xd9, 0x91, 0x37, 0x8d, 0x84, 0x34, 0x59, 0x6e, 0xe9, 0x35, 0x0f, 0x23, 0x21, - 0xf9, 0x24, 0xf7, 0x13, 0xda, 0xcc, 0x8e, 0xd4, 0x44, 0xd5, 0x37, 0xe7, 0x33, 0xaf, 0x5a, 0x8b, - 0xd7, 0xa1, 0x12, 0x94, 0xf2, 0xd9, 0xea, 0x36, 0xbd, 0x9c, 0xcf, 0xaa, 0x99, 0xfb, 0xf3, 0xbc, - 0x46, 0x95, 0x74, 0xe4, 0x3a, 0xd8, 0xb8, 0xb5, 0xb5, 0x7e, 0x6b, 0x04, 0xc9, 0x00, 0xea, 0x41, - 0x22, 0x4c, 0x78, 0x9b, 0xe6, 0x56, 0x3d, 0x7e, 0x86, 0xa7, 0x9f, 0x2a, 0x88, 0xdc, 0x81, 0xce, - 0x6a, 0x58, 0x6f, 0x48, 0x7d, 0xce, 0x73, 0x5f, 0x5a, 0xd0, 0x3c, 0xc0, 0x96, 0xa0, 0xde, 0x8b, - 0x80, 0x17, 0xa9, 0x5c, 0xea, 0x17, 0xda, 0xa4, 0xce, 0x65, 0xcc, 0x67, 0x2c, 0xf7, 0x0e, 0x79, - 0x91, 0x86, 0x18, 0x45, 0x8f, 0x02, 0x9a, 0x0e, 0x94, 0x45, 0x11, 0x8a, 0x2c, 0xab, 0x08, 0x75, - 0x4d, 0x40, 0x93, 0x26, 0xec, 0x42, 0x2b, 0x67, 0x19, 0xf3, 0xa5, 0x58, 0x7a, 0x68, 0x4a, 0x23, - 0xe9, 0x43, 0x3d, 0x0d, 0x4f, 0x74, 0x1f, 0xa5, 0x6a, 0xe8, 0x7e, 0x09, 0x9d, 0x4a, 0x04, 0x72, - 0x59, 0xc3, 0x8b, 0xa1, 0x29, 0x03, 0x79, 0x1f, 0x5a, 0xba, 0xa3, 0xe9, 0x73, 0xd2, 0xdd, 0xef, - 0xe9, 0x94, 0x75, 0x4e, 0xb4, 0x04, 0xdd, 0x7b, 0xd0, 0x7e, 0x60, 0xd4, 0x22, 0x0e, 0xd8, 0x89, - 0x2f, 0x8e, 0xd0, 0x59, 0xf9, 0x2e, 0xa2, 0x45, 0xb5, 0x84, 0xa9, 0x2f, 0xa6, 0xea, 0x35, 0x54, - 0xde, 0x6c, 0x5a, 0x4e, 0xdd, 0x7f, 0x2c, 0xd8, 0x5a, 0x91, 0x51, 0xb1, 0xf5, 0xcd, 0xd4, 0x27, - 0xad, 0x47, 0xcb, 0x29, 0xb9, 0x0e, 0x90, 0x16, 0x71, 0xec, 0x69, 0x3d, 0x17, 0x1b, 0x6b, 0x47, - 0xd9, 0xef, 0xa3, 0xa6, 0x95, 0xde, 0xf5, 0xf3, 0x7a, 0xdf, 0x86, 0xce, 0x38, 0xf1, 0x74, 0x6f, - 0x43, 0xbd, 0xaa, 0x9a, 0x97, 0x59, 0xd0, 0xf6, 0x38, 0x31, 0xf9, 0xdc, 0x86, 0x4e, 0x50, 0x91, - 0x1b, 0x6b, 0x0f, 0x48, 0x3b, 0x28, 0xc9, 0xef, 0xa9, 0x97, 0x46, 0xfa, 0xf1, 0xc2, 0x7b, 0x44, - 0x3b, 0x68, 0x51, 0x5d, 0xdc, 0xfd, 0xdd, 0x02, 0x72, 0xfe, 0x14, 0x93, 0xbd, 0xe5, 0x54, 0xab, - 0x53, 0x5a, 0x51, 0xe7, 0xb9, 0xe3, 0x6b, 0x5c, 0xe6, 0x6e, 0x6e, 0xef, 0xfc, 0x35, 0x36, 0xc9, - 0x8b, 0x77, 0xc9, 0xbe, 0xfe, 0x9f, 0xd9, 0x2f, 0x27, 0xd4, 0xc0, 0x66, 0xb1, 0x90, 0xd0, 0x5d, - 0xe8, 0x54, 0x41, 0xaa, 0x43, 0x96, 0xf3, 0x99, 0xa9, 0x96, 0x1a, 0x92, 0xab, 0xd0, 0x9c, 0xb1, - 0x68, 0x32, 0x5d, 0xae, 0x92, 0xb1, 0xb9, 0x7b, 0xd0, 0xad, 0x24, 0xe4, 0x33, 0xb2, 0x03, 0x6d, - 0x0c, 0x90, 0x99, 0xde, 0xb2, 0x41, 0xab, 0xb9, 0x7b, 0x0f, 0x7a, 0x25, 0xf5, 0x39, 0xcf, 0x9e, - 0x10, 0x02, 0x76, 0xe8, 0x4b, 0x1f, 0x0f, 0x59, 0x8f, 0xe2, 0x78, 0x9e, 0x73, 0x6d, 0xf1, 0x8f, - 0x0c, 0x4d, 0xee, 0x0f, 0x16, 0xb4, 0x4b, 0x07, 0xe4, 0x06, 0xd8, 0x39, 0x9f, 0x95, 0x5a, 0x6f, - 0xaf, 0x14, 0x93, 0xcf, 0x28, 0xc2, 0xe4, 0x26, 0x34, 0xf0, 0xaf, 0xc1, 0x1c, 0x7d, 0xb2, 0xcc, - 0x53, 0x61, 0x50, 0x5b, 0xfd, 0x44, 0x90, 0x3d, 0xd8, 0x08, 0xd9, 0xd8, 0x2f, 0x62, 0xe9, 0x9d, - 0xf8, 0x71, 0xc1, 0x96, 0x7e, 0x09, 0x7b, 0x06, 0xfa, 0x46, 0x21, 0xb7, 0xbe, 0x87, 0xee, 0xc2, - 0xaf, 0x27, 0xd9, 0x80, 0x8e, 0xfa, 0x62, 0xb3, 0xea, 0x5f, 0x20, 0x9b, 0x00, 0x6a, 0xaa, 0x5b, - 0x6e, 0xdf, 0x22, 0x17, 0xa1, 0xaf, 0xe7, 0x49, 0xc2, 0xd3, 0x87, 0x7e, 0x1a, 0xc6, 0xac, 0x5f, - 0x23, 0xff, 0x83, 0x2d, 0x65, 0xd5, 0xa2, 0xeb, 0xa5, 0xf5, 0xd2, 0x13, 0x3e, 0x4d, 0x7d, 0xbb, - 0x5c, 0xf9, 0xa0, 0x88, 0x63, 0xe4, 0x45, 0xe9, 0xa4, 0xdf, 0x38, 0xd8, 0x7b, 0xf5, 0x7a, 0xd7, - 0xfa, 0xe3, 0xf5, 0xae, 0xf5, 0xd7, 0xeb, 0x5d, 0xeb, 0xe5, 0xdf, 0xbb, 0x17, 0xe0, 0x52, 0xc0, - 0x93, 0x51, 0x16, 0xa5, 0x93, 0xc0, 0xcf, 0x46, 0x32, 0x0a, 0x0f, 0x31, 0xc9, 0xa7, 0xd6, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x85, 0xd4, 0x5c, 0x7c, 0x0b, 0x00, 0x00, + // 1310 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x6e, 0xdb, 0xc6, + 0x12, 0x0e, 0x25, 0xea, 0x6f, 0x24, 0xdb, 0xf4, 0x9e, 0x24, 0x87, 0x31, 0x72, 0x1c, 0x81, 0x41, + 0x4e, 0xe4, 0xa4, 0x70, 0x0b, 0x07, 0xbd, 0x28, 0x82, 0x16, 0xa8, 0x53, 0xa4, 0x49, 0xda, 0xa4, + 0xc1, 0x26, 0x68, 0x81, 0xde, 0x10, 0x34, 0xb9, 0x92, 0x08, 0x93, 0x5c, 0x9a, 0xbb, 0xb4, 0x1c, + 0xa3, 0x97, 0x6d, 0x81, 0xde, 0xb4, 0xb7, 0x79, 0x8f, 0xf6, 0x21, 0x72, 0xd9, 0x27, 0x28, 0x8a, + 0x14, 0x7d, 0x8f, 0x62, 0x67, 0x97, 0x94, 0x64, 0x2b, 0x45, 0x72, 0x25, 0xee, 0x7c, 0xdf, 0xce, + 0xce, 0x7c, 0x33, 0x3b, 0x2b, 0x58, 0x0b, 0xb2, 0x20, 0x79, 0x71, 0xca, 0x76, 0xf3, 0x82, 0x4b, + 0x4e, 0x6c, 0x19, 0xe7, 0x07, 0x5b, 0x03, 0x11, 0x4e, 0x59, 0x1a, 0x68, 0xdb, 0xd6, 0xc5, 0x09, + 0x9f, 0x70, 0xfc, 0x7c, 0x5f, 0x7d, 0x69, 0xab, 0xf7, 0x4b, 0x03, 0xe0, 0x53, 0xbd, 0x97, 0xb2, + 0x23, 0x72, 0x13, 0x1a, 0x32, 0x77, 0xad, 0xa1, 0x35, 0x5a, 0xdf, 0xdb, 0xdc, 0x55, 0x5e, 0x76, + 0x0d, 0xfa, 0xfc, 0x45, 0xce, 0xf6, 0xed, 0x57, 0x7f, 0x5c, 0xbb, 0x40, 0x1b, 0x32, 0x27, 0xb7, + 0x60, 0x53, 0xc8, 0xa0, 0x90, 0xbe, 0x14, 0xfe, 0x38, 0x48, 0x92, 0x83, 0x20, 0x3c, 0x74, 0x1b, + 0x43, 0x6b, 0x64, 0xd3, 0x0d, 0x04, 0x9e, 0x8b, 0xfb, 0xc6, 0x4c, 0xb6, 0xa0, 0x35, 0x4e, 0x82, + 0x89, 0x70, 0x9b, 0x0a, 0x37, 0x4e, 0xb4, 0x89, 0xec, 0x82, 0x23, 0xe3, 0x94, 0xf9, 0xa7, 0x3c, + 0x63, 0x3e, 0x1f, 0x8f, 0x05, 0x93, 0xae, 0x3d, 0xb4, 0x46, 0x4d, 0x43, 0x5b, 0x57, 0xe8, 0xb7, + 0x3c, 0x63, 0x5f, 0x21, 0x46, 0x76, 0xa1, 0x13, 0x47, 0x27, 0x7e, 0xc1, 0x8e, 0xdc, 0xd6, 0xd0, + 0x1a, 0xf5, 0xf7, 0x2e, 0x2d, 0x45, 0xf9, 0x30, 0x8b, 0xd8, 0x09, 0x65, 0x47, 0xb4, 0x1d, 0x47, + 0xea, 0x97, 0x7c, 0x00, 0x9d, 0x90, 0x27, 0xc8, 0x6f, 0x23, 0xff, 0xbf, 0x4b, 0xfc, 0x7b, 0x3c, + 0x29, 0xd3, 0x4c, 0xe0, 0x8e, 0x90, 0x27, 0x94, 0x1d, 0x79, 0xbf, 0x36, 0x60, 0xe3, 0x8c, 0x37, + 0x72, 0x03, 0xfa, 0x07, 0x65, 0x78, 0xc8, 0xa4, 0x2f, 0xe2, 0x53, 0x86, 0xfa, 0x54, 0x01, 0x82, + 0x06, 0x9e, 0xc5, 0xa7, 0x4c, 0xd1, 0xb2, 0x32, 0xf5, 0x43, 0xed, 0x14, 0xe5, 0x68, 0x55, 0xb4, + 0xac, 0x4c, 0xcd, 0x61, 0xe4, 0x06, 0xac, 0x87, 0xa9, 0x38, 0x64, 0x32, 0x9c, 0xfa, 0x11, 0xcb, + 0xe5, 0x14, 0x85, 0x69, 0xd1, 0xb5, 0xca, 0xfa, 0x99, 0x32, 0x2e, 0xd1, 0x66, 0x71, 0x24, 0xa7, + 0x28, 0xcc, 0x02, 0xed, 0x1b, 0x65, 0x54, 0x87, 0x8a, 0x20, 0xcd, 0x13, 0xa6, 0x63, 0x6b, 0x2d, + 0xc6, 0xa6, 0x81, 0x2a, 0x36, 0xe3, 0x0b, 0x69, 0xed, 0x25, 0x1a, 0x02, 0x48, 0xbb, 0x0a, 0x20, + 0x79, 0xee, 0x67, 0x9a, 0xd5, 0xc1, 0x03, 0xbb, 0x92, 0xe7, 0x4f, 0x10, 0x75, 0xa1, 0x73, 0xcc, + 0x0a, 0x11, 0xf3, 0xcc, 0xed, 0x22, 0x54, 0x2d, 0xbd, 0x9f, 0x6c, 0xd8, 0x3c, 0xa7, 0xe9, 0x3b, + 0xe8, 0xb6, 0x98, 0x42, 0xe3, 0xed, 0x52, 0x68, 0xbe, 0x21, 0x85, 0x3b, 0x30, 0x30, 0x15, 0xf0, + 0xe3, 0x6c, 0xcc, 0x5d, 0x7b, 0xd8, 0x1c, 0xf5, 0xf7, 0x1c, 0x5d, 0x77, 0x1d, 0xdc, 0xc3, 0x6c, + 0xcc, 0x69, 0xdf, 0xb0, 0xd4, 0x62, 0x45, 0x4d, 0x5a, 0x6f, 0x57, 0x93, 0xf6, 0xaa, 0x9a, 0xbc, + 0x07, 0x24, 0x2f, 0xe2, 0x34, 0x28, 0x5e, 0x98, 0x66, 0xf0, 0xe3, 0x48, 0xb8, 0x9d, 0x61, 0x73, + 0xd4, 0xa4, 0x8e, 0x41, 0x4c, 0x24, 0x91, 0x78, 0xb3, 0xaa, 0xe4, 0x23, 0xb8, 0x52, 0xf9, 0xc9, + 0x0b, 0x36, 0x8e, 0x4f, 0x16, 0xdd, 0xf5, 0xd0, 0xdd, 0x65, 0x43, 0x78, 0x8a, 0xf8, 0xdc, 0xe9, + 0xc7, 0xb0, 0x66, 0xb8, 0x93, 0x82, 0x97, 0xb9, 0x70, 0x01, 0x65, 0x70, 0x57, 0xb4, 0xff, 0xe7, + 0x8a, 0x40, 0x8d, 0x68, 0xb8, 0x10, 0xe4, 0x5a, 0x5d, 0x92, 0x22, 0x90, 0xcc, 0xed, 0x0f, 0xad, + 0x91, 0x55, 0x15, 0x83, 0x06, 0x92, 0x91, 0x2b, 0xd0, 0xcd, 0xa2, 0x63, 0x8d, 0x0e, 0x10, 0xed, + 0x64, 0xd1, 0xb1, 0x82, 0xbc, 0x1f, 0x2d, 0x70, 0xcc, 0x01, 0x8f, 0xe3, 0x13, 0x16, 0x51, 0x26, + 0x72, 0x72, 0x77, 0x5e, 0x95, 0x82, 0x09, 0x3d, 0x63, 0x56, 0x87, 0x23, 0x14, 0xbf, 0xae, 0x0e, + 0x6e, 0xfe, 0x10, 0x20, 0x56, 0x77, 0x51, 0x6f, 0x6d, 0xe0, 0xd6, 0xcb, 0xab, 0x2e, 0xbe, 0xc8, + 0x69, 0x2f, 0xae, 0x3e, 0xbd, 0x03, 0x20, 0xe7, 0x13, 0xc5, 0x1a, 0x6a, 0x65, 0xf4, 0xbc, 0x11, + 0xae, 0x85, 0x4a, 0x1a, 0xbd, 0xf4, 0xa0, 0xc1, 0x5b, 0x6a, 0x34, 0x4f, 0x58, 0x36, 0x91, 0x53, + 0x75, 0x9f, 0x91, 0xa6, 0xad, 0x5f, 0x6a, 0xa3, 0xf7, 0x9b, 0x75, 0xe6, 0x90, 0x3a, 0xe2, 0x90, + 0x27, 0x09, 0x0b, 0x25, 0x2f, 0xf4, 0x01, 0xf5, 0xa8, 0x7a, 0x86, 0x22, 0xde, 0xab, 0x50, 0xba, + 0x40, 0x24, 0x23, 0xe8, 0xe4, 0x87, 0xfe, 0x34, 0x16, 0xd2, 0x64, 0xb9, 0xa1, 0xf7, 0x3c, 0x88, + 0x85, 0xe4, 0x93, 0x22, 0x48, 0x69, 0x3b, 0x3f, 0x54, 0x0b, 0x55, 0xdf, 0x82, 0xcf, 0xfc, 0x7a, + 0x2f, 0x5e, 0x87, 0x5a, 0x50, 0xca, 0x67, 0x67, 0x8f, 0x19, 0x14, 0x7c, 0x56, 0xaf, 0xbc, 0x9f, + 0xe7, 0x35, 0xaa, 0xa5, 0x23, 0xd7, 0xc1, 0xc6, 0xa3, 0xad, 0xd5, 0x47, 0x23, 0x48, 0x86, 0xd0, + 0x0c, 0x53, 0x61, 0xc2, 0x5b, 0x37, 0xb7, 0xea, 0xf1, 0x33, 0xec, 0x7e, 0xaa, 0x20, 0x72, 0x07, + 0x7a, 0x67, 0xc3, 0x7a, 0x43, 0xea, 0x73, 0x9e, 0xf7, 0xd2, 0x82, 0xf6, 0x3e, 0x8e, 0x04, 0xf5, + 0x5e, 0x84, 0xbc, 0xcc, 0xe4, 0xd2, 0xbc, 0xd0, 0x26, 0xd5, 0x97, 0x09, 0x9f, 0xb1, 0xc2, 0x3f, + 0xe0, 0x65, 0x16, 0x61, 0x14, 0x03, 0x0a, 0x68, 0xda, 0x57, 0x16, 0x45, 0x28, 0xf3, 0xbc, 0x26, + 0x34, 0x35, 0x01, 0x4d, 0x9a, 0xb0, 0x0d, 0x9d, 0x82, 0xe5, 0x2c, 0x90, 0x62, 0xe9, 0xa1, 0xa9, + 0x8c, 0xc4, 0x81, 0x66, 0x16, 0x1d, 0xeb, 0x39, 0x4a, 0xd5, 0xa7, 0xf7, 0x05, 0xf4, 0x6a, 0x11, + 0xc8, 0x65, 0x0d, 0x2f, 0x86, 0xa6, 0x0c, 0xe4, 0xff, 0xd0, 0xd1, 0x13, 0x4d, 0xf7, 0x49, 0x7f, + 0x6f, 0xa0, 0x53, 0xd6, 0x39, 0xd1, 0x0a, 0xf4, 0x42, 0xe8, 0xde, 0x37, 0x6a, 0x11, 0x17, 0xec, + 0x34, 0x10, 0x87, 0xe8, 0xac, 0x7a, 0x17, 0xd1, 0xa2, 0x46, 0xc2, 0x34, 0x10, 0x53, 0xf5, 0x1a, + 0x2a, 0x6f, 0x36, 0xad, 0x96, 0xe4, 0x3a, 0xac, 0xa5, 0x65, 0x22, 0x63, 0xbf, 0xc2, 0x9b, 0x88, + 0x0f, 0xd0, 0xf8, 0x40, 0xdb, 0xbc, 0xbf, 0x2d, 0xd8, 0x38, 0xa3, 0xb5, 0x72, 0xa9, 0xaf, 0xaf, + 0x6e, 0xc7, 0x01, 0xad, 0x96, 0xe4, 0x3a, 0x40, 0x56, 0x26, 0x89, 0xaf, 0x45, 0x5f, 0x9c, 0xbe, + 0x3d, 0x65, 0xbf, 0x87, 0xc2, 0xd7, 0x45, 0x69, 0x9e, 0x2f, 0xca, 0x6d, 0xe8, 0x8d, 0x53, 0x5f, + 0x0f, 0x40, 0x14, 0xb5, 0x6e, 0x8c, 0x2a, 0x55, 0xda, 0x1d, 0xa7, 0x26, 0xe9, 0xdb, 0xd0, 0x0b, + 0x6b, 0x72, 0x6b, 0x65, 0x17, 0x75, 0xc3, 0x8a, 0xfc, 0x3f, 0xf5, 0x1c, 0xc9, 0x20, 0x59, 0x78, + 0xb4, 0x68, 0x0f, 0x2d, 0x6a, 0xd4, 0x7b, 0xdf, 0x37, 0x80, 0x9c, 0x6f, 0x75, 0xb2, 0xb3, 0x9c, + 0x6a, 0xdd, 0xca, 0x35, 0x75, 0x9e, 0x3b, 0x3e, 0xd9, 0x55, 0xee, 0xe6, 0x8a, 0xcf, 0x9f, 0x6c, + 0x93, 0xbc, 0x78, 0x97, 0xec, 0x9b, 0xff, 0x9a, 0xfd, 0x72, 0x42, 0x2d, 0x9c, 0x28, 0xf3, 0x84, + 0xc8, 0x08, 0x1c, 0x35, 0x55, 0xcd, 0xe8, 0xd5, 0x47, 0x76, 0x31, 0xeb, 0xf5, 0x2c, 0x3a, 0xae, + 0xf2, 0x2c, 0x33, 0xf9, 0xc8, 0xee, 0xb6, 0x9d, 0xce, 0x23, 0xbb, 0xdb, 0x71, 0xba, 0xde, 0x5d, + 0xe8, 0xd5, 0xa9, 0xa9, 0xfe, 0x2d, 0xf8, 0xcc, 0xd4, 0x58, 0x7d, 0x92, 0xab, 0xd0, 0x9e, 0xb1, + 0x78, 0x32, 0x5d, 0xae, 0xad, 0xb1, 0x79, 0x3b, 0xd0, 0xaf, 0x85, 0xe7, 0x33, 0xb2, 0x05, 0x5d, + 0x3c, 0x96, 0x99, 0xb1, 0xb5, 0x46, 0xeb, 0xb5, 0xf7, 0x09, 0x0c, 0x2a, 0xea, 0x73, 0x9e, 0x3f, + 0x21, 0x04, 0xec, 0x28, 0x90, 0x01, 0xf6, 0xef, 0x80, 0xe2, 0xf7, 0x5c, 0xa9, 0xc6, 0xe2, 0x9f, + 0x3d, 0x34, 0x79, 0x3f, 0x58, 0xd0, 0xad, 0x1c, 0x90, 0x1b, 0x60, 0x17, 0x7c, 0x56, 0x55, 0x68, + 0xf3, 0x4c, 0x0b, 0xf0, 0x19, 0x45, 0x98, 0xdc, 0x84, 0x16, 0xfe, 0x21, 0x31, 0xb7, 0x8a, 0x2c, + 0xf3, 0x54, 0x18, 0xd4, 0x56, 0xff, 0x4f, 0xc8, 0x0e, 0xac, 0x45, 0x6c, 0x1c, 0x94, 0x89, 0xf4, + 0x8f, 0x83, 0xa4, 0x64, 0x4b, 0xff, 0x36, 0x07, 0x06, 0xfa, 0x5a, 0x21, 0xb7, 0xbe, 0x83, 0xfe, + 0xc2, 0xbf, 0x5a, 0xb2, 0x06, 0x3d, 0xf5, 0x8b, 0x73, 0xd0, 0xb9, 0x40, 0xd6, 0x01, 0xd4, 0x52, + 0x4f, 0x73, 0xc7, 0x22, 0x17, 0xc1, 0xd1, 0xeb, 0x34, 0xe5, 0xd9, 0x83, 0x20, 0x8b, 0x12, 0xe6, + 0x34, 0xc8, 0x7f, 0x60, 0x43, 0x59, 0xb5, 0xe8, 0x7a, 0x6b, 0xb3, 0xf2, 0x84, 0xaf, 0x9e, 0x63, + 0x57, 0x3b, 0xef, 0x97, 0x49, 0x82, 0xbc, 0x38, 0x9b, 0x38, 0xad, 0xfd, 0x9d, 0x57, 0xaf, 0xb7, + 0xad, 0xdf, 0x5f, 0x6f, 0x5b, 0x7f, 0xbe, 0xde, 0xb6, 0x5e, 0xfe, 0xb5, 0x7d, 0x01, 0x2e, 0x85, + 0x3c, 0xdd, 0xcd, 0xe3, 0x6c, 0x12, 0x06, 0xf9, 0xae, 0x8c, 0xa3, 0x03, 0x4c, 0xf2, 0xa9, 0xf5, + 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x1e, 0xd9, 0x50, 0xd7, 0x0b, 0x00, 0x00, } diff --git a/proto/analyze.proto b/proto/analyze.proto index c26a59b5..88590113 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -80,7 +80,10 @@ message AnalyzeColumnsReq { // There must be one non-zero value in sample_rate and sample_size. optional double sample_rate = 11; - // ndv_rate is the sampling rate that determines how many samples will be used to calculate the NDV. + // ndv_rate is the probability that the server keeps a row for NDV. If it is + // absent, the server keeps all rows. The server takes samples only from the + // kept rows, so ndv_rate must not be less than sample_rate. A server that + // does not support ndv_rate ignores it. optional double ndv_rate = 12; } @@ -132,6 +135,10 @@ message Histogram { message FMSketch { optional uint64 mask = 1 [(gogoproto.nullable) = false]; repeated uint64 hashset = 2; + // multi_hashset is used only when RowSampleCollector.ndv_sample_count is + // set. It has the hashes seen more than once, and hashset then has only the + // hashes seen once, because the NDV estimate scales up only those. + repeated uint64 multi_hashset = 3; } // SampleCollector is used for collect samples and calculate the count and ndv of an column. @@ -150,6 +157,14 @@ message RowSampleCollector { optional int64 count = 3 [(gogoproto.nullable) = false]; repeated FMSketch fm_sketch = 4; repeated int64 total_size = 5; + reserved 6, 7; + // ndv_sample_count is the number of rows that the server kept for NDV. The + // server sets it only when AnalyzeColumnsReq.ndv_rate is less than 1, even + // if it kept no rows. The count field includes the rows that were not kept, + // and the server scales null_counts and total_size up to match count. If + // ndv_sample_count is 0, there is nothing to scale: null_counts and + // total_size are 0 and do not describe the rows in count. + optional int64 ndv_sample_count = 8; } message RowSample { diff --git a/scripts/proto.lock b/scripts/proto.lock index 071cc592..a3700d22 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -435,6 +435,12 @@ "name": "hashset", "type": "uint64", "is_repeated": true + }, + { + "id": 3, + "name": "multi_hashset", + "type": "uint64", + "is_repeated": true } ] }, @@ -535,7 +541,17 @@ "name": "total_size", "type": "int64", "is_repeated": true + }, + { + "id": 8, + "name": "ndv_sample_count", + "type": "int64", + "optional": true } + ], + "reserved_ids": [ + 6, + 7 ] }, {