diff --git a/go-tipb/analyze.pb.go b/go-tipb/analyze.pb.go index 07ad048b..fc2c8d36 100644 --- a/go-tipb/analyze.pb.go +++ b/go-tipb/analyze.pb.go @@ -906,10 +906,6 @@ 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"` } func (m *RowSampleCollector) Reset() { *m = RowSampleCollector{} } @@ -980,20 +976,6 @@ 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 - } - 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"` @@ -1225,90 +1207,90 @@ 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, + // 1318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x6f, 0xdb, 0x46, + 0x13, 0x36, 0x25, 0xea, 0x6b, 0x24, 0xdb, 0xf2, 0xe6, 0xe3, 0x65, 0x8c, 0xbc, 0x8a, 0xc0, 0x20, + 0x8d, 0x92, 0x14, 0x6e, 0xe1, 0xa0, 0x87, 0x20, 0x68, 0x80, 0x3a, 0x45, 0x9a, 0xa4, 0x4d, 0x1a, + 0x6c, 0x82, 0x16, 0xe8, 0x85, 0xa0, 0xc9, 0x95, 0x44, 0x98, 0xe4, 0xd2, 0xdc, 0x95, 0xe5, 0x18, + 0xbd, 0xf4, 0xd0, 0x02, 0xbd, 0xb4, 0x3d, 0xe6, 0x27, 0xf4, 0xde, 0xfe, 0x88, 0x1c, 0x73, 0xcc, + 0xa9, 0x28, 0x62, 0xf4, 0x7f, 0x14, 0x3b, 0xbb, 0xa4, 0x24, 0x5b, 0x29, 0x92, 0x13, 0x77, 0xe7, + 0x79, 0x76, 0x76, 0xe6, 0x99, 0xdd, 0x59, 0xc2, 0xaa, 0x9f, 0xfa, 0xf1, 0xf3, 0x23, 0xb6, 0x95, + 0xe5, 0x5c, 0x72, 0x62, 0xcb, 0x28, 0xdb, 0xdd, 0xec, 0x88, 0x60, 0xcc, 0x12, 0x5f, 0xdb, 0x36, + 0xcf, 0x8e, 0xf8, 0x88, 0xe3, 0xf0, 0x23, 0x35, 0x32, 0xd6, 0xf5, 0x7c, 0x22, 0x24, 0x0e, 0xb5, + 0xc1, 0xfd, 0xb5, 0x02, 0xf0, 0x99, 0x76, 0x46, 0xd9, 0x3e, 0xb9, 0x0a, 0x15, 0x99, 0x39, 0x56, + 0xdf, 0x1a, 0xac, 0x6d, 0x6f, 0x6c, 0x29, 0xb7, 0x5b, 0x06, 0x7d, 0xf6, 0x3c, 0x63, 0x3b, 0xf6, + 0xcb, 0xbf, 0x2e, 0xad, 0xd0, 0x8a, 0xcc, 0xc8, 0x75, 0xd8, 0x10, 0xd2, 0xcf, 0xa5, 0x27, 0x85, + 0x37, 0xf4, 0xe3, 0x78, 0xd7, 0x0f, 0xf6, 0x9c, 0x4a, 0xdf, 0x1a, 0xd8, 0x74, 0x1d, 0x81, 0x67, + 0xe2, 0x9e, 0x31, 0x93, 0x4d, 0xa8, 0x0d, 0x63, 0x7f, 0x24, 0x9c, 0xaa, 0xc2, 0x8d, 0x13, 0x6d, + 0x22, 0x5b, 0xd0, 0x95, 0x51, 0xc2, 0xbc, 0x23, 0x9e, 0x32, 0x8f, 0x0f, 0x87, 0x82, 0x49, 0xc7, + 0xee, 0x5b, 0x83, 0xaa, 0xa1, 0xad, 0x29, 0xf4, 0x3b, 0x9e, 0xb2, 0xaf, 0x11, 0x23, 0x5b, 0xd0, + 0x88, 0xc2, 0x43, 0x2f, 0x67, 0xfb, 0x4e, 0xad, 0x6f, 0x0d, 0xda, 0xdb, 0xe7, 0x16, 0xa2, 0x7c, + 0x90, 0x86, 0xec, 0x90, 0xb2, 0x7d, 0x5a, 0x8f, 0x42, 0xf5, 0x25, 0x1f, 0x43, 0x23, 0xe0, 0x31, + 0xf2, 0xeb, 0xc8, 0xff, 0xdf, 0x02, 0xff, 0x2e, 0x8f, 0x27, 0x49, 0x2a, 0x70, 0x45, 0xc0, 0x63, + 0xca, 0xf6, 0xdd, 0x3f, 0x2a, 0xb0, 0x7e, 0xc2, 0x1b, 0xb9, 0x02, 0xed, 0xdd, 0x49, 0xb0, 0xc7, + 0xa4, 0x27, 0xa2, 0x23, 0x86, 0xfa, 0x14, 0x01, 0x82, 0x06, 0x9e, 0x46, 0x47, 0x4c, 0xd1, 0xd2, + 0x49, 0xe2, 0x05, 0xda, 0x29, 0xca, 0x51, 0x2b, 0x68, 0xe9, 0x24, 0x31, 0x9b, 0x91, 0x2b, 0xb0, + 0x16, 0x24, 0x62, 0x8f, 0xc9, 0x60, 0xec, 0x85, 0x2c, 0x93, 0x63, 0x14, 0xa6, 0x46, 0x57, 0x0b, + 0xeb, 0xe7, 0xca, 0xb8, 0x40, 0x9b, 0x46, 0xa1, 0x1c, 0xa3, 0x30, 0x73, 0xb4, 0x6f, 0x95, 0x51, + 0x6d, 0x2a, 0xfc, 0x24, 0x8b, 0x99, 0x8e, 0xad, 0x36, 0x1f, 0x9b, 0x06, 0x8a, 0xd8, 0x8c, 0x2f, + 0xa4, 0xd5, 0x17, 0x68, 0x08, 0x20, 0xed, 0x22, 0x80, 0xe4, 0x99, 0x97, 0x6a, 0x56, 0x03, 0x37, + 0x6c, 0x4a, 0x9e, 0x3d, 0x46, 0xd4, 0x81, 0xc6, 0x01, 0xcb, 0x45, 0xc4, 0x53, 0xa7, 0x89, 0x50, + 0x31, 0x75, 0x7f, 0xb6, 0x61, 0xe3, 0x94, 0xa6, 0xef, 0xa1, 0xdb, 0x7c, 0x0a, 0x95, 0x77, 0x4b, + 0xa1, 0xfa, 0x96, 0x14, 0x6e, 0x42, 0xc7, 0x54, 0xc0, 0x8b, 0xd2, 0x21, 0x77, 0xec, 0x7e, 0x75, + 0xd0, 0xde, 0xee, 0xea, 0xba, 0xeb, 0xe0, 0x1e, 0xa4, 0x43, 0x4e, 0xdb, 0x86, 0xa5, 0x26, 0x4b, + 0x6a, 0x52, 0x7b, 0xb7, 0x9a, 0xd4, 0x97, 0xd5, 0xe4, 0x43, 0x20, 0x59, 0x1e, 0x25, 0x7e, 0xfe, + 0xdc, 0x1c, 0x06, 0x2f, 0x0a, 0x85, 0xd3, 0xe8, 0x57, 0x07, 0x55, 0xda, 0x35, 0x88, 0x89, 0x24, + 0x14, 0x6f, 0x57, 0x95, 0xdc, 0x82, 0x0b, 0x85, 0x9f, 0x2c, 0x67, 0xc3, 0xe8, 0x70, 0xde, 0x5d, + 0x0b, 0xdd, 0x9d, 0x37, 0x84, 0x27, 0x88, 0xcf, 0x9c, 0x7e, 0x0a, 0xab, 0x86, 0x3b, 0xca, 0xf9, + 0x24, 0x13, 0x0e, 0xa0, 0x0c, 0xce, 0x92, 0xe3, 0xff, 0x85, 0x22, 0x50, 0x23, 0x1a, 0x4e, 0x04, + 0xb9, 0x54, 0x96, 0x24, 0xf7, 0x25, 0x73, 0xda, 0x7d, 0x6b, 0x60, 0x15, 0xc5, 0xa0, 0xbe, 0x64, + 0xe4, 0x02, 0x34, 0xd3, 0xf0, 0x40, 0xa3, 0x1d, 0x44, 0x1b, 0x69, 0x78, 0xa0, 0x20, 0xf7, 0x27, + 0x0b, 0xba, 0x66, 0x83, 0x47, 0xd1, 0x21, 0x0b, 0x29, 0x13, 0x19, 0xb9, 0x3d, 0xab, 0x4a, 0xce, + 0x84, 0xee, 0x31, 0xcb, 0xc3, 0x11, 0x8a, 0x5f, 0x56, 0x07, 0x17, 0x7f, 0x02, 0x10, 0xa9, 0xbb, + 0xa8, 0x97, 0x56, 0x70, 0xe9, 0xf9, 0x65, 0x17, 0x5f, 0x64, 0xb4, 0x15, 0x15, 0x43, 0x77, 0x17, + 0xc8, 0xe9, 0x44, 0xb1, 0x86, 0x5a, 0x19, 0xdd, 0x6f, 0x84, 0x63, 0xa1, 0x92, 0x46, 0x2f, 0xdd, + 0x68, 0xf0, 0x96, 0x1a, 0xcd, 0x63, 0x96, 0x8e, 0xe4, 0x58, 0xdd, 0x67, 0xa4, 0x69, 0xeb, 0x57, + 0xda, 0xe8, 0xfe, 0x69, 0x9d, 0xd8, 0xa4, 0x8c, 0x38, 0xe0, 0x71, 0xcc, 0x02, 0xc9, 0x73, 0xbd, + 0x41, 0xd9, 0xaa, 0x9e, 0xa2, 0x88, 0x77, 0x0b, 0x94, 0xce, 0x11, 0xc9, 0x00, 0x1a, 0xd9, 0x9e, + 0x37, 0x8e, 0x84, 0x34, 0x59, 0xae, 0xeb, 0x35, 0xf7, 0x23, 0x21, 0xf9, 0x28, 0xf7, 0x13, 0x5a, + 0xcf, 0xf6, 0xd4, 0x44, 0xd5, 0x37, 0xe7, 0x53, 0xaf, 0x5c, 0x8b, 0xd7, 0xa1, 0x14, 0x94, 0xf2, + 0xe9, 0xc9, 0x6d, 0x3a, 0x39, 0x9f, 0x96, 0x33, 0xf7, 0x97, 0x59, 0x8d, 0x4a, 0xe9, 0xc8, 0x65, + 0xb0, 0x71, 0x6b, 0x6b, 0xf9, 0xd6, 0x08, 0x92, 0x3e, 0x54, 0x83, 0x44, 0x98, 0xf0, 0xd6, 0xcc, + 0xad, 0x7a, 0xf4, 0x14, 0x4f, 0x3f, 0x55, 0x10, 0xb9, 0x09, 0xad, 0x93, 0x61, 0xbd, 0x25, 0xf5, + 0x19, 0xcf, 0x7d, 0x61, 0x41, 0x7d, 0x07, 0x5b, 0x82, 0x7a, 0x2f, 0x02, 0x3e, 0x49, 0xe5, 0x42, + 0xbf, 0xd0, 0x26, 0x75, 0x2e, 0x63, 0x3e, 0x65, 0xb9, 0xb7, 0xcb, 0x27, 0x69, 0x88, 0x51, 0x74, + 0x28, 0xa0, 0x69, 0x47, 0x59, 0x14, 0x61, 0x92, 0x65, 0x25, 0xa1, 0xaa, 0x09, 0x68, 0xd2, 0x84, + 0x1e, 0x34, 0x72, 0x96, 0x31, 0x5f, 0x8a, 0x85, 0x87, 0xa6, 0x30, 0x92, 0x2e, 0x54, 0xd3, 0xf0, + 0x40, 0xf7, 0x51, 0xaa, 0x86, 0xee, 0x97, 0xd0, 0x2a, 0x45, 0x20, 0xe7, 0x35, 0x3c, 0x1f, 0x9a, + 0x32, 0x90, 0x0f, 0xa0, 0xa1, 0x3b, 0x9a, 0x3e, 0x27, 0xed, 0xed, 0x8e, 0x4e, 0x59, 0xe7, 0x44, + 0x0b, 0xd0, 0xbd, 0x03, 0xcd, 0x7b, 0x46, 0x2d, 0xe2, 0x80, 0x9d, 0xf8, 0x62, 0x0f, 0x9d, 0x15, + 0xef, 0x22, 0x5a, 0x54, 0x4b, 0x18, 0xfb, 0x62, 0xac, 0x5e, 0x43, 0xe5, 0xcd, 0xa6, 0xc5, 0xd4, + 0xfd, 0xc7, 0x82, 0xf5, 0x13, 0x32, 0x2a, 0xb6, 0xbe, 0x99, 0xfa, 0xa4, 0x75, 0x68, 0x31, 0x25, + 0x97, 0x01, 0xd2, 0x49, 0x1c, 0x7b, 0x5a, 0xcf, 0xf9, 0xc6, 0xda, 0x52, 0xf6, 0xbb, 0xa8, 0x69, + 0xa9, 0x77, 0xf5, 0xb4, 0xde, 0x37, 0xa0, 0x35, 0x4c, 0x3c, 0xdd, 0xdb, 0x50, 0xaf, 0xb2, 0xe6, + 0x45, 0x16, 0xb4, 0x39, 0x4c, 0x4c, 0x3e, 0x37, 0xa0, 0x15, 0x94, 0xe4, 0xda, 0xd2, 0x03, 0xd2, + 0x0c, 0x0a, 0xf2, 0xff, 0xd5, 0x4b, 0x23, 0xfd, 0x78, 0xee, 0x3d, 0xa2, 0x2d, 0xb4, 0xa8, 0x2e, + 0xee, 0xfe, 0x50, 0x01, 0x72, 0xfa, 0x14, 0x93, 0x6b, 0x8b, 0xa9, 0x96, 0xa7, 0xb4, 0xa4, 0xce, + 0x72, 0xc7, 0xd7, 0xb8, 0xc8, 0xdd, 0xdc, 0xde, 0xd9, 0x6b, 0x6c, 0x92, 0x17, 0xef, 0x93, 0x7d, + 0xf5, 0x3f, 0xb3, 0x5f, 0x4c, 0xa8, 0x86, 0xcd, 0x62, 0x96, 0xd0, 0x43, 0xbb, 0x59, 0xef, 0x36, + 0x1e, 0xda, 0xcd, 0x46, 0xb7, 0x49, 0xbb, 0x22, 0x4a, 0x47, 0x31, 0x93, 0x3c, 0x35, 0xce, 0xe9, + 0x99, 0xe2, 0x65, 0xd3, 0x4d, 0x17, 0xb7, 0x77, 0x6f, 0x43, 0xab, 0xcc, 0x4b, 0x9d, 0xcb, 0x9c, + 0x4f, 0x4d, 0x81, 0xd5, 0x90, 0x5c, 0x84, 0xfa, 0x94, 0x45, 0xa3, 0xf1, 0x62, 0x61, 0x8d, 0xcd, + 0xbd, 0x06, 0xed, 0x52, 0x75, 0x3e, 0x25, 0x9b, 0xd0, 0x44, 0xa7, 0xcc, 0xb4, 0xa3, 0x55, 0x5a, + 0xce, 0xdd, 0x3b, 0xd0, 0x29, 0xa8, 0xcf, 0x78, 0xf6, 0x98, 0x10, 0xb0, 0x43, 0x5f, 0xfa, 0x78, + 0x2e, 0x3b, 0x14, 0xc7, 0x33, 0x99, 0x2a, 0xf3, 0x3f, 0x71, 0x3a, 0xce, 0x1f, 0x2d, 0x68, 0x16, + 0x0e, 0xc8, 0x15, 0xb0, 0x73, 0x3e, 0x2d, 0xca, 0xb3, 0x71, 0xa2, 0xfe, 0x7c, 0x4a, 0x11, 0x26, + 0x57, 0xa1, 0x86, 0x3f, 0x1a, 0xe6, 0xb6, 0x90, 0x45, 0x9e, 0x0a, 0x83, 0xda, 0xea, 0xbf, 0x83, + 0x5c, 0x83, 0xd5, 0x90, 0x0d, 0xfd, 0x49, 0x2c, 0xbd, 0x03, 0x3f, 0x9e, 0xb0, 0x85, 0xbf, 0xc8, + 0x8e, 0x81, 0xbe, 0x51, 0xc8, 0xf5, 0xef, 0xa1, 0x3d, 0xf7, 0xb7, 0x4a, 0x56, 0xa1, 0xa5, 0xbe, + 0xd8, 0xdf, 0xba, 0x2b, 0x64, 0x0d, 0x40, 0x4d, 0x75, 0x97, 0xee, 0x5a, 0xe4, 0x2c, 0x74, 0xf5, + 0x3c, 0x49, 0x78, 0x7a, 0xdf, 0x4f, 0xc3, 0x98, 0x75, 0x2b, 0xe4, 0x0c, 0xac, 0x2b, 0xab, 0x16, + 0x5d, 0x2f, 0xad, 0x16, 0x9e, 0xf0, 0x35, 0xeb, 0xda, 0xc5, 0xca, 0x7b, 0x93, 0x38, 0x46, 0x5e, + 0x94, 0x8e, 0xba, 0xb5, 0x9d, 0x5b, 0xaf, 0x7f, 0x6f, 0x5a, 0x2f, 0xdf, 0xf4, 0xac, 0x57, 0x6f, + 0x7a, 0xd6, 0xdf, 0x6f, 0x7a, 0xd6, 0x6f, 0xc7, 0xbd, 0x95, 0x17, 0xc7, 0xbd, 0x95, 0x57, 0xc7, + 0xbd, 0x95, 0xd7, 0xc7, 0xbd, 0x15, 0x38, 0x17, 0xf0, 0x64, 0x2b, 0x8b, 0xd2, 0x51, 0xe0, 0x67, + 0x5b, 0x32, 0x0a, 0x77, 0x31, 0xe9, 0x27, 0xd6, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb6, + 0x04, 0xb9, 0xd0, 0x0b, 0x00, 0x00, } func (m *AnalyzeReq) Marshal() (dAtA []byte, err error) { @@ -1940,23 +1922,6 @@ 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 len(m.TotalSize) > 0 { for iNdEx := len(m.TotalSize) - 1; iNdEx >= 0; iNdEx-- { i = encodeVarintAnalyze(dAtA, i, uint64(m.TotalSize[iNdEx])) @@ -2455,13 +2420,6 @@ 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)) - } - } - n += 1 + sovAnalyze(uint64(m.SketchSampleCount)) return n } @@ -4895,59 +4853,6 @@ 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: - 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/go-tipb/analyze_test.go b/go-tipb/analyze_test.go new file mode 100644 index 00000000..e0a9456a --- /dev/null +++ b/go-tipb/analyze_test.go @@ -0,0 +1,165 @@ +package tipb + +import ( + "bytes" + "strings" + "testing" + + "github.com/golang/protobuf/jsonpb" + "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/reflect/protoreflect" +) + +// rowSampleCollector407 preserves the wire schema introduced by PR #407 so +// both directions can be tested without registering another tipb descriptor. +type rowSampleCollector407 struct { + Samples []*RowSample `protobuf:"bytes,1,rep,name=samples"` + NullCounts []int64 `protobuf:"varint,2,rep,name=null_counts"` + Count int64 `protobuf:"varint,3,opt,name=count"` + FmSketch []*FMSketch `protobuf:"bytes,4,rep,name=fm_sketch"` + TotalSize []int64 `protobuf:"varint,5,rep,name=total_size"` + SingletonSketch []*FMSketch `protobuf:"bytes,6,rep,name=singleton_sketch"` + SketchSampleCount int64 `protobuf:"varint,7,opt,name=sketch_sample_count"` +} + +func (m *rowSampleCollector407) Reset() { *m = rowSampleCollector407{} } +func (m *rowSampleCollector407) String() string { return proto.CompactTextString(m) } +func (*rowSampleCollector407) ProtoMessage() {} + +func TestRowSampleCollectorRemovedFieldsCompatibility(t *testing.T) { + want := &RowSampleCollector{ + Samples: []*RowSample{{Row: [][]byte{[]byte("sample")}, Weight: 42}}, + NullCounts: []int64{2, 3}, + Count: 1000, + FmSketch: []*FMSketch{{Mask: 3, Hashset: []uint64{4, 8}}}, + TotalSize: []int64{100, 200}, + } + legacyWire, err := proto.Marshal(want) + if err != nil { + t.Fatal(err) + } + + for _, populated := range []bool{false, true} { + name := "default_fields" + if populated { + name = "populated_fields" + } + t.Run(name, func(t *testing.T) { + sender := &rowSampleCollector407{ + Samples: want.Samples, + NullCounts: want.NullCounts, + Count: want.Count, + FmSketch: want.FmSketch, + TotalSize: want.TotalSize, + } + if populated { + sender.SingletonSketch = []*FMSketch{{Mask: 1, Hashset: []uint64{2, 6}}, {}} + sender.SketchSampleCount = 123 + } + wire, err := proto.Marshal(sender) + if err != nil { + t.Fatal(err) + } + // The #407 generated Go codec emits field 7 even when it is zero; + // the reflection-based fixture omits it in that case. + if !populated { + wire = append(wire, 0x38, 0x00) + } + var decoded RowSampleCollector + if err := proto.Unmarshal(wire, &decoded); err != nil { + t.Fatalf("decode #407 payload: %v", err) + } + if !proto.Equal(&decoded, want) { + t.Fatalf("retained fields = %v, want %v", &decoded, want) + } + roundTrip, err := proto.Marshal(&decoded) + if err != nil { + t.Fatal(err) + } + if len(roundTrip) != decoded.Size() { + t.Fatalf("wire size = %d, Size() = %d", len(roundTrip), decoded.Size()) + } + // goproto_unrecognized_all=false means removed fields are discarded, + // not preserved for a subsequent #407-aware reader. + if !bytes.Equal(roundTrip, legacyWire) { + t.Fatalf("re-encoded payload = %x, want %x", roundTrip, legacyWire) + } + var receiver rowSampleCollector407 + if err := proto.Unmarshal(roundTrip, &receiver); err != nil { + t.Fatalf("#407 reader decoding reverted payload: %v", err) + } + if len(receiver.SingletonSketch) != 0 || receiver.SketchSampleCount != 0 { + t.Fatalf("removed fields did not default to empty/zero: %v", &receiver) + } + if !proto.Equal(&receiver, &rowSampleCollector407{ + Samples: want.Samples, NullCounts: want.NullCounts, Count: want.Count, + FmSketch: want.FmSketch, TotalSize: want.TotalSize, + }) { + t.Fatalf("#407 reader lost retained fields: %v", &receiver) + } + }) + } +} + +func TestRowSampleCollectorReservedFields(t *testing.T) { + descriptor := proto.MessageReflect(&RowSampleCollector{}).Descriptor() + wantFields := []protoreflect.Name{"samples", "null_counts", "count", "fm_sketch", "total_size"} + if descriptor.Fields().Len() != len(wantFields) { + t.Fatalf("field count = %d, want %d", descriptor.Fields().Len(), len(wantFields)) + } + for i, name := range wantFields { + field := descriptor.Fields().ByName(name) + if field == nil || field.Number() != protoreflect.FieldNumber(i+1) { + t.Errorf("field %s must retain number %d", name, i+1) + } + } + for i, name := range []protoreflect.Name{"singleton_sketch", "sketch_sample_count"} { + number := protoreflect.FieldNumber(i + 6) + if !descriptor.ReservedRanges().Has(number) || !descriptor.ReservedNames().Has(name) { + t.Errorf("removed field %s (%d) must reserve both name and number", name, number) + } + } +} + +func TestRowSampleCollectorRemovedFieldsJSON(t *testing.T) { + for _, input := range []string{ + `{"count":"1000","singletonSketch":[{"mask":"1"}]}`, + `{"count":"1000","sketchSampleCount":"123"}`, + } { + var decoded RowSampleCollector + if err := jsonpb.Unmarshal(strings.NewReader(input), &decoded); err == nil { + t.Fatalf("strict JSON reader unexpectedly accepted removed field: %s", input) + } + decoded.Reset() + reader := jsonpb.Unmarshaler{AllowUnknownFields: true} + if err := reader.Unmarshal(strings.NewReader(input), &decoded); err != nil { + t.Fatalf("permissive JSON reader: %v", err) + } + if decoded.Count != 1000 { + t.Fatalf("permissive JSON reader lost count: %v", &decoded) + } + } +} + +func TestAnalyzeColumnsReqNDVRatePreserved(t *testing.T) { + // PR #410 is independent of the #407 revert: preserve its field number, + // explicit-zero presence, and non-zero value. + field := proto.MessageReflect(&AnalyzeColumnsReq{}).Descriptor().Fields().ByName("ndv_rate") + if field == nil || field.Number() != 12 { + t.Fatal("ndv_rate must retain field number 12") + } + for _, rate := range []*float64{nil, proto.Float64(0), proto.Float64(0.25)} { + want := &AnalyzeColumnsReq{NdvRate: rate} + wire, err := proto.Marshal(want) + if err != nil { + t.Fatal(err) + } + var decoded AnalyzeColumnsReq + if err := proto.Unmarshal(wire, &decoded); err != nil { + t.Fatal(err) + } + if !proto.Equal(&decoded, want) || (decoded.NdvRate == nil) != (rate == nil) { + t.Fatalf("ndv_rate round trip = %v, want %v", &decoded, want) + } + } +} diff --git a/proto/analyze.proto b/proto/analyze.proto index 651219d9..d935f5c2 100644 --- a/proto/analyze.proto +++ b/proto/analyze.proto @@ -156,10 +156,9 @@ 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]; + // Removed fields from PR #407. Do not reuse their numbers or names. + reserved 6, 7; + reserved "singleton_sketch", "sketch_sample_count"; } message RowSample { diff --git a/scripts/proto.lock b/scripts/proto.lock index a51c8de5..5a1ec566 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -535,25 +535,15 @@ "name": "total_size", "type": "int64", "is_repeated": true - }, - { - "id": 6, - "name": "singleton_sketch", - "type": "FMSketch", - "is_repeated": true - }, - { - "id": 7, - "name": "sketch_sample_count", - "type": "int64", - "optional": true, - "options": [ - { - "name": "(gogoproto.nullable)", - "value": "false" - } - ] } + ], + "reserved_ids": [ + 6, + 7 + ], + "reserved_names": [ + "singleton_sketch", + "sketch_sample_count" ] }, {