From 7585d09a8ffbb1a5cc5918c06e1fa2d97ca28ab0 Mon Sep 17 00:00:00 2001 From: 0xPoe Date: Fri, 13 Feb 2026 16:10:39 +0100 Subject: [PATCH 1/2] feat: f1 sketch Signed-off-by: 0xPoe --- go-tipb/analyze.pb.go | 267 ++++++++++++++++++++++++++++-------------- proto/analyze.proto | 10 ++ 2 files changed, 191 insertions(+), 86 deletions(-) diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index cd2817b8..de783300 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -892,11 +892,13 @@ 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"` + 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"` + F1Sketch []*FMSketch `protobuf:"bytes,6,rep,name=f1_sketch,json=f1Sketch" json:"f1_sketch,omitempty"` + SketchSampleCount int64 `protobuf:"varint,7,opt,name=sketch_sample_count,json=sketchSampleCount" json:"sketch_sample_count"` } func (m *RowSampleCollector) Reset() { *m = RowSampleCollector{} } @@ -967,6 +969,20 @@ func (m *RowSampleCollector) GetTotalSize() []int64 { return nil } +func (m *RowSampleCollector) GetF1Sketch() []*FMSketch { + if m != nil { + return m.F1Sketch + } + return nil +} + +func (m *RowSampleCollector) GetSketchSampleCount() int64 { + if m != nil { + return m.SketchSampleCount + } + 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"` @@ -1198,87 +1214,89 @@ func init() { func init() { proto.RegisterFile("analyze.proto", fileDescriptor_76c3eb6de5a1604f) } var fileDescriptor_76c3eb6de5a1604f = []byte{ - // 1272 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6e, 0xdb, 0x46, - 0x13, 0x37, 0xf5, 0x5f, 0x23, 0xd9, 0x96, 0xf7, 0x4b, 0xf2, 0xb1, 0x46, 0xaa, 0x08, 0x0c, 0xd2, - 0x28, 0x49, 0xa1, 0x16, 0x0e, 0x7a, 0x08, 0x82, 0x06, 0xa8, 0x53, 0xa4, 0x09, 0xda, 0xa4, 0xc1, - 0x26, 0x68, 0x81, 0x5e, 0x08, 0x9a, 0x5c, 0x49, 0x84, 0x49, 0x2e, 0xcd, 0x5d, 0x46, 0x8e, 0xd1, - 0x6b, 0x7b, 0x6c, 0x7b, 0xcc, 0x23, 0xf4, 0xde, 0x3e, 0x44, 0x4e, 0x45, 0x8e, 0x39, 0x15, 0x45, - 0x8c, 0x5e, 0xfb, 0x0c, 0xc5, 0xce, 0x2e, 0x29, 0xc9, 0x96, 0x8b, 0xe4, 0xc4, 0x9d, 0x99, 0xdf, - 0xce, 0xce, 0xfc, 0x66, 0x76, 0x96, 0xb0, 0xee, 0x25, 0x5e, 0xf4, 0xfc, 0x88, 0x8d, 0xd2, 0x8c, - 0x4b, 0x4e, 0x6a, 0x32, 0x4c, 0xf7, 0xb6, 0xbb, 0xc2, 0x9f, 0xb2, 0xd8, 0xd3, 0xba, 0xed, 0x73, - 0x13, 0x3e, 0xe1, 0xb8, 0xfc, 0x48, 0xad, 0x8c, 0x76, 0x33, 0xcb, 0x85, 0xc4, 0xa5, 0x56, 0x38, - 0x3f, 0x57, 0x00, 0x3e, 0xd3, 0xce, 0x28, 0x3b, 0x20, 0x57, 0xa1, 0x22, 0x53, 0xdb, 0x1a, 0x58, - 0xc3, 0x8d, 0x9d, 0xad, 0x91, 0x72, 0x3b, 0x32, 0xd6, 0xa7, 0xcf, 0x53, 0xb6, 0x5b, 0x7b, 0xf9, - 0xe7, 0xa5, 0x35, 0x5a, 0x91, 0x29, 0xb9, 0x0e, 0x5b, 0x42, 0x7a, 0x99, 0x74, 0xa5, 0x70, 0xc7, - 0x5e, 0x14, 0xed, 0x79, 0xfe, 0xbe, 0x5d, 0x19, 0x58, 0xc3, 0x1a, 0xdd, 0x44, 0xc3, 0x53, 0x71, - 0xcf, 0xa8, 0xc9, 0x36, 0xd4, 0xc7, 0x91, 0x37, 0x11, 0x76, 0x55, 0xd9, 0x8d, 0x13, 0xad, 0x22, - 0x23, 0xe8, 0xc9, 0x30, 0x66, 0xee, 0x11, 0x4f, 0x98, 0xcb, 0xc7, 0x63, 0xc1, 0xa4, 0x5d, 0x1b, - 0x58, 0xc3, 0xaa, 0x81, 0x6d, 0x28, 0xeb, 0x77, 0x3c, 0x61, 0x5f, 0xa3, 0x8d, 0x8c, 0xa0, 0x19, - 0x06, 0x87, 0x6e, 0xc6, 0x0e, 0xec, 0xfa, 0xc0, 0x1a, 0x76, 0x76, 0xce, 0x2f, 0x45, 0xf9, 0x20, - 0x09, 0xd8, 0x21, 0x65, 0x07, 0xb4, 0x11, 0x06, 0xea, 0x4b, 0x3e, 0x86, 0xa6, 0xcf, 0x23, 0xc4, - 0x37, 0x10, 0xff, 0xff, 0x25, 0xfc, 0x5d, 0x1e, 0xe5, 0x71, 0x22, 0x70, 0x87, 0xcf, 0x23, 0xca, - 0x0e, 0x9c, 0xdf, 0x2a, 0xb0, 0x79, 0xc2, 0x1b, 0xb9, 0x02, 0x9d, 0xbd, 0xdc, 0xdf, 0x67, 0xd2, - 0x15, 0xe1, 0x11, 0x43, 0x7e, 0x8a, 0x00, 0x41, 0x1b, 0x9e, 0x84, 0x47, 0x4c, 0xc1, 0x92, 0x3c, - 0x76, 0x7d, 0xed, 0x14, 0xe9, 0xa8, 0x17, 0xb0, 0x24, 0x8f, 0xcd, 0x61, 0xe4, 0x0a, 0x6c, 0xf8, - 0xb1, 0xd8, 0x67, 0xd2, 0x9f, 0xba, 0x01, 0x4b, 0xe5, 0x14, 0x89, 0xa9, 0xd3, 0xf5, 0x42, 0xfb, - 0xb9, 0x52, 0x2e, 0xc1, 0x66, 0x61, 0x20, 0xa7, 0x48, 0xcc, 0x02, 0xec, 0x5b, 0xa5, 0x54, 0x87, - 0x0a, 0x2f, 0x4e, 0x23, 0xa6, 0x63, 0xab, 0x2f, 0xc6, 0xa6, 0x0d, 0x45, 0x6c, 0xc6, 0x17, 0xc2, - 0x1a, 0x4b, 0x30, 0x34, 0x20, 0xec, 0x22, 0x80, 0xe4, 0xa9, 0x9b, 0x68, 0x54, 0x13, 0x0f, 0x6c, - 0x49, 0x9e, 0x3e, 0x42, 0xab, 0x0d, 0xcd, 0x67, 0x2c, 0x13, 0x21, 0x4f, 0xec, 0x16, 0x9a, 0x0a, - 0xd1, 0xf9, 0xa7, 0x0a, 0x5b, 0xa7, 0x38, 0x7d, 0x07, 0xde, 0x16, 0x53, 0xa8, 0xbc, 0x5d, 0x0a, - 0xd5, 0x33, 0x52, 0xb8, 0x09, 0x5d, 0x53, 0x01, 0x37, 0x4c, 0xc6, 0xdc, 0xae, 0x0d, 0xaa, 0xc3, - 0xce, 0x4e, 0x4f, 0xd7, 0x5d, 0x07, 0xf7, 0x20, 0x19, 0x73, 0xda, 0x31, 0x28, 0x25, 0xac, 0xa8, - 0x49, 0xfd, 0xed, 0x6a, 0xd2, 0x58, 0x55, 0x93, 0x0f, 0x81, 0xa4, 0x59, 0x18, 0x7b, 0xd9, 0x73, - 0xd3, 0x0c, 0x6e, 0x18, 0x08, 0xbb, 0x39, 0xa8, 0x0e, 0xab, 0xb4, 0x67, 0x2c, 0x26, 0x92, 0x40, - 0x9c, 0xcd, 0x2a, 0xb9, 0x05, 0xef, 0x15, 0x7e, 0xd2, 0x8c, 0x8d, 0xc3, 0xc3, 0x45, 0x77, 0x6d, - 0x74, 0x77, 0xc1, 0x00, 0x1e, 0xa3, 0x7d, 0xee, 0xf4, 0x53, 0x58, 0x37, 0xd8, 0x49, 0xc6, 0xf3, - 0x54, 0xd8, 0x80, 0x34, 0xd8, 0x2b, 0xda, 0xff, 0x0b, 0x05, 0xa0, 0x86, 0x34, 0x14, 0x04, 0xb9, - 0x54, 0x96, 0x24, 0xf3, 0x24, 0xb3, 0x3b, 0x03, 0x6b, 0x68, 0x15, 0xc5, 0xa0, 0x9e, 0x64, 0xce, - 0x8f, 0x16, 0xf4, 0x8c, 0x97, 0x87, 0xe1, 0x21, 0x0b, 0x28, 0x13, 0x29, 0xb9, 0x3d, 0xa7, 0x3e, - 0x63, 0x42, 0x0f, 0x92, 0xd5, 0x67, 0x0a, 0x85, 0x2f, 0x4b, 0x80, 0x9b, 0x3f, 0x01, 0x08, 0xd5, - 0x85, 0xd3, 0x5b, 0x2b, 0xb8, 0xf5, 0xc2, 0xaa, 0xdb, 0x2d, 0x52, 0xda, 0x0e, 0x8b, 0xa5, 0xb3, - 0x07, 0xe4, 0x74, 0x36, 0x58, 0x28, 0x9d, 0xbe, 0x1e, 0x2a, 0xc2, 0xb6, 0x90, 0x2e, 0x43, 0x8a, - 0x9e, 0x26, 0x78, 0x15, 0x0d, 0xb1, 0x11, 0x4b, 0x26, 0x72, 0xaa, 0x2e, 0x2d, 0xc2, 0xb4, 0xf6, - 0x2b, 0xad, 0x74, 0x7e, 0xb7, 0x4e, 0x1c, 0x52, 0x46, 0xec, 0xf3, 0x28, 0x62, 0xbe, 0xe4, 0x99, - 0x3e, 0xa0, 0x9c, 0x47, 0x4f, 0x90, 0xa9, 0xbb, 0x85, 0x95, 0x2e, 0x00, 0xc9, 0x10, 0x9a, 0xe9, - 0xbe, 0x3b, 0x0d, 0x85, 0x34, 0x59, 0x6e, 0xea, 0x3d, 0xf7, 0x43, 0x21, 0xf9, 0x24, 0xf3, 0x62, - 0xda, 0x48, 0xf7, 0x95, 0xa0, 0x8a, 0x98, 0xf1, 0x99, 0x5b, 0xee, 0xc5, 0x9e, 0x2f, 0x09, 0xa5, - 0x7c, 0x76, 0xf2, 0x98, 0x6e, 0xc6, 0x67, 0xa5, 0xe4, 0xfc, 0x34, 0xaf, 0x51, 0x49, 0x1d, 0xb9, - 0x0c, 0x35, 0x3c, 0xda, 0x5a, 0x7d, 0x34, 0x1a, 0xc9, 0x00, 0xaa, 0x7e, 0x2c, 0x4c, 0x78, 0x1b, - 0xe6, 0xea, 0x3c, 0x7c, 0x82, 0x2d, 0x4e, 0x95, 0x89, 0xdc, 0x84, 0xf6, 0xc9, 0xb0, 0xce, 0x48, - 0x7d, 0x8e, 0x73, 0x5e, 0x58, 0xd0, 0xd8, 0xc5, 0x7b, 0xaf, 0x1e, 0x05, 0x9f, 0xe7, 0x89, 0x5c, - 0x1a, 0x0a, 0x5a, 0xa5, 0x9a, 0x2f, 0xe2, 0x33, 0x96, 0xb9, 0x7b, 0x3c, 0x4f, 0x02, 0x8c, 0xa2, - 0x4b, 0x01, 0x55, 0xbb, 0x4a, 0xa3, 0x00, 0x79, 0x9a, 0x96, 0x80, 0xaa, 0x06, 0xa0, 0x4a, 0x03, - 0xfa, 0xd0, 0xcc, 0x58, 0xca, 0x3c, 0x29, 0x96, 0x5e, 0x93, 0x42, 0x49, 0x7a, 0x50, 0x4d, 0x82, - 0x67, 0x7a, 0x58, 0x52, 0xb5, 0x74, 0xbe, 0x84, 0x76, 0x49, 0x02, 0xb9, 0xa0, 0xcd, 0x8b, 0xa1, - 0x29, 0x05, 0xf9, 0x00, 0x9a, 0x7a, 0x6c, 0xe9, 0x3e, 0xe9, 0xec, 0x74, 0x75, 0xca, 0x3a, 0x27, - 0x5a, 0x18, 0x9d, 0x3b, 0xd0, 0xba, 0x67, 0xd8, 0x22, 0x36, 0xd4, 0x62, 0x4f, 0xec, 0xa3, 0xb3, - 0xe2, 0xf1, 0x43, 0x8d, 0xba, 0xf7, 0x53, 0x4f, 0x4c, 0xd5, 0x93, 0xa7, 0xbc, 0xd5, 0x68, 0x21, - 0x3a, 0x7f, 0x5b, 0xb0, 0x79, 0x82, 0x46, 0x85, 0xd6, 0xd7, 0x4f, 0x77, 0x5a, 0x97, 0x16, 0x22, - 0xb9, 0x0c, 0x90, 0xe4, 0x51, 0xe4, 0x6a, 0x3e, 0x17, 0xa7, 0x67, 0x5b, 0xe9, 0xef, 0x22, 0xa7, - 0x25, 0xdf, 0xd5, 0xd3, 0x7c, 0xdf, 0x80, 0xf6, 0x38, 0x76, 0xf5, 0x00, 0x43, 0xbe, 0xca, 0x9a, - 0x17, 0x59, 0xd0, 0xd6, 0x38, 0x36, 0xf9, 0xdc, 0x80, 0xb6, 0x5f, 0x82, 0xeb, 0x2b, 0x1b, 0xa4, - 0xe5, 0x17, 0xe0, 0xf7, 0xd5, 0x73, 0x22, 0xbd, 0x68, 0xe1, 0xd1, 0xa1, 0x6d, 0xd4, 0xa8, 0x51, - 0xed, 0xfc, 0x61, 0x01, 0x39, 0xdd, 0xc5, 0xe4, 0xda, 0x72, 0xaa, 0x65, 0x97, 0x96, 0xd0, 0x79, - 0xee, 0xf8, 0xe4, 0x16, 0xb9, 0x9b, 0xdb, 0x3b, 0x7f, 0x72, 0x4d, 0xf2, 0xe2, 0x5d, 0xb2, 0xaf, - 0xfe, 0x67, 0xf6, 0xcb, 0x09, 0xd5, 0x71, 0x58, 0x2c, 0x24, 0x74, 0x1b, 0xda, 0x65, 0x90, 0xaa, - 0xc9, 0x32, 0x3e, 0x33, 0xd5, 0x52, 0x4b, 0x72, 0x11, 0x1a, 0x33, 0x16, 0x4e, 0xa6, 0xcb, 0x55, - 0x32, 0x3a, 0xe7, 0x1a, 0x74, 0x4a, 0x0a, 0xf9, 0x8c, 0x6c, 0x43, 0x0b, 0x03, 0x64, 0x66, 0xb6, - 0xac, 0xd3, 0x52, 0x76, 0xee, 0x40, 0xb7, 0x80, 0x3e, 0xe5, 0xe9, 0x23, 0x42, 0xa0, 0x16, 0x78, - 0xd2, 0xc3, 0x26, 0xeb, 0x52, 0x5c, 0xcf, 0x73, 0xae, 0x2c, 0xfe, 0x76, 0xa1, 0xca, 0xf9, 0xc1, - 0x82, 0x56, 0xe1, 0x80, 0x5c, 0x81, 0x5a, 0xc6, 0x67, 0x05, 0xd7, 0x5b, 0x27, 0x8a, 0xc9, 0x67, - 0x14, 0xcd, 0xe4, 0x2a, 0xd4, 0xf1, 0xd7, 0xc0, 0xb4, 0x3e, 0x59, 0xc6, 0xa9, 0x30, 0x68, 0x4d, - 0xfd, 0x29, 0x90, 0x6b, 0xb0, 0x1e, 0xb0, 0xb1, 0x97, 0x47, 0xd2, 0x7d, 0xe6, 0x45, 0x39, 0x5b, - 0xfa, 0xef, 0xeb, 0x1a, 0xd3, 0x37, 0xca, 0x72, 0xfd, 0x7b, 0xe8, 0x2c, 0xfc, 0x5f, 0x92, 0x75, - 0x68, 0xab, 0x2f, 0x0e, 0xab, 0xde, 0x1a, 0xd9, 0x00, 0x50, 0xa2, 0x1e, 0xb9, 0x3d, 0x8b, 0x9c, - 0x83, 0x9e, 0x96, 0xe3, 0x98, 0x27, 0xf7, 0xbd, 0x24, 0x88, 0x58, 0xaf, 0x42, 0xfe, 0x07, 0x9b, - 0x4a, 0xab, 0x49, 0xd7, 0x5b, 0xab, 0x85, 0x27, 0x7c, 0x9a, 0x7a, 0xb5, 0x62, 0xe7, 0xbd, 0x3c, - 0x8a, 0x10, 0x17, 0x26, 0x93, 0x5e, 0x7d, 0xf7, 0xd6, 0xeb, 0x5f, 0x5b, 0xd6, 0xcb, 0x37, 0x7d, - 0xeb, 0xd5, 0x9b, 0xbe, 0xf5, 0xd7, 0x9b, 0xbe, 0xf5, 0xcb, 0x71, 0x7f, 0xed, 0xc5, 0x71, 0x7f, - 0xed, 0xd5, 0x71, 0x7f, 0xed, 0xf5, 0x71, 0x7f, 0x0d, 0xce, 0xfb, 0x3c, 0x1e, 0xa5, 0x61, 0x32, - 0xf1, 0xbd, 0x74, 0x24, 0xc3, 0x60, 0x0f, 0x93, 0x7e, 0x6c, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0x10, 0xc3, 0x90, 0xb5, 0x82, 0x0b, 0x00, 0x00, + // 1305 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0xdb, 0x46, + 0x13, 0x36, 0xf5, 0xad, 0x91, 0x6c, 0xcb, 0x9b, 0x8f, 0x97, 0xaf, 0x91, 0x2a, 0x02, 0x83, 0x34, + 0x4a, 0x52, 0xb8, 0x8d, 0xd3, 0x1e, 0x82, 0xa0, 0x01, 0xea, 0x14, 0x69, 0x82, 0x36, 0x69, 0xb0, + 0x09, 0x5a, 0xa0, 0x17, 0x82, 0x26, 0x57, 0x12, 0x61, 0x92, 0x4b, 0x73, 0x97, 0x91, 0x63, 0xf4, + 0xda, 0x1e, 0xdb, 0x1e, 0xf3, 0x13, 0x7a, 0x2d, 0xda, 0x1f, 0x91, 0x63, 0x8e, 0x39, 0x15, 0x45, + 0x8c, 0x5e, 0xfb, 0x1b, 0x8a, 0x9d, 0x5d, 0x52, 0x92, 0x2d, 0x17, 0xc9, 0x89, 0xbb, 0x33, 0xcf, + 0xce, 0xce, 0x3c, 0x33, 0x3b, 0x43, 0x58, 0xf5, 0x12, 0x2f, 0x7a, 0x7e, 0xc8, 0xb6, 0xd2, 0x8c, + 0x4b, 0x4e, 0x6a, 0x32, 0x4c, 0x77, 0x37, 0xbb, 0xc2, 0x9f, 0xb0, 0xd8, 0xd3, 0xb2, 0xcd, 0xb3, + 0x63, 0x3e, 0xe6, 0xb8, 0xfc, 0x50, 0xad, 0x8c, 0x74, 0x3d, 0xcb, 0x85, 0xc4, 0xa5, 0x16, 0x38, + 0x3f, 0x57, 0x00, 0x3e, 0xd3, 0xc6, 0x28, 0xdb, 0x27, 0x57, 0xa0, 0x22, 0x53, 0xdb, 0x1a, 0x58, + 0xc3, 0xb5, 0xed, 0x8d, 0x2d, 0x65, 0x76, 0xcb, 0x68, 0x9f, 0x3e, 0x4f, 0xd9, 0x4e, 0xed, 0xe5, + 0x9f, 0x17, 0x57, 0x68, 0x45, 0xa6, 0xe4, 0x1a, 0x6c, 0x08, 0xe9, 0x65, 0xd2, 0x95, 0xc2, 0x1d, + 0x79, 0x51, 0xb4, 0xeb, 0xf9, 0x7b, 0x76, 0x65, 0x60, 0x0d, 0x6b, 0x74, 0x1d, 0x15, 0x4f, 0xc5, + 0x3d, 0x23, 0x26, 0x9b, 0x50, 0x1f, 0x45, 0xde, 0x58, 0xd8, 0x55, 0xa5, 0x37, 0x46, 0xb4, 0x88, + 0x6c, 0x41, 0x4f, 0x86, 0x31, 0x73, 0x0f, 0x79, 0xc2, 0x5c, 0x3e, 0x1a, 0x09, 0x26, 0xed, 0xda, + 0xc0, 0x1a, 0x56, 0x0d, 0x6c, 0x4d, 0x69, 0xbf, 0xe3, 0x09, 0xfb, 0x1a, 0x75, 0x64, 0x0b, 0x9a, + 0x61, 0x70, 0xe0, 0x66, 0x6c, 0xdf, 0xae, 0x0f, 0xac, 0x61, 0x67, 0xfb, 0xdc, 0x82, 0x97, 0x0f, + 0x92, 0x80, 0x1d, 0x50, 0xb6, 0x4f, 0x1b, 0x61, 0xa0, 0xbe, 0xe4, 0x23, 0x68, 0xfa, 0x3c, 0x42, + 0x7c, 0x03, 0xf1, 0xff, 0x5b, 0xc0, 0xdf, 0xe5, 0x51, 0x1e, 0x27, 0x02, 0x4f, 0xf8, 0x3c, 0xa2, + 0x6c, 0xdf, 0xf9, 0xbd, 0x02, 0xeb, 0xc7, 0xac, 0x91, 0xcb, 0xd0, 0xd9, 0xcd, 0xfd, 0x3d, 0x26, + 0x5d, 0x11, 0x1e, 0x32, 0xe4, 0xa7, 0x70, 0x10, 0xb4, 0xe2, 0x49, 0x78, 0xc8, 0x14, 0x2c, 0xc9, + 0x63, 0xd7, 0xd7, 0x46, 0x91, 0x8e, 0x7a, 0x01, 0x4b, 0xf2, 0xd8, 0x5c, 0x46, 0x2e, 0xc3, 0x9a, + 0x1f, 0x8b, 0x3d, 0x26, 0xfd, 0x89, 0x1b, 0xb0, 0x54, 0x4e, 0x90, 0x98, 0x3a, 0x5d, 0x2d, 0xa4, + 0x9f, 0x2b, 0xe1, 0x02, 0x6c, 0x1a, 0x06, 0x72, 0x82, 0xc4, 0xcc, 0xc1, 0xbe, 0x55, 0x42, 0x75, + 0xa9, 0xf0, 0xe2, 0x34, 0x62, 0xda, 0xb7, 0xfa, 0xbc, 0x6f, 0x5a, 0x51, 0xf8, 0x66, 0x6c, 0x21, + 0xac, 0xb1, 0x00, 0x43, 0x05, 0xc2, 0x2e, 0x00, 0x48, 0x9e, 0xba, 0x89, 0x46, 0x35, 0xf1, 0xc2, + 0x96, 0xe4, 0xe9, 0x23, 0xd4, 0xda, 0xd0, 0x7c, 0xc6, 0x32, 0x11, 0xf2, 0xc4, 0x6e, 0xa1, 0xaa, + 0xd8, 0x3a, 0xff, 0x54, 0x61, 0xe3, 0x04, 0xa7, 0xef, 0xc0, 0xdb, 0x7c, 0x08, 0x95, 0xb7, 0x0b, + 0xa1, 0x7a, 0x4a, 0x08, 0x37, 0xa1, 0x6b, 0x32, 0xe0, 0x86, 0xc9, 0x88, 0xdb, 0xb5, 0x41, 0x75, + 0xd8, 0xd9, 0xee, 0xe9, 0xbc, 0x6b, 0xe7, 0x1e, 0x24, 0x23, 0x4e, 0x3b, 0x06, 0xa5, 0x36, 0x4b, + 0x72, 0x52, 0x7f, 0xbb, 0x9c, 0x34, 0x96, 0xe5, 0xe4, 0x03, 0x20, 0x69, 0x16, 0xc6, 0x5e, 0xf6, + 0xdc, 0x14, 0x83, 0x1b, 0x06, 0xc2, 0x6e, 0x0e, 0xaa, 0xc3, 0x2a, 0xed, 0x19, 0x8d, 0xf1, 0x24, + 0x10, 0xa7, 0xb3, 0x4a, 0x6e, 0xc1, 0xff, 0x0b, 0x3b, 0x69, 0xc6, 0x46, 0xe1, 0xc1, 0xbc, 0xb9, + 0x36, 0x9a, 0x3b, 0x6f, 0x00, 0x8f, 0x51, 0x3f, 0x33, 0xfa, 0x29, 0xac, 0x1a, 0xec, 0x38, 0xe3, + 0x79, 0x2a, 0x6c, 0x40, 0x1a, 0xec, 0x25, 0xe5, 0xff, 0x85, 0x02, 0x50, 0x43, 0x1a, 0x6e, 0x04, + 0xb9, 0x58, 0xa6, 0x24, 0xf3, 0x24, 0xb3, 0x3b, 0x03, 0x6b, 0x68, 0x15, 0xc9, 0xa0, 0x9e, 0x64, + 0xce, 0x8f, 0x16, 0xf4, 0x8c, 0x95, 0x87, 0xe1, 0x01, 0x0b, 0x28, 0x13, 0x29, 0xb9, 0x3d, 0xa3, + 0x3e, 0x63, 0x42, 0x37, 0x92, 0xe5, 0x77, 0x0a, 0x85, 0x2f, 0x53, 0x80, 0x87, 0x3f, 0x01, 0x08, + 0xd5, 0x83, 0xd3, 0x47, 0x2b, 0x78, 0xf4, 0xfc, 0xb2, 0xd7, 0x2d, 0x52, 0xda, 0x0e, 0x8b, 0xa5, + 0xb3, 0x0b, 0xe4, 0x64, 0x34, 0x98, 0x28, 0x1d, 0xbe, 0x6e, 0x2a, 0xc2, 0xb6, 0x90, 0x2e, 0x43, + 0x8a, 0xee, 0x26, 0xf8, 0x14, 0x0d, 0xb1, 0x11, 0x4b, 0xc6, 0x72, 0xa2, 0x1e, 0x2d, 0xc2, 0xb4, + 0xf4, 0x2b, 0x2d, 0x74, 0xfe, 0xb0, 0x8e, 0x5d, 0x52, 0x7a, 0xec, 0xf3, 0x28, 0x62, 0xbe, 0xe4, + 0x99, 0xbe, 0xa0, 0xec, 0x47, 0x4f, 0x90, 0xa9, 0xbb, 0x85, 0x96, 0xce, 0x01, 0xc9, 0x10, 0x9a, + 0xe9, 0x9e, 0x3b, 0x09, 0x85, 0x34, 0x51, 0xae, 0xeb, 0x33, 0xf7, 0x43, 0x21, 0xf9, 0x38, 0xf3, + 0x62, 0xda, 0x48, 0xf7, 0xd4, 0x46, 0x25, 0x31, 0xe3, 0x53, 0xb7, 0x3c, 0x8b, 0x35, 0x5f, 0x12, + 0x4a, 0xf9, 0xf4, 0xf8, 0x35, 0xdd, 0x8c, 0x4f, 0xcb, 0x9d, 0xf3, 0xd3, 0x2c, 0x47, 0x25, 0x75, + 0xe4, 0x12, 0xd4, 0xf0, 0x6a, 0x6b, 0xf9, 0xd5, 0xa8, 0x24, 0x03, 0xa8, 0xfa, 0xb1, 0x30, 0xee, + 0xad, 0x99, 0xa7, 0xf3, 0xf0, 0x09, 0x96, 0x38, 0x55, 0x2a, 0x72, 0x13, 0xda, 0xc7, 0xdd, 0x3a, + 0x25, 0xf4, 0x19, 0xce, 0x79, 0x61, 0x41, 0x63, 0x07, 0xdf, 0xbd, 0x1a, 0x0a, 0x3e, 0xcf, 0x13, + 0xb9, 0xd0, 0x14, 0xb4, 0x48, 0x15, 0x5f, 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, 0x4c, 0x93, 0x42, 0x48, 0x7a, 0x50, 0x4d, + 0x82, 0x67, 0xba, 0x59, 0x52, 0xb5, 0x74, 0xbe, 0x84, 0x76, 0x49, 0x02, 0x39, 0xaf, 0xd5, 0xf3, + 0xae, 0x29, 0x01, 0x79, 0x1f, 0x9a, 0xba, 0x6d, 0xe9, 0x3a, 0xe9, 0x6c, 0x77, 0x75, 0xc8, 0x3a, + 0x26, 0x5a, 0x28, 0x9d, 0x3b, 0xd0, 0xba, 0x67, 0xd8, 0x22, 0x36, 0xd4, 0x62, 0x4f, 0xec, 0xa1, + 0xb1, 0x62, 0xf8, 0xa1, 0x44, 0xbd, 0xfb, 0x89, 0x27, 0x26, 0x6a, 0xe4, 0x29, 0x6b, 0x35, 0x5a, + 0x6c, 0x9d, 0xbf, 0x2d, 0x58, 0x3f, 0x46, 0xa3, 0x42, 0xeb, 0xe7, 0xa7, 0x2b, 0xad, 0x4b, 0x8b, + 0x2d, 0xb9, 0x04, 0x90, 0xe4, 0x51, 0xe4, 0x6a, 0x3e, 0xe7, 0xbb, 0x67, 0x5b, 0xc9, 0xef, 0x22, + 0xa7, 0x25, 0xdf, 0xd5, 0x93, 0x7c, 0x5f, 0x87, 0xf6, 0x28, 0x76, 0x75, 0x03, 0x43, 0xbe, 0xca, + 0x9c, 0x17, 0x51, 0xd0, 0xd6, 0x28, 0x36, 0xf1, 0x5c, 0x87, 0xb6, 0x5f, 0x82, 0xeb, 0x4b, 0x0b, + 0xa4, 0xe5, 0x17, 0xe0, 0xf7, 0xd4, 0x38, 0x91, 0x5e, 0x34, 0x37, 0x74, 0x68, 0x1b, 0x25, 0xaa, + 0x55, 0x3b, 0xbf, 0x55, 0x80, 0x9c, 0xac, 0x62, 0x72, 0x75, 0x31, 0xd4, 0xb2, 0x4a, 0x4b, 0xe8, + 0x2c, 0x76, 0x1c, 0xb9, 0x45, 0xec, 0xe6, 0xf5, 0xce, 0x46, 0xae, 0x09, 0x5e, 0xbc, 0x4b, 0xf4, + 0xd5, 0xff, 0x8c, 0x7e, 0x31, 0xa0, 0x3a, 0x36, 0x8b, 0x59, 0x40, 0x68, 0xeb, 0x46, 0x61, 0xab, + 0x71, 0x8a, 0xad, 0x1b, 0xc6, 0xd6, 0xc7, 0x70, 0xa6, 0x98, 0x67, 0xba, 0xd5, 0x6a, 0x17, 0x9b, + 0x73, 0x2e, 0x6e, 0x98, 0xb9, 0x66, 0x08, 0xca, 0x13, 0xe9, 0xdc, 0x86, 0x76, 0xc9, 0x83, 0xaa, + 0xe3, 0x8c, 0x4f, 0x4d, 0x41, 0xa8, 0x25, 0xb9, 0x00, 0x8d, 0x29, 0x0b, 0xc7, 0x93, 0xc5, 0x42, + 0x30, 0x32, 0xe7, 0x2a, 0x74, 0xca, 0x2c, 0xf1, 0x29, 0xd9, 0x84, 0x16, 0xde, 0xc9, 0x4c, 0xfb, + 0x5a, 0xa5, 0xe5, 0xde, 0xb9, 0x03, 0xdd, 0x02, 0xfa, 0x94, 0xa7, 0x8f, 0x08, 0x81, 0x5a, 0xe0, + 0x49, 0x0f, 0xeb, 0xb8, 0x4b, 0x71, 0x3d, 0xa3, 0xb5, 0x32, 0xff, 0x67, 0x87, 0x22, 0xe7, 0x07, + 0x0b, 0x5a, 0x85, 0x01, 0x72, 0x19, 0x6a, 0x19, 0x9f, 0x16, 0xe9, 0xdc, 0x38, 0x56, 0x2f, 0x7c, + 0x4a, 0x51, 0x4d, 0xae, 0x40, 0x1d, 0xff, 0x3e, 0xcc, 0xeb, 0x22, 0x8b, 0x38, 0xe5, 0x06, 0xad, + 0xa9, 0x9f, 0x11, 0x72, 0x15, 0x56, 0x03, 0x36, 0xf2, 0xf2, 0x48, 0xba, 0xcf, 0xbc, 0x28, 0x67, + 0x0b, 0xbf, 0x96, 0x5d, 0xa3, 0xfa, 0x46, 0x69, 0xae, 0x7d, 0x0f, 0x9d, 0xb9, 0x5f, 0x58, 0xb2, + 0x0a, 0x6d, 0xf5, 0xc5, 0x7e, 0xd8, 0x5b, 0x21, 0x6b, 0x00, 0x6a, 0xab, 0xbb, 0x7a, 0xcf, 0x22, + 0x67, 0xa1, 0xa7, 0xf7, 0x71, 0xcc, 0x93, 0xfb, 0x5e, 0x12, 0x44, 0xac, 0x57, 0x21, 0x67, 0x60, + 0x5d, 0x49, 0x35, 0xe9, 0xfa, 0x68, 0xb5, 0xb0, 0x84, 0xd3, 0xaf, 0x57, 0x2b, 0x4e, 0xde, 0xcb, + 0xa3, 0x08, 0x71, 0x61, 0x32, 0xee, 0xd5, 0x77, 0x6e, 0xbd, 0xfe, 0xb5, 0x65, 0xbd, 0x7c, 0xd3, + 0xb7, 0x5e, 0xbd, 0xe9, 0x5b, 0x7f, 0xbd, 0xe9, 0x5b, 0xbf, 0x1c, 0xf5, 0x57, 0x5e, 0x1c, 0xf5, + 0x57, 0x5e, 0x1d, 0xf5, 0x57, 0x5e, 0x1f, 0xf5, 0x57, 0xe0, 0x9c, 0xcf, 0xe3, 0xad, 0x34, 0x4c, + 0xc6, 0xbe, 0x97, 0x6e, 0xc9, 0x30, 0xd8, 0xc5, 0xa0, 0x1f, 0x5b, 0xff, 0x06, 0x00, 0x00, 0xff, + 0xff, 0xb7, 0x6a, 0xeb, 0x2b, 0xe5, 0x0b, 0x00, 0x00, } func (m *AnalyzeReq) Marshal() (dAtA []byte, err error) { @@ -1904,6 +1922,23 @@ 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.F1Sketch) > 0 { + for iNdEx := len(m.F1Sketch) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.F1Sketch[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAnalyze(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + } if len(m.TotalSize) > 0 { for iNdEx := len(m.TotalSize) - 1; iNdEx >= 0; iNdEx-- { i = encodeVarintAnalyze(dAtA, i, uint64(m.TotalSize[iNdEx])) @@ -2399,6 +2434,13 @@ func (m *RowSampleCollector) Size() (n int) { n += 1 + sovAnalyze(uint64(e)) } } + if len(m.F1Sketch) > 0 { + for _, e := range m.F1Sketch { + l = e.Size() + n += 1 + l + sovAnalyze(uint64(l)) + } + } + n += 1 + sovAnalyze(uint64(m.SketchSampleCount)) return n } @@ -4820,6 +4862,59 @@ 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 F1Sketch", 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.F1Sketch = append(m.F1Sketch, &FMSketch{}) + if err := m.F1Sketch[len(m.F1Sketch)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SketchSampleCount", wireType) + } + m.SketchSampleCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SketchSampleCount |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) diff --git a/proto/analyze.proto b/proto/analyze.proto index b1d509d7..2125dd3f 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -137,6 +137,12 @@ message FMSketch { repeated uint64 hashset = 2; } +// HLLSketch is used to count distinct values for columns. +// message HLLSketch { +// optional uint32 b = 1 [(gogoproto.nullable) = false]; +// optional bytes registers = 2; +// } + // SampleCollector is used for collect samples and calculate the count and ndv of an column. message SampleCollector { repeated bytes samples = 1; @@ -153,6 +159,10 @@ message RowSampleCollector { optional int64 count = 3 [(gogoproto.nullable) = false]; repeated FMSketch fm_sketch = 4; repeated int64 total_size = 5; + repeated FMSketch f1_sketch = 6; + optional int64 sketch_sample_count = 7 [(gogoproto.nullable) = false]; + // repeated HLLSketch hll_sketch = 8; + // repeated HLLSketch hll_f1_sketch = 9; } message RowSample { From 8f797d567323d1d9ce9b4c64f3911ac07b4486bc Mon Sep 17 00:00:00 2001 From: 0xPoe Date: Fri, 13 Feb 2026 21:45:26 +0100 Subject: [PATCH 2/2] fix: hll Signed-off-by: 0xPoe --- go-tipb/analyze.pb.go | 510 ++++++++++++++++++++++++++++++++++-------- proto/analyze.proto | 12 +- 2 files changed, 427 insertions(+), 95 deletions(-) diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index de783300..d880eaa5 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -806,6 +806,59 @@ func (m *FMSketch) GetHashset() []uint64 { return nil } +// HLLSketch is used to count distinct values for columns. +type HLLSketch struct { + B uint32 `protobuf:"varint,1,opt,name=b" json:"b"` + Registers []byte `protobuf:"bytes,2,opt,name=registers" json:"registers,omitempty"` +} + +func (m *HLLSketch) Reset() { *m = HLLSketch{} } +func (m *HLLSketch) String() string { return proto.CompactTextString(m) } +func (*HLLSketch) ProtoMessage() {} +func (*HLLSketch) Descriptor() ([]byte, []int) { + return fileDescriptor_76c3eb6de5a1604f, []int{10} +} +func (m *HLLSketch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HLLSketch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HLLSketch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HLLSketch) XXX_Merge(src proto.Message) { + xxx_messageInfo_HLLSketch.Merge(m, src) +} +func (m *HLLSketch) XXX_Size() int { + return m.Size() +} +func (m *HLLSketch) XXX_DiscardUnknown() { + xxx_messageInfo_HLLSketch.DiscardUnknown(m) +} + +var xxx_messageInfo_HLLSketch proto.InternalMessageInfo + +func (m *HLLSketch) GetB() uint32 { + if m != nil { + return m.B + } + return 0 +} + +func (m *HLLSketch) GetRegisters() []byte { + if m != nil { + return m.Registers + } + 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"` @@ -820,7 +873,7 @@ func (m *SampleCollector) Reset() { *m = SampleCollector{} } func (m *SampleCollector) String() string { return proto.CompactTextString(m) } func (*SampleCollector) ProtoMessage() {} func (*SampleCollector) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{10} + return fileDescriptor_76c3eb6de5a1604f, []int{11} } func (m *SampleCollector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -899,13 +952,15 @@ type RowSampleCollector struct { TotalSize []int64 `protobuf:"varint,5,rep,name=total_size,json=totalSize" json:"total_size,omitempty"` F1Sketch []*FMSketch `protobuf:"bytes,6,rep,name=f1_sketch,json=f1Sketch" json:"f1_sketch,omitempty"` SketchSampleCount int64 `protobuf:"varint,7,opt,name=sketch_sample_count,json=sketchSampleCount" json:"sketch_sample_count"` + HllSketch []*HLLSketch `protobuf:"bytes,8,rep,name=hll_sketch,json=hllSketch" json:"hll_sketch,omitempty"` + HllF1Sketch []*HLLSketch `protobuf:"bytes,9,rep,name=hll_f1_sketch,json=hllF1Sketch" json:"hll_f1_sketch,omitempty"` } func (m *RowSampleCollector) Reset() { *m = RowSampleCollector{} } func (m *RowSampleCollector) String() string { return proto.CompactTextString(m) } func (*RowSampleCollector) ProtoMessage() {} func (*RowSampleCollector) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{11} + return fileDescriptor_76c3eb6de5a1604f, []int{12} } func (m *RowSampleCollector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -983,6 +1038,20 @@ func (m *RowSampleCollector) GetSketchSampleCount() int64 { return 0 } +func (m *RowSampleCollector) GetHllSketch() []*HLLSketch { + if m != nil { + return m.HllSketch + } + return nil +} + +func (m *RowSampleCollector) GetHllF1Sketch() []*HLLSketch { + if m != nil { + return m.HllF1Sketch + } + return nil +} + type RowSample struct { Row [][]byte `protobuf:"bytes,1,rep,name=row" json:"row,omitempty"` Weight int64 `protobuf:"varint,2,opt,name=weight" json:"weight"` @@ -992,7 +1061,7 @@ func (m *RowSample) Reset() { *m = RowSample{} } func (m *RowSample) String() string { return proto.CompactTextString(m) } func (*RowSample) ProtoMessage() {} func (*RowSample) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{12} + return fileDescriptor_76c3eb6de5a1604f, []int{13} } func (m *RowSample) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1043,7 +1112,7 @@ func (m *CMSketchRow) Reset() { *m = CMSketchRow{} } func (m *CMSketchRow) String() string { return proto.CompactTextString(m) } func (*CMSketchRow) ProtoMessage() {} func (*CMSketchRow) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{13} + return fileDescriptor_76c3eb6de5a1604f, []int{14} } func (m *CMSketchRow) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1088,7 +1157,7 @@ func (m *CMSketchTopN) Reset() { *m = CMSketchTopN{} } func (m *CMSketchTopN) String() string { return proto.CompactTextString(m) } func (*CMSketchTopN) ProtoMessage() {} func (*CMSketchTopN) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{14} + return fileDescriptor_76c3eb6de5a1604f, []int{15} } func (m *CMSketchTopN) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1141,7 +1210,7 @@ func (m *CMSketch) Reset() { *m = CMSketch{} } func (m *CMSketch) String() string { return proto.CompactTextString(m) } func (*CMSketch) ProtoMessage() {} func (*CMSketch) Descriptor() ([]byte, []int) { - return fileDescriptor_76c3eb6de5a1604f, []int{15} + return fileDescriptor_76c3eb6de5a1604f, []int{16} } func (m *CMSketch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1203,6 +1272,7 @@ func init() { proto.RegisterType((*Bucket)(nil), "tipb.Bucket") proto.RegisterType((*Histogram)(nil), "tipb.Histogram") proto.RegisterType((*FMSketch)(nil), "tipb.FMSketch") + proto.RegisterType((*HLLSketch)(nil), "tipb.HLLSketch") proto.RegisterType((*SampleCollector)(nil), "tipb.SampleCollector") proto.RegisterType((*RowSampleCollector)(nil), "tipb.RowSampleCollector") proto.RegisterType((*RowSample)(nil), "tipb.RowSample") @@ -1214,89 +1284,93 @@ func init() { func init() { proto.RegisterFile("analyze.proto", fileDescriptor_76c3eb6de5a1604f) } var fileDescriptor_76c3eb6de5a1604f = []byte{ - // 1305 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0xdb, 0x46, - 0x13, 0x36, 0xf5, 0xad, 0x91, 0x6c, 0xcb, 0x9b, 0x8f, 0x97, 0xaf, 0x91, 0x2a, 0x02, 0x83, 0x34, - 0x4a, 0x52, 0xb8, 0x8d, 0xd3, 0x1e, 0x82, 0xa0, 0x01, 0xea, 0x14, 0x69, 0x82, 0x36, 0x69, 0xb0, - 0x09, 0x5a, 0xa0, 0x17, 0x82, 0x26, 0x57, 0x12, 0x61, 0x92, 0x4b, 0x73, 0x97, 0x91, 0x63, 0xf4, - 0xda, 0x1e, 0xdb, 0x1e, 0xf3, 0x13, 0x7a, 0x2d, 0xda, 0x1f, 0x91, 0x63, 0x8e, 0x39, 0x15, 0x45, - 0x8c, 0x5e, 0xfb, 0x1b, 0x8a, 0x9d, 0x5d, 0x52, 0x92, 0x2d, 0x17, 0xc9, 0x89, 0xbb, 0x33, 0xcf, - 0xce, 0xce, 0x3c, 0x33, 0x3b, 0x43, 0x58, 0xf5, 0x12, 0x2f, 0x7a, 0x7e, 0xc8, 0xb6, 0xd2, 0x8c, - 0x4b, 0x4e, 0x6a, 0x32, 0x4c, 0x77, 0x37, 0xbb, 0xc2, 0x9f, 0xb0, 0xd8, 0xd3, 0xb2, 0xcd, 0xb3, - 0x63, 0x3e, 0xe6, 0xb8, 0xfc, 0x50, 0xad, 0x8c, 0x74, 0x3d, 0xcb, 0x85, 0xc4, 0xa5, 0x16, 0x38, - 0x3f, 0x57, 0x00, 0x3e, 0xd3, 0xc6, 0x28, 0xdb, 0x27, 0x57, 0xa0, 0x22, 0x53, 0xdb, 0x1a, 0x58, - 0xc3, 0xb5, 0xed, 0x8d, 0x2d, 0x65, 0x76, 0xcb, 0x68, 0x9f, 0x3e, 0x4f, 0xd9, 0x4e, 0xed, 0xe5, - 0x9f, 0x17, 0x57, 0x68, 0x45, 0xa6, 0xe4, 0x1a, 0x6c, 0x08, 0xe9, 0x65, 0xd2, 0x95, 0xc2, 0x1d, - 0x79, 0x51, 0xb4, 0xeb, 0xf9, 0x7b, 0x76, 0x65, 0x60, 0x0d, 0x6b, 0x74, 0x1d, 0x15, 0x4f, 0xc5, - 0x3d, 0x23, 0x26, 0x9b, 0x50, 0x1f, 0x45, 0xde, 0x58, 0xd8, 0x55, 0xa5, 0x37, 0x46, 0xb4, 0x88, - 0x6c, 0x41, 0x4f, 0x86, 0x31, 0x73, 0x0f, 0x79, 0xc2, 0x5c, 0x3e, 0x1a, 0x09, 0x26, 0xed, 0xda, - 0xc0, 0x1a, 0x56, 0x0d, 0x6c, 0x4d, 0x69, 0xbf, 0xe3, 0x09, 0xfb, 0x1a, 0x75, 0x64, 0x0b, 0x9a, - 0x61, 0x70, 0xe0, 0x66, 0x6c, 0xdf, 0xae, 0x0f, 0xac, 0x61, 0x67, 0xfb, 0xdc, 0x82, 0x97, 0x0f, - 0x92, 0x80, 0x1d, 0x50, 0xb6, 0x4f, 0x1b, 0x61, 0xa0, 0xbe, 0xe4, 0x23, 0x68, 0xfa, 0x3c, 0x42, - 0x7c, 0x03, 0xf1, 0xff, 0x5b, 0xc0, 0xdf, 0xe5, 0x51, 0x1e, 0x27, 0x02, 0x4f, 0xf8, 0x3c, 0xa2, - 0x6c, 0xdf, 0xf9, 0xbd, 0x02, 0xeb, 0xc7, 0xac, 0x91, 0xcb, 0xd0, 0xd9, 0xcd, 0xfd, 0x3d, 0x26, - 0x5d, 0x11, 0x1e, 0x32, 0xe4, 0xa7, 0x70, 0x10, 0xb4, 0xe2, 0x49, 0x78, 0xc8, 0x14, 0x2c, 0xc9, - 0x63, 0xd7, 0xd7, 0x46, 0x91, 0x8e, 0x7a, 0x01, 0x4b, 0xf2, 0xd8, 0x5c, 0x46, 0x2e, 0xc3, 0x9a, - 0x1f, 0x8b, 0x3d, 0x26, 0xfd, 0x89, 0x1b, 0xb0, 0x54, 0x4e, 0x90, 0x98, 0x3a, 0x5d, 0x2d, 0xa4, - 0x9f, 0x2b, 0xe1, 0x02, 0x6c, 0x1a, 0x06, 0x72, 0x82, 0xc4, 0xcc, 0xc1, 0xbe, 0x55, 0x42, 0x75, - 0xa9, 0xf0, 0xe2, 0x34, 0x62, 0xda, 0xb7, 0xfa, 0xbc, 0x6f, 0x5a, 0x51, 0xf8, 0x66, 0x6c, 0x21, - 0xac, 0xb1, 0x00, 0x43, 0x05, 0xc2, 0x2e, 0x00, 0x48, 0x9e, 0xba, 0x89, 0x46, 0x35, 0xf1, 0xc2, - 0x96, 0xe4, 0xe9, 0x23, 0xd4, 0xda, 0xd0, 0x7c, 0xc6, 0x32, 0x11, 0xf2, 0xc4, 0x6e, 0xa1, 0xaa, - 0xd8, 0x3a, 0xff, 0x54, 0x61, 0xe3, 0x04, 0xa7, 0xef, 0xc0, 0xdb, 0x7c, 0x08, 0x95, 0xb7, 0x0b, - 0xa1, 0x7a, 0x4a, 0x08, 0x37, 0xa1, 0x6b, 0x32, 0xe0, 0x86, 0xc9, 0x88, 0xdb, 0xb5, 0x41, 0x75, - 0xd8, 0xd9, 0xee, 0xe9, 0xbc, 0x6b, 0xe7, 0x1e, 0x24, 0x23, 0x4e, 0x3b, 0x06, 0xa5, 0x36, 0x4b, - 0x72, 0x52, 0x7f, 0xbb, 0x9c, 0x34, 0x96, 0xe5, 0xe4, 0x03, 0x20, 0x69, 0x16, 0xc6, 0x5e, 0xf6, - 0xdc, 0x14, 0x83, 0x1b, 0x06, 0xc2, 0x6e, 0x0e, 0xaa, 0xc3, 0x2a, 0xed, 0x19, 0x8d, 0xf1, 0x24, - 0x10, 0xa7, 0xb3, 0x4a, 0x6e, 0xc1, 0xff, 0x0b, 0x3b, 0x69, 0xc6, 0x46, 0xe1, 0xc1, 0xbc, 0xb9, - 0x36, 0x9a, 0x3b, 0x6f, 0x00, 0x8f, 0x51, 0x3f, 0x33, 0xfa, 0x29, 0xac, 0x1a, 0xec, 0x38, 0xe3, - 0x79, 0x2a, 0x6c, 0x40, 0x1a, 0xec, 0x25, 0xe5, 0xff, 0x85, 0x02, 0x50, 0x43, 0x1a, 0x6e, 0x04, - 0xb9, 0x58, 0xa6, 0x24, 0xf3, 0x24, 0xb3, 0x3b, 0x03, 0x6b, 0x68, 0x15, 0xc9, 0xa0, 0x9e, 0x64, - 0xce, 0x8f, 0x16, 0xf4, 0x8c, 0x95, 0x87, 0xe1, 0x01, 0x0b, 0x28, 0x13, 0x29, 0xb9, 0x3d, 0xa3, - 0x3e, 0x63, 0x42, 0x37, 0x92, 0xe5, 0x77, 0x0a, 0x85, 0x2f, 0x53, 0x80, 0x87, 0x3f, 0x01, 0x08, - 0xd5, 0x83, 0xd3, 0x47, 0x2b, 0x78, 0xf4, 0xfc, 0xb2, 0xd7, 0x2d, 0x52, 0xda, 0x0e, 0x8b, 0xa5, - 0xb3, 0x0b, 0xe4, 0x64, 0x34, 0x98, 0x28, 0x1d, 0xbe, 0x6e, 0x2a, 0xc2, 0xb6, 0x90, 0x2e, 0x43, - 0x8a, 0xee, 0x26, 0xf8, 0x14, 0x0d, 0xb1, 0x11, 0x4b, 0xc6, 0x72, 0xa2, 0x1e, 0x2d, 0xc2, 0xb4, - 0xf4, 0x2b, 0x2d, 0x74, 0xfe, 0xb0, 0x8e, 0x5d, 0x52, 0x7a, 0xec, 0xf3, 0x28, 0x62, 0xbe, 0xe4, - 0x99, 0xbe, 0xa0, 0xec, 0x47, 0x4f, 0x90, 0xa9, 0xbb, 0x85, 0x96, 0xce, 0x01, 0xc9, 0x10, 0x9a, - 0xe9, 0x9e, 0x3b, 0x09, 0x85, 0x34, 0x51, 0xae, 0xeb, 0x33, 0xf7, 0x43, 0x21, 0xf9, 0x38, 0xf3, - 0x62, 0xda, 0x48, 0xf7, 0xd4, 0x46, 0x25, 0x31, 0xe3, 0x53, 0xb7, 0x3c, 0x8b, 0x35, 0x5f, 0x12, - 0x4a, 0xf9, 0xf4, 0xf8, 0x35, 0xdd, 0x8c, 0x4f, 0xcb, 0x9d, 0xf3, 0xd3, 0x2c, 0x47, 0x25, 0x75, - 0xe4, 0x12, 0xd4, 0xf0, 0x6a, 0x6b, 0xf9, 0xd5, 0xa8, 0x24, 0x03, 0xa8, 0xfa, 0xb1, 0x30, 0xee, - 0xad, 0x99, 0xa7, 0xf3, 0xf0, 0x09, 0x96, 0x38, 0x55, 0x2a, 0x72, 0x13, 0xda, 0xc7, 0xdd, 0x3a, - 0x25, 0xf4, 0x19, 0xce, 0x79, 0x61, 0x41, 0x63, 0x07, 0xdf, 0xbd, 0x1a, 0x0a, 0x3e, 0xcf, 0x13, - 0xb9, 0xd0, 0x14, 0xb4, 0x48, 0x15, 0x5f, 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, 0x4c, 0x93, 0x42, 0x48, 0x7a, 0x50, 0x4d, - 0x82, 0x67, 0xba, 0x59, 0x52, 0xb5, 0x74, 0xbe, 0x84, 0x76, 0x49, 0x02, 0x39, 0xaf, 0xd5, 0xf3, - 0xae, 0x29, 0x01, 0x79, 0x1f, 0x9a, 0xba, 0x6d, 0xe9, 0x3a, 0xe9, 0x6c, 0x77, 0x75, 0xc8, 0x3a, - 0x26, 0x5a, 0x28, 0x9d, 0x3b, 0xd0, 0xba, 0x67, 0xd8, 0x22, 0x36, 0xd4, 0x62, 0x4f, 0xec, 0xa1, - 0xb1, 0x62, 0xf8, 0xa1, 0x44, 0xbd, 0xfb, 0x89, 0x27, 0x26, 0x6a, 0xe4, 0x29, 0x6b, 0x35, 0x5a, - 0x6c, 0x9d, 0xbf, 0x2d, 0x58, 0x3f, 0x46, 0xa3, 0x42, 0xeb, 0xe7, 0xa7, 0x2b, 0xad, 0x4b, 0x8b, - 0x2d, 0xb9, 0x04, 0x90, 0xe4, 0x51, 0xe4, 0x6a, 0x3e, 0xe7, 0xbb, 0x67, 0x5b, 0xc9, 0xef, 0x22, - 0xa7, 0x25, 0xdf, 0xd5, 0x93, 0x7c, 0x5f, 0x87, 0xf6, 0x28, 0x76, 0x75, 0x03, 0x43, 0xbe, 0xca, - 0x9c, 0x17, 0x51, 0xd0, 0xd6, 0x28, 0x36, 0xf1, 0x5c, 0x87, 0xb6, 0x5f, 0x82, 0xeb, 0x4b, 0x0b, - 0xa4, 0xe5, 0x17, 0xe0, 0xf7, 0xd4, 0x38, 0x91, 0x5e, 0x34, 0x37, 0x74, 0x68, 0x1b, 0x25, 0xaa, - 0x55, 0x3b, 0xbf, 0x55, 0x80, 0x9c, 0xac, 0x62, 0x72, 0x75, 0x31, 0xd4, 0xb2, 0x4a, 0x4b, 0xe8, - 0x2c, 0x76, 0x1c, 0xb9, 0x45, 0xec, 0xe6, 0xf5, 0xce, 0x46, 0xae, 0x09, 0x5e, 0xbc, 0x4b, 0xf4, - 0xd5, 0xff, 0x8c, 0x7e, 0x31, 0xa0, 0x3a, 0x36, 0x8b, 0x59, 0x40, 0x68, 0xeb, 0x46, 0x61, 0xab, - 0x71, 0x8a, 0xad, 0x1b, 0xc6, 0xd6, 0xc7, 0x70, 0xa6, 0x98, 0x67, 0xba, 0xd5, 0x6a, 0x17, 0x9b, - 0x73, 0x2e, 0x6e, 0x98, 0xb9, 0x66, 0x08, 0xca, 0x13, 0xe9, 0xdc, 0x86, 0x76, 0xc9, 0x83, 0xaa, - 0xe3, 0x8c, 0x4f, 0x4d, 0x41, 0xa8, 0x25, 0xb9, 0x00, 0x8d, 0x29, 0x0b, 0xc7, 0x93, 0xc5, 0x42, - 0x30, 0x32, 0xe7, 0x2a, 0x74, 0xca, 0x2c, 0xf1, 0x29, 0xd9, 0x84, 0x16, 0xde, 0xc9, 0x4c, 0xfb, - 0x5a, 0xa5, 0xe5, 0xde, 0xb9, 0x03, 0xdd, 0x02, 0xfa, 0x94, 0xa7, 0x8f, 0x08, 0x81, 0x5a, 0xe0, - 0x49, 0x0f, 0xeb, 0xb8, 0x4b, 0x71, 0x3d, 0xa3, 0xb5, 0x32, 0xff, 0x67, 0x87, 0x22, 0xe7, 0x07, - 0x0b, 0x5a, 0x85, 0x01, 0x72, 0x19, 0x6a, 0x19, 0x9f, 0x16, 0xe9, 0xdc, 0x38, 0x56, 0x2f, 0x7c, - 0x4a, 0x51, 0x4d, 0xae, 0x40, 0x1d, 0xff, 0x3e, 0xcc, 0xeb, 0x22, 0x8b, 0x38, 0xe5, 0x06, 0xad, - 0xa9, 0x9f, 0x11, 0x72, 0x15, 0x56, 0x03, 0x36, 0xf2, 0xf2, 0x48, 0xba, 0xcf, 0xbc, 0x28, 0x67, - 0x0b, 0xbf, 0x96, 0x5d, 0xa3, 0xfa, 0x46, 0x69, 0xae, 0x7d, 0x0f, 0x9d, 0xb9, 0x5f, 0x58, 0xb2, - 0x0a, 0x6d, 0xf5, 0xc5, 0x7e, 0xd8, 0x5b, 0x21, 0x6b, 0x00, 0x6a, 0xab, 0xbb, 0x7a, 0xcf, 0x22, - 0x67, 0xa1, 0xa7, 0xf7, 0x71, 0xcc, 0x93, 0xfb, 0x5e, 0x12, 0x44, 0xac, 0x57, 0x21, 0x67, 0x60, - 0x5d, 0x49, 0x35, 0xe9, 0xfa, 0x68, 0xb5, 0xb0, 0x84, 0xd3, 0xaf, 0x57, 0x2b, 0x4e, 0xde, 0xcb, - 0xa3, 0x08, 0x71, 0x61, 0x32, 0xee, 0xd5, 0x77, 0x6e, 0xbd, 0xfe, 0xb5, 0x65, 0xbd, 0x7c, 0xd3, - 0xb7, 0x5e, 0xbd, 0xe9, 0x5b, 0x7f, 0xbd, 0xe9, 0x5b, 0xbf, 0x1c, 0xf5, 0x57, 0x5e, 0x1c, 0xf5, - 0x57, 0x5e, 0x1d, 0xf5, 0x57, 0x5e, 0x1f, 0xf5, 0x57, 0xe0, 0x9c, 0xcf, 0xe3, 0xad, 0x34, 0x4c, - 0xc6, 0xbe, 0x97, 0x6e, 0xc9, 0x30, 0xd8, 0xc5, 0xa0, 0x1f, 0x5b, 0xff, 0x06, 0x00, 0x00, 0xff, - 0xff, 0xb7, 0x6a, 0xeb, 0x2b, 0xe5, 0x0b, 0x00, 0x00, + // 1370 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x8f, 0x13, 0x47, + 0x13, 0xde, 0xf1, 0xb7, 0xcb, 0xf6, 0xae, 0xb7, 0xf9, 0x78, 0xfd, 0xae, 0x88, 0xb1, 0x06, 0x11, + 0x0c, 0x44, 0x4e, 0x58, 0x92, 0x03, 0x42, 0x20, 0x65, 0x89, 0x36, 0xa0, 0x00, 0x41, 0x0d, 0x4a, + 0xa4, 0x5c, 0x46, 0xe3, 0x99, 0xb6, 0x3d, 0xda, 0x99, 0xe9, 0xd9, 0xe9, 0x36, 0x5e, 0x56, 0xb9, + 0x26, 0xc7, 0x24, 0xa7, 0x88, 0x9f, 0x90, 0x7b, 0xf2, 0x23, 0x38, 0x72, 0xe4, 0x14, 0x45, 0xac, + 0x72, 0xcd, 0x6f, 0x88, 0xba, 0xba, 0x67, 0x6c, 0xef, 0x7a, 0x23, 0x38, 0x4d, 0x77, 0xd5, 0xd3, + 0xd5, 0x55, 0x4f, 0x55, 0x57, 0x0d, 0xb4, 0xdc, 0xd8, 0x0d, 0x5f, 0x1c, 0xb2, 0x41, 0x92, 0x72, + 0xc9, 0x49, 0x49, 0x06, 0xc9, 0x70, 0xab, 0x29, 0xbc, 0x09, 0x8b, 0x5c, 0x2d, 0xdb, 0x3a, 0x3b, + 0xe6, 0x63, 0x8e, 0xcb, 0x8f, 0xd5, 0xca, 0x48, 0x37, 0xd2, 0xa9, 0x90, 0xb8, 0xd4, 0x02, 0xfb, + 0xe7, 0x02, 0xc0, 0xe7, 0xda, 0x18, 0x65, 0xfb, 0xe4, 0x0a, 0x14, 0x64, 0xd2, 0xb1, 0x7a, 0x56, + 0x7f, 0x7d, 0x7b, 0x73, 0xa0, 0xcc, 0x0e, 0x8c, 0xf6, 0xd9, 0x8b, 0x84, 0xed, 0x94, 0x5e, 0xfd, + 0x79, 0x71, 0x8d, 0x16, 0x64, 0x42, 0xae, 0xc1, 0xa6, 0x90, 0x6e, 0x2a, 0x1d, 0x29, 0x9c, 0x91, + 0x1b, 0x86, 0x43, 0xd7, 0xdb, 0xeb, 0x14, 0x7a, 0x56, 0xbf, 0x44, 0x37, 0x50, 0xf1, 0x4c, 0xec, + 0x1a, 0x31, 0xd9, 0x82, 0xf2, 0x28, 0x74, 0xc7, 0xa2, 0x53, 0x54, 0x7a, 0x63, 0x44, 0x8b, 0xc8, + 0x00, 0xda, 0x32, 0x88, 0x98, 0x73, 0xc8, 0x63, 0xe6, 0xf0, 0xd1, 0x48, 0x30, 0xd9, 0x29, 0xf5, + 0xac, 0x7e, 0xd1, 0xc0, 0xd6, 0x95, 0xf6, 0x3b, 0x1e, 0xb3, 0xaf, 0x51, 0x47, 0x06, 0x50, 0x0d, + 0xfc, 0x03, 0x27, 0x65, 0xfb, 0x9d, 0x72, 0xcf, 0xea, 0x37, 0xb6, 0xcf, 0x2d, 0x79, 0xf9, 0x20, + 0xf6, 0xd9, 0x01, 0x65, 0xfb, 0xb4, 0x12, 0xf8, 0xea, 0x4b, 0x3e, 0x81, 0xaa, 0xc7, 0x43, 0xc4, + 0x57, 0x10, 0xff, 0xbf, 0x25, 0xfc, 0x3d, 0x1e, 0x4e, 0xa3, 0x58, 0xe0, 0x09, 0x8f, 0x87, 0x94, + 0xed, 0xdb, 0xbf, 0x17, 0x60, 0xe3, 0x98, 0x35, 0x72, 0x19, 0x1a, 0xc3, 0xa9, 0xb7, 0xc7, 0xa4, + 0x23, 0x82, 0x43, 0x86, 0xfc, 0x64, 0x0e, 0x82, 0x56, 0x3c, 0x0d, 0x0e, 0x99, 0x82, 0xc5, 0xd3, + 0xc8, 0xf1, 0xb4, 0x51, 0xa4, 0xa3, 0x9c, 0xc1, 0xe2, 0x69, 0x64, 0x2e, 0x23, 0x97, 0x61, 0xdd, + 0x8b, 0xc4, 0x1e, 0x93, 0xde, 0xc4, 0xf1, 0x59, 0x22, 0x27, 0x48, 0x4c, 0x99, 0xb6, 0x32, 0xe9, + 0x17, 0x4a, 0xb8, 0x04, 0x9b, 0x05, 0xbe, 0x9c, 0x20, 0x31, 0x0b, 0xb0, 0x6f, 0x95, 0x50, 0x5d, + 0x2a, 0xdc, 0x28, 0x09, 0x99, 0xf6, 0xad, 0xbc, 0xe8, 0x9b, 0x56, 0x64, 0xbe, 0x19, 0x5b, 0x08, + 0xab, 0x2c, 0xc1, 0x50, 0x81, 0xb0, 0x0b, 0x00, 0x92, 0x27, 0x4e, 0xac, 0x51, 0x55, 0xbc, 0xb0, + 0x26, 0x79, 0xf2, 0x18, 0xb5, 0x1d, 0xa8, 0x3e, 0x67, 0xa9, 0x08, 0x78, 0xdc, 0xa9, 0xa1, 0x2a, + 0xdb, 0xda, 0xff, 0x14, 0x61, 0xf3, 0x04, 0xa7, 0xef, 0xc1, 0xdb, 0x62, 0x08, 0x85, 0x77, 0x0b, + 0xa1, 0x78, 0x4a, 0x08, 0x37, 0xa1, 0x69, 0x32, 0xe0, 0x04, 0xf1, 0x88, 0x77, 0x4a, 0xbd, 0x62, + 0xbf, 0xb1, 0xdd, 0xd6, 0x79, 0xd7, 0xce, 0x3d, 0x88, 0x47, 0x9c, 0x36, 0x0c, 0x4a, 0x6d, 0x56, + 0xe4, 0xa4, 0xfc, 0x6e, 0x39, 0xa9, 0xac, 0xca, 0xc9, 0x47, 0x40, 0x92, 0x34, 0x88, 0xdc, 0xf4, + 0x85, 0x29, 0x06, 0x27, 0xf0, 0x45, 0xa7, 0xda, 0x2b, 0xf6, 0x8b, 0xb4, 0x6d, 0x34, 0xc6, 0x13, + 0x5f, 0x9c, 0xce, 0x2a, 0xb9, 0x05, 0xff, 0xcf, 0xec, 0x24, 0x29, 0x1b, 0x05, 0x07, 0x8b, 0xe6, + 0xea, 0x68, 0xee, 0xbc, 0x01, 0x3c, 0x41, 0xfd, 0xdc, 0xe8, 0x1d, 0x68, 0x19, 0xec, 0x38, 0xe5, + 0xd3, 0x44, 0x74, 0x00, 0x69, 0xe8, 0xac, 0x28, 0xff, 0x2f, 0x15, 0x80, 0x1a, 0xd2, 0x70, 0x23, + 0xc8, 0xc5, 0x3c, 0x25, 0xa9, 0x2b, 0x59, 0xa7, 0xd1, 0xb3, 0xfa, 0x56, 0x96, 0x0c, 0xea, 0x4a, + 0x66, 0xff, 0x68, 0x41, 0xdb, 0x58, 0x79, 0x14, 0x1c, 0x30, 0x9f, 0x32, 0x91, 0x90, 0xdb, 0x73, + 0xea, 0x53, 0x26, 0x74, 0x23, 0x59, 0x7d, 0xa7, 0x50, 0xf8, 0x3c, 0x05, 0x78, 0xf8, 0x33, 0x80, + 0x40, 0x3d, 0x38, 0x7d, 0xb4, 0x80, 0x47, 0xcf, 0xaf, 0x7a, 0xdd, 0x22, 0xa1, 0xf5, 0x20, 0x5b, + 0xda, 0x43, 0x20, 0x27, 0xa3, 0xc1, 0x44, 0xe9, 0xf0, 0x75, 0x53, 0x11, 0x1d, 0x0b, 0xe9, 0x32, + 0xa4, 0xe8, 0x6e, 0x82, 0x4f, 0xd1, 0x10, 0x1b, 0xb2, 0x78, 0x2c, 0x27, 0xea, 0xd1, 0x22, 0x4c, + 0x4b, 0x1f, 0x6a, 0xa1, 0xfd, 0x87, 0x75, 0xec, 0x92, 0xdc, 0x63, 0x8f, 0x87, 0x21, 0xf3, 0x24, + 0x4f, 0xf5, 0x05, 0x79, 0x3f, 0x7a, 0x8a, 0x4c, 0xdd, 0xcb, 0xb4, 0x74, 0x01, 0x48, 0xfa, 0x50, + 0x4d, 0xf6, 0x9c, 0x49, 0x20, 0xa4, 0x89, 0x72, 0x43, 0x9f, 0xb9, 0x1f, 0x08, 0xc9, 0xc7, 0xa9, + 0x1b, 0xd1, 0x4a, 0xb2, 0xa7, 0x36, 0x2a, 0x89, 0x29, 0x9f, 0x39, 0xf9, 0x59, 0xac, 0xf9, 0x9c, + 0x50, 0xca, 0x67, 0xc7, 0xaf, 0x69, 0xa6, 0x7c, 0x96, 0xef, 0xec, 0x9f, 0xe6, 0x39, 0xca, 0xa9, + 0x23, 0x97, 0xa0, 0x84, 0x57, 0x5b, 0xab, 0xaf, 0x46, 0x25, 0xe9, 0x41, 0xd1, 0x8b, 0x84, 0x71, + 0x6f, 0xdd, 0x3c, 0x9d, 0x47, 0x4f, 0xb1, 0xc4, 0xa9, 0x52, 0x91, 0x9b, 0x50, 0x3f, 0xee, 0xd6, + 0x29, 0xa1, 0xcf, 0x71, 0xf6, 0x4b, 0x0b, 0x2a, 0x3b, 0xf8, 0xee, 0xd5, 0x50, 0xf0, 0xf8, 0x34, + 0x96, 0x4b, 0x4d, 0x41, 0x8b, 0x54, 0xf1, 0x85, 0x7c, 0xc6, 0x52, 0x67, 0xc8, 0xa7, 0xb1, 0x8f, + 0x5e, 0x34, 0x29, 0xa0, 0x68, 0x47, 0x49, 0x14, 0x60, 0x9a, 0x24, 0x39, 0xa0, 0xa8, 0x01, 0x28, + 0xd2, 0x80, 0x2e, 0x54, 0x53, 0x96, 0x30, 0x57, 0x8a, 0xa5, 0x69, 0x92, 0x09, 0x49, 0x1b, 0x8a, + 0xb1, 0xff, 0x5c, 0x37, 0x4b, 0xaa, 0x96, 0xf6, 0x57, 0x50, 0xcf, 0x49, 0x20, 0xe7, 0xb5, 0x7a, + 0xd1, 0x35, 0x25, 0x20, 0x1f, 0x42, 0x55, 0xb7, 0x2d, 0x5d, 0x27, 0x8d, 0xed, 0xa6, 0x0e, 0x59, + 0xc7, 0x44, 0x33, 0xa5, 0x7d, 0x17, 0x6a, 0xbb, 0x86, 0x2d, 0xd2, 0x81, 0x52, 0xe4, 0x8a, 0x3d, + 0x34, 0x96, 0x0d, 0x3f, 0x94, 0xa8, 0x77, 0x3f, 0x71, 0xc5, 0x44, 0x8d, 0x3c, 0x65, 0xad, 0x44, + 0xb3, 0xad, 0x7d, 0x07, 0xea, 0xf7, 0x1f, 0x3e, 0x34, 0x06, 0x08, 0x58, 0x43, 0x3c, 0xdd, 0x32, + 0xa7, 0xad, 0x21, 0xb9, 0x00, 0xf5, 0x94, 0x8d, 0x03, 0x21, 0x59, 0x2a, 0x0c, 0x3f, 0x73, 0x81, + 0xfd, 0xb7, 0x05, 0x1b, 0xc7, 0xb2, 0xa0, 0x2e, 0xd3, 0xaf, 0x57, 0x17, 0x6a, 0x93, 0x66, 0x5b, + 0x72, 0x09, 0x20, 0x9e, 0x86, 0xa1, 0xa3, 0xd3, 0xb1, 0xd8, 0x7c, 0xeb, 0x4a, 0x7e, 0x0f, 0x53, + 0x92, 0xa7, 0xab, 0x78, 0x32, 0x5d, 0xd7, 0xa1, 0x3e, 0x8a, 0x1c, 0xdd, 0xff, 0x90, 0xee, 0xbc, + 0x64, 0x32, 0x12, 0x68, 0x6d, 0x14, 0x99, 0x68, 0xae, 0x43, 0xdd, 0xcb, 0xc1, 0xe5, 0x95, 0xf5, + 0x55, 0xf3, 0x32, 0xf0, 0x07, 0x6a, 0x1a, 0x49, 0x37, 0x5c, 0x98, 0x59, 0xb4, 0x8e, 0x12, 0xd5, + 0xe9, 0xed, 0x5f, 0x8b, 0x40, 0x4e, 0x3e, 0x02, 0x72, 0x75, 0x39, 0xd4, 0xbc, 0xc8, 0x73, 0xe8, + 0x3c, 0x76, 0x9c, 0xd8, 0x59, 0xec, 0xe6, 0xf1, 0xcf, 0x27, 0xb6, 0x09, 0x5e, 0xbc, 0x4f, 0xf4, + 0xc5, 0xff, 0x8c, 0x7e, 0x39, 0xa0, 0x32, 0xf6, 0x9a, 0x79, 0x40, 0x68, 0xeb, 0x46, 0x66, 0xab, + 0x72, 0x8a, 0xad, 0x1b, 0xc6, 0xd6, 0xa7, 0x70, 0x26, 0x1b, 0x87, 0xba, 0x53, 0x6b, 0x17, 0xab, + 0x0b, 0x2e, 0x6e, 0x9a, 0xb1, 0x68, 0x08, 0x52, 0xee, 0x0e, 0x00, 0x26, 0x61, 0x98, 0xdd, 0x51, + 0x5b, 0xe4, 0x27, 0x2f, 0x39, 0x5a, 0x9f, 0x84, 0xa1, 0xb9, 0xe5, 0x26, 0xb4, 0x14, 0x7e, 0xee, + 0x56, 0x7d, 0xf5, 0x91, 0xc6, 0x24, 0x0c, 0x77, 0x8d, 0x6b, 0xf6, 0x6d, 0xa8, 0xe7, 0x64, 0xab, + 0xb7, 0x96, 0xf2, 0x99, 0xa9, 0x3a, 0xb5, 0x24, 0x17, 0xa0, 0x32, 0x63, 0xc1, 0x78, 0xb2, 0x5c, + 0x6d, 0x46, 0x66, 0x5f, 0x85, 0x46, 0x5e, 0x0a, 0x7c, 0x46, 0xb6, 0xa0, 0x86, 0x81, 0x31, 0xd3, + 0x62, 0x5b, 0x34, 0xdf, 0xdb, 0x77, 0xa1, 0x99, 0x41, 0x9f, 0xf1, 0xe4, 0x31, 0x21, 0x50, 0xf2, + 0x5d, 0xe9, 0xe2, 0x6b, 0x69, 0x52, 0x5c, 0xcf, 0x73, 0x57, 0x58, 0xfc, 0xfb, 0x44, 0x91, 0xfd, + 0x83, 0x05, 0xb5, 0xcc, 0x00, 0xb9, 0x0c, 0xa5, 0x94, 0xcf, 0xb2, 0x9a, 0xd9, 0x3c, 0x56, 0x94, + 0x7c, 0x46, 0x51, 0x4d, 0xae, 0x40, 0x19, 0xff, 0x90, 0x4c, 0x07, 0x20, 0xcb, 0x38, 0xe5, 0x06, + 0x2d, 0xa9, 0x1f, 0x26, 0x72, 0x15, 0x5a, 0x3e, 0x1b, 0xb9, 0xd3, 0x50, 0x3a, 0xcf, 0xdd, 0x70, + 0xca, 0x96, 0x7e, 0x7f, 0x9b, 0x46, 0xf5, 0x8d, 0xd2, 0x5c, 0xfb, 0x1e, 0x1a, 0x0b, 0xbf, 0xd9, + 0xa4, 0x05, 0x75, 0xf5, 0xc5, 0x9e, 0xdd, 0x5e, 0x23, 0xeb, 0x00, 0x6a, 0xab, 0x27, 0x4f, 0xdb, + 0x22, 0x67, 0xa1, 0xad, 0xf7, 0x51, 0xc4, 0xe3, 0xfb, 0x6e, 0xec, 0x87, 0xac, 0x5d, 0x20, 0x67, + 0x60, 0x43, 0x49, 0x35, 0xe9, 0xfa, 0x68, 0x31, 0xb3, 0x84, 0x13, 0xba, 0x5d, 0xca, 0x4e, 0xee, + 0x4e, 0xc3, 0x10, 0x71, 0x41, 0x3c, 0x6e, 0x97, 0x77, 0x6e, 0xbd, 0xf9, 0xad, 0x66, 0xbd, 0x7a, + 0xdb, 0xb5, 0x5e, 0xbf, 0xed, 0x5a, 0x7f, 0xbd, 0xed, 0x5a, 0xbf, 0x1c, 0x75, 0xd7, 0x5e, 0x1e, + 0x75, 0xd7, 0x5e, 0x1f, 0x75, 0xd7, 0xde, 0x1c, 0x75, 0xd7, 0xe0, 0x9c, 0xc7, 0xa3, 0x41, 0x12, + 0xc4, 0x63, 0xcf, 0x4d, 0x06, 0x32, 0xf0, 0x87, 0x18, 0xf4, 0x13, 0xeb, 0xdf, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x38, 0x3c, 0xb4, 0x81, 0x89, 0x0c, 0x00, 0x00, } func (m *AnalyzeReq) Marshal() (dAtA []byte, err error) { @@ -1835,6 +1909,39 @@ func (m *FMSketch) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *HLLSketch) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *HLLSketch) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *HLLSketch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Registers != nil { + i -= len(m.Registers) + copy(dAtA[i:], m.Registers) + i = encodeVarintAnalyze(dAtA, i, uint64(len(m.Registers))) + i-- + dAtA[i] = 0x12 + } + i = encodeVarintAnalyze(dAtA, i, uint64(m.B)) + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil +} + func (m *SampleCollector) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1922,6 +2029,34 @@ func (m *RowSampleCollector) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.HllF1Sketch) > 0 { + for iNdEx := len(m.HllF1Sketch) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.HllF1Sketch[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAnalyze(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } + } + if len(m.HllSketch) > 0 { + for iNdEx := len(m.HllSketch) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.HllSketch[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAnalyze(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } + } i = encodeVarintAnalyze(dAtA, i, uint64(m.SketchSampleCount)) i-- dAtA[i] = 0x38 @@ -2377,6 +2512,20 @@ func (m *FMSketch) Size() (n int) { return n } +func (m *HLLSketch) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + n += 1 + sovAnalyze(uint64(m.B)) + if m.Registers != nil { + l = len(m.Registers) + n += 1 + l + sovAnalyze(uint64(l)) + } + return n +} + func (m *SampleCollector) Size() (n int) { if m == nil { return 0 @@ -2441,6 +2590,18 @@ func (m *RowSampleCollector) Size() (n int) { } } n += 1 + sovAnalyze(uint64(m.SketchSampleCount)) + if len(m.HllSketch) > 0 { + for _, e := range m.HllSketch { + l = e.Size() + n += 1 + l + sovAnalyze(uint64(l)) + } + } + if len(m.HllF1Sketch) > 0 { + for _, e := range m.HllF1Sketch { + l = e.Size() + n += 1 + l + sovAnalyze(uint64(l)) + } + } return n } @@ -4382,6 +4543,109 @@ func (m *FMSketch) Unmarshal(dAtA []byte) error { } return nil } +func (m *HLLSketch) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: HLLSketch: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: HLLSketch: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field B", wireType) + } + m.B = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.B |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Registers", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAnalyze + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthAnalyze + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthAnalyze + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Registers = append(m.Registers[:0], dAtA[iNdEx:postIndex]...) + if m.Registers == nil { + m.Registers = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipAnalyze(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthAnalyze + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *SampleCollector) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4915,6 +5179,74 @@ func (m *RowSampleCollector) Unmarshal(dAtA []byte) error { break } } + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HllSketch", 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.HllSketch = append(m.HllSketch, &HLLSketch{}) + if err := m.HllSketch[len(m.HllSketch)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HllF1Sketch", 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.HllF1Sketch = append(m.HllF1Sketch, &HLLSketch{}) + if err := m.HllF1Sketch[len(m.HllF1Sketch)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAnalyze(dAtA[iNdEx:]) diff --git a/proto/analyze.proto b/proto/analyze.proto index 2125dd3f..b78f1cab 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -138,10 +138,10 @@ message FMSketch { } // HLLSketch is used to count distinct values for columns. -// message HLLSketch { -// optional uint32 b = 1 [(gogoproto.nullable) = false]; -// optional bytes registers = 2; -// } +message HLLSketch { + optional uint32 b = 1 [(gogoproto.nullable) = false]; + optional bytes registers = 2; +} // SampleCollector is used for collect samples and calculate the count and ndv of an column. message SampleCollector { @@ -161,8 +161,8 @@ message RowSampleCollector { repeated int64 total_size = 5; repeated FMSketch f1_sketch = 6; optional int64 sketch_sample_count = 7 [(gogoproto.nullable) = false]; - // repeated HLLSketch hll_sketch = 8; - // repeated HLLSketch hll_f1_sketch = 9; + repeated HLLSketch hll_sketch = 8; + repeated HLLSketch hll_f1_sketch = 9; } message RowSample {