diff --git a/src/api/proto/vispb/vis.pb.go b/src/api/proto/vispb/vis.pb.go index eb6684ba46c..4a39e0e57a9 100755 --- a/src/api/proto/vispb/vis.pb.go +++ b/src/api/proto/vispb/vis.pb.go @@ -1808,6 +1808,7 @@ type StackTraceFlameGraph struct { PidColumn string `protobuf:"bytes,7,opt,name=pid_column,json=pidColumn,proto3" json:"pid_column,omitempty"` NodeColumn string `protobuf:"bytes,8,opt,name=node_column,json=nodeColumn,proto3" json:"node_column,omitempty"` PercentageLabel string `protobuf:"bytes,9,opt,name=percentage_label,json=percentageLabel,proto3" json:"percentage_label,omitempty"` + DifferenceColumn string `protobuf:"bytes,10,opt,name=difference_column,json=differenceColumn,proto3" json:"difference_column,omitempty"` } func (m *StackTraceFlameGraph) Reset() { *m = StackTraceFlameGraph{} } @@ -1905,6 +1906,13 @@ func (m *StackTraceFlameGraph) GetPercentageLabel() string { return "" } +func (m *StackTraceFlameGraph) GetDifferenceColumn() string { + if m != nil { + return m.DifferenceColumn + } + return "" +} + func init() { proto.RegisterEnum("px.vispb.PXType", PXType_name, PXType_value) proto.RegisterEnum("px.vispb.TimeseriesChart_Timeseries_Mode", TimeseriesChart_Timeseries_Mode_name, TimeseriesChart_Timeseries_Mode_value) @@ -1939,129 +1947,130 @@ func init() { func init() { proto.RegisterFile("src/api/proto/vispb/vis.proto", fileDescriptor_c1b4dce3e9f2d6af) } var fileDescriptor_c1b4dce3e9f2d6af = []byte{ - // 1943 bytes of a gzipped FileDescriptorProto + // 1963 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x8f, 0x1b, 0x59, - 0x15, 0x76, 0xf9, 0xd1, 0xb6, 0x8f, 0x5f, 0x95, 0x4b, 0xc8, 0x38, 0x9e, 0xc4, 0xe9, 0x31, 0x13, - 0x94, 0x64, 0x82, 0x3b, 0x34, 0x13, 0x26, 0x51, 0x84, 0x84, 0xdd, 0xed, 0x7e, 0x88, 0x8e, 0x6d, - 0x95, 0x4d, 0xa7, 0x85, 0x90, 0x4a, 0xe5, 0xaa, 0xdb, 0xe5, 0x02, 0xbb, 0x6e, 0x51, 0x75, 0xdd, - 0xdd, 0x66, 0x35, 0x3b, 0xb6, 0x2c, 0x59, 0xb3, 0x42, 0x42, 0xfc, 0x0f, 0x84, 0x40, 0xca, 0xec, - 0x86, 0x1d, 0xe9, 0x6c, 0x86, 0x87, 0xc4, 0x48, 0xf3, 0x07, 0xd0, 0x7d, 0xd4, 0xc3, 0x8e, 0x35, - 0x62, 0x35, 0x9b, 0xee, 0x3a, 0xe7, 0xfb, 0xce, 0xf3, 0x9e, 0xfb, 0x30, 0xdc, 0x0d, 0x7c, 0x73, - 0xc7, 0xf0, 0x9c, 0x1d, 0xcf, 0x27, 0x94, 0xec, 0x5c, 0x38, 0x81, 0x37, 0x61, 0x7f, 0xdb, 0x5c, - 0x46, 0x05, 0xef, 0xaa, 0xcd, 0x75, 0x8d, 0xdb, 0x36, 0x21, 0xf6, 0x0c, 0x0b, 0xde, 0x64, 0x71, - 0xbe, 0x63, 0xb8, 0x4b, 0x41, 0x6a, 0x34, 0xd7, 0xa1, 0x4b, 0xdf, 0xf0, 0x3c, 0xec, 0x4b, 0x27, - 0x8d, 0xef, 0xd9, 0x0e, 0x9d, 0x2e, 0x26, 0x6d, 0x93, 0xcc, 0x77, 0x6c, 0x62, 0x93, 0x98, 0xc8, - 0x24, 0x11, 0x98, 0x7d, 0x09, 0x7a, 0xeb, 0x6f, 0x19, 0xc8, 0x9c, 0x3a, 0x01, 0xfa, 0x18, 0x8a, - 0x17, 0x86, 0xef, 0x18, 0x93, 0x19, 0x0e, 0xea, 0xca, 0x76, 0xe6, 0x41, 0x69, 0xf7, 0x56, 0x3b, - 0xcc, 0xa7, 0x7d, 0xea, 0x04, 0xed, 0x53, 0x09, 0x6b, 0x31, 0x11, 0x3d, 0x82, 0xfc, 0xa5, 0x63, - 0xd9, 0x98, 0x06, 0xf5, 0x34, 0xb7, 0x51, 0x63, 0x9b, 0x57, 0x1c, 0xd0, 0x42, 0x02, 0x7a, 0x01, - 0x65, 0x7b, 0x46, 0x26, 0xc6, 0x4c, 0x3f, 0x5f, 0xb8, 0x66, 0x50, 0xcf, 0x70, 0x83, 0xfa, 0x6a, - 0x90, 0x43, 0xce, 0x38, 0x58, 0xb8, 0xa6, 0x56, 0xb2, 0xa3, 0xef, 0xa0, 0xf1, 0x57, 0x05, 0x0a, - 0x61, 0x02, 0x08, 0x41, 0xd6, 0x35, 0xe6, 0xb8, 0xae, 0x6c, 0x2b, 0x0f, 0x8a, 0x1a, 0xff, 0x46, - 0x1f, 0x42, 0x96, 0x2e, 0x3d, 0x5c, 0x4f, 0x6f, 0x2b, 0x0f, 0xaa, 0xc9, 0x34, 0x86, 0x67, 0xe3, - 0xa5, 0x87, 0x35, 0x8e, 0xa2, 0x0e, 0x54, 0x2c, 0x7c, 0x6e, 0x2c, 0x66, 0x54, 0xbf, 0x30, 0x66, - 0x0b, 0x5c, 0xcf, 0x6c, 0x2b, 0x0f, 0x4a, 0xbb, 0x77, 0xda, 0xa2, 0xa9, 0xed, 0xb0, 0x57, 0xed, - 0x11, 0xf5, 0x1d, 0xd7, 0x3e, 0x65, 0x1c, 0xad, 0x2c, 0x4d, 0xb8, 0x84, 0xb6, 0xa1, 0x64, 0xe1, - 0xc0, 0xf4, 0x1d, 0x8f, 0x3a, 0xc4, 0xad, 0x67, 0x79, 0x0e, 0x49, 0x15, 0xfa, 0x00, 0xca, 0x17, - 0xc6, 0xcc, 0xb1, 0x44, 0x88, 0xa0, 0x9e, 0xdb, 0xce, 0x30, 0x0a, 0xd7, 0x71, 0x1f, 0x41, 0xe3, - 0x0c, 0x20, 0xae, 0x14, 0xdd, 0x83, 0x12, 0x59, 0x50, 0x6f, 0x41, 0xf5, 0x44, 0x59, 0x20, 0x54, - 0x7d, 0x56, 0xdc, 0x43, 0xc8, 0xb2, 0x9e, 0xf1, 0xe2, 0x4a, 0xbb, 0xdf, 0x5e, 0xef, 0x71, 0x9b, - 0xf7, 0x8b, 0x53, 0x5a, 0x5f, 0x65, 0x60, 0x4b, 0x68, 0x37, 0xb6, 0xe9, 0x29, 0x14, 0x3c, 0x12, - 0x38, 0x3c, 0x75, 0xe1, 0xed, 0xf6, 0x3b, 0xde, 0x86, 0x92, 0xa0, 0x45, 0x54, 0xf4, 0x91, 0x4c, - 0x20, 0xf3, 0x35, 0x09, 0x1c, 0xa5, 0x44, 0x0a, 0xe8, 0x13, 0x78, 0x2f, 0xb1, 0xd0, 0x7a, 0xb2, - 0xb4, 0x1c, 0x4b, 0xe5, 0x28, 0xa5, 0xdd, 0x8c, 0xd7, 0x76, 0x10, 0x97, 0xf9, 0x09, 0x94, 0x2d, - 0x27, 0xf0, 0x66, 0xc6, 0x52, 0x0f, 0x3c, 0x6c, 0xf2, 0xde, 0x96, 0x76, 0x6f, 0xbe, 0xb3, 0x38, - 0x1d, 0x77, 0xa9, 0x95, 0x24, 0x73, 0xe4, 0x61, 0xb3, 0xd1, 0x85, 0x42, 0x98, 0x34, 0x2a, 0x83, - 0x72, 0xc5, 0x4b, 0xce, 0x69, 0xca, 0x15, 0x93, 0x96, 0xbc, 0xd0, 0x9c, 0xa6, 0x2c, 0x99, 0x74, - 0xc9, 0x6b, 0xc8, 0x69, 0xca, 0x25, 0x93, 0xa6, 0x3c, 0x46, 0x4e, 0x53, 0xa6, 0x8d, 0x3f, 0x2a, - 0x90, 0xe5, 0xab, 0xb1, 0xa9, 0x6d, 0xdf, 0x87, 0xac, 0xe1, 0xdb, 0xe1, 0x90, 0xdf, 0xdd, 0x58, - 0x3f, 0xff, 0xd3, 0xf1, 0x6d, 0x8d, 0x53, 0x1b, 0x3f, 0x87, 0xbc, 0x54, 0x6c, 0xf4, 0x78, 0x0b, - 0x72, 0x62, 0x02, 0xd3, 0xb2, 0x25, 0x42, 0x44, 0x77, 0xa0, 0x10, 0x6e, 0x2f, 0x9e, 0x29, 0x83, - 0x22, 0x4d, 0x37, 0x0f, 0x39, 0xc7, 0xf5, 0x16, 0xb4, 0x5b, 0x81, 0x92, 0x68, 0xae, 0xaf, 0xfb, - 0xf8, 0xbc, 0x75, 0x07, 0xb2, 0x9d, 0x2b, 0x27, 0x40, 0x37, 0x21, 0x37, 0x33, 0x26, 0x78, 0x26, - 0x43, 0x09, 0xa1, 0xf5, 0xfb, 0x34, 0x14, 0xba, 0x86, 0xbf, 0x37, 0x35, 0x7c, 0x8a, 0x1e, 0x40, - 0x66, 0x62, 0xf8, 0x9c, 0xb0, 0xb2, 0xc5, 0x43, 0x02, 0xfb, 0xd0, 0x18, 0x85, 0x39, 0xa3, 0x0e, - 0x9d, 0xc9, 0x14, 0x35, 0x21, 0xa0, 0xfb, 0xb0, 0x75, 0xa5, 0x1b, 0x57, 0x4e, 0x20, 0x87, 0xa1, - 0x1a, 0xbb, 0x60, 0x29, 0x68, 0xb9, 0x2b, 0x9e, 0xc9, 0x7d, 0xd8, 0x5a, 0x0a, 0x5a, 0x76, 0x33, - 0x6d, 0xc9, 0xfe, 0x35, 0x7e, 0xa3, 0x40, 0xa6, 0x2b, 0x62, 0x89, 0x76, 0xc8, 0xc4, 0x45, 0x33, - 0xa2, 0x72, 0xd2, 0x89, 0x72, 0xd0, 0x6d, 0x28, 0x04, 0xd4, 0x30, 0x7f, 0xa9, 0x4f, 0x96, 0xa2, - 0x45, 0x5a, 0x9e, 0xcb, 0xdd, 0x25, 0x83, 0x6c, 0x9f, 0x2c, 0x3c, 0x06, 0x89, 0x9d, 0x99, 0xe7, - 0x72, 0x77, 0x89, 0x9a, 0x00, 0x53, 0xe2, 0x3b, 0xbf, 0x26, 0x2e, 0x35, 0x66, 0x7c, 0x10, 0x0b, - 0x5a, 0x42, 0xd3, 0x3a, 0x81, 0xc2, 0xd0, 0xc1, 0xa2, 0x47, 0x1b, 0xdb, 0x18, 0xe7, 0x98, 0x5e, - 0xcb, 0x51, 0x74, 0x29, 0x93, 0xe8, 0x52, 0xeb, 0xb3, 0x34, 0x54, 0x8f, 0x9c, 0x80, 0x12, 0xdb, - 0x37, 0xe6, 0xc2, 0xe9, 0x8f, 0xa1, 0x38, 0x0d, 0x35, 0xb2, 0xfd, 0xad, 0xb8, 0x29, 0xab, 0xe4, - 0x58, 0xd4, 0x62, 0xa3, 0x6f, 0x64, 0x41, 0x7e, 0xa7, 0x40, 0xf1, 0x28, 0x19, 0x71, 0xc3, 0xb2, - 0xd4, 0x21, 0x3f, 0x37, 0xae, 0x26, 0x8e, 0x1b, 0xf0, 0x4c, 0x32, 0x5a, 0x28, 0x72, 0xc4, 0x71, - 0x03, 0x8a, 0x3d, 0x9e, 0x8c, 0xa2, 0x85, 0xe2, 0x5a, 0xfb, 0xb3, 0xeb, 0xed, 0x67, 0x87, 0xa6, - 0xe7, 0xe3, 0x89, 0xe3, 0xea, 0x26, 0x59, 0xb8, 0x54, 0x9c, 0x14, 0x5a, 0x49, 0xe8, 0xf6, 0x98, - 0xaa, 0xf5, 0x0c, 0xe0, 0xd0, 0x58, 0xd8, 0xf1, 0x1a, 0x6d, 0x9e, 0x98, 0x77, 0x5b, 0xd4, 0xfa, - 0x53, 0x06, 0x6a, 0x63, 0x67, 0x8e, 0x03, 0xec, 0x3b, 0x38, 0x10, 0xf6, 0xfb, 0x00, 0x34, 0x52, - 0xc9, 0x1b, 0xef, 0xc3, 0xb8, 0x27, 0x6b, 0xf4, 0x84, 0xac, 0x25, 0xec, 0xbe, 0x91, 0x25, 0xf9, - 0xaf, 0x02, 0x30, 0x5e, 0x09, 0xb9, 0xa1, 0xf0, 0x5b, 0xb0, 0x25, 0x4b, 0x11, 0x99, 0x48, 0x09, - 0x7d, 0x17, 0x6a, 0xe1, 0x66, 0xd1, 0x25, 0x21, 0xc3, 0x9b, 0x5f, 0x91, 0x7b, 0x66, 0x24, 0x78, - 0x3f, 0x82, 0xec, 0x9c, 0x58, 0x98, 0x67, 0x52, 0xdd, 0x7d, 0xf8, 0xff, 0x34, 0xa2, 0xfd, 0x92, - 0x58, 0x58, 0xe3, 0x66, 0xad, 0x13, 0xc8, 0x32, 0x09, 0xa9, 0x50, 0x7e, 0x39, 0xd8, 0xef, 0xe9, - 0x3f, 0xed, 0xff, 0xa4, 0x3f, 0x78, 0xd5, 0x57, 0x53, 0xa8, 0x02, 0x45, 0xae, 0x39, 0x39, 0xee, - 0xf7, 0xd4, 0x34, 0xaa, 0x02, 0x70, 0x71, 0x38, 0x38, 0xee, 0x8f, 0xd5, 0x4c, 0x04, 0x77, 0xb4, - 0x5e, 0x47, 0xcd, 0xb6, 0xb2, 0x05, 0x45, 0x55, 0x5a, 0x73, 0x28, 0x8e, 0xa8, 0x41, 0xc5, 0x42, - 0x3d, 0x86, 0x6c, 0x40, 0x0d, 0x2a, 0xb7, 0x4c, 0xe2, 0xbd, 0x10, 0x51, 0xf8, 0x97, 0xc6, 0x59, - 0x9b, 0x17, 0xa4, 0x71, 0x07, 0xb2, 0x23, 0x89, 0xbe, 0xdb, 0xbb, 0xd6, 0x3d, 0x28, 0x8e, 0xf1, - 0x95, 0x0c, 0x87, 0x20, 0x3b, 0x21, 0xd6, 0x32, 0x3c, 0xac, 0xd9, 0x37, 0x23, 0x9c, 0x62, 0xdb, - 0x88, 0x08, 0xfc, 0x76, 0x92, 0x04, 0xf6, 0xdd, 0x7a, 0x0c, 0xb9, 0x31, 0x7f, 0x9a, 0x7c, 0x07, - 0x2a, 0xf6, 0x82, 0x52, 0xec, 0xeb, 0x26, 0x99, 0x2d, 0xe6, 0xae, 0x64, 0x95, 0x85, 0x72, 0x8f, - 0xeb, 0x5a, 0x9f, 0xe6, 0x20, 0x77, 0xe8, 0x1b, 0xde, 0x14, 0xdd, 0x03, 0xb0, 0x08, 0x5d, 0xe1, - 0x1e, 0xa5, 0xb4, 0xa2, 0x45, 0xa8, 0xa0, 0xa2, 0x03, 0xa8, 0x1a, 0xd6, 0x2f, 0x0c, 0x13, 0xbb, - 0xe6, 0x52, 0x9f, 0x39, 0x01, 0x95, 0xb7, 0x76, 0xe2, 0x0a, 0xe2, 0x9e, 0xda, 0x9d, 0x90, 0x75, - 0xe2, 0x04, 0xf4, 0x28, 0xa5, 0x55, 0x8c, 0xa4, 0x02, 0x3d, 0x06, 0x84, 0x2d, 0x1b, 0xeb, 0x97, - 0xd8, 0xb1, 0xa7, 0x51, 0x40, 0x71, 0x64, 0xa9, 0x0c, 0x79, 0xc5, 0x01, 0x19, 0xf5, 0x31, 0x20, - 0x97, 0x58, 0xeb, 0x6c, 0x71, 0xa0, 0xaa, 0x0c, 0x59, 0x61, 0x3f, 0x82, 0x1b, 0xdc, 0xb7, 0x49, - 0x66, 0x24, 0xaa, 0x5b, 0xec, 0xdf, 0x1a, 0x03, 0xf6, 0x98, 0x5e, 0x72, 0x0f, 0x81, 0xab, 0x74, - 0x3a, 0xf5, 0x71, 0x30, 0x25, 0x33, 0x2b, 0xa8, 0x6f, 0xf1, 0x82, 0x9a, 0xeb, 0x05, 0xf5, 0x2c, - 0x1b, 0x8f, 0x23, 0x96, 0x56, 0xc5, 0x2b, 0x32, 0x9b, 0x6b, 0xee, 0x68, 0x4a, 0x2e, 0xb0, 0xaf, - 0x3b, 0xee, 0x39, 0xa9, 0xe7, 0xf9, 0x3b, 0xab, 0xc2, 0xd4, 0x47, 0x4c, 0x7b, 0xec, 0x9e, 0x13, - 0xf6, 0xb6, 0xe2, 0xbc, 0x19, 0x76, 0x6d, 0x3a, 0xad, 0x17, 0xf8, 0x79, 0x05, 0x4c, 0x75, 0xc2, - 0x35, 0xe8, 0x19, 0xd4, 0xb1, 0xcb, 0xd6, 0x4e, 0x0f, 0x5f, 0x86, 0x53, 0x07, 0xfb, 0x86, 0x6f, - 0x4e, 0x97, 0xf5, 0x22, 0xdf, 0x29, 0xb7, 0x04, 0xbe, 0x2f, 0xe0, 0xa3, 0x10, 0x6d, 0xbc, 0x84, - 0xca, 0x4a, 0xd7, 0x59, 0xac, 0x73, 0x9f, 0xcc, 0x57, 0x97, 0x1e, 0x98, 0x4a, 0x56, 0xff, 0x3e, - 0x14, 0x29, 0x09, 0x61, 0x31, 0xa0, 0x05, 0x4a, 0x04, 0xd8, 0x98, 0x40, 0x75, 0xb5, 0x66, 0xf4, - 0x10, 0xd4, 0x39, 0xb6, 0x9c, 0xc5, 0x3c, 0x6e, 0x17, 0x77, 0x9a, 0xd1, 0x6a, 0x42, 0x1f, 0x71, - 0xd1, 0x7d, 0xa8, 0x4e, 0x1d, 0x7b, 0x9a, 0x20, 0x8a, 0x93, 0xb9, 0xc2, 0xb4, 0x11, 0x2d, 0x7a, - 0x3f, 0xb4, 0xfe, 0x9e, 0x83, 0xb2, 0x86, 0x7f, 0xb5, 0xc0, 0x01, 0x15, 0x93, 0xf8, 0x04, 0x6e, - 0xfa, 0x42, 0x26, 0xbe, 0xee, 0x11, 0x6b, 0xb5, 0x08, 0x14, 0x61, 0x43, 0x62, 0xc9, 0x62, 0xb8, - 0x45, 0xe0, 0x11, 0xd7, 0xc2, 0x2b, 0x16, 0xe9, 0xd0, 0x42, 0x62, 0xb1, 0xc5, 0x33, 0xa8, 0xc7, - 0x31, 0x02, 0xec, 0x5f, 0x38, 0x26, 0x5e, 0x1d, 0xc5, 0x5b, 0x11, 0x3e, 0x12, 0x70, 0xd2, 0x32, - 0x8c, 0xb5, 0x66, 0x99, 0x0d, 0x2d, 0x25, 0xbe, 0x6a, 0xb9, 0x93, 0xac, 0xcb, 0xd1, 0xbd, 0xd0, - 0xaa, 0xc2, 0xad, 0x6e, 0x44, 0xd8, 0xf1, 0x30, 0x69, 0x10, 0x86, 0x4a, 0x18, 0x54, 0x43, 0x03, - 0x89, 0x45, 0x06, 0x77, 0x01, 0xbc, 0xa7, 0x4f, 0x56, 0xe7, 0xbe, 0xe8, 0x3d, 0x7d, 0x92, 0x80, - 0x9f, 0x47, 0xf0, 0x96, 0x84, 0x9f, 0xaf, 0xc0, 0xcf, 0x43, 0x38, 0x1f, 0xc2, 0xcf, 0x13, 0x7b, - 0xcb, 0xf7, 0xd9, 0x2b, 0xcf, 0xa0, 0x51, 0xc5, 0x05, 0xb9, 0xb7, 0x18, 0xa0, 0x19, 0x34, 0x2c, - 0xf5, 0x05, 0x34, 0x64, 0x39, 0x81, 0xee, 0xf1, 0x3e, 0x99, 0xc4, 0x8d, 0x96, 0xa5, 0xc8, 0x8d, - 0xde, 0x0b, 0x19, 0x43, 0xd6, 0x28, 0x86, 0x4b, 0xe3, 0x7d, 0xb8, 0xe7, 0xb8, 0x13, 0xb2, 0x70, - 0x2d, 0x7d, 0xb2, 0xa4, 0x78, 0x93, 0x07, 0xe0, 0x1e, 0xde, 0x97, 0xb4, 0x2e, 0x63, 0xad, 0x7b, - 0x39, 0x80, 0x6d, 0xb2, 0xa0, 0x5f, 0xef, 0xa6, 0xc4, 0xdd, 0xdc, 0x09, 0x79, 0x1b, 0xfd, 0xbc, - 0x80, 0x06, 0x25, 0xd4, 0x98, 0xe9, 0x32, 0x5d, 0xf1, 0x28, 0x08, 0x3d, 0x94, 0x45, 0x29, 0x9c, - 0x21, 0x87, 0x98, 0xbf, 0x10, 0xe4, 0xf1, 0xfa, 0x55, 0x1a, 0x6e, 0x8e, 0xd8, 0xe5, 0x36, 0xf6, - 0x0d, 0x13, 0x1f, 0xcc, 0x8c, 0x39, 0x16, 0x33, 0xfe, 0x11, 0xdc, 0xe0, 0x97, 0x1e, 0x65, 0xfa, - 0xd5, 0x01, 0x57, 0x63, 0x40, 0xa6, 0xf0, 0x01, 0x94, 0x57, 0x82, 0x8a, 0xb1, 0x2e, 0x99, 0x71, - 0x20, 0xe6, 0xcf, 0xc3, 0xbe, 0x89, 0x5d, 0x6a, 0xd8, 0x6b, 0x83, 0xac, 0xc6, 0x80, 0x24, 0x3f, - 0x04, 0x95, 0x3d, 0xfc, 0x03, 0xcf, 0x58, 0x1f, 0xdd, 0x5a, 0xa4, 0x4f, 0xcc, 0x44, 0xbc, 0x9f, - 0xc2, 0x89, 0x8a, 0xb6, 0xd1, 0x43, 0x50, 0x4d, 0xf6, 0x68, 0x72, 0xdc, 0xf8, 0x9a, 0x11, 0x73, - 0x55, 0x8b, 0xf4, 0x09, 0x4f, 0x8e, 0xb5, 0x3e, 0x5d, 0x4e, 0xe8, 0xe9, 0x1e, 0x94, 0xf8, 0x39, - 0xbf, 0x32, 0x57, 0xc0, 0x54, 0x71, 0xa8, 0x44, 0x85, 0xe2, 0x4d, 0x2c, 0x06, 0xa9, 0x16, 0xeb, - 0x4f, 0x98, 0xfa, 0xd1, 0x5f, 0x14, 0xd8, 0x12, 0xbf, 0xb5, 0xd9, 0x1d, 0x3f, 0x3c, 0x4b, 0x3c, - 0x01, 0x84, 0xdc, 0x1d, 0x0c, 0x4e, 0x7a, 0x9d, 0xbe, 0xaa, 0xa0, 0x32, 0x14, 0x86, 0x67, 0xfa, - 0x71, 0x7f, 0xfc, 0xc3, 0x8f, 0xc5, 0x8b, 0x60, 0x78, 0xa6, 0x1f, 0x9c, 0x0c, 0x3a, 0x4c, 0xe6, - 0x2f, 0x82, 0xe1, 0x99, 0x3e, 0x1a, 0x6b, 0xc7, 0xfd, 0x43, 0x35, 0x8b, 0x6a, 0x1c, 0x1e, 0xf5, - 0xb4, 0xd3, 0xe3, 0xbd, 0x9e, 0xfa, 0x45, 0x1e, 0x95, 0x58, 0x1c, 0x7d, 0x38, 0xd8, 0x57, 0xff, - 0x99, 0x47, 0x37, 0xa0, 0x3c, 0x3c, 0xd3, 0xf7, 0x06, 0xfd, 0x71, 0xe7, 0xb8, 0xdf, 0xd3, 0xd4, - 0x7f, 0x85, 0xaa, 0x7e, 0xe7, 0x65, 0x6f, 0x34, 0xec, 0xec, 0xf5, 0xd4, 0x7f, 0xe7, 0x51, 0x19, - 0xf2, 0x4c, 0x35, 0xd8, 0xef, 0xa9, 0xff, 0x09, 0xa5, 0x93, 0xe3, 0xd1, 0x58, 0x7d, 0x5d, 0x43, - 0xdf, 0x82, 0x6a, 0x14, 0x4e, 0x28, 0x3f, 0xab, 0x75, 0x5f, 0xbc, 0x7e, 0xd3, 0x4c, 0x7d, 0xfe, - 0xa6, 0x99, 0xfa, 0xf2, 0x4d, 0x53, 0xf9, 0xf4, 0xba, 0xa9, 0xfc, 0xe1, 0xba, 0xa9, 0xfc, 0xf9, - 0xba, 0xa9, 0xbc, 0xbe, 0x6e, 0x2a, 0xff, 0xb8, 0x6e, 0x2a, 0x5f, 0x5c, 0x37, 0x53, 0x5f, 0x5e, - 0x37, 0x95, 0xdf, 0xbe, 0x6d, 0xa6, 0x5e, 0xbf, 0x6d, 0xa6, 0x3e, 0x7f, 0xdb, 0x4c, 0xfd, 0x2c, - 0xc7, 0xef, 0xaf, 0xc9, 0x16, 0xff, 0xa1, 0xfa, 0x83, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0e, - 0x3d, 0x01, 0xc0, 0xee, 0x11, 0x00, 0x00, + 0x15, 0x76, 0xb5, 0xed, 0xb6, 0x7d, 0xfc, 0xaa, 0x5c, 0x42, 0xc6, 0xe3, 0x49, 0x9c, 0x1e, 0x33, + 0x41, 0xdd, 0x49, 0x70, 0x87, 0x66, 0xc2, 0x24, 0x8a, 0x90, 0xb0, 0xbb, 0xdd, 0x0f, 0xd1, 0xb1, + 0xad, 0xb2, 0xe9, 0xb4, 0x10, 0x52, 0xa9, 0x5c, 0x75, 0xbb, 0x5c, 0x60, 0xd7, 0x2d, 0xaa, 0xae, + 0xbb, 0xdb, 0xac, 0x66, 0xc7, 0x96, 0x25, 0x4b, 0xc4, 0x0a, 0x09, 0xf1, 0x3f, 0x10, 0x02, 0x29, + 0xb3, 0x1b, 0x76, 0xa4, 0xb3, 0x19, 0x1e, 0x12, 0x23, 0xf1, 0x07, 0xd0, 0x7d, 0xd4, 0xc3, 0x8e, + 0x35, 0x62, 0x35, 0x9b, 0xee, 0x3a, 0xe7, 0xfb, 0xce, 0xf3, 0x9e, 0x5b, 0x75, 0x0c, 0xf7, 0x02, + 0xdf, 0xdc, 0x35, 0x3c, 0x67, 0xd7, 0xf3, 0x09, 0x25, 0xbb, 0x97, 0x4e, 0xe0, 0x8d, 0xd9, 0xdf, + 0x16, 0x97, 0x51, 0xde, 0xbb, 0x6e, 0x71, 0x5d, 0xfd, 0x7d, 0x9b, 0x10, 0x7b, 0x8a, 0x05, 0x6f, + 0x3c, 0xbf, 0xd8, 0x35, 0xdc, 0x85, 0x20, 0xd5, 0x1b, 0xab, 0xd0, 0x95, 0x6f, 0x78, 0x1e, 0xf6, + 0xa5, 0x93, 0xfa, 0x77, 0x6c, 0x87, 0x4e, 0xe6, 0xe3, 0x96, 0x49, 0x66, 0xbb, 0x36, 0xb1, 0x49, + 0x4c, 0x64, 0x92, 0x08, 0xcc, 0x9e, 0x04, 0xbd, 0xf9, 0xd7, 0x34, 0xa4, 0xcf, 0x9c, 0x00, 0x7d, + 0x0c, 0x85, 0x4b, 0xc3, 0x77, 0x8c, 0xf1, 0x14, 0x07, 0x35, 0x65, 0x2b, 0xbd, 0x5d, 0xdc, 0xbb, + 0xd3, 0x0a, 0xf3, 0x69, 0x9d, 0x39, 0x41, 0xeb, 0x4c, 0xc2, 0x5a, 0x4c, 0x44, 0x0f, 0x21, 0x77, + 0xe5, 0x58, 0x36, 0xa6, 0x41, 0x6d, 0x83, 0xdb, 0xa8, 0xb1, 0xcd, 0x2b, 0x0e, 0x68, 0x21, 0x01, + 0xbd, 0x80, 0x92, 0x3d, 0x25, 0x63, 0x63, 0xaa, 0x5f, 0xcc, 0x5d, 0x33, 0xa8, 0xa5, 0xb9, 0x41, + 0x6d, 0x39, 0xc8, 0x11, 0x67, 0x1c, 0xce, 0x5d, 0x53, 0x2b, 0xda, 0xd1, 0x73, 0x50, 0xff, 0x8b, + 0x02, 0xf9, 0x30, 0x01, 0x84, 0x20, 0xe3, 0x1a, 0x33, 0x5c, 0x53, 0xb6, 0x94, 0xed, 0x82, 0xc6, + 0x9f, 0xd1, 0x47, 0x90, 0xa1, 0x0b, 0x0f, 0xd7, 0x36, 0xb6, 0x94, 0xed, 0x4a, 0x32, 0x8d, 0xc1, + 0xf9, 0x68, 0xe1, 0x61, 0x8d, 0xa3, 0xa8, 0x0d, 0x65, 0x0b, 0x5f, 0x18, 0xf3, 0x29, 0xd5, 0x2f, + 0x8d, 0xe9, 0x1c, 0xd7, 0xd2, 0x5b, 0xca, 0x76, 0x71, 0xef, 0x6e, 0x4b, 0x34, 0xb5, 0x15, 0xf6, + 0xaa, 0x35, 0xa4, 0xbe, 0xe3, 0xda, 0x67, 0x8c, 0xa3, 0x95, 0xa4, 0x09, 0x97, 0xd0, 0x16, 0x14, + 0x2d, 0x1c, 0x98, 0xbe, 0xe3, 0x51, 0x87, 0xb8, 0xb5, 0x0c, 0xcf, 0x21, 0xa9, 0x42, 0x1f, 0x42, + 0xe9, 0xd2, 0x98, 0x3a, 0x96, 0x08, 0x11, 0xd4, 0xb2, 0x5b, 0x69, 0x46, 0xe1, 0x3a, 0xee, 0x23, + 0xa8, 0x9f, 0x03, 0xc4, 0x95, 0xa2, 0xfb, 0x50, 0x24, 0x73, 0xea, 0xcd, 0xa9, 0x9e, 0x28, 0x0b, + 0x84, 0xaa, 0xc7, 0x8a, 0xdb, 0x81, 0x0c, 0xeb, 0x19, 0x2f, 0xae, 0xb8, 0xf7, 0xcd, 0xd5, 0x1e, + 0xb7, 0x78, 0xbf, 0x38, 0xa5, 0xf9, 0xdf, 0x34, 0x6c, 0x0a, 0xed, 0xda, 0x36, 0x3d, 0x85, 0xbc, + 0x47, 0x02, 0x87, 0xa7, 0x2e, 0xbc, 0xbd, 0xff, 0x8e, 0xb7, 0x81, 0x24, 0x68, 0x11, 0x15, 0x3d, + 0x92, 0x09, 0xa4, 0xbf, 0x22, 0x81, 0xe3, 0x94, 0x48, 0x01, 0x7d, 0x02, 0xef, 0x25, 0x0e, 0x5a, + 0x4f, 0x96, 0x96, 0x65, 0xa9, 0x1c, 0xa7, 0xb4, 0xdb, 0xf1, 0xd9, 0xf6, 0xe3, 0x32, 0x3f, 0x81, + 0x92, 0xe5, 0x04, 0xde, 0xd4, 0x58, 0xe8, 0x81, 0x87, 0x4d, 0xde, 0xdb, 0xe2, 0xde, 0xed, 0x77, + 0x0e, 0xa7, 0xed, 0x2e, 0xb4, 0xa2, 0x64, 0x0e, 0x3d, 0x6c, 0xd6, 0x3b, 0x90, 0x0f, 0x93, 0x46, + 0x25, 0x50, 0xae, 0x79, 0xc9, 0x59, 0x4d, 0xb9, 0x66, 0xd2, 0x82, 0x17, 0x9a, 0xd5, 0x94, 0x05, + 0x93, 0xae, 0x78, 0x0d, 0x59, 0x4d, 0xb9, 0x62, 0xd2, 0x84, 0xc7, 0xc8, 0x6a, 0xca, 0xa4, 0xfe, + 0x07, 0x05, 0x32, 0xfc, 0x34, 0xd6, 0xb5, 0xed, 0xbb, 0x90, 0x31, 0x7c, 0x3b, 0x1c, 0xf2, 0x7b, + 0x6b, 0xeb, 0xe7, 0x7f, 0xda, 0xbe, 0xad, 0x71, 0x6a, 0xfd, 0xa7, 0x90, 0x93, 0x8a, 0xb5, 0x1e, + 0xef, 0x40, 0x56, 0x4c, 0xe0, 0x86, 0x6c, 0x89, 0x10, 0xd1, 0x5d, 0xc8, 0x87, 0xd7, 0x8b, 0x67, + 0xca, 0xa0, 0x48, 0xd3, 0xc9, 0x41, 0xd6, 0x71, 0xbd, 0x39, 0xed, 0x94, 0xa1, 0x28, 0x9a, 0xeb, + 0xeb, 0x3e, 0xbe, 0x68, 0xde, 0x85, 0x4c, 0xfb, 0xda, 0x09, 0xd0, 0x6d, 0xc8, 0x4e, 0x8d, 0x31, + 0x9e, 0xca, 0x50, 0x42, 0x68, 0xfe, 0x6e, 0x03, 0xf2, 0x1d, 0xc3, 0xdf, 0x9f, 0x18, 0x3e, 0x45, + 0xdb, 0x90, 0x1e, 0x1b, 0x3e, 0x27, 0x2c, 0x5d, 0xf1, 0x90, 0xc0, 0x1e, 0x34, 0x46, 0x61, 0xce, + 0xa8, 0x43, 0xa7, 0x32, 0x45, 0x4d, 0x08, 0xe8, 0x01, 0x6c, 0x5e, 0xeb, 0xc6, 0xb5, 0x13, 0xc8, + 0x61, 0xa8, 0xc4, 0x2e, 0x58, 0x0a, 0x5a, 0xf6, 0x9a, 0x67, 0xf2, 0x00, 0x36, 0x17, 0x82, 0x96, + 0x59, 0x4f, 0x5b, 0xb0, 0x7f, 0xf5, 0x5f, 0x29, 0x90, 0xee, 0x88, 0x58, 0xa2, 0x1d, 0x32, 0x71, + 0xd1, 0x8c, 0xa8, 0x9c, 0x8d, 0x44, 0x39, 0xe8, 0x7d, 0xc8, 0x07, 0xd4, 0x30, 0x7f, 0xae, 0x8f, + 0x17, 0xa2, 0x45, 0x5a, 0x8e, 0xcb, 0x9d, 0x05, 0x83, 0x6c, 0x9f, 0xcc, 0x3d, 0x06, 0x89, 0x9b, + 0x99, 0xe3, 0x72, 0x67, 0x81, 0x1a, 0x00, 0x13, 0xe2, 0x3b, 0xbf, 0x24, 0x2e, 0x35, 0xa6, 0x7c, + 0x10, 0xf3, 0x5a, 0x42, 0xd3, 0x3c, 0x85, 0xfc, 0xc0, 0xc1, 0xa2, 0x47, 0x6b, 0xdb, 0x18, 0xe7, + 0xb8, 0xb1, 0x92, 0xa3, 0xe8, 0x52, 0x3a, 0xd1, 0xa5, 0xe6, 0x67, 0x1b, 0x50, 0x39, 0x76, 0x02, + 0x4a, 0x6c, 0xdf, 0x98, 0x09, 0xa7, 0x3f, 0x84, 0xc2, 0x24, 0xd4, 0xc8, 0xf6, 0x37, 0xe3, 0xa6, + 0x2c, 0x93, 0x63, 0x51, 0x8b, 0x8d, 0xbe, 0x96, 0x03, 0xf9, 0x8d, 0x02, 0x85, 0xe3, 0x64, 0xc4, + 0x35, 0xc7, 0x52, 0x83, 0xdc, 0xcc, 0xb8, 0x1e, 0x3b, 0x6e, 0xc0, 0x33, 0x49, 0x6b, 0xa1, 0xc8, + 0x11, 0xc7, 0x0d, 0x28, 0xf6, 0x78, 0x32, 0x8a, 0x16, 0x8a, 0x2b, 0xed, 0xcf, 0xac, 0xb6, 0x9f, + 0xbd, 0x34, 0x3d, 0x1f, 0x8f, 0x1d, 0x57, 0x37, 0xc9, 0xdc, 0xa5, 0xe2, 0x4d, 0xa1, 0x15, 0x85, + 0x6e, 0x9f, 0xa9, 0x9a, 0xcf, 0x00, 0x8e, 0x8c, 0xb9, 0x1d, 0x9f, 0xd1, 0xfa, 0x89, 0x79, 0xb7, + 0x45, 0xcd, 0x3f, 0xa6, 0xa1, 0x3a, 0x72, 0x66, 0x38, 0xc0, 0xbe, 0x83, 0x03, 0x61, 0x7f, 0x00, + 0x40, 0x23, 0x95, 0xfc, 0xe2, 0x7d, 0x14, 0xf7, 0x64, 0x85, 0x9e, 0x90, 0xb5, 0x84, 0xdd, 0xd7, + 0x72, 0x24, 0xff, 0x51, 0x00, 0x46, 0x4b, 0x21, 0xd7, 0x14, 0x7e, 0x07, 0x36, 0x65, 0x29, 0x22, + 0x13, 0x29, 0xa1, 0x6f, 0x43, 0x35, 0xbc, 0x2c, 0xba, 0x24, 0xa4, 0x79, 0xf3, 0xcb, 0xf2, 0xce, + 0x0c, 0x05, 0xef, 0x07, 0x90, 0x99, 0x11, 0x0b, 0xf3, 0x4c, 0x2a, 0x7b, 0x3b, 0xff, 0x4f, 0x23, + 0x5a, 0x2f, 0x89, 0x85, 0x35, 0x6e, 0xd6, 0x3c, 0x85, 0x0c, 0x93, 0x90, 0x0a, 0xa5, 0x97, 0xfd, + 0x83, 0xae, 0xfe, 0xe3, 0xde, 0x8f, 0x7a, 0xfd, 0x57, 0x3d, 0x35, 0x85, 0xca, 0x50, 0xe0, 0x9a, + 0xd3, 0x93, 0x5e, 0x57, 0xdd, 0x40, 0x15, 0x00, 0x2e, 0x0e, 0xfa, 0x27, 0xbd, 0x91, 0x9a, 0x8e, + 0xe0, 0xb6, 0xd6, 0x6d, 0xab, 0x99, 0x66, 0x26, 0xaf, 0xa8, 0x4a, 0x73, 0x06, 0x85, 0x21, 0x35, + 0xa8, 0x38, 0xa8, 0xc7, 0x90, 0x09, 0xa8, 0x41, 0xe5, 0x95, 0x49, 0xec, 0x0b, 0x11, 0x85, 0x3f, + 0x69, 0x9c, 0xb5, 0xfe, 0x40, 0xea, 0x77, 0x21, 0x33, 0x94, 0xe8, 0xbb, 0xbd, 0x6b, 0xde, 0x87, + 0xc2, 0x08, 0x5f, 0xcb, 0x70, 0x08, 0x32, 0x63, 0x62, 0x2d, 0xc2, 0x97, 0x35, 0x7b, 0x66, 0x84, + 0x33, 0x6c, 0x1b, 0x11, 0x81, 0x7f, 0x9d, 0x24, 0x81, 0x3d, 0x37, 0x1f, 0x43, 0x76, 0xc4, 0x57, + 0x93, 0x6f, 0x41, 0xd9, 0x9e, 0x53, 0x8a, 0x7d, 0xdd, 0x24, 0xd3, 0xf9, 0xcc, 0x95, 0xac, 0x92, + 0x50, 0xee, 0x73, 0x5d, 0xf3, 0xd3, 0x2c, 0x64, 0x8f, 0x7c, 0xc3, 0x9b, 0xa0, 0xfb, 0x00, 0x16, + 0xa1, 0x4b, 0xdc, 0xe3, 0x94, 0x56, 0xb0, 0x08, 0x15, 0x54, 0x74, 0x08, 0x15, 0xc3, 0xfa, 0x99, + 0x61, 0x62, 0xd7, 0x5c, 0xe8, 0x53, 0x27, 0xa0, 0xf2, 0xab, 0x9d, 0xf8, 0x04, 0x71, 0x4f, 0xad, + 0x76, 0xc8, 0x3a, 0x75, 0x02, 0x7a, 0x9c, 0xd2, 0xca, 0x46, 0x52, 0x81, 0x1e, 0x03, 0xc2, 0x96, + 0x8d, 0xf5, 0x2b, 0xec, 0xd8, 0x93, 0x28, 0xa0, 0x78, 0x65, 0xa9, 0x0c, 0x79, 0xc5, 0x01, 0x19, + 0xf5, 0x31, 0x20, 0x97, 0x58, 0xab, 0x6c, 0xf1, 0x42, 0x55, 0x19, 0xb2, 0xc4, 0x7e, 0x08, 0xb7, + 0xb8, 0x6f, 0x93, 0x4c, 0x49, 0x54, 0xb7, 0xb8, 0xbf, 0x55, 0x06, 0xec, 0x33, 0xbd, 0xe4, 0x1e, + 0x01, 0x57, 0xe9, 0x74, 0xe2, 0xe3, 0x60, 0x42, 0xa6, 0x56, 0x50, 0xdb, 0xe4, 0x05, 0x35, 0x56, + 0x0b, 0xea, 0x5a, 0x36, 0x1e, 0x45, 0x2c, 0xad, 0x82, 0x97, 0x64, 0x36, 0xd7, 0xdc, 0xd1, 0x84, + 0x5c, 0x62, 0x5f, 0x77, 0xdc, 0x0b, 0x52, 0xcb, 0xf1, 0x3d, 0xab, 0xcc, 0xd4, 0xc7, 0x4c, 0x7b, + 0xe2, 0x5e, 0x10, 0xb6, 0x5b, 0x71, 0xde, 0x14, 0xbb, 0x36, 0x9d, 0xd4, 0xf2, 0xfc, 0x7d, 0x05, + 0x4c, 0x75, 0xca, 0x35, 0xe8, 0x19, 0xd4, 0xb0, 0xcb, 0xce, 0x4e, 0x0f, 0x37, 0xc3, 0x89, 0x83, + 0x7d, 0xc3, 0x37, 0x27, 0x8b, 0x5a, 0x81, 0xdf, 0x94, 0x3b, 0x02, 0x3f, 0x10, 0xf0, 0x71, 0x88, + 0xd6, 0x5f, 0x42, 0x79, 0xa9, 0xeb, 0x2c, 0xd6, 0x85, 0x4f, 0x66, 0xcb, 0x47, 0x0f, 0x4c, 0x25, + 0xab, 0xff, 0x00, 0x0a, 0x94, 0x84, 0xb0, 0x18, 0xd0, 0x3c, 0x25, 0x02, 0xac, 0x8f, 0xa1, 0xb2, + 0x5c, 0x33, 0xda, 0x01, 0x75, 0x86, 0x2d, 0x67, 0x3e, 0x8b, 0xdb, 0xc5, 0x9d, 0xa6, 0xb5, 0xaa, + 0xd0, 0x47, 0x5c, 0xf4, 0x00, 0x2a, 0x13, 0xc7, 0x9e, 0x24, 0x88, 0xe2, 0xcd, 0x5c, 0x66, 0xda, + 0x88, 0x16, 0xed, 0x0f, 0xcd, 0xbf, 0x65, 0xa1, 0xa4, 0xe1, 0x5f, 0xcc, 0x71, 0x40, 0xc5, 0x24, + 0x3e, 0x81, 0xdb, 0xbe, 0x90, 0x89, 0xaf, 0x7b, 0xc4, 0x5a, 0x2e, 0x02, 0x45, 0xd8, 0x80, 0x58, + 0xb2, 0x18, 0x6e, 0x11, 0x78, 0xc4, 0xb5, 0xf0, 0x92, 0xc5, 0x46, 0x68, 0x21, 0xb1, 0xd8, 0xe2, + 0x19, 0xd4, 0xe2, 0x18, 0x01, 0xf6, 0x2f, 0x1d, 0x13, 0x2f, 0x8f, 0xe2, 0x9d, 0x08, 0x1f, 0x0a, + 0x38, 0x69, 0x19, 0xc6, 0x5a, 0xb1, 0xcc, 0x84, 0x96, 0x12, 0x5f, 0xb6, 0xdc, 0x4d, 0xd6, 0xe5, + 0xe8, 0x5e, 0x68, 0x55, 0xe6, 0x56, 0xb7, 0x22, 0xec, 0x64, 0x90, 0x34, 0x08, 0x43, 0x25, 0x0c, + 0x2a, 0xa1, 0x81, 0xc4, 0x22, 0x83, 0x7b, 0x00, 0xde, 0xd3, 0x27, 0xcb, 0x73, 0x5f, 0xf0, 0x9e, + 0x3e, 0x49, 0xc0, 0xcf, 0x23, 0x78, 0x53, 0xc2, 0xcf, 0x97, 0xe0, 0xe7, 0x21, 0x9c, 0x0b, 0xe1, + 0xe7, 0x89, 0xbb, 0xe5, 0xfb, 0x6c, 0xcb, 0x33, 0x68, 0x54, 0x71, 0x5e, 0xde, 0x2d, 0x06, 0x68, + 0x06, 0x0d, 0x4b, 0x7d, 0x01, 0x75, 0x59, 0x4e, 0xa0, 0x7b, 0xbc, 0x4f, 0x26, 0x71, 0xa3, 0x63, + 0x29, 0x70, 0xa3, 0xf7, 0x42, 0xc6, 0x80, 0x35, 0x8a, 0xe1, 0xd2, 0xf8, 0x00, 0xee, 0x3b, 0xee, + 0x98, 0xcc, 0x5d, 0x4b, 0x1f, 0x2f, 0x28, 0x5e, 0xe7, 0x01, 0xb8, 0x87, 0x0f, 0x24, 0xad, 0xc3, + 0x58, 0xab, 0x5e, 0x0e, 0x61, 0x8b, 0xcc, 0xe9, 0x57, 0xbb, 0x29, 0x72, 0x37, 0x77, 0x43, 0xde, + 0x5a, 0x3f, 0x2f, 0xa0, 0x4e, 0x09, 0x35, 0xa6, 0xba, 0x4c, 0x57, 0x2c, 0x05, 0xa1, 0x87, 0x92, + 0x28, 0x85, 0x33, 0xe4, 0x10, 0xf3, 0x0d, 0x41, 0xbe, 0x5e, 0x7f, 0x9b, 0x86, 0xdb, 0x43, 0xf6, + 0x71, 0x1b, 0xf9, 0x86, 0x89, 0x0f, 0xa7, 0xc6, 0x0c, 0x8b, 0x19, 0x7f, 0x04, 0xb7, 0xf8, 0x47, + 0x8f, 0x32, 0xfd, 0xf2, 0x80, 0xab, 0x31, 0x20, 0x53, 0xf8, 0x10, 0x4a, 0x4b, 0x41, 0xc5, 0x58, + 0x17, 0xcd, 0x38, 0x10, 0xf3, 0xe7, 0x61, 0xdf, 0xc4, 0x2e, 0x35, 0xec, 0x95, 0x41, 0x56, 0x63, + 0x40, 0x92, 0x77, 0x40, 0x65, 0x8b, 0x7f, 0xe0, 0x19, 0xab, 0xa3, 0x5b, 0x8d, 0xf4, 0x89, 0x99, + 0x88, 0xef, 0x53, 0x38, 0x51, 0xd1, 0x35, 0xda, 0x01, 0xd5, 0x64, 0x4b, 0x93, 0xe3, 0xc6, 0x9f, + 0x19, 0x31, 0x57, 0xd5, 0x48, 0x9f, 0xf0, 0xe4, 0x58, 0xab, 0xd3, 0xe5, 0x84, 0x9e, 0xee, 0x43, + 0x91, 0xbf, 0xe7, 0x97, 0xe6, 0x0a, 0x98, 0x2a, 0x0e, 0x95, 0xa8, 0x50, 0xec, 0xc4, 0x62, 0x90, + 0xaa, 0xb1, 0xfe, 0x94, 0x6f, 0xc7, 0x8f, 0xe0, 0x96, 0xe5, 0x5c, 0x5c, 0x60, 0x1f, 0xbb, 0x71, + 0x81, 0x62, 0x64, 0xd4, 0x18, 0x10, 0x7e, 0x1f, 0xfe, 0x59, 0x81, 0x4d, 0xf1, 0xc3, 0x9c, 0x2d, + 0x04, 0x83, 0xf3, 0xc4, 0xbe, 0x20, 0xe4, 0x4e, 0xbf, 0x7f, 0xda, 0x6d, 0xf7, 0x54, 0x05, 0x95, + 0x20, 0x3f, 0x38, 0xd7, 0x4f, 0x7a, 0xa3, 0xef, 0x7f, 0x2c, 0xd6, 0x87, 0xc1, 0xb9, 0x7e, 0x78, + 0xda, 0x6f, 0x33, 0x99, 0xaf, 0x0f, 0x83, 0x73, 0x7d, 0x38, 0xd2, 0x4e, 0x7a, 0x47, 0x6a, 0x06, + 0x55, 0x39, 0x3c, 0xec, 0x6a, 0x67, 0x27, 0xfb, 0x5d, 0xf5, 0x8b, 0x1c, 0x2a, 0xb2, 0x38, 0xfa, + 0xa0, 0x7f, 0xa0, 0xfe, 0x23, 0x87, 0x6e, 0x41, 0x69, 0x70, 0xae, 0xef, 0xf7, 0x7b, 0xa3, 0xf6, + 0x49, 0xaf, 0xab, 0xa9, 0xff, 0x0c, 0x55, 0xbd, 0xf6, 0xcb, 0xee, 0x70, 0xd0, 0xde, 0xef, 0xaa, + 0xff, 0xca, 0xa1, 0x12, 0xe4, 0x98, 0xaa, 0x7f, 0xd0, 0x55, 0xff, 0x1d, 0x4a, 0xa7, 0x27, 0xc3, + 0x91, 0xfa, 0xba, 0x8a, 0xbe, 0x01, 0x95, 0x28, 0x9c, 0x50, 0x7e, 0x56, 0xed, 0xbc, 0x78, 0xfd, + 0xa6, 0x91, 0xfa, 0xfc, 0x4d, 0x23, 0xf5, 0xe5, 0x9b, 0x86, 0xf2, 0xe9, 0x4d, 0x43, 0xf9, 0xfd, + 0x4d, 0x43, 0xf9, 0xd3, 0x4d, 0x43, 0x79, 0x7d, 0xd3, 0x50, 0xfe, 0x7e, 0xd3, 0x50, 0xbe, 0xb8, + 0x69, 0xa4, 0xbe, 0xbc, 0x69, 0x28, 0xbf, 0x7e, 0xdb, 0x48, 0xbd, 0x7e, 0xdb, 0x48, 0x7d, 0xfe, + 0xb6, 0x91, 0xfa, 0x49, 0x96, 0x7f, 0xec, 0xc6, 0x9b, 0xfc, 0x57, 0xed, 0xf7, 0xfe, 0x17, 0x00, + 0x00, 0xff, 0xff, 0xbc, 0x69, 0x0a, 0x41, 0x1b, 0x12, 0x00, 0x00, } func (x PXType) String() string { @@ -3104,6 +3113,9 @@ func (this *StackTraceFlameGraph) Equal(that interface{}) bool { if this.PercentageLabel != that1.PercentageLabel { return false } + if this.DifferenceColumn != that1.DifferenceColumn { + return false + } return true } func (this *Vis) GoString() string { @@ -3513,7 +3525,7 @@ func (this *StackTraceFlameGraph) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 13) + s := make([]string, 0, 14) s = append(s, "&vispb.StackTraceFlameGraph{") s = append(s, "StacktraceColumn: "+fmt.Sprintf("%#v", this.StacktraceColumn)+",\n") s = append(s, "CountColumn: "+fmt.Sprintf("%#v", this.CountColumn)+",\n") @@ -3524,6 +3536,7 @@ func (this *StackTraceFlameGraph) GoString() string { s = append(s, "PidColumn: "+fmt.Sprintf("%#v", this.PidColumn)+",\n") s = append(s, "NodeColumn: "+fmt.Sprintf("%#v", this.NodeColumn)+",\n") s = append(s, "PercentageLabel: "+fmt.Sprintf("%#v", this.PercentageLabel)+",\n") + s = append(s, "DifferenceColumn: "+fmt.Sprintf("%#v", this.DifferenceColumn)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -4936,6 +4949,13 @@ func (m *StackTraceFlameGraph) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.DifferenceColumn) > 0 { + i -= len(m.DifferenceColumn) + copy(dAtA[i:], m.DifferenceColumn) + i = encodeVarintVis(dAtA, i, uint64(len(m.DifferenceColumn))) + i-- + dAtA[i] = 0x52 + } if len(m.PercentageLabel) > 0 { i -= len(m.PercentageLabel) copy(dAtA[i:], m.PercentageLabel) @@ -5684,6 +5704,10 @@ func (m *StackTraceFlameGraph) Size() (n int) { if l > 0 { n += 1 + l + sovVis(uint64(l)) } + l = len(m.DifferenceColumn) + if l > 0 { + n += 1 + l + sovVis(uint64(l)) + } return n } @@ -6103,6 +6127,7 @@ func (this *StackTraceFlameGraph) String() string { `PidColumn:` + fmt.Sprintf("%v", this.PidColumn) + `,`, `NodeColumn:` + fmt.Sprintf("%v", this.NodeColumn) + `,`, `PercentageLabel:` + fmt.Sprintf("%v", this.PercentageLabel) + `,`, + `DifferenceColumn:` + fmt.Sprintf("%v", this.DifferenceColumn) + `,`, `}`, }, "") return s @@ -10403,6 +10428,38 @@ func (m *StackTraceFlameGraph) Unmarshal(dAtA []byte) error { } m.PercentageLabel = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DifferenceColumn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowVis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthVis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthVis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DifferenceColumn = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipVis(dAtA[iNdEx:]) diff --git a/src/api/proto/vispb/vis.proto b/src/api/proto/vispb/vis.proto index 4be3b434d5e..62747bb06f3 100644 --- a/src/api/proto/vispb/vis.proto +++ b/src/api/proto/vispb/vis.proto @@ -458,4 +458,7 @@ message StackTraceFlameGraph { string node_column = 8; // The label for the percentage. string percentage_label = 9; + // The column containing the stacktrace's delta. This is only relevant for differential + // flamegraphs. + string difference_column = 10; } diff --git a/src/common/exec/exec.cc b/src/common/exec/exec.cc index b75ae3521c2..fdbf81adb18 100644 --- a/src/common/exec/exec.cc +++ b/src/common/exec/exec.cc @@ -24,8 +24,14 @@ namespace px { +// GCC's ingnored-attribute warning is triggered without wrapping pclose. This is likely do to the +// nonnull attribute. +struct pclose_deleter { + void operator()(FILE* file) const { pclose(file); } +}; + StatusOr Exec(std::string cmd) { - std::unique_ptr pipe(popen(cmd.c_str(), "r"), pclose); + std::unique_ptr pipe(popen(cmd.c_str(), "r")); if (pipe == nullptr) { return error::Internal("popen() failed!"); } diff --git a/src/e2e_test/vizier/planner/BUILD.bazel b/src/e2e_test/vizier/planner/BUILD.bazel index de8b063004f..57ebdbd4893 100644 --- a/src/e2e_test/vizier/planner/BUILD.bazel +++ b/src/e2e_test/vizier/planner/BUILD.bazel @@ -24,8 +24,6 @@ pl_go_test( ], tags = [ "no_asan", - "no_gcc", - "no_libcpp", "no_msan", "no_tsan", ], diff --git a/src/ui/src/types/generated/vis_pb.d.ts b/src/ui/src/types/generated/vis_pb.d.ts index a1c2ab2650b..79a5c865525 100755 --- a/src/ui/src/types/generated/vis_pb.d.ts +++ b/src/ui/src/types/generated/vis_pb.d.ts @@ -2728,6 +2728,9 @@ export namespace px { /** StackTraceFlameGraph percentageLabel */ percentageLabel?: (string|null); + + /** StackTraceFlameGraph differenceColumn */ + differenceColumn?: (string|null); } /** Represents a StackTraceFlameGraph. */ @@ -2766,6 +2769,9 @@ export namespace px { /** StackTraceFlameGraph percentageLabel. */ public percentageLabel: string; + /** StackTraceFlameGraph differenceColumn. */ + public differenceColumn: string; + /** * Creates a new StackTraceFlameGraph instance using the specified properties. * @param [properties] Properties to set diff --git a/src/ui/src/types/generated/vis_pb.js b/src/ui/src/types/generated/vis_pb.js index 2abe33c11c6..b8b1d084b9b 100755 --- a/src/ui/src/types/generated/vis_pb.js +++ b/src/ui/src/types/generated/vis_pb.js @@ -6633,6 +6633,7 @@ export const px = $root.px = (() => { * @property {string|null} [pidColumn] StackTraceFlameGraph pidColumn * @property {string|null} [nodeColumn] StackTraceFlameGraph nodeColumn * @property {string|null} [percentageLabel] StackTraceFlameGraph percentageLabel + * @property {string|null} [differenceColumn] StackTraceFlameGraph differenceColumn */ /** @@ -6722,6 +6723,14 @@ export const px = $root.px = (() => { */ StackTraceFlameGraph.prototype.percentageLabel = ""; + /** + * StackTraceFlameGraph differenceColumn. + * @member {string} differenceColumn + * @memberof px.vispb.StackTraceFlameGraph + * @instance + */ + StackTraceFlameGraph.prototype.differenceColumn = ""; + /** * Creates a new StackTraceFlameGraph instance using the specified properties. * @function create @@ -6764,6 +6773,8 @@ export const px = $root.px = (() => { writer.uint32(/* id 8, wireType 2 =*/66).string(message.nodeColumn); if (message.percentageLabel != null && Object.hasOwnProperty.call(message, "percentageLabel")) writer.uint32(/* id 9, wireType 2 =*/74).string(message.percentageLabel); + if (message.differenceColumn != null && Object.hasOwnProperty.call(message, "differenceColumn")) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.differenceColumn); return writer; }; @@ -6825,6 +6836,9 @@ export const px = $root.px = (() => { case 9: message.percentageLabel = reader.string(); break; + case 10: + message.differenceColumn = reader.string(); + break; default: reader.skipType(tag & 7); break; @@ -6887,6 +6901,9 @@ export const px = $root.px = (() => { if (message.percentageLabel != null && message.hasOwnProperty("percentageLabel")) if (!$util.isString(message.percentageLabel)) return "percentageLabel: string expected"; + if (message.differenceColumn != null && message.hasOwnProperty("differenceColumn")) + if (!$util.isString(message.differenceColumn)) + return "differenceColumn: string expected"; return null; }; @@ -6920,6 +6937,8 @@ export const px = $root.px = (() => { message.nodeColumn = String(object.nodeColumn); if (object.percentageLabel != null) message.percentageLabel = String(object.percentageLabel); + if (object.differenceColumn != null) + message.differenceColumn = String(object.differenceColumn); return message; }; @@ -6946,6 +6965,7 @@ export const px = $root.px = (() => { object.pidColumn = ""; object.nodeColumn = ""; object.percentageLabel = ""; + object.differenceColumn = ""; } if (message.stacktraceColumn != null && message.hasOwnProperty("stacktraceColumn")) object.stacktraceColumn = message.stacktraceColumn; @@ -6965,6 +6985,8 @@ export const px = $root.px = (() => { object.nodeColumn = message.nodeColumn; if (message.percentageLabel != null && message.hasOwnProperty("percentageLabel")) object.percentageLabel = message.percentageLabel; + if (message.differenceColumn != null && message.hasOwnProperty("differenceColumn")) + object.differenceColumn = message.differenceColumn; return object; };