diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index 07ad048b..b971bf6b 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -284,7 +284,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"` } @@ -766,6 +769,10 @@ func (m *Histogram) GetBuckets() []*Bucket { type FMSketch struct { 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"` } func (m *FMSketch) Reset() { *m = FMSketch{} } @@ -815,6 +822,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"` @@ -906,10 +920,13 @@ type RowSampleCollector struct { 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"` - // singleton_sketch estimates the number of values that appear only once in the sample. - SingletonSketch []*FMSketch `protobuf:"bytes,6,rep,name=singleton_sketch,json=singletonSketch" json:"singleton_sketch,omitempty"` - // sketch_sample_count is the number of samples processed when building fm_sketch and singleton_sketch. - SketchSampleCount int64 `protobuf:"varint,7,opt,name=sketch_sample_count,json=sketchSampleCount" json:"sketch_sample_count"` + // 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"` } func (m *RowSampleCollector) Reset() { *m = RowSampleCollector{} } @@ -980,16 +997,9 @@ func (m *RowSampleCollector) GetTotalSize() []int64 { return nil } -func (m *RowSampleCollector) GetSingletonSketch() []*FMSketch { - if m != nil { - return m.SingletonSketch - } - return nil -} - -func (m *RowSampleCollector) GetSketchSampleCount() int64 { - if m != nil { - return m.SketchSampleCount +func (m *RowSampleCollector) GetNdvSampleCount() int64 { + if m != nil && m.NdvSampleCount != nil { + return *m.NdvSampleCount } return 0 } @@ -1225,90 +1235,91 @@ func init() { func init() { proto.RegisterFile("analyze.proto", fileDescriptor_76c3eb6de5a1604f) } var fileDescriptor_76c3eb6de5a1604f = []byte{ - // 1326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0x8f, 0xf7, 0xff, 0xbe, 0xdd, 0x24, 0x9b, 0xe9, 0x1f, 0xdc, 0xa8, 0x6c, 0x57, 0xae, 0x4a, - 0xb7, 0x2d, 0x0a, 0x28, 0x85, 0x43, 0x55, 0x51, 0x89, 0x14, 0x95, 0x56, 0xd0, 0x52, 0x4d, 0x2b, - 0x90, 0xb8, 0x58, 0x8e, 0x3d, 0xbb, 0x6b, 0xc5, 0xf6, 0x38, 0x9e, 0x71, 0x36, 0x8d, 0xb8, 0x82, - 0xc4, 0x05, 0x38, 0xf6, 0x23, 0x70, 0x87, 0x3b, 0xd7, 0x1e, 0x7b, 0xec, 0x09, 0xa1, 0x46, 0x7c, - 0x0f, 0x34, 0x6f, 0xc6, 0xde, 0xdd, 0x64, 0x8b, 0xda, 0x93, 0x67, 0xde, 0xfb, 0xcd, 0x9b, 0xf7, - 0x7e, 0xef, 0xcd, 0x7b, 0x86, 0x55, 0x2f, 0xf1, 0xa2, 0x67, 0x47, 0x6c, 0x2b, 0xcd, 0xb8, 0xe4, - 0xa4, 0x26, 0xc3, 0x74, 0x77, 0xb3, 0x2b, 0xfc, 0x09, 0x8b, 0x3d, 0x2d, 0xdb, 0x3c, 0x3b, 0xe6, - 0x63, 0x8e, 0xcb, 0x8f, 0xd4, 0xca, 0x48, 0xd7, 0xb3, 0x5c, 0x48, 0x5c, 0x6a, 0x81, 0xf3, 0x6b, - 0x05, 0xe0, 0x73, 0x6d, 0x8c, 0xb2, 0x7d, 0x72, 0x15, 0x2a, 0x32, 0xb5, 0xad, 0x81, 0x35, 0x5c, - 0xdb, 0xde, 0xd8, 0x52, 0x66, 0xb7, 0x8c, 0xf6, 0xe9, 0xb3, 0x94, 0xed, 0xd4, 0x5e, 0xfc, 0x7d, - 0x69, 0x85, 0x56, 0x64, 0x4a, 0xae, 0xc3, 0x86, 0x90, 0x5e, 0x26, 0x5d, 0x29, 0xdc, 0x91, 0x17, - 0x45, 0xbb, 0x9e, 0xbf, 0x67, 0x57, 0x06, 0xd6, 0xb0, 0x46, 0xd7, 0x51, 0xf1, 0x54, 0xdc, 0x33, - 0x62, 0xb2, 0x09, 0xf5, 0x51, 0xe4, 0x8d, 0x85, 0x5d, 0x55, 0x7a, 0x63, 0x44, 0x8b, 0xc8, 0x16, - 0xf4, 0x64, 0x18, 0x33, 0xf7, 0x88, 0x27, 0xcc, 0xe5, 0xa3, 0x91, 0x60, 0xd2, 0xae, 0x0d, 0xac, - 0x61, 0xd5, 0xc0, 0xd6, 0x94, 0xf6, 0x7b, 0x9e, 0xb0, 0x6f, 0x50, 0x47, 0xb6, 0xa0, 0x19, 0x06, - 0x87, 0x6e, 0xc6, 0xf6, 0xed, 0xfa, 0xc0, 0x1a, 0x76, 0xb6, 0xcf, 0x2d, 0x78, 0xf9, 0x20, 0x09, - 0xd8, 0x21, 0x65, 0xfb, 0xb4, 0x11, 0x06, 0xea, 0x4b, 0x3e, 0x86, 0xa6, 0xcf, 0x23, 0xc4, 0x37, - 0x10, 0xff, 0xde, 0x02, 0xfe, 0x2e, 0x8f, 0xf2, 0x38, 0x11, 0x78, 0xc2, 0xe7, 0x11, 0x65, 0xfb, - 0xce, 0x1f, 0x15, 0x58, 0x3f, 0x61, 0x8d, 0x5c, 0x81, 0xce, 0x6e, 0xee, 0xef, 0x31, 0xe9, 0x8a, - 0xf0, 0x88, 0x21, 0x3f, 0x85, 0x83, 0xa0, 0x15, 0x4f, 0xc2, 0x23, 0xa6, 0x60, 0x49, 0x1e, 0xbb, - 0xbe, 0x36, 0x8a, 0x74, 0xd4, 0x0b, 0x58, 0x92, 0xc7, 0xe6, 0x32, 0x72, 0x05, 0xd6, 0xfc, 0x58, - 0xec, 0x31, 0xe9, 0x4f, 0xdc, 0x80, 0xa5, 0x72, 0x82, 0xc4, 0xd4, 0xe9, 0x6a, 0x21, 0xfd, 0x42, - 0x09, 0x17, 0x60, 0xd3, 0x30, 0x90, 0x13, 0x24, 0x66, 0x0e, 0xf6, 0x9d, 0x12, 0xaa, 0x4b, 0x85, - 0x17, 0xa7, 0x11, 0xd3, 0xbe, 0xd5, 0xe7, 0x7d, 0xd3, 0x8a, 0xc2, 0x37, 0x63, 0x0b, 0x61, 0x8d, - 0x05, 0x18, 0x2a, 0x10, 0x76, 0x11, 0x40, 0xf2, 0xd4, 0x4d, 0x34, 0xaa, 0x89, 0x17, 0xb6, 0x24, - 0x4f, 0x1f, 0xa1, 0xd6, 0x86, 0xe6, 0x01, 0xcb, 0x44, 0xc8, 0x13, 0xbb, 0x85, 0xaa, 0x62, 0xeb, - 0xfc, 0x5c, 0x83, 0x8d, 0x53, 0x9c, 0xbe, 0x03, 0x6f, 0xf3, 0x21, 0x54, 0xde, 0x2e, 0x84, 0xea, - 0x1b, 0x42, 0xb8, 0x09, 0x5d, 0x93, 0x01, 0x37, 0x4c, 0x46, 0xdc, 0xae, 0x0d, 0xaa, 0xc3, 0xce, - 0x76, 0x4f, 0xe7, 0x5d, 0x3b, 0xf7, 0x20, 0x19, 0x71, 0xda, 0x31, 0x28, 0xb5, 0x59, 0x92, 0x93, - 0xfa, 0xdb, 0xe5, 0xa4, 0xb1, 0x2c, 0x27, 0x1f, 0x02, 0x49, 0xb3, 0x30, 0xf6, 0xb2, 0x67, 0xa6, - 0x18, 0xdc, 0x30, 0x10, 0x76, 0x73, 0x50, 0x1d, 0x56, 0x69, 0xcf, 0x68, 0x8c, 0x27, 0x81, 0x78, - 0x33, 0xab, 0xe4, 0x16, 0x5c, 0x28, 0xec, 0xa4, 0x19, 0x1b, 0x85, 0x87, 0xf3, 0xe6, 0xda, 0x68, - 0xee, 0xbc, 0x01, 0x3c, 0x46, 0xfd, 0xcc, 0xe8, 0x67, 0xb0, 0x6a, 0xb0, 0xe3, 0x8c, 0xe7, 0xa9, - 0xb0, 0x01, 0x69, 0xb0, 0x97, 0x94, 0xff, 0x97, 0x0a, 0x40, 0x0d, 0x69, 0xb8, 0x11, 0xe4, 0x52, - 0x99, 0x92, 0xcc, 0x93, 0xcc, 0xee, 0x0c, 0xac, 0xa1, 0x55, 0x24, 0x83, 0x7a, 0x92, 0x91, 0x0b, - 0xd0, 0x4a, 0x82, 0x03, 0xad, 0xed, 0xa2, 0xb6, 0x99, 0x04, 0x07, 0x4a, 0xe5, 0xfc, 0x64, 0x41, - 0xcf, 0x5c, 0xf0, 0x30, 0x3c, 0x64, 0x01, 0x65, 0x22, 0x25, 0xb7, 0x67, 0x59, 0xc9, 0x98, 0xd0, - 0x3d, 0x66, 0xb9, 0x3b, 0x42, 0xe1, 0xcb, 0xec, 0xe0, 0xe1, 0x4f, 0x01, 0x42, 0xf5, 0x16, 0xf5, - 0xd1, 0x0a, 0x1e, 0x3d, 0xbf, 0xec, 0xe1, 0x8b, 0x94, 0xb6, 0xc3, 0x62, 0xe9, 0xec, 0x02, 0x39, - 0x1d, 0x28, 0xe6, 0x50, 0x33, 0xa3, 0xfb, 0x8d, 0xb0, 0x2d, 0x64, 0xd2, 0xf0, 0xa5, 0x1b, 0x0d, - 0xbe, 0x52, 0xc3, 0x79, 0xc4, 0x92, 0xb1, 0x9c, 0xa8, 0xf7, 0x8c, 0x30, 0x2d, 0xfd, 0x5a, 0x0b, - 0x9d, 0x3f, 0xad, 0x13, 0x97, 0x94, 0x1e, 0xfb, 0x3c, 0x8a, 0x98, 0x2f, 0x79, 0xa6, 0x2f, 0x28, - 0x5b, 0xd5, 0x13, 0x24, 0xf1, 0x6e, 0xa1, 0xa5, 0x73, 0x40, 0x32, 0x84, 0x66, 0xba, 0xe7, 0x4e, - 0x42, 0x21, 0x4d, 0x94, 0xeb, 0xfa, 0xcc, 0xfd, 0x50, 0x48, 0x3e, 0xce, 0xbc, 0x98, 0x36, 0xd2, - 0x3d, 0xb5, 0x51, 0xf9, 0xcd, 0xf8, 0xd4, 0x2d, 0xcf, 0xe2, 0x73, 0x28, 0x09, 0xa5, 0x7c, 0x7a, - 0xf2, 0x9a, 0x6e, 0xc6, 0xa7, 0xe5, 0xce, 0xf9, 0x65, 0x96, 0xa3, 0x92, 0x3a, 0x72, 0x19, 0x6a, - 0x78, 0xb5, 0xb5, 0xfc, 0x6a, 0x54, 0x92, 0x01, 0x54, 0xfd, 0x58, 0x18, 0xf7, 0xd6, 0xcc, 0xab, - 0x7a, 0xf8, 0x04, 0xab, 0x9f, 0x2a, 0x15, 0xb9, 0x09, 0xed, 0x93, 0x6e, 0xbd, 0x21, 0xf4, 0x19, - 0xce, 0x79, 0x6e, 0x41, 0x63, 0x07, 0x5b, 0x82, 0x9a, 0x17, 0x3e, 0xcf, 0x13, 0xb9, 0xd0, 0x2f, - 0xb4, 0x48, 0xd5, 0x65, 0xc4, 0xa7, 0x2c, 0x73, 0x77, 0x79, 0x9e, 0x04, 0xe8, 0x45, 0x97, 0x02, - 0x8a, 0x76, 0x94, 0x44, 0x01, 0xf2, 0x34, 0x2d, 0x01, 0x55, 0x0d, 0x40, 0x91, 0x06, 0xf4, 0xa1, - 0x99, 0xb1, 0x94, 0x79, 0x52, 0x2c, 0x0c, 0x9a, 0x42, 0x48, 0x7a, 0x50, 0x4d, 0x82, 0x03, 0xdd, - 0x47, 0xa9, 0x5a, 0x3a, 0x5f, 0x41, 0xbb, 0x24, 0x81, 0x9c, 0xd7, 0xea, 0x79, 0xd7, 0x94, 0x80, - 0x7c, 0x00, 0x4d, 0xdd, 0xd1, 0x74, 0x9d, 0x74, 0xb6, 0xbb, 0x3a, 0x64, 0x1d, 0x13, 0x2d, 0x94, - 0xce, 0x1d, 0x68, 0xdd, 0x33, 0x6c, 0x11, 0x1b, 0x6a, 0xb1, 0x27, 0xf6, 0xd0, 0x58, 0x31, 0x17, - 0x51, 0xa2, 0x5a, 0xc2, 0xc4, 0x13, 0x13, 0x35, 0x0d, 0x95, 0xb5, 0x1a, 0x2d, 0xb6, 0xce, 0xbf, - 0x16, 0xac, 0x9f, 0xa0, 0x51, 0xa1, 0xf5, 0xcb, 0xd4, 0x95, 0xd6, 0xa5, 0xc5, 0x96, 0x5c, 0x06, - 0x48, 0xf2, 0x28, 0x72, 0x35, 0x9f, 0xf3, 0x8d, 0xb5, 0xad, 0xe4, 0x77, 0x91, 0xd3, 0x92, 0xef, - 0xea, 0x69, 0xbe, 0x6f, 0x40, 0x7b, 0x14, 0xbb, 0xba, 0xb7, 0x21, 0x5f, 0x65, 0xce, 0x8b, 0x28, - 0x68, 0x6b, 0x14, 0x9b, 0x78, 0x6e, 0x40, 0xdb, 0x2f, 0xc1, 0xf5, 0xa5, 0x05, 0xd2, 0xf2, 0x0b, - 0xf0, 0xfb, 0x6a, 0xd2, 0x48, 0x2f, 0x9a, 0x9b, 0x47, 0xb4, 0x8d, 0x12, 0xd5, 0xc5, 0x9d, 0xbf, - 0x2a, 0x40, 0x4e, 0x57, 0x31, 0xb9, 0xb6, 0x18, 0x6a, 0x59, 0xa5, 0x25, 0x74, 0x16, 0x3b, 0x4e, - 0xe3, 0x22, 0x76, 0xf3, 0x7a, 0x67, 0xd3, 0xd8, 0x04, 0x2f, 0xde, 0x25, 0xfa, 0xea, 0xff, 0x46, - 0xbf, 0x18, 0x50, 0x1d, 0x9b, 0xc5, 0x2c, 0x20, 0x72, 0x0b, 0x7a, 0x22, 0x4c, 0xc6, 0x11, 0x93, - 0x3c, 0x29, 0x4c, 0x36, 0x96, 0x9a, 0x5c, 0x2f, 0x71, 0xc6, 0xf2, 0x27, 0x70, 0xa6, 0x18, 0x7c, - 0xba, 0x27, 0x6b, 0x87, 0x9b, 0x73, 0x0e, 0x6f, 0x98, 0x01, 0x68, 0xe8, 0xca, 0x13, 0xe9, 0xdc, - 0x86, 0x76, 0xc9, 0x8a, 0xaa, 0xea, 0x8c, 0x4f, 0x4d, 0x79, 0xa8, 0x25, 0xb9, 0x08, 0x8d, 0x29, - 0x0b, 0xc7, 0x93, 0xc5, 0xb2, 0x30, 0x32, 0xe7, 0x1a, 0x74, 0xca, 0x9c, 0xf1, 0x29, 0xd9, 0x84, - 0x16, 0xde, 0xc9, 0x4c, 0x33, 0x5b, 0xa5, 0xe5, 0xde, 0xb9, 0x03, 0xdd, 0x02, 0xfa, 0x94, 0xa7, - 0x8f, 0x08, 0x81, 0x5a, 0xe0, 0x49, 0x0f, 0xab, 0xba, 0x4b, 0x71, 0x3d, 0x23, 0xb9, 0x32, 0xff, - 0x0b, 0x88, 0x22, 0xe7, 0x47, 0x0b, 0x5a, 0x85, 0x01, 0x72, 0x05, 0x6a, 0x19, 0x9f, 0x16, 0xc9, - 0xdd, 0x38, 0x51, 0x3d, 0x7c, 0x4a, 0x51, 0x4d, 0xae, 0x42, 0x1d, 0x7f, 0x53, 0xcc, 0x5b, 0x23, - 0x8b, 0x38, 0xe5, 0x06, 0xad, 0xa9, 0xbf, 0x16, 0x72, 0x0d, 0x56, 0x03, 0x36, 0xf2, 0xf2, 0x48, - 0xba, 0x07, 0x5e, 0x94, 0xb3, 0x85, 0x7f, 0xd0, 0xae, 0x51, 0x7d, 0xab, 0x34, 0xd7, 0x7f, 0x80, - 0xce, 0xdc, 0xbf, 0x2e, 0x59, 0x85, 0xb6, 0xfa, 0x62, 0x77, 0xec, 0xad, 0x90, 0x35, 0x00, 0xb5, - 0xd5, 0x3d, 0xbe, 0x67, 0x91, 0xb3, 0xd0, 0xd3, 0xfb, 0x38, 0xe6, 0xc9, 0x7d, 0x2f, 0x09, 0x22, - 0xd6, 0xab, 0x90, 0x33, 0xb0, 0xae, 0xa4, 0x9a, 0x74, 0x7d, 0xb4, 0x5a, 0x58, 0xc2, 0x59, 0xd8, - 0xab, 0x15, 0x27, 0xef, 0xe5, 0x51, 0x84, 0xb8, 0x30, 0x19, 0xf7, 0xea, 0x3b, 0xb7, 0x5e, 0xfd, - 0xde, 0xb2, 0x5e, 0xbc, 0xee, 0x5b, 0x2f, 0x5f, 0xf7, 0xad, 0x7f, 0x5e, 0xf7, 0xad, 0xdf, 0x8e, - 0xfb, 0x2b, 0xcf, 0x8f, 0xfb, 0x2b, 0x2f, 0x8f, 0xfb, 0x2b, 0xaf, 0x8e, 0xfb, 0x2b, 0x70, 0xce, - 0xe7, 0xf1, 0x56, 0x1a, 0x26, 0x63, 0xdf, 0x4b, 0xb7, 0x64, 0x18, 0xec, 0x62, 0xd0, 0x8f, 0xad, - 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x50, 0x82, 0xf7, 0x5e, 0x0e, 0x0c, 0x00, 0x00, + // 1337 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5f, 0x6f, 0xd4, 0xc6, + 0x16, 0x8f, 0x77, 0xbd, 0xff, 0xce, 0x6e, 0x92, 0xcd, 0x5c, 0xe0, 0x9a, 0x88, 0xbb, 0xac, 0x8c, + 0xb8, 0x2c, 0x70, 0x95, 0x5b, 0x05, 0xf5, 0x01, 0xa1, 0x56, 0x6a, 0xa8, 0x28, 0xd0, 0x42, 0xd1, + 0x80, 0x5a, 0xa9, 0x2f, 0x96, 0x63, 0xcf, 0xee, 0x5a, 0xb1, 0x3d, 0x8e, 0x67, 0x9c, 0x0d, 0x51, + 0x1f, 0xdb, 0x4a, 0x7d, 0x69, 0xfb, 0xc8, 0x47, 0xe8, 0x7b, 0xfb, 0x21, 0x78, 0xe4, 0x91, 0xa7, + 0xaa, 0x22, 0xea, 0xf7, 0xa8, 0xe6, 0xcc, 0xd8, 0xbb, 0x9b, 0x84, 0x0a, 0x9e, 0x3c, 0x73, 0x7e, + 0xbf, 0x39, 0x73, 0xce, 0xef, 0xcc, 0x9c, 0x31, 0xac, 0xfa, 0xa9, 0x1f, 0x3f, 0x3f, 0x62, 0x5b, + 0x59, 0xce, 0x25, 0x27, 0xb6, 0x8c, 0xb2, 0xdd, 0xcd, 0x9e, 0x08, 0xa6, 0x2c, 0xf1, 0xb5, 0x6d, + 0xf3, 0xdc, 0x84, 0x4f, 0x38, 0x0e, 0xff, 0xaf, 0x46, 0xc6, 0xba, 0x9e, 0x17, 0x42, 0xe2, 0x50, + 0x1b, 0xdc, 0x9f, 0x6b, 0x00, 0x9f, 0x68, 0x67, 0x94, 0xed, 0x93, 0x6b, 0x50, 0x93, 0x99, 0x63, + 0x0d, 0xad, 0xd1, 0xda, 0xf6, 0xc6, 0x96, 0x72, 0xbb, 0x65, 0xd0, 0x67, 0xcf, 0x33, 0xb6, 0x63, + 0xbf, 0xfc, 0xe3, 0xf2, 0x0a, 0xad, 0xc9, 0x8c, 0xdc, 0x80, 0x0d, 0x21, 0xfd, 0x5c, 0x7a, 0x52, + 0x78, 0x63, 0x3f, 0x8e, 0x77, 0xfd, 0x60, 0xcf, 0xa9, 0x0d, 0xad, 0x91, 0x4d, 0xd7, 0x11, 0x78, + 0x26, 0xee, 0x19, 0x33, 0xd9, 0x84, 0xc6, 0x38, 0xf6, 0x27, 0xc2, 0xa9, 0x2b, 0xdc, 0x38, 0xd1, + 0x26, 0xb2, 0x05, 0x7d, 0x19, 0x25, 0xcc, 0x3b, 0xe2, 0x29, 0xf3, 0xf8, 0x78, 0x2c, 0x98, 0x74, + 0xec, 0xa1, 0x35, 0xaa, 0x1b, 0xda, 0x9a, 0x42, 0xbf, 0xe1, 0x29, 0xfb, 0x12, 0x31, 0xb2, 0x05, + 0xad, 0x28, 0x3c, 0xf4, 0x72, 0xb6, 0xef, 0x34, 0x86, 0xd6, 0xa8, 0xbb, 0x7d, 0x7e, 0x29, 0xca, + 0x07, 0x69, 0xc8, 0x0e, 0x29, 0xdb, 0xa7, 0xcd, 0x28, 0x54, 0x5f, 0xf2, 0x01, 0xb4, 0x02, 0x1e, + 0x23, 0xbf, 0x89, 0xfc, 0x7f, 0x2f, 0xf1, 0xef, 0xf2, 0xb8, 0x48, 0x52, 0x81, 0x2b, 0x02, 0x1e, + 0x53, 0xb6, 0xef, 0xfe, 0x56, 0x83, 0xf5, 0x13, 0xde, 0xc8, 0x55, 0xe8, 0xee, 0x16, 0xc1, 0x1e, + 0x93, 0x9e, 0x88, 0x8e, 0x18, 0xea, 0x53, 0x06, 0x08, 0x1a, 0x78, 0x1a, 0x1d, 0x31, 0x45, 0x4b, + 0x8b, 0xc4, 0x0b, 0xb4, 0x53, 0x94, 0xa3, 0x51, 0xd2, 0xd2, 0x22, 0x31, 0x9b, 0x91, 0xab, 0xb0, + 0x16, 0x24, 0x62, 0x8f, 0xc9, 0x60, 0xea, 0x85, 0x2c, 0x93, 0x53, 0x14, 0xa6, 0x41, 0x57, 0x4b, + 0xeb, 0xa7, 0xca, 0xb8, 0x44, 0x9b, 0x45, 0xa1, 0x9c, 0xa2, 0x30, 0x0b, 0xb4, 0xaf, 0x95, 0x51, + 0x6d, 0x2a, 0xfc, 0x24, 0x8b, 0x99, 0x8e, 0xad, 0xb1, 0x18, 0x9b, 0x06, 0xca, 0xd8, 0x8c, 0x2f, + 0xa4, 0x35, 0x97, 0x68, 0x08, 0x20, 0xed, 0x12, 0x80, 0xe4, 0x99, 0x97, 0x6a, 0x56, 0x0b, 0x37, + 0x6c, 0x4b, 0x9e, 0x3d, 0x46, 0xd4, 0x81, 0xd6, 0x01, 0xcb, 0x45, 0xc4, 0x53, 0xa7, 0x8d, 0x50, + 0x39, 0x75, 0x7f, 0xb4, 0x61, 0xe3, 0x94, 0xa6, 0xef, 0xa1, 0xdb, 0x62, 0x0a, 0xb5, 0x77, 0x4b, + 0xa1, 0xfe, 0x96, 0x14, 0x6e, 0x41, 0xcf, 0x54, 0xc0, 0x8b, 0xd2, 0x31, 0x77, 0xec, 0x61, 0x7d, + 0xd4, 0xdd, 0xee, 0xeb, 0xba, 0xeb, 0xe0, 0x1e, 0xa4, 0x63, 0x4e, 0xbb, 0x86, 0xa5, 0x26, 0x67, + 0xd4, 0xa4, 0xf1, 0x6e, 0x35, 0x69, 0x9e, 0x55, 0x93, 0xff, 0x01, 0xc9, 0xf2, 0x28, 0xf1, 0xf3, + 0xe7, 0xe6, 0x30, 0x78, 0x51, 0x28, 0x9c, 0xd6, 0xb0, 0x3e, 0xaa, 0xd3, 0xbe, 0x41, 0x4c, 0x24, + 0xa1, 0x78, 0xbb, 0xaa, 0xe4, 0x36, 0x5c, 0x2c, 0xfd, 0x64, 0x39, 0x1b, 0x47, 0x87, 0x8b, 0xee, + 0x3a, 0xe8, 0xee, 0x82, 0x21, 0x3c, 0x41, 0x7c, 0xee, 0xf4, 0x23, 0x58, 0x35, 0xdc, 0x49, 0xce, + 0x8b, 0x4c, 0x38, 0x80, 0x32, 0x38, 0x67, 0x1c, 0xff, 0xcf, 0x14, 0x81, 0x1a, 0xd1, 0x70, 0x22, + 0xc8, 0xe5, 0xaa, 0x24, 0xb9, 0x2f, 0x99, 0xd3, 0x1d, 0x5a, 0x23, 0xab, 0x2c, 0x06, 0xf5, 0x25, + 0x23, 0x17, 0xa1, 0x9d, 0x86, 0x07, 0x1a, 0xed, 0x21, 0xda, 0x4a, 0xc3, 0x03, 0x05, 0xb9, 0x3f, + 0x58, 0xd0, 0x37, 0x1b, 0x3c, 0x8a, 0x0e, 0x59, 0x48, 0x99, 0xc8, 0xc8, 0x9d, 0x79, 0x55, 0x72, + 0x26, 0x74, 0x8f, 0x39, 0x3b, 0x1c, 0xa1, 0xf8, 0x55, 0x75, 0x70, 0xf1, 0x87, 0x00, 0x91, 0xba, + 0x8b, 0x7a, 0x69, 0x0d, 0x97, 0x5e, 0x38, 0xeb, 0xe2, 0x8b, 0x8c, 0x76, 0xa2, 0x72, 0xe8, 0xee, + 0x02, 0x39, 0x9d, 0x28, 0xd6, 0x50, 0x2b, 0xa3, 0xfb, 0x8d, 0x70, 0x2c, 0x54, 0xd2, 0xe8, 0xa5, + 0x1b, 0x0d, 0xde, 0x52, 0xa3, 0x79, 0xcc, 0xd2, 0x89, 0x9c, 0xaa, 0xfb, 0x8c, 0x34, 0x6d, 0xfd, + 0x42, 0x1b, 0xdd, 0xdf, 0xad, 0x13, 0x9b, 0x54, 0x11, 0x07, 0x3c, 0x8e, 0x59, 0x20, 0x79, 0xae, + 0x37, 0xa8, 0x5a, 0xd5, 0x53, 0x14, 0xf1, 0x6e, 0x89, 0xd2, 0x05, 0x22, 0x19, 0x41, 0x2b, 0xdb, + 0xf3, 0xa6, 0x91, 0x90, 0x26, 0xcb, 0x75, 0xbd, 0xe6, 0x7e, 0x24, 0x24, 0x9f, 0xe4, 0x7e, 0x42, + 0x9b, 0xd9, 0x9e, 0x9a, 0xa8, 0xfa, 0xe6, 0x7c, 0xe6, 0x55, 0x6b, 0xf1, 0x3a, 0x54, 0x82, 0x52, + 0x3e, 0x3b, 0xb9, 0x4d, 0x2f, 0xe7, 0xb3, 0x6a, 0xe6, 0xfe, 0x34, 0xaf, 0x51, 0x25, 0x1d, 0xb9, + 0x02, 0x36, 0x6e, 0x6d, 0x9d, 0xbd, 0x35, 0x82, 0x64, 0x08, 0xf5, 0x20, 0x11, 0x26, 0xbc, 0x35, + 0x73, 0xab, 0x1e, 0x3d, 0xc5, 0xd3, 0x4f, 0x15, 0x44, 0x6e, 0x41, 0xe7, 0x64, 0x58, 0x6f, 0x49, + 0x7d, 0xce, 0x73, 0x5f, 0x58, 0xd0, 0xdc, 0xc1, 0x96, 0xa0, 0xde, 0x8b, 0x80, 0x17, 0xa9, 0x5c, + 0xea, 0x17, 0xda, 0xa4, 0xce, 0x65, 0xcc, 0x67, 0x2c, 0xf7, 0x76, 0x79, 0x91, 0x86, 0x18, 0x45, + 0x8f, 0x02, 0x9a, 0x76, 0x94, 0x45, 0x11, 0x8a, 0x2c, 0xab, 0x08, 0x75, 0x4d, 0x40, 0x93, 0x26, + 0x0c, 0xa0, 0x95, 0xb3, 0x8c, 0xf9, 0x52, 0x2c, 0x3d, 0x34, 0xa5, 0x91, 0xf4, 0xa1, 0x9e, 0x86, + 0x07, 0xba, 0x8f, 0x52, 0x35, 0x74, 0x3f, 0x87, 0x4e, 0x25, 0x02, 0xb9, 0xa0, 0xe1, 0xc5, 0xd0, + 0x94, 0x81, 0xfc, 0x17, 0x5a, 0xba, 0xa3, 0xe9, 0x73, 0xd2, 0xdd, 0xee, 0xe9, 0x94, 0x75, 0x4e, + 0xb4, 0x04, 0xdd, 0x00, 0xda, 0xf7, 0x8c, 0x5a, 0xc4, 0x01, 0x3b, 0xf1, 0xc5, 0x1e, 0x3a, 0x2b, + 0xdf, 0x45, 0xb4, 0xa8, 0x96, 0x30, 0xf5, 0xc5, 0x54, 0xbd, 0x86, 0xca, 0x9b, 0x4d, 0xcb, 0x29, + 0xb9, 0x02, 0xab, 0x49, 0x11, 0xcb, 0xc8, 0x2b, 0xf1, 0x3a, 0xe2, 0x3d, 0x34, 0xde, 0xd7, 0x36, + 0xf7, 0x2f, 0x0b, 0xd6, 0x4f, 0x68, 0xad, 0x5c, 0xea, 0xeb, 0xab, 0x8f, 0x63, 0x8f, 0x96, 0x53, + 0x72, 0x05, 0x20, 0x2d, 0xe2, 0xd8, 0xd3, 0xa2, 0x2f, 0x76, 0xdf, 0x8e, 0xb2, 0xdf, 0x45, 0xe1, + 0xab, 0xa2, 0xd4, 0x4f, 0x17, 0xe5, 0x26, 0x74, 0xc6, 0x89, 0xa7, 0x1b, 0x20, 0x8a, 0x5a, 0x1d, + 0x8c, 0x32, 0x55, 0xda, 0x1e, 0x27, 0x26, 0xe9, 0x9b, 0xd0, 0x09, 0x2a, 0x72, 0xe3, 0xcc, 0x53, + 0xd4, 0x0e, 0x4a, 0xf2, 0x7f, 0xd4, 0x73, 0x24, 0xfd, 0x78, 0xe1, 0xd1, 0xa2, 0x1d, 0xb4, 0xa8, + 0x56, 0xef, 0x7e, 0x57, 0x03, 0x72, 0xfa, 0xa8, 0x93, 0xeb, 0xcb, 0xa9, 0x56, 0x47, 0xb9, 0xa2, + 0xce, 0x73, 0xc7, 0x27, 0xbb, 0xcc, 0xdd, 0x5c, 0xf1, 0xf9, 0x93, 0x6d, 0x92, 0x17, 0xef, 0x93, + 0x7d, 0xfd, 0x1f, 0xb3, 0x5f, 0x4e, 0xa8, 0x81, 0x1d, 0x65, 0x9e, 0x10, 0x19, 0x41, 0x5f, 0x75, + 0x55, 0xd3, 0x7a, 0xf5, 0x96, 0x6d, 0xcc, 0x7a, 0x2d, 0x0d, 0x0f, 0xca, 0x3c, 0x8b, 0x54, 0x3e, + 0xb4, 0xdb, 0xcd, 0x7e, 0xeb, 0xa1, 0xdd, 0x6e, 0xf5, 0xdb, 0xee, 0x1d, 0xe8, 0x54, 0xa9, 0xa9, + 0xf3, 0x9b, 0xf3, 0x99, 0xa9, 0xb1, 0x1a, 0x92, 0x4b, 0xd0, 0x9c, 0xb1, 0x68, 0x32, 0x5d, 0xae, + 0xad, 0xb1, 0xb9, 0xd7, 0xa1, 0x5b, 0x09, 0xcf, 0x67, 0x64, 0x13, 0xda, 0xb8, 0x2d, 0x33, 0x6d, + 0x6b, 0x95, 0x56, 0x73, 0xf7, 0x63, 0xe8, 0x95, 0xd4, 0x67, 0x3c, 0x7b, 0x4c, 0x08, 0xd8, 0xa1, + 0x2f, 0x7d, 0x3c, 0xbf, 0x3d, 0x8a, 0xe3, 0xb9, 0x52, 0xb5, 0xc5, 0x9f, 0x3d, 0x34, 0xb9, 0xdf, + 0x5b, 0xd0, 0x2e, 0x1d, 0x90, 0xab, 0x60, 0xe7, 0x7c, 0x56, 0x56, 0x68, 0xe3, 0xc4, 0x11, 0xe0, + 0x33, 0x8a, 0x30, 0xb9, 0x06, 0x0d, 0xfc, 0x21, 0x31, 0xb7, 0x8a, 0x2c, 0xf3, 0x54, 0x18, 0xd4, + 0x56, 0xff, 0x27, 0xe4, 0x3a, 0xac, 0x86, 0x6c, 0xec, 0x17, 0xb1, 0xf4, 0x0e, 0xfc, 0xb8, 0x60, + 0x4b, 0x7f, 0x9b, 0x3d, 0x03, 0x7d, 0xa5, 0x90, 0x1b, 0xdf, 0x42, 0x77, 0xe1, 0xaf, 0x96, 0xac, + 0x42, 0x47, 0x7d, 0xb1, 0x0f, 0xf6, 0x57, 0xc8, 0x1a, 0x80, 0x9a, 0xea, 0x6e, 0xde, 0xb7, 0xc8, + 0x39, 0xe8, 0xeb, 0x79, 0x92, 0xf0, 0xf4, 0xbe, 0x9f, 0x86, 0x31, 0xeb, 0xd7, 0xc8, 0xbf, 0x60, + 0x5d, 0x59, 0xb5, 0xe8, 0x7a, 0x69, 0xbd, 0xf4, 0x84, 0xaf, 0x5e, 0xdf, 0x2e, 0x57, 0xde, 0x2b, + 0xe2, 0x18, 0x79, 0x51, 0x3a, 0xe9, 0x37, 0x76, 0x6e, 0xbf, 0xfe, 0xb5, 0x6d, 0xbd, 0x7c, 0x33, + 0xb0, 0x5e, 0xbd, 0x19, 0x58, 0x7f, 0xbe, 0x19, 0x58, 0xbf, 0x1c, 0x0f, 0x56, 0x5e, 0x1c, 0x0f, + 0x56, 0x5e, 0x1d, 0x0f, 0x56, 0x5e, 0x1f, 0x0f, 0x56, 0xe0, 0x7c, 0xc0, 0x93, 0xad, 0x2c, 0x4a, + 0x27, 0x81, 0x9f, 0x6d, 0xc9, 0x28, 0xdc, 0xc5, 0xa4, 0x9f, 0x58, 0x7f, 0x07, 0x00, 0x00, 0xff, + 0xff, 0x5b, 0x29, 0x73, 0x92, 0xf8, 0x0b, 0x00, 0x00, } func (m *AnalyzeReq) Marshal() (dAtA []byte, err error) { @@ -1840,6 +1851,13 @@ func (m *FMSketch) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.MultiHashset) > 0 { + for iNdEx := len(m.MultiHashset) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintAnalyze(dAtA, i, uint64(m.MultiHashset[iNdEx])) + i-- + dAtA[i] = 0x18 + } + } if len(m.Hashset) > 0 { for iNdEx := len(m.Hashset) - 1; iNdEx >= 0; iNdEx-- { i = encodeVarintAnalyze(dAtA, i, uint64(m.Hashset[iNdEx])) @@ -1940,22 +1958,10 @@ func (m *RowSampleCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - i = encodeVarintAnalyze(dAtA, i, uint64(m.SketchSampleCount)) - i-- - dAtA[i] = 0x38 - if len(m.SingletonSketch) > 0 { - for iNdEx := len(m.SingletonSketch) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.SingletonSketch[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintAnalyze(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } + if m.NdvSampleCount != nil { + i = encodeVarintAnalyze(dAtA, i, uint64(*m.NdvSampleCount)) + i-- + dAtA[i] = 0x40 } if len(m.TotalSize) > 0 { for iNdEx := len(m.TotalSize) - 1; iNdEx >= 0; iNdEx-- { @@ -2395,6 +2401,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)) + } + } return n } @@ -2455,13 +2466,9 @@ func (m *RowSampleCollector) Size() (n int) { n += 1 + sovAnalyze(uint64(e)) } } - if len(m.SingletonSketch) > 0 { - for _, e := range m.SingletonSketch { - l = e.Size() - n += 1 + l + sovAnalyze(uint64(l)) - } + if m.NdvSampleCount != nil { + n += 1 + sovAnalyze(uint64(*m.NdvSampleCount)) } - n += 1 + sovAnalyze(uint64(m.SketchSampleCount)) return n } @@ -4394,6 +4401,82 @@ 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 < 0 { + return ErrInvalidLengthAnalyze + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.MultiHashset) == 0 { + m.MultiHashset = make([]uint64, 0, elementCount) + } + 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:]) @@ -4895,45 +4978,11 @@ func (m *RowSampleCollector) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field TotalSize", wireType) } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SingletonSketch", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAnalyze - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthAnalyze - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthAnalyze - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SingletonSketch = append(m.SingletonSketch, &FMSketch{}) - if err := m.SingletonSketch[len(m.SingletonSketch)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: + case 8: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SketchSampleCount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field NdvSampleCount", wireType) } - m.SketchSampleCount = 0 + var v int64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowAnalyze @@ -4943,11 +4992,12 @@ func (m *RowSampleCollector) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.SketchSampleCount |= int64(b&0x7F) << shift + v |= int64(b&0x7F) << shift if b < 0x80 { break } } + m.NdvSampleCount = &v default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) diff --git a/proto/analyze.proto b/proto/analyze.proto index 651219d9..4a91ca6a 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -86,7 +86,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; } @@ -138,6 +141,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. @@ -156,10 +163,14 @@ message RowSampleCollector { optional int64 count = 3 [(gogoproto.nullable) = false]; repeated FMSketch fm_sketch = 4; repeated int64 total_size = 5; - // singleton_sketch estimates the number of values that appear only once in the sample. - repeated FMSketch singleton_sketch = 6; - // sketch_sample_count is the number of samples processed when building fm_sketch and singleton_sketch. - optional int64 sketch_sample_count = 7 [(gogoproto.nullable) = false]; + 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 362a7a6a..239712c8 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 } ] }, @@ -537,23 +543,15 @@ "is_repeated": true }, { - "id": 6, - "name": "singleton_sketch", - "type": "FMSketch", - "is_repeated": true - }, - { - "id": 7, - "name": "sketch_sample_count", + "id": 8, + "name": "ndv_sample_count", "type": "int64", - "optional": true, - "options": [ - { - "name": "(gogoproto.nullable)", - "value": "false" - } - ] + "optional": true } + ], + "reserved_ids": [ + 6, + 7 ] }, {