diff --git a/pkg/ccl/importccl/import_stmt.go b/pkg/ccl/importccl/import_stmt.go index 2f30aa1a37ff..6d0fffe8e76c 100644 --- a/pkg/ccl/importccl/import_stmt.go +++ b/pkg/ccl/importccl/import_stmt.go @@ -56,6 +56,7 @@ const ( importOptionTransform = "transform" importOptionSSTSize = "sstsize" importOptionDecompress = "decompress" + importOptionOversample = "oversample" pgCopyDelimiter = "delimiter" pgCopyNull = "nullif" @@ -77,6 +78,7 @@ var importOptionExpectValues = map[string]bool{ importOptionTransform: true, importOptionSSTSize: true, importOptionDecompress: true, + importOptionOversample: true, pgMaxRowSize: true, } @@ -537,6 +539,14 @@ func importPlanHook( } sstSize = sz } + var oversample int64 + if override, ok := opts[importOptionOversample]; ok { + os, err := strconv.ParseInt(override, 10, 64) + if err != nil { + return err + } + sstSize = os + } if override, ok := opts[importOptionDecompress]; ok { found := false @@ -675,6 +685,7 @@ func importPlanHook( Tables: tableDetails, BackupPath: transform, SSTSize: sstSize, + Oversample: oversample, Walltime: walltime, }, Progress: jobspb.ImportProgress{}, @@ -698,6 +709,7 @@ func doDistributedCSVTransform( format roachpb.IOFileFormat, walltime int64, sstSize int64, + oversample int64, ) error { evalCtx := p.ExtendedEvalContext() @@ -726,6 +738,7 @@ func doDistributedCSVTransform( format, walltime, sstSize, + oversample, func(descs map[sqlbase.ID]*sqlbase.TableDescriptor) (sql.KeyRewriter, error) { return storageccl.MakeKeyRewriter(descs) }, @@ -837,6 +850,7 @@ func (r *importResumer) Resume( parentID := details.ParentID sstSize := details.SSTSize format := details.Format + oversample := details.Oversample if sstSize == 0 { // The distributed importer will correctly chunk up large ranges into @@ -864,7 +878,7 @@ func (r *importResumer) Resume( } return doDistributedCSVTransform( - ctx, job, files, p, parentID, tables, transform, format, walltime, sstSize, + ctx, job, files, p, parentID, tables, transform, format, walltime, sstSize, oversample, ) } diff --git a/pkg/ccl/importccl/import_stmt_test.go b/pkg/ccl/importccl/import_stmt_test.go index 59c500ec31e1..2f8cd9f9e9ce 100644 --- a/pkg/ccl/importccl/import_stmt_test.go +++ b/pkg/ccl/importccl/import_stmt_test.go @@ -167,6 +167,13 @@ d data: `\x0`, err: "odd length hex string", }, + { + name: "oversample", + create: `i int`, + with: `WITH oversample = '100'`, + typ: "CSV", + data: "1", + }, // MySQL OUTFILE { diff --git a/pkg/sql/distsql_plan_csv.go b/pkg/sql/distsql_plan_csv.go index 4ce82f4a4b6b..b029e8d4b517 100644 --- a/pkg/sql/distsql_plan_csv.go +++ b/pkg/sql/distsql_plan_csv.go @@ -172,6 +172,7 @@ func LoadCSV( format roachpb.IOFileFormat, walltime int64, splitSize int64, + oversample int64, makeRewriter func(map[sqlbase.ID]*sqlbase.TableDescriptor) (KeyRewriter, error), ) error { ctx = log.WithLogTag(ctx, "import-distsql", nil) @@ -250,7 +251,7 @@ func LoadCSV( var parsedTables map[sqlbase.ID]*sqlbase.TableDescriptor if samples == nil { var err error - samples, parsedTables, err = dsp.loadCSVSamplingPlan(ctx, job, db, evalCtx, thisNode, nodes, from, splitSize, &planCtx, inputSpecs, sstSpecs) + samples, parsedTables, err = dsp.loadCSVSamplingPlan(ctx, job, db, evalCtx, thisNode, nodes, from, splitSize, oversample, &planCtx, inputSpecs, sstSpecs) if err != nil { return err } @@ -478,6 +479,7 @@ func (dsp *DistSQLPlanner) loadCSVSamplingPlan( nodes []roachpb.NodeID, from []string, splitSize int64, + oversample int64, planCtx *planningCtx, csvSpecs []*distsqlrun.ReadImportDataSpec, sstSpecs []distsqlrun.SSTWriterSpec, @@ -494,7 +496,9 @@ func (dsp *DistSQLPlanner) loadCSVSamplingPlan( // factor of 3 would sample the KV with probability 100/10000000 since we are // sampling at 3x. Since we're now getting back 3x more samples than needed, // we only use every 1/(oversample), or 1/3 here, in our final sampling. - const oversample = 3 + if oversample < 1 { + oversample = 3 + } sampleSize := splitSize / oversample if sampleSize > math.MaxInt32 { return nil, nil, errors.Errorf("SST size must fit in an int32: %d", splitSize) @@ -572,7 +576,7 @@ func (dsp *DistSQLPlanner) loadCSVSamplingPlan( } sampleCount++ - sampleCount = sampleCount % oversample + sampleCount = sampleCount % int(oversample) if sampleCount == 0 { k, err := keys.EnsureSafeSplitKey(key) if err != nil { diff --git a/pkg/sql/jobs/jobspb/jobs.pb.go b/pkg/sql/jobs/jobspb/jobs.pb.go index 3d64520810dc..37395a0bd812 100644 --- a/pkg/sql/jobs/jobspb/jobs.pb.go +++ b/pkg/sql/jobs/jobspb/jobs.pb.go @@ -153,6 +153,7 @@ type ImportDetails struct { URIs []string `protobuf:"bytes,2,rep,name=uris" json:"uris,omitempty"` Format cockroach_roachpb2.IOFileFormat `protobuf:"bytes,3,opt,name=format" json:"format"` SSTSize int64 `protobuf:"varint,4,opt,name=sst_size,json=sstSize,proto3" json:"sst_size,omitempty"` + Oversample int64 `protobuf:"varint,9,opt,name=oversample,proto3" json:"oversample,omitempty"` Walltime int64 `protobuf:"varint,5,opt,name=walltime,proto3" json:"walltime,omitempty"` ParentID github_com_cockroachdb_cockroach_pkg_sql_sqlbase.ID `protobuf:"varint,6,opt,name=parent_id,json=parentId,proto3,casttype=github.com/cockroachdb/cockroach/pkg/sql/sqlbase.ID" json:"parent_id,omitempty"` BackupPath string `protobuf:"bytes,7,opt,name=backup_path,json=backupPath,proto3" json:"backup_path,omitempty"` @@ -1051,6 +1052,11 @@ func (m *ImportDetails) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], b) } } + if m.Oversample != 0 { + dAtA[i] = 0x48 + i++ + i = encodeVarintJobs(dAtA, i, uint64(m.Oversample)) + } return i, nil } @@ -1716,6 +1722,9 @@ func (m *ImportDetails) Size() (n int) { n += 1 + l + sovJobs(uint64(l)) } } + if m.Oversample != 0 { + n += 1 + sovJobs(uint64(m.Oversample)) + } return n } @@ -2967,6 +2976,25 @@ func (m *ImportDetails) Unmarshal(dAtA []byte) error { m.Samples = append(m.Samples, make([]byte, postIndex-iNdEx)) copy(m.Samples[len(m.Samples)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Oversample", wireType) + } + m.Oversample = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowJobs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Oversample |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipJobs(dAtA[iNdEx:]) @@ -4647,114 +4675,115 @@ var ( func init() { proto.RegisterFile("sql/jobs/jobspb/jobs.proto", fileDescriptorJobs) } var fileDescriptorJobs = []byte{ - // 1744 bytes of a gzipped FileDescriptorProto + // 1757 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0xeb, 0x58, - 0x15, 0x8f, 0x63, 0x27, 0x71, 0x4e, 0x3e, 0xea, 0xde, 0xa9, 0xc0, 0x13, 0x3d, 0x9a, 0x28, 0x0c, + 0x15, 0xaf, 0x63, 0x27, 0x71, 0x4e, 0x3e, 0xea, 0xde, 0xa9, 0xc0, 0x13, 0x3d, 0x92, 0x28, 0x0c, 0x33, 0x79, 0x33, 0xbc, 0x44, 0x7a, 0x23, 0xcd, 0x43, 0x4f, 0x80, 0x68, 0xd2, 0x74, 0x1a, 0xf3, 0xfa, 0x5a, 0xb9, 0xad, 0x46, 0x8c, 0x84, 0x8c, 0x13, 0xdf, 0x36, 0xa6, 0x4e, 0xec, 0x77, 0xaf, 0x33, 0xe5, 0xcd, 0x06, 0x89, 0x15, 0xea, 0x8a, 0x0d, 0x3b, 0x2a, 0x21, 0xc1, 0x82, 0x3d, 0x0b, - 0xfe, 0x85, 0xb7, 0x41, 0xb0, 0x41, 0x62, 0x84, 0x14, 0x20, 0x2c, 0xe0, 0x6f, 0x60, 0x85, 0xee, - 0xbd, 0xb6, 0xe3, 0xf4, 0x95, 0x7e, 0x3c, 0x69, 0x36, 0xad, 0x7d, 0xee, 0x39, 0x3f, 0x9f, 0x8f, - 0xdf, 0x39, 0xe7, 0xb6, 0x50, 0xa3, 0x2f, 0xbc, 0xce, 0x8f, 0xfd, 0x21, 0xe5, 0x3f, 0x82, 0x21, - 0xff, 0xd5, 0x0e, 0x88, 0x1f, 0xfa, 0xe8, 0xed, 0x91, 0x3f, 0x3a, 0x23, 0xbe, 0x3d, 0x1a, 0xb7, - 0xe9, 0x0b, 0xaf, 0xcd, 0x4f, 0x84, 0x56, 0x6d, 0xe3, 0xd4, 0x3f, 0xf5, 0xb9, 0x56, 0x87, 0x3d, - 0x09, 0x83, 0x1a, 0xe2, 0xca, 0xc1, 0xb0, 0xe3, 0xd8, 0xa1, 0x1d, 0xc9, 0xf4, 0x58, 0xe6, 0xfa, - 0x8f, 0x4e, 0x7c, 0x32, 0xb1, 0xc3, 0x08, 0xbe, 0xf6, 0x80, 0x7d, 0x9a, 0xbe, 0xf0, 0x86, 0x36, - 0xc5, 0x1d, 0x1a, 0x92, 0xd9, 0x28, 0x9c, 0x11, 0xec, 0xc4, 0x76, 0xb3, 0xd0, 0xf5, 0x3a, 0x63, - 0x6f, 0xd4, 0x09, 0xdd, 0x09, 0xa6, 0xa1, 0x3d, 0x09, 0xc4, 0x49, 0xf3, 0xa7, 0x90, 0x7b, 0x86, - 0x6d, 0x8a, 0xd1, 0xa7, 0x50, 0x98, 0xfa, 0x0e, 0xb6, 0x5c, 0x47, 0x97, 0x1a, 0x52, 0xab, 0xd2, - 0xdd, 0x5a, 0xcc, 0xeb, 0xf9, 0xe7, 0xbe, 0x83, 0x07, 0xdb, 0xff, 0x9d, 0xd7, 0x3f, 0x3c, 0x75, - 0xc3, 0xf1, 0x6c, 0xd8, 0x1e, 0xf9, 0x93, 0x4e, 0x12, 0x89, 0x33, 0x5c, 0x3e, 0x77, 0x82, 0xb3, - 0xd3, 0x4e, 0xe4, 0x5e, 0x5b, 0x98, 0x99, 0x79, 0x86, 0x38, 0x70, 0xd0, 0x06, 0xe4, 0x70, 0xe0, - 0x8f, 0xc6, 0x7a, 0xb6, 0x21, 0xb5, 0x64, 0x53, 0xbc, 0x3c, 0x55, 0xfe, 0xf3, 0xeb, 0xba, 0xd4, - 0xfc, 0x9b, 0x04, 0x95, 0xae, 0x3d, 0x3a, 0x9b, 0x05, 0xdb, 0x38, 0xb4, 0x5d, 0x8f, 0xa2, 0x2e, - 0x00, 0x0d, 0x6d, 0x12, 0x5a, 0xcc, 0x57, 0xee, 0x4c, 0xe9, 0xf1, 0xd7, 0xda, 0xcb, 0xf4, 0xb1, - 0x58, 0xda, 0x63, 0x6f, 0xd4, 0x3e, 0x8a, 0x63, 0xe9, 0x2a, 0xaf, 0xe6, 0xf5, 0x8c, 0x59, 0xe4, - 0x66, 0x4c, 0x8a, 0xbe, 0x0b, 0x2a, 0x9e, 0x3a, 0x02, 0x21, 0x7b, 0x77, 0x84, 0x02, 0x9e, 0x3a, - 0xdc, 0xfe, 0x6d, 0x90, 0x67, 0xc4, 0xd5, 0xe5, 0x86, 0xd4, 0x2a, 0x76, 0x0b, 0x8b, 0x79, 0x5d, - 0x3e, 0x36, 0x07, 0x26, 0x93, 0xa1, 0x0f, 0x60, 0x7d, 0xc8, 0xfd, 0xb5, 0x1c, 0x4c, 0x47, 0xc4, - 0x0d, 0x42, 0x9f, 0xe8, 0x4a, 0x43, 0x6a, 0x95, 0x4d, 0x6d, 0x18, 0x05, 0x12, 0xcb, 0x9b, 0x1a, - 0x54, 0x45, 0x70, 0x07, 0xc4, 0x3f, 0x25, 0x98, 0xd2, 0xe6, 0x17, 0x39, 0xa8, 0x9a, 0x98, 0x86, - 0x3e, 0xc1, 0x71, 0xc0, 0xbf, 0x92, 0xa0, 0x1a, 0xda, 0x43, 0x0f, 0x5b, 0x04, 0x9f, 0x13, 0x37, - 0xc4, 0x54, 0xcf, 0x36, 0xe4, 0x56, 0xe9, 0xf1, 0xb7, 0xdb, 0xff, 0x97, 0x34, 0xed, 0x55, 0x8c, - 0xf6, 0x11, 0xb3, 0x37, 0x23, 0xf3, 0xfe, 0x34, 0x24, 0x2f, 0xbb, 0x4f, 0x7e, 0xf6, 0xf7, 0x3b, - 0x96, 0x2d, 0xc5, 0x9d, 0xf6, 0x60, 0xdb, 0xac, 0x84, 0x69, 0x30, 0xf4, 0x00, 0x94, 0x19, 0x71, - 0xa9, 0x2e, 0x37, 0xe4, 0x56, 0xb1, 0xab, 0x2e, 0xe6, 0x75, 0xe5, 0xd8, 0x1c, 0x50, 0x93, 0x4b, - 0x57, 0x32, 0xad, 0xbc, 0x41, 0xa6, 0x3f, 0x86, 0x92, 0x88, 0x9d, 0x65, 0x93, 0xea, 0x39, 0x1e, - 0xf8, 0xbb, 0x57, 0x02, 0x8f, 0x9d, 0xe3, 0x51, 0x2e, 0xd3, 0x6b, 0x42, 0x18, 0x0b, 0x28, 0xea, - 0x40, 0xc9, 0xff, 0x0c, 0x13, 0xe2, 0x3a, 0xd8, 0x72, 0x86, 0x7a, 0x9e, 0x97, 0xae, 0xba, 0x98, - 0xd7, 0x61, 0x3f, 0x12, 0x6f, 0x77, 0x4d, 0x88, 0x55, 0xb6, 0x87, 0xb5, 0x3f, 0x49, 0x50, 0x4e, - 0xa7, 0x0d, 0xfd, 0x10, 0x54, 0xe1, 0x4a, 0xd2, 0x03, 0xdd, 0xc5, 0xbc, 0x5e, 0xe0, 0x3a, 0xf7, - 0x68, 0x82, 0x2b, 0xd9, 0x2c, 0x70, 0xcc, 0x81, 0x83, 0x7e, 0x04, 0xc5, 0xc0, 0x26, 0x78, 0x1a, - 0x32, 0xfc, 0x2c, 0xc7, 0xef, 0x2d, 0xe6, 0x75, 0xf5, 0x80, 0x0b, 0xdf, 0xfc, 0x03, 0xaa, 0x40, - 0x1d, 0x38, 0xb5, 0x9f, 0x00, 0x7a, 0x9d, 0x07, 0x48, 0x03, 0xf9, 0x0c, 0xbf, 0x14, 0x11, 0x99, - 0xec, 0x11, 0x3d, 0x83, 0xdc, 0x67, 0xb6, 0x37, 0x8b, 0x5b, 0xe3, 0xa3, 0x37, 0xa3, 0x99, 0x29, - 0x40, 0x9e, 0x66, 0xbf, 0x25, 0x19, 0x8a, 0x2a, 0x69, 0xd9, 0xe6, 0x13, 0x58, 0x8b, 0xf4, 0x63, - 0xba, 0xa3, 0x77, 0xa0, 0xea, 0xf9, 0xe7, 0xd6, 0xb9, 0x1d, 0x62, 0x62, 0x4d, 0x6c, 0x72, 0xc6, - 0xfd, 0x28, 0x9b, 0x65, 0xcf, 0x3f, 0xff, 0x84, 0x09, 0xf7, 0x6c, 0x72, 0xd6, 0xfc, 0x8b, 0x02, - 0x95, 0xc1, 0x24, 0xf0, 0x49, 0x18, 0xf7, 0xc4, 0x33, 0xc8, 0xf3, 0xbc, 0x51, 0x5d, 0xe2, 0x8c, - 0x68, 0xdf, 0xe0, 0xe3, 0x8a, 0xa5, 0x70, 0x31, 0x62, 0x59, 0x84, 0x91, 0x50, 0x38, 0x7b, 0x2d, - 0x85, 0xbf, 0x03, 0x79, 0x31, 0x4c, 0x79, 0xbf, 0x97, 0x1e, 0xd7, 0x53, 0xdf, 0x8a, 0x27, 0xda, - 0x60, 0x7f, 0xc7, 0xf5, 0xf0, 0x0e, 0x57, 0x8b, 0xc1, 0x85, 0x11, 0x7a, 0x17, 0x54, 0x4a, 0x43, - 0x8b, 0xba, 0x9f, 0x8b, 0x0e, 0x90, 0xbb, 0x25, 0x46, 0x9b, 0xc3, 0xc3, 0xa3, 0x43, 0xf7, 0x73, - 0x6c, 0x16, 0x28, 0x0d, 0xd9, 0x03, 0xaa, 0x81, 0x7a, 0x6e, 0x7b, 0x1e, 0xef, 0x94, 0x1c, 0x1f, - 0x84, 0xc9, 0xfb, 0x2a, 0x37, 0xf2, 0x5f, 0x02, 0x37, 0x50, 0x1d, 0x4a, 0xd1, 0xd8, 0x0a, 0xec, - 0x70, 0xac, 0x17, 0x58, 0x7b, 0x98, 0x20, 0x44, 0x07, 0x76, 0x38, 0x46, 0x3a, 0x14, 0xa8, 0x3d, - 0x09, 0x58, 0xca, 0xd5, 0x86, 0xdc, 0x2a, 0x9b, 0xf1, 0x6b, 0xed, 0x0f, 0x12, 0xe4, 0x78, 0x56, - 0xd1, 0x53, 0x50, 0x58, 0x9b, 0x46, 0x43, 0xf9, 0xae, 0x5d, 0xca, 0x6d, 0x10, 0x02, 0x65, 0x6a, - 0x4f, 0xb0, 0x8e, 0xf8, 0x97, 0xf9, 0xb3, 0xa1, 0xa8, 0x59, 0x4d, 0x36, 0x14, 0x55, 0xd6, 0x14, - 0x43, 0x51, 0x15, 0x2d, 0x67, 0x28, 0x6a, 0x4e, 0xcb, 0x1b, 0x8a, 0x9a, 0xd7, 0x0a, 0x86, 0xa2, - 0x16, 0x34, 0xd5, 0x50, 0x54, 0x55, 0x2b, 0x1a, 0x8a, 0x5a, 0xd4, 0xc0, 0x50, 0x54, 0xd0, 0x4a, - 0x86, 0xa2, 0x96, 0xb4, 0xb2, 0xa1, 0xa8, 0x65, 0xad, 0x62, 0x28, 0x6a, 0x45, 0xab, 0x1a, 0x8a, - 0x5a, 0xd5, 0xd6, 0x0c, 0x45, 0x5d, 0xd3, 0x34, 0x43, 0x51, 0x35, 0x6d, 0xdd, 0x50, 0xd4, 0x75, - 0x0d, 0x35, 0xff, 0x28, 0x41, 0x55, 0xb0, 0x23, 0x21, 0xe4, 0x07, 0xb0, 0xce, 0xe3, 0x72, 0xa7, - 0xa7, 0x56, 0x10, 0x09, 0x39, 0xc7, 0xb2, 0xa6, 0x16, 0x1f, 0x24, 0xca, 0x5f, 0x87, 0x0a, 0xc1, - 0xb6, 0xb3, 0x54, 0xcc, 0x72, 0xc5, 0x32, 0x13, 0x26, 0x4a, 0xdf, 0x80, 0x2a, 0xef, 0x87, 0xa5, - 0x96, 0xcc, 0xb5, 0x2a, 0x5c, 0x9a, 0xa8, 0x75, 0xa1, 0x42, 0x03, 0x7b, 0xba, 0xd4, 0x52, 0x38, - 0xb1, 0xbf, 0x7a, 0x0d, 0xd9, 0x0e, 0x03, 0x7b, 0x1a, 0x91, 0xac, 0xcc, 0x6c, 0x92, 0xe5, 0x61, - 0xf2, 0xdd, 0x31, 0x9b, 0x60, 0xa6, 0xf1, 0xcc, 0xa5, 0x21, 0xfa, 0x1e, 0x94, 0x09, 0x97, 0x58, - 0x4c, 0x31, 0xee, 0x96, 0x5b, 0x40, 0x4b, 0x24, 0x01, 0xa1, 0xcd, 0xdf, 0x4b, 0xf0, 0xd6, 0xe1, - 0x68, 0x8c, 0x27, 0x76, 0x6f, 0x6c, 0x4f, 0x4f, 0x93, 0xad, 0xb4, 0x05, 0xc0, 0x63, 0xb7, 0xa9, - 0xe5, 0x9f, 0xdc, 0x67, 0x0d, 0xab, 0xcc, 0x6c, 0x8b, 0xee, 0x9f, 0xa0, 0x1f, 0x80, 0x96, 0x72, - 0xce, 0xf2, 0x5c, 0x1a, 0x46, 0x9b, 0xed, 0xe1, 0xcd, 0x23, 0x27, 0x15, 0x61, 0x04, 0x5a, 0x25, - 0x2b, 0xd2, 0xe6, 0x57, 0x60, 0x23, 0xed, 0x74, 0x92, 0xa1, 0x5f, 0x66, 0x61, 0x5d, 0x88, 0x4e, - 0x30, 0x76, 0xe2, 0x58, 0xf6, 0x56, 0x97, 0x4c, 0xf6, 0x3e, 0x4b, 0x26, 0x72, 0x20, 0xbd, 0x6a, - 0x58, 0xc7, 0xbb, 0xd3, 0x33, 0x6b, 0x79, 0x45, 0x10, 0x1d, 0xef, 0x4e, 0xcf, 0xd8, 0x35, 0xa1, - 0xc0, 0x0e, 0x8f, 0x89, 0x8b, 0x0c, 0x50, 0xfc, 0x20, 0x8c, 0x2b, 0x7d, 0xd3, 0x98, 0x7d, 0xcd, - 0xe5, 0xf6, 0x7e, 0x10, 0x8a, 0xf9, 0x6d, 0x72, 0x8c, 0xda, 0x13, 0x28, 0x26, 0xa2, 0xf4, 0x48, - 0x2f, 0x8a, 0x91, 0xbe, 0x91, 0x1e, 0xe9, 0xc5, 0xd7, 0x47, 0xf3, 0x27, 0x80, 0x96, 0xdf, 0x48, - 0x38, 0xb9, 0x05, 0xc5, 0xb1, 0x7b, 0x3a, 0xe6, 0xd3, 0xf9, 0x5e, 0x37, 0xad, 0xc4, 0xaa, 0xb9, - 0xc8, 0x41, 0xe1, 0xc0, 0x7e, 0xe9, 0xf9, 0xb6, 0x83, 0x1a, 0x50, 0x8a, 0xef, 0x44, 0xae, 0x3f, - 0x8d, 0xdc, 0x4b, 0x8b, 0xd8, 0x0c, 0x9c, 0x51, 0x4c, 0xf8, 0x20, 0x10, 0x9e, 0x26, 0xef, 0xac, - 0x8f, 0xf8, 0x05, 0x0e, 0x3b, 0xd6, 0xc4, 0x1d, 0x11, 0x9f, 0xf2, 0xdc, 0xca, 0x66, 0x25, 0x92, - 0xee, 0x71, 0x21, 0x7a, 0x0f, 0xd6, 0x4e, 0xdc, 0xa9, 0x4b, 0xc7, 0x4b, 0x3d, 0x3e, 0x75, 0xcd, - 0x6a, 0x2c, 0x8e, 0x14, 0x7d, 0xa8, 0x2e, 0x6f, 0x68, 0x96, 0xeb, 0x50, 0x3d, 0xdf, 0x90, 0x5b, - 0x95, 0xee, 0xee, 0x62, 0x5e, 0xaf, 0x2c, 0xeb, 0x3b, 0xd8, 0xa6, 0x6f, 0x3a, 0x5d, 0x2b, 0x4b, - 0xfc, 0x81, 0x43, 0xf9, 0x35, 0x97, 0x10, 0x9f, 0xe8, 0xaa, 0xa8, 0x01, 0x7f, 0x41, 0x1f, 0x41, - 0xce, 0x63, 0x37, 0x6c, 0xbd, 0xc8, 0xf3, 0xdb, 0xb8, 0x81, 0x05, 0xfc, 0x26, 0x6e, 0x0a, 0x75, - 0xd4, 0x85, 0xbc, 0x98, 0xce, 0x3a, 0x70, 0xc3, 0xd6, 0x0d, 0x86, 0x2b, 0x17, 0xe8, 0xdd, 0x8c, - 0x19, 0x59, 0xa2, 0x3e, 0x14, 0x88, 0x58, 0xc8, 0x7a, 0x89, 0x83, 0x3c, 0xbc, 0xf3, 0xaa, 0xdf, - 0xcd, 0x98, 0xb1, 0x2d, 0x3a, 0x82, 0x32, 0x4d, 0x35, 0x9b, 0x5e, 0xe6, 0x58, 0x37, 0xad, 0xe4, - 0x6b, 0x06, 0xca, 0x2e, 0x1b, 0x66, 0x29, 0x31, 0x0b, 0xd0, 0xe5, 0xb3, 0x59, 0xaf, 0xdc, 0x1a, - 0xe0, 0xca, 0x8a, 0x67, 0x01, 0x0a, 0x4b, 0xf4, 0x1c, 0x60, 0x94, 0xd0, 0x5a, 0xaf, 0x72, 0x9c, - 0x6f, 0xde, 0xa7, 0xcf, 0x76, 0x33, 0x66, 0x0a, 0xa1, 0x5b, 0x84, 0x82, 0x23, 0x0e, 0x92, 0x4d, - 0x54, 0xd0, 0xd4, 0xe6, 0xbf, 0x65, 0x50, 0x93, 0xa6, 0x79, 0x04, 0xe8, 0x84, 0xd8, 0x23, 0xc6, - 0x67, 0x6b, 0xe4, 0xb3, 0x15, 0x19, 0x62, 0x71, 0x61, 0xcc, 0x9a, 0xeb, 0xf1, 0x49, 0x2f, 0x3e, - 0x60, 0x7c, 0x9d, 0xf8, 0x8e, 0x7b, 0xe2, 0x2e, 0xf9, 0x2a, 0xfe, 0x0c, 0xaa, 0xc6, 0xe2, 0x88, - 0xaf, 0xbd, 0x2b, 0x05, 0x7f, 0x78, 0x6b, 0xc1, 0x63, 0x97, 0x52, 0x15, 0xdf, 0xb9, 0x5a, 0xf1, - 0xf7, 0x6f, 0xaf, 0x78, 0x0a, 0x26, 0x29, 0xf9, 0xf1, 0xb5, 0x25, 0xef, 0xdc, 0xb1, 0xe4, 0x29, - 0xc4, 0xd5, 0x9a, 0xf7, 0xae, 0xd4, 0xfc, 0xe1, 0xad, 0x35, 0x4f, 0xc7, 0x18, 0x15, 0x7d, 0xff, - 0x9a, 0xa2, 0x3f, 0xba, 0x53, 0xd1, 0x53, 0x60, 0xd7, 0x57, 0xfd, 0xfd, 0x2f, 0x24, 0x50, 0x8e, - 0x5e, 0x06, 0x18, 0xbd, 0x03, 0xa5, 0xe3, 0xe7, 0x87, 0x07, 0xfd, 0xde, 0x60, 0x67, 0xd0, 0xdf, - 0xd6, 0x32, 0xb5, 0xb7, 0x2e, 0x2e, 0x1b, 0x6b, 0xec, 0xe8, 0x78, 0x4a, 0x03, 0x3c, 0xe2, 0x95, - 0x43, 0x35, 0xc8, 0x77, 0xb7, 0x7a, 0xdf, 0x3f, 0x3e, 0xd0, 0xa4, 0x5a, 0xf5, 0xe2, 0xb2, 0x01, - 0x4c, 0x41, 0x14, 0x07, 0x3d, 0x80, 0x82, 0xd9, 0x3f, 0x3c, 0xda, 0x37, 0xfb, 0x5a, 0xb6, 0xb6, - 0x76, 0x71, 0xd9, 0x28, 0xb1, 0xc3, 0x28, 0xe7, 0xe8, 0x3d, 0xa8, 0x1c, 0xf6, 0x76, 0xfb, 0x7b, - 0x5b, 0x56, 0x6f, 0x77, 0xeb, 0xf9, 0xc7, 0x7d, 0x4d, 0xae, 0x6d, 0x5c, 0x5c, 0x36, 0x34, 0xa6, - 0x93, 0x4e, 0x25, 0xfb, 0xc4, 0x60, 0xef, 0x60, 0xdf, 0x3c, 0xd2, 0x94, 0xe5, 0x27, 0x44, 0x6e, - 0x50, 0x13, 0x40, 0x58, 0xef, 0xf4, 0xfb, 0xdb, 0x5a, 0xae, 0x86, 0x2e, 0x2e, 0x1b, 0x55, 0x76, - 0xbe, 0x0c, 0xb9, 0xa6, 0xfe, 0xfc, 0x37, 0x9b, 0x99, 0xdf, 0xfd, 0x76, 0x33, 0xd3, 0x6d, 0xbc, - 0xfa, 0xe7, 0x66, 0xe6, 0xd5, 0x62, 0x53, 0xfa, 0xf3, 0x62, 0x53, 0xfa, 0xeb, 0x62, 0x53, 0xfa, - 0xc7, 0x62, 0x53, 0xfa, 0xc5, 0xbf, 0x36, 0x33, 0x9f, 0xe6, 0x45, 0xa6, 0x86, 0x79, 0xfe, 0x4f, - 0x81, 0x0f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x05, 0xa0, 0x56, 0x9b, 0xc9, 0x10, 0x00, 0x00, + 0xfe, 0x85, 0xb7, 0x41, 0xb0, 0x64, 0x84, 0x14, 0x20, 0x2c, 0xe0, 0x1f, 0x60, 0xc3, 0x0a, 0xdd, + 0x7b, 0x6d, 0xc7, 0xe9, 0x2b, 0xfd, 0x78, 0xd2, 0x6c, 0x5a, 0xfb, 0xdc, 0x73, 0x7e, 0x3e, 0x1f, + 0xbf, 0x73, 0xee, 0x69, 0xa1, 0x4a, 0x5f, 0x78, 0x9d, 0x1f, 0xfb, 0x43, 0xca, 0x7f, 0x04, 0x43, + 0xfe, 0xab, 0x1d, 0x10, 0x3f, 0xf4, 0xd1, 0xdb, 0x23, 0x7f, 0x74, 0x46, 0x7c, 0x7b, 0x34, 0x6e, + 0xd3, 0x17, 0x5e, 0x9b, 0x9f, 0x08, 0xad, 0xea, 0xe6, 0xa9, 0x7f, 0xea, 0x73, 0xad, 0x0e, 0x7b, + 0x12, 0x06, 0x55, 0xc4, 0x95, 0x83, 0x61, 0xc7, 0xb1, 0x43, 0x3b, 0x92, 0xe9, 0xb1, 0xcc, 0xf5, + 0x1f, 0x9d, 0xf8, 0x64, 0x62, 0x87, 0x11, 0x7c, 0xf5, 0x01, 0xfb, 0x34, 0x7d, 0xe1, 0x0d, 0x6d, + 0x8a, 0x3b, 0x34, 0x24, 0xb3, 0x51, 0x38, 0x23, 0xd8, 0x89, 0xed, 0x66, 0xa1, 0xeb, 0x75, 0xc6, + 0xde, 0xa8, 0x13, 0xba, 0x13, 0x4c, 0x43, 0x7b, 0x12, 0x88, 0x93, 0xe6, 0x4f, 0x21, 0xfb, 0x0c, + 0xdb, 0x14, 0xa3, 0x4f, 0x21, 0x3f, 0xf5, 0x1d, 0x6c, 0xb9, 0x8e, 0x2e, 0x35, 0xa4, 0x56, 0xb9, + 0xbb, 0xb5, 0x98, 0xd7, 0x73, 0xcf, 0x7d, 0x07, 0x0f, 0xb6, 0xff, 0x3b, 0xaf, 0x7f, 0x78, 0xea, + 0x86, 0xe3, 0xd9, 0xb0, 0x3d, 0xf2, 0x27, 0x9d, 0x24, 0x12, 0x67, 0xb8, 0x7c, 0xee, 0x04, 0x67, + 0xa7, 0x9d, 0xc8, 0xbd, 0xb6, 0x30, 0x33, 0x73, 0x0c, 0x71, 0xe0, 0xa0, 0x4d, 0xc8, 0xe2, 0xc0, + 0x1f, 0x8d, 0xf5, 0x4c, 0x43, 0x6a, 0xc9, 0xa6, 0x78, 0x79, 0xaa, 0xfc, 0xfb, 0xd7, 0x75, 0xa9, + 0xf9, 0x57, 0x09, 0xca, 0x5d, 0x7b, 0x74, 0x36, 0x0b, 0xb6, 0x71, 0x68, 0xbb, 0x1e, 0x45, 0x5d, + 0x00, 0x1a, 0xda, 0x24, 0xb4, 0x98, 0xaf, 0xdc, 0x99, 0xe2, 0xe3, 0xaf, 0xb5, 0x97, 0xe9, 0x63, + 0xb1, 0xb4, 0xc7, 0xde, 0xa8, 0x7d, 0x14, 0xc7, 0xd2, 0x55, 0x5e, 0xcd, 0xeb, 0x6b, 0x66, 0x81, + 0x9b, 0x31, 0x29, 0xfa, 0x2e, 0xa8, 0x78, 0xea, 0x08, 0x84, 0xcc, 0xdd, 0x11, 0xf2, 0x78, 0xea, + 0x70, 0xfb, 0xb7, 0x41, 0x9e, 0x11, 0x57, 0x97, 0x1b, 0x52, 0xab, 0xd0, 0xcd, 0x2f, 0xe6, 0x75, + 0xf9, 0xd8, 0x1c, 0x98, 0x4c, 0x86, 0x3e, 0x80, 0x8d, 0x21, 0xf7, 0xd7, 0x72, 0x30, 0x1d, 0x11, + 0x37, 0x08, 0x7d, 0xa2, 0x2b, 0x0d, 0xa9, 0x55, 0x32, 0xb5, 0x61, 0x14, 0x48, 0x2c, 0x6f, 0x6a, + 0x50, 0x11, 0xc1, 0x1d, 0x10, 0xff, 0x94, 0x60, 0x4a, 0x9b, 0x5f, 0x64, 0xa1, 0x62, 0x62, 0x1a, + 0xfa, 0x04, 0xc7, 0x01, 0xff, 0x4a, 0x82, 0x4a, 0x68, 0x0f, 0x3d, 0x6c, 0x11, 0x7c, 0x4e, 0xdc, + 0x10, 0x53, 0x3d, 0xd3, 0x90, 0x5b, 0xc5, 0xc7, 0xdf, 0x6e, 0xff, 0x5f, 0xd2, 0xb4, 0x57, 0x31, + 0xda, 0x47, 0xcc, 0xde, 0x8c, 0xcc, 0xfb, 0xd3, 0x90, 0xbc, 0xec, 0x3e, 0xf9, 0xd9, 0xdf, 0xee, + 0x58, 0xb6, 0x14, 0x77, 0xda, 0x83, 0x6d, 0xb3, 0x1c, 0xa6, 0xc1, 0xd0, 0x03, 0x50, 0x66, 0xc4, + 0xa5, 0xba, 0xdc, 0x90, 0x5b, 0x85, 0xae, 0xba, 0x98, 0xd7, 0x95, 0x63, 0x73, 0x40, 0x4d, 0x2e, + 0x5d, 0xc9, 0xb4, 0xf2, 0x06, 0x99, 0xfe, 0x18, 0x8a, 0x22, 0x76, 0x96, 0x4d, 0xaa, 0x67, 0x79, + 0xe0, 0xef, 0x5e, 0x09, 0x3c, 0x76, 0x8e, 0x47, 0xb9, 0x4c, 0xaf, 0x09, 0x61, 0x2c, 0xa0, 0xa8, + 0x03, 0x45, 0xff, 0x33, 0x4c, 0x88, 0xeb, 0x60, 0xcb, 0x19, 0xea, 0x39, 0x5e, 0xba, 0xca, 0x62, + 0x5e, 0x87, 0xfd, 0x48, 0xbc, 0xdd, 0x35, 0x21, 0x56, 0xd9, 0x1e, 0x56, 0xff, 0x24, 0x41, 0x29, + 0x9d, 0x36, 0xf4, 0x43, 0x50, 0x85, 0x2b, 0x49, 0x0f, 0x74, 0x17, 0xf3, 0x7a, 0x9e, 0xeb, 0xdc, + 0xa3, 0x09, 0xae, 0x64, 0x33, 0xcf, 0x31, 0x07, 0x0e, 0xfa, 0x11, 0x14, 0x02, 0x9b, 0xe0, 0x69, + 0xc8, 0xf0, 0x33, 0x1c, 0xbf, 0xb7, 0x98, 0xd7, 0xd5, 0x03, 0x2e, 0x7c, 0xf3, 0x0f, 0xa8, 0x02, + 0x75, 0xe0, 0x54, 0x7f, 0x02, 0xe8, 0x75, 0x1e, 0x20, 0x0d, 0xe4, 0x33, 0xfc, 0x52, 0x44, 0x64, + 0xb2, 0x47, 0xf4, 0x0c, 0xb2, 0x9f, 0xd9, 0xde, 0x2c, 0x6e, 0x8d, 0x8f, 0xde, 0x8c, 0x66, 0xa6, + 0x00, 0x79, 0x9a, 0xf9, 0x96, 0x64, 0x28, 0xaa, 0xa4, 0x65, 0x9a, 0x4f, 0x60, 0x3d, 0xd2, 0x8f, + 0xe9, 0x8e, 0xde, 0x81, 0x8a, 0xe7, 0x9f, 0x5b, 0xe7, 0x76, 0x88, 0x89, 0x35, 0xb1, 0xc9, 0x19, + 0xf7, 0xa3, 0x64, 0x96, 0x3c, 0xff, 0xfc, 0x13, 0x26, 0xdc, 0xb3, 0xc9, 0x59, 0xf3, 0x3f, 0x0a, + 0x94, 0x07, 0x93, 0xc0, 0x27, 0x61, 0xdc, 0x13, 0xcf, 0x20, 0xc7, 0xf3, 0x46, 0x75, 0x89, 0x33, + 0xa2, 0x7d, 0x83, 0x8f, 0x2b, 0x96, 0xc2, 0xc5, 0x88, 0x65, 0x11, 0x46, 0x42, 0xe1, 0xcc, 0xb5, + 0x14, 0xfe, 0x0e, 0xe4, 0xc4, 0x30, 0xe5, 0xfd, 0x5e, 0x7c, 0x5c, 0x4f, 0x7d, 0x2b, 0x9e, 0x68, + 0x83, 0xfd, 0x1d, 0xd7, 0xc3, 0x3b, 0x5c, 0x2d, 0x06, 0x17, 0x46, 0xe8, 0x5d, 0x50, 0x29, 0x0d, + 0x2d, 0xea, 0x7e, 0x2e, 0x3a, 0x40, 0xee, 0x16, 0x19, 0x6d, 0x0e, 0x0f, 0x8f, 0x0e, 0xdd, 0xcf, + 0xb1, 0x99, 0xa7, 0x34, 0x64, 0x0f, 0xa8, 0x0a, 0xea, 0xb9, 0xed, 0x79, 0xbc, 0x53, 0xb2, 0x7c, + 0x10, 0x26, 0xef, 0xab, 0xdc, 0xc8, 0x7d, 0x09, 0xdc, 0x40, 0x75, 0x28, 0x46, 0x63, 0x2b, 0xb0, + 0xc3, 0xb1, 0x9e, 0x67, 0xed, 0x61, 0x82, 0x10, 0x1d, 0xd8, 0xe1, 0x18, 0xe9, 0x90, 0xa7, 0xf6, + 0x24, 0x60, 0x29, 0x57, 0x1b, 0x72, 0xab, 0x64, 0xc6, 0xaf, 0xa8, 0x06, 0xbc, 0x6d, 0xc4, 0xab, + 0x5e, 0xe0, 0xae, 0xa7, 0x24, 0xd5, 0x3f, 0x48, 0x90, 0xe5, 0x59, 0x47, 0x4f, 0x41, 0x61, 0x6d, + 0x1c, 0x0d, 0xed, 0xbb, 0x76, 0x31, 0xb7, 0x41, 0x08, 0x94, 0xa9, 0x3d, 0xc1, 0x3a, 0xe2, 0x9e, + 0xf1, 0x67, 0x43, 0x51, 0x33, 0x9a, 0x6c, 0x28, 0xaa, 0xac, 0x29, 0x86, 0xa2, 0x2a, 0x5a, 0xd6, + 0x50, 0xd4, 0xac, 0x96, 0x33, 0x14, 0x35, 0xa7, 0xe5, 0x0d, 0x45, 0xcd, 0x6b, 0xaa, 0xa1, 0xa8, + 0xaa, 0x56, 0x30, 0x14, 0xb5, 0xa0, 0x81, 0xa1, 0xa8, 0xa0, 0x15, 0x0d, 0x45, 0x2d, 0x6a, 0x25, + 0x43, 0x51, 0x4b, 0x5a, 0xd9, 0x50, 0xd4, 0xb2, 0x56, 0x31, 0x14, 0xb5, 0xa2, 0xad, 0x1b, 0x8a, + 0xba, 0xae, 0x69, 0x86, 0xa2, 0x6a, 0xda, 0x86, 0xa1, 0xa8, 0x1b, 0x1a, 0x6a, 0xfe, 0x51, 0x82, + 0x8a, 0x60, 0x4f, 0x42, 0xd8, 0x0f, 0x60, 0x83, 0x87, 0xe5, 0x4e, 0x4f, 0xad, 0x20, 0x12, 0x72, + 0x0e, 0x66, 0x4c, 0x2d, 0x3e, 0x48, 0x94, 0xbf, 0x0e, 0x65, 0x82, 0x6d, 0x67, 0xa9, 0x98, 0xe1, + 0x8a, 0x25, 0x26, 0x4c, 0x94, 0xbe, 0x01, 0x15, 0xde, 0x2f, 0x4b, 0x2d, 0x99, 0x6b, 0x95, 0xb9, + 0x34, 0x51, 0xeb, 0x42, 0x99, 0x06, 0xf6, 0x74, 0xa9, 0xa5, 0x70, 0xe2, 0x7f, 0xf5, 0x1a, 0x32, + 0x1e, 0x06, 0xf6, 0x34, 0x22, 0x61, 0x89, 0xd9, 0x24, 0x97, 0x8b, 0xc9, 0xef, 0x96, 0xd9, 0x04, + 0x33, 0x8d, 0x67, 0x2e, 0x0d, 0xd1, 0xf7, 0xa0, 0x44, 0xb8, 0xc4, 0x62, 0x8a, 0x71, 0x37, 0xdd, + 0x02, 0x5a, 0x24, 0x09, 0x08, 0x6d, 0xfe, 0x5e, 0x82, 0xb7, 0x0e, 0x47, 0x63, 0x3c, 0xb1, 0x7b, + 0x63, 0x7b, 0x7a, 0x9a, 0xdc, 0x5a, 0x5b, 0x00, 0x3c, 0x76, 0x9b, 0x5a, 0xfe, 0xc9, 0x7d, 0xae, + 0x69, 0x95, 0x99, 0x6d, 0xd1, 0xfd, 0x13, 0xf4, 0x03, 0xd0, 0x52, 0xce, 0x59, 0x9e, 0x4b, 0xc3, + 0xe8, 0xe6, 0x7b, 0x78, 0xf3, 0x48, 0x4a, 0x45, 0x18, 0x81, 0x56, 0xc8, 0x8a, 0xb4, 0xf9, 0x15, + 0xd8, 0x4c, 0x3b, 0x9d, 0x64, 0xe8, 0x97, 0x19, 0xd8, 0x10, 0xa2, 0x13, 0x8c, 0x9d, 0x38, 0x96, + 0xbd, 0xd5, 0x4b, 0x28, 0x73, 0x9f, 0x4b, 0x28, 0x72, 0x20, 0x7d, 0x15, 0xb1, 0x89, 0xe0, 0x4e, + 0xcf, 0xac, 0xe5, 0x0a, 0x21, 0x26, 0x82, 0x3b, 0x3d, 0x63, 0x6b, 0x44, 0x9e, 0x1d, 0x1e, 0x13, + 0x17, 0x19, 0xa0, 0xf8, 0x41, 0x18, 0x57, 0xfa, 0xa6, 0x31, 0xfc, 0x9a, 0xcb, 0xed, 0xfd, 0x20, + 0x14, 0xf3, 0xdd, 0xe4, 0x18, 0xd5, 0x27, 0x50, 0x48, 0x44, 0xe9, 0x91, 0x5f, 0x10, 0x23, 0x7f, + 0x33, 0x3d, 0xf2, 0x0b, 0xaf, 0x8f, 0xee, 0x4f, 0x00, 0x2d, 0xbf, 0x91, 0x70, 0x72, 0x0b, 0x0a, + 0x63, 0xf7, 0x74, 0xcc, 0xa7, 0xf7, 0xbd, 0x36, 0xb1, 0xc4, 0xaa, 0xb9, 0xc8, 0x42, 0xfe, 0xc0, + 0x7e, 0xe9, 0xf9, 0xb6, 0x83, 0x1a, 0x50, 0x8c, 0x77, 0x26, 0xd7, 0x9f, 0x46, 0xee, 0xa5, 0x45, + 0x6c, 0x46, 0xce, 0x28, 0x26, 0x7c, 0x10, 0x08, 0x4f, 0x93, 0x77, 0xd6, 0x47, 0x7c, 0xc1, 0xc3, + 0x8e, 0x35, 0x71, 0x47, 0xc4, 0xa7, 0x3c, 0xb7, 0xb2, 0x59, 0x8e, 0xa4, 0x7b, 0x5c, 0x88, 0xde, + 0x83, 0xf5, 0x13, 0x77, 0xea, 0xd2, 0xf1, 0x52, 0x8f, 0x4f, 0x65, 0xb3, 0x12, 0x8b, 0x23, 0x45, + 0x1f, 0x2a, 0xcb, 0x0d, 0xce, 0x72, 0x1d, 0xaa, 0xe7, 0x1a, 0x72, 0xab, 0xdc, 0xdd, 0x5d, 0xcc, + 0xeb, 0xe5, 0x65, 0x7d, 0x07, 0xdb, 0xf4, 0x4d, 0xa7, 0x6f, 0x79, 0x89, 0x3f, 0x70, 0x28, 0x5f, + 0x83, 0x09, 0xf1, 0x89, 0xae, 0x8a, 0x1a, 0xf0, 0x17, 0xf4, 0x11, 0x64, 0x3d, 0xb6, 0x81, 0xf3, + 0xc1, 0x5a, 0x7c, 0xdc, 0xb8, 0x81, 0x05, 0x7c, 0x53, 0x37, 0x85, 0x3a, 0xea, 0x42, 0x4e, 0x4c, + 0x6f, 0x1d, 0xb8, 0x61, 0xeb, 0x06, 0xc3, 0x95, 0x05, 0x7b, 0x77, 0xcd, 0x8c, 0x2c, 0x51, 0x1f, + 0xf2, 0x44, 0x5c, 0xd8, 0x7a, 0x91, 0x83, 0x3c, 0xbc, 0xf3, 0x2a, 0xb0, 0xbb, 0x66, 0xc6, 0xb6, + 0xe8, 0x08, 0x4a, 0x34, 0xd5, 0x6c, 0x7a, 0x89, 0x63, 0xdd, 0x74, 0x65, 0x5f, 0x33, 0x50, 0x76, + 0xd9, 0x30, 0x4b, 0x89, 0x59, 0x80, 0x2e, 0x9f, 0xcd, 0x7a, 0xf9, 0xd6, 0x00, 0x57, 0x56, 0x00, + 0x16, 0xa0, 0xb0, 0x44, 0xcf, 0x01, 0x46, 0x09, 0xad, 0xf5, 0x0a, 0xc7, 0xf9, 0xe6, 0x7d, 0xfa, + 0x6c, 0x77, 0xcd, 0x4c, 0x21, 0x74, 0x0b, 0x90, 0x77, 0xc4, 0x41, 0x72, 0x13, 0xe5, 0x35, 0xb5, + 0xf9, 0x2f, 0x19, 0xd4, 0xa4, 0x69, 0x1e, 0x01, 0x3a, 0x21, 0xf6, 0x88, 0xf1, 0xd9, 0x1a, 0xf9, + 0xec, 0x86, 0x0c, 0xb1, 0x58, 0x28, 0x33, 0xe6, 0x46, 0x7c, 0xd2, 0x8b, 0x0f, 0x18, 0x5f, 0x27, + 0xbe, 0xe3, 0x9e, 0xb8, 0x4b, 0xbe, 0x8a, 0x3f, 0x93, 0x2a, 0xb1, 0x38, 0xe2, 0x6b, 0xef, 0x4a, + 0xc1, 0x1f, 0xde, 0x5a, 0xf0, 0xd8, 0xa5, 0x54, 0xc5, 0x77, 0xae, 0x56, 0xfc, 0xfd, 0xdb, 0x2b, + 0x9e, 0x82, 0x49, 0x4a, 0x7e, 0x7c, 0x6d, 0xc9, 0x3b, 0x77, 0x2c, 0x79, 0x0a, 0x71, 0xb5, 0xe6, + 0xbd, 0x2b, 0x35, 0x7f, 0x78, 0x6b, 0xcd, 0xd3, 0x31, 0x46, 0x45, 0xdf, 0xbf, 0xa6, 0xe8, 0x8f, + 0xee, 0x54, 0xf4, 0x14, 0xd8, 0xf5, 0x55, 0x7f, 0xff, 0x0b, 0x09, 0x94, 0xa3, 0x97, 0x01, 0x46, + 0xef, 0x40, 0xf1, 0xf8, 0xf9, 0xe1, 0x41, 0xbf, 0x37, 0xd8, 0x19, 0xf4, 0xb7, 0xb5, 0xb5, 0xea, + 0x5b, 0x17, 0x97, 0x8d, 0x75, 0x76, 0x74, 0x3c, 0xa5, 0x01, 0x1e, 0xf1, 0xca, 0xa1, 0x2a, 0xe4, + 0xba, 0x5b, 0xbd, 0xef, 0x1f, 0x1f, 0x68, 0x52, 0xb5, 0x72, 0x71, 0xd9, 0x00, 0xa6, 0x20, 0x8a, + 0x83, 0x1e, 0x40, 0xde, 0xec, 0x1f, 0x1e, 0xed, 0x9b, 0x7d, 0x2d, 0x53, 0x5d, 0xbf, 0xb8, 0x6c, + 0x14, 0xd9, 0x61, 0x94, 0x73, 0xf4, 0x1e, 0x94, 0x0f, 0x7b, 0xbb, 0xfd, 0xbd, 0x2d, 0xab, 0xb7, + 0xbb, 0xf5, 0xfc, 0xe3, 0xbe, 0x26, 0x57, 0x37, 0x2f, 0x2e, 0x1b, 0x1a, 0xd3, 0x49, 0xa7, 0x92, + 0x7d, 0x62, 0xb0, 0x77, 0xb0, 0x6f, 0x1e, 0x69, 0xca, 0xf2, 0x13, 0x22, 0x37, 0xa8, 0x09, 0x20, + 0xac, 0x77, 0xfa, 0xfd, 0x6d, 0x2d, 0x5b, 0x45, 0x17, 0x97, 0x8d, 0x0a, 0x3b, 0x5f, 0x86, 0x5c, + 0x55, 0x7f, 0xfe, 0x9b, 0xda, 0xda, 0xef, 0x7e, 0x5b, 0x5b, 0xeb, 0x36, 0x5e, 0xfd, 0xa3, 0xb6, + 0xf6, 0x6a, 0x51, 0x93, 0xfe, 0xbc, 0xa8, 0x49, 0x7f, 0x59, 0xd4, 0xa4, 0xbf, 0x2f, 0x6a, 0xd2, + 0x2f, 0xfe, 0x59, 0x5b, 0xfb, 0x34, 0x27, 0x32, 0x35, 0xcc, 0xf1, 0x7f, 0x1a, 0x7c, 0xf8, 0xbf, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xed, 0xd5, 0x66, 0xe9, 0x10, 0x00, 0x00, } diff --git a/pkg/sql/jobs/jobspb/jobs.proto b/pkg/sql/jobs/jobspb/jobs.proto index 380d0d45505f..ee11e291b5f5 100644 --- a/pkg/sql/jobs/jobspb/jobs.proto +++ b/pkg/sql/jobs/jobspb/jobs.proto @@ -81,6 +81,7 @@ message ImportDetails { roachpb.IOFileFormat format = 3 [(gogoproto.nullable) = false]; int64 sst_size = 4 [(gogoproto.customname) = "SSTSize"]; + int64 oversample = 9; int64 walltime = 5; uint32 parent_id = 6 [ (gogoproto.customname) = "ParentID",