diff --git a/pkg/ccl/importccl/import_stmt.go b/pkg/ccl/importccl/import_stmt.go index 4c2bba08dcdd..6d01a6d6eab8 100644 --- a/pkg/ccl/importccl/import_stmt.go +++ b/pkg/ccl/importccl/import_stmt.go @@ -400,7 +400,6 @@ func importPlanHook( if err != nil { return err } -<<<<<<< HEAD // Validate target columns. var intoCols []string @@ -429,10 +428,6 @@ func importPlanHook( } tableDetails = []jobspb.ImportDetails_Table{{Desc: &found.TableDescriptor, IsNew: false, TargetCols: intoCols}} -======= - // TODO(dt): configure target cols from ImportStmt.IntoCols - tableDetails = []jobspb.ImportDetails_Table{{Desc: &found.TableDescriptor, IsNew: false}} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } else { var tableDescs []*sqlbase.TableDescriptor seqVals := make(map[sqlbase.ID]int64) @@ -702,16 +697,6 @@ func prepareNewTableDescsForIngestion( return nil, errors.Wrapf(err, "creating tables") } -<<<<<<< HEAD -======= - // TODO(dt): we should be creating the job with this txn too. Once a job - // is created, the contract is it does its own, explicit cleanup on - // failure (i.e. not just txn rollback) but everything up to and including - // the creation of the job *should* be a single atomic txn. As-is, if we - // fail to creat the job after committing this txn, we've leaving broken - // descs and namespace records. - ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. return tableDescs, nil } @@ -766,11 +751,7 @@ func (r *importResumer) prepareTableDescsForIngestion( ) error { importDetails := details var hasExistingTables bool -<<<<<<< HEAD err := p.ExecCfg().DB.Txn(ctx, func(ctx context.Context, txn *client.Txn) error { -======= - if err := p.ExecCfg().DB.Txn(ctx, func(ctx context.Context, txn *client.Txn) error { ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. var err error newTableDescToIdx := make(map[*sqlbase.TableDescriptor]int, len(importDetails.Tables)) var newTableDescs []jobspb.ImportDetails_Table @@ -817,24 +798,11 @@ func (r *importResumer) prepareTableDescsForIngestion( } // Update the job once all descs have been prepared for ingestion. -<<<<<<< HEAD err = r.job.WithTxn(txn).SetDetails(ctx, importDetails) return err }) return err -======= - if err = r.job.WithTxn(txn).SetDetails(ctx, importDetails); err != nil { - return err - } - - return nil - }); err != nil { - return err - } - - return nil ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } // Resume is part of the jobs.Resumer interface. @@ -863,12 +831,7 @@ func (r *importResumer) Resume( sstSize = storageccl.MaxImportBatchSize(r.settings) * 5 } -<<<<<<< HEAD tables := make(map[string]*distsqlpb.ReadImportDataSpec_ImportTable, len(details.Tables)) -======= - tables := make(map[string]*sqlbase.TableDescriptor, len(details.Tables)) - ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. if details.Tables != nil { // Skip prepare stage on job resumption, if it has already been completed. if !details.PrepareComplete { @@ -880,19 +843,11 @@ func (r *importResumer) Resume( details = r.job.Details().(jobspb.ImportDetails) } -<<<<<<< HEAD for _, i := range details.Tables { if i.Name != "" { tables[i.Name] = &distsqlpb.ReadImportDataSpec_ImportTable{Desc: i.Desc, TargetCols: i.TargetCols} } else if i.Desc != nil { tables[i.Desc.Name] = &distsqlpb.ReadImportDataSpec_ImportTable{Desc: i.Desc, TargetCols: i.TargetCols} -======= - for _, tbl := range details.Tables { - if tbl.Name != "" { - tables[tbl.Name] = tbl.Desc - } else if tbl.Desc != nil { - tables[tbl.Desc.Name] = tbl.Desc ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } else { return errors.Errorf("invalid table specification") } diff --git a/pkg/ccl/importccl/import_stmt_test.go b/pkg/ccl/importccl/import_stmt_test.go index 3a7ef55106cc..c5142d224801 100644 --- a/pkg/ccl/importccl/import_stmt_test.go +++ b/pkg/ccl/importccl/import_stmt_test.go @@ -31,7 +31,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/parser" - "github.com/cockroachdb/cockroach/pkg/sql/sem/builtins" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/stats" @@ -1095,14 +1094,14 @@ func TestImportCSVStmt(t *testing.T) { sqlDB.Exec(t, fmt.Sprintf(`IMPORT TABLE pk.t (a INT8, b STRING) CSV DATA (%s)`, strings.Join(testFiles.files, ", "))) // Verify the rowids are being generated as expected. sqlDB.CheckQueryResults(t, - `SELECT count(*), sum(rowid) FROM pk.t`, + `SELECT count(*) FROM pk.t`, sqlDB.QueryStr(t, ` - SELECT count(*), sum(rowid) FROM - (SELECT file + (rownum << $3) as rowid FROM + SELECT count(*) FROM + (SELECT * FROM (SELECT generate_series(0, $1 - 1) file), (SELECT generate_series(1, $2) rownum) ) - `, numFiles, rowsPerFile, builtins.NodeIDBits), + `, numFiles, rowsPerFile), ) }) @@ -1505,20 +1504,17 @@ func TestImportIntoCSV(t *testing.T) { } } - var existingRowsRowIDSum int - sqlDB.QueryRow(t, `SELECT sum(rowid) FROM pk.t`).Scan(&existingRowsRowIDSum) - sqlDB.Exec(t, fmt.Sprintf(`IMPORT INTO pk.t (a, b) CSV DATA (%s)`, strings.Join(testFiles.files, ", "))) // Verify the rowids are being generated as expected. sqlDB.CheckQueryResults(t, - `SELECT count(*), sum(rowid) FROM pk.t`, + `SELECT count(*) FROM pk.t`, sqlDB.QueryStr(t, ` - SELECT count(*) + $5, sum(rowid) + $4 FROM - (SELECT file + (rownum << $3) as rowid FROM - (SELECT generate_series(0, $1 - 1) file), - (SELECT generate_series(1, $2) rownum) - ) - `, numFiles, rowsPerFile, builtins.NodeIDBits, existingRowsRowIDSum, numExistingRows), + SELECT count(*) + $3 FROM + (SELECT * FROM + (SELECT generate_series(0, $1 - 1) file), + (SELECT generate_series(1, $2) rownum) + ) + `, numFiles, rowsPerFile, numExistingRows), ) }) @@ -1658,21 +1654,6 @@ func TestImportIntoCSV(t *testing.T) { sqlDB.Exec(t, "CREATE DATABASE targetcols; USE targetcols") sqlDB.Exec(t, `CREATE TABLE t (a INT PRIMARY KEY, b STRING)`) - // Insert the test data - insert := []string{"''", "'text'", "'a'", "'e'", "'l'", "'t'", "'z'"} - - if tx, err := db.Begin(); err != nil { - t.Fatal(err) - } else { - for i, v := range insert { - sqlDB.Exec(t, fmt.Sprintf("INSERT INTO t (a, b) VALUES (%d, %s)", i, v)) - } - - if err := tx.Commit(); err != nil { - t.Fatal(err) - } - } - // Expect an error if attempting to IMPORT INTO a target list which does // not include all the PKs of the table. sqlDB.ExpectErr( @@ -1773,6 +1754,43 @@ func TestImportIntoCSV(t *testing.T) { }) // TODO(adityamaru): Add test for IMPORT INTO without target columns specified // once grammar has been added. + + // This tests that consecutive imports from unique data sources into an + // existing table without an explicit PK, do not overwrite each other. It + // exercises the row_id generation in IMPORT. + t.Run("multiple-import-into-without-pk", func(t *testing.T) { + sqlDB.Exec(t, "CREATE DATABASE multiple; USE multiple") + sqlDB.Exec(t, `CREATE TABLE t (a INT, b STRING)`) + + // Insert the test data + insert := []string{"''", "'text'", "'a'", "'e'", "'l'", "'t'", "'z'"} + numExistingRows := len(insert) + insertedRows := 3000 + + if tx, err := db.Begin(); err != nil { + t.Fatal(err) + } else { + for i, v := range insert { + sqlDB.Exec(t, fmt.Sprintf("INSERT INTO t (a, b) VALUES (%d, %s)", i, v)) + } + + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + } + + // Expect it to succeed with correct columns. + sqlDB.Exec(t, fmt.Sprintf(`IMPORT INTO t (a, b) CSV DATA (%s)`, testFiles.files[0])) + sqlDB.Exec(t, fmt.Sprintf(`IMPORT INTO t (a, b) CSV DATA (%s)`, testFiles.files[1])) + sqlDB.Exec(t, fmt.Sprintf(`IMPORT INTO t (a, b) CSV DATA (%s)`, testFiles.files[2])) + + // Verify correct number of rows via COUNT. + var result int + sqlDB.QueryRow(t, `SELECT count(*) FROM t`).Scan(&result) + if expect := numExistingRows + insertedRows; result != expect { + t.Fatalf("expected %d rows, got %d", expect, result) + } + }) } func BenchmarkImport(b *testing.B) { diff --git a/pkg/ccl/importccl/read_import_csv.go b/pkg/ccl/importccl/read_import_csv.go index 9af11b811dd9..296c818f22eb 100644 --- a/pkg/ccl/importccl/read_import_csv.go +++ b/pkg/ccl/importccl/read_import_csv.go @@ -12,6 +12,7 @@ import ( "context" "io" "runtime" + "time" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" @@ -32,6 +33,7 @@ type csvInputReader struct { batchSize int batch csvRecord opts roachpb.CSVOptions + walltime int64 tableDesc *sqlbase.TableDescriptor targetCols tree.NameList expectedCols int @@ -42,6 +44,7 @@ var _ inputConverter = &csvInputReader{} func newCSVInputReader( kvCh chan []roachpb.KeyValue, opts roachpb.CSVOptions, + walltime int64, tableDesc *sqlbase.TableDescriptor, targetCols tree.NameList, evalCtx *tree.EvalContext, @@ -49,6 +52,7 @@ func newCSVInputReader( return &csvInputReader{ evalCtx: evalCtx, opts: opts, + walltime: walltime, kvCh: kvCh, expectedCols: len(tableDesc.VisibleColumns()), tableDesc: tableDesc, @@ -173,6 +177,9 @@ func (c *csvInputReader) convertRecordWorker(ctx context.Context) error { panic("uninitialized session data") } + const precision = uint64(10 * time.Microsecond) + timestamp := uint64(c.walltime) / precision + for batch := range c.recordCh { for batchIdx, record := range batch.r { rowNum := int64(batch.rowOffset + batchIdx) @@ -196,7 +203,9 @@ func (c *csvInputReader) convertRecordWorker(ctx context.Context) error { } datumIdx++ } - if err := conv.Row(ctx, batch.fileIndex, rowNum); err != nil { + + rowIndex := int64(timestamp) + rowNum + if err := conv.Row(ctx, batch.fileIndex, rowIndex); err != nil { return wrapRowErr(err, batch.file, rowNum, pgcode.Uncategorized, "") } } diff --git a/pkg/ccl/importccl/read_import_proc.go b/pkg/ccl/importccl/read_import_proc.go index bdc8ce3f4060..b63036d77b10 100644 --- a/pkg/ccl/importccl/read_import_proc.go +++ b/pkg/ccl/importccl/read_import_proc.go @@ -297,7 +297,7 @@ func (cp *readImportDataProcessor) doRun(ctx context.Context) error { if isWorkload { conv = newWorkloadReader(kvCh, singleTable, evalCtx) } else { - conv = newCSVInputReader(kvCh, cp.spec.Format.Csv, singleTable, singleTableTargetCols, evalCtx) + conv = newCSVInputReader(kvCh, cp.spec.Format.Csv, cp.spec.WalltimeNanos, singleTable, singleTableTargetCols, evalCtx) } case roachpb.IOFileFormat_MysqlOutfile: conv, err = newMysqloutfileReader(kvCh, cp.spec.Format.MysqlOut, singleTable, evalCtx) diff --git a/pkg/jobs/jobspb/jobs.pb.go b/pkg/jobs/jobspb/jobs.pb.go index a48cd9c755d0..46f99bf87b8b 100644 --- a/pkg/jobs/jobspb/jobs.pb.go +++ b/pkg/jobs/jobspb/jobs.pb.go @@ -55,11 +55,7 @@ func (x Status) String() string { return proto.EnumName(Status_name, int32(x)) } func (Status) EnumDescriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{0} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{0} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } type Type int32 @@ -97,11 +93,7 @@ var Type_value = map[string]int32{ } func (Type) EnumDescriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{1} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{1} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } type Lease struct { @@ -115,11 +107,7 @@ func (m *Lease) Reset() { *m = Lease{} } func (m *Lease) String() string { return proto.CompactTextString(m) } func (*Lease) ProtoMessage() {} func (*Lease) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{0} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{0} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *Lease) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -155,11 +143,7 @@ func (m *BackupDetails) Reset() { *m = BackupDetails{} } func (m *BackupDetails) String() string { return proto.CompactTextString(m) } func (*BackupDetails) ProtoMessage() {} func (*BackupDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{1} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{1} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *BackupDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -191,11 +175,7 @@ func (m *BackupProgress) Reset() { *m = BackupProgress{} } func (m *BackupProgress) String() string { return proto.CompactTextString(m) } func (*BackupProgress) ProtoMessage() {} func (*BackupProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{2} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{2} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *BackupProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -232,11 +212,7 @@ func (m *RestoreDetails) Reset() { *m = RestoreDetails{} } func (m *RestoreDetails) String() string { return proto.CompactTextString(m) } func (*RestoreDetails) ProtoMessage() {} func (*RestoreDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{3} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{3} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *RestoreDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -270,11 +246,7 @@ func (m *RestoreDetails_TableRewrite) Reset() { *m = RestoreDetails_Tabl func (m *RestoreDetails_TableRewrite) String() string { return proto.CompactTextString(m) } func (*RestoreDetails_TableRewrite) ProtoMessage() {} func (*RestoreDetails_TableRewrite) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{3, 0} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{3, 0} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *RestoreDetails_TableRewrite) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -307,11 +279,7 @@ func (m *RestoreProgress) Reset() { *m = RestoreProgress{} } func (m *RestoreProgress) String() string { return proto.CompactTextString(m) } func (*RestoreProgress) ProtoMessage() {} func (*RestoreProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{4} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{4} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *RestoreProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -363,11 +331,7 @@ func (m *ImportDetails) Reset() { *m = ImportDetails{} } func (m *ImportDetails) String() string { return proto.CompactTextString(m) } func (*ImportDetails) ProtoMessage() {} func (*ImportDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{5} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{5} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ImportDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -404,11 +368,7 @@ func (m *ImportDetails_Table) Reset() { *m = ImportDetails_Table{} } func (m *ImportDetails_Table) String() string { return proto.CompactTextString(m) } func (*ImportDetails_Table) ProtoMessage() {} func (*ImportDetails_Table) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{5, 0} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{5, 0} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ImportDetails_Table) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -447,11 +407,7 @@ func (m *ImportProgress) Reset() { *m = ImportProgress{} } func (m *ImportProgress) String() string { return proto.CompactTextString(m) } func (*ImportProgress) ProtoMessage() {} func (*ImportProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{6} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{6} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ImportProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -484,11 +440,7 @@ func (m *ResumeSpanList) Reset() { *m = ResumeSpanList{} } func (m *ResumeSpanList) String() string { return proto.CompactTextString(m) } func (*ResumeSpanList) ProtoMessage() {} func (*ResumeSpanList) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{7} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{7} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ResumeSpanList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -523,11 +475,7 @@ func (m *DroppedTableDetails) Reset() { *m = DroppedTableDetails{} } func (m *DroppedTableDetails) String() string { return proto.CompactTextString(m) } func (*DroppedTableDetails) ProtoMessage() {} func (*DroppedTableDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{8} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{8} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *DroppedTableDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -569,11 +517,7 @@ func (m *SchemaChangeDetails) Reset() { *m = SchemaChangeDetails{} } func (m *SchemaChangeDetails) String() string { return proto.CompactTextString(m) } func (*SchemaChangeDetails) ProtoMessage() {} func (*SchemaChangeDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{9} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{9} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *SchemaChangeDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -605,11 +549,7 @@ func (m *SchemaChangeProgress) Reset() { *m = SchemaChangeProgress{} } func (m *SchemaChangeProgress) String() string { return proto.CompactTextString(m) } func (*SchemaChangeProgress) ProtoMessage() {} func (*SchemaChangeProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{10} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{10} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *SchemaChangeProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -642,11 +582,7 @@ func (m *ChangefeedTarget) Reset() { *m = ChangefeedTarget{} } func (m *ChangefeedTarget) String() string { return proto.CompactTextString(m) } func (*ChangefeedTarget) ProtoMessage() {} func (*ChangefeedTarget) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{11} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{11} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ChangefeedTarget) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -699,11 +635,7 @@ func (m *ChangefeedDetails) Reset() { *m = ChangefeedDetails{} } func (m *ChangefeedDetails) String() string { return proto.CompactTextString(m) } func (*ChangefeedDetails) ProtoMessage() {} func (*ChangefeedDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{12} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{12} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ChangefeedDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -737,11 +669,7 @@ func (m *ResolvedSpan) Reset() { *m = ResolvedSpan{} } func (m *ResolvedSpan) String() string { return proto.CompactTextString(m) } func (*ResolvedSpan) ProtoMessage() {} func (*ResolvedSpan) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{13} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{13} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ResolvedSpan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -774,11 +702,7 @@ func (m *ChangefeedProgress) Reset() { *m = ChangefeedProgress{} } func (m *ChangefeedProgress) String() string { return proto.CompactTextString(m) } func (*ChangefeedProgress) ProtoMessage() {} func (*ChangefeedProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{14} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{14} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *ChangefeedProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -822,11 +746,7 @@ func (m *CreateStatsDetails) Reset() { *m = CreateStatsDetails{} } func (m *CreateStatsDetails) String() string { return proto.CompactTextString(m) } func (*CreateStatsDetails) ProtoMessage() {} func (*CreateStatsDetails) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{15} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{15} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *CreateStatsDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -861,11 +781,7 @@ func (m *CreateStatsDetails_ColStat) Reset() { *m = CreateStatsDetails_C func (m *CreateStatsDetails_ColStat) String() string { return proto.CompactTextString(m) } func (*CreateStatsDetails_ColStat) ProtoMessage() {} func (*CreateStatsDetails_ColStat) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{15, 0} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{15, 0} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *CreateStatsDetails_ColStat) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -897,11 +813,7 @@ func (m *CreateStatsProgress) Reset() { *m = CreateStatsProgress{} } func (m *CreateStatsProgress) String() string { return proto.CompactTextString(m) } func (*CreateStatsProgress) ProtoMessage() {} func (*CreateStatsProgress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{16} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{16} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *CreateStatsProgress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,11 +866,7 @@ func (m *Payload) Reset() { *m = Payload{} } func (m *Payload) String() string { return proto.CompactTextString(m) } func (*Payload) ProtoMessage() {} func (*Payload) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{17} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{17} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *Payload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1235,11 +1143,7 @@ func (m *Progress) Reset() { *m = Progress{} } func (m *Progress) String() string { return proto.CompactTextString(m) } func (*Progress) ProtoMessage() {} func (*Progress) Descriptor() ([]byte, []int) { -<<<<<<< HEAD return fileDescriptor_jobs_1cf33e53f58bda4f, []int{18} -======= - return fileDescriptor_jobs_44de5c875f049a7e, []int{18} ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. } func (m *Progress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -7418,7 +7322,6 @@ var ( ErrIntOverflowJobs = fmt.Errorf("proto: integer overflow") ) -<<<<<<< HEAD func init() { proto.RegisterFile("jobs/jobspb/jobs.proto", fileDescriptor_jobs_1cf33e53f58bda4f) } var fileDescriptor_jobs_1cf33e53f58bda4f = []byte{ @@ -7581,167 +7484,4 @@ var fileDescriptor_jobs_1cf33e53f58bda4f = []byte{ 0x2d, 0xe1, 0xf3, 0xc5, 0x96, 0xf0, 0xcf, 0xc5, 0x96, 0xf0, 0xb3, 0x2f, 0xb6, 0x62, 0x9f, 0x7d, 0xb1, 0x15, 0xfb, 0xfc, 0x8b, 0xad, 0xd8, 0x07, 0x29, 0xbe, 0xe1, 0x47, 0x29, 0xf6, 0xe7, 0x86, 0xd7, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x89, 0xdf, 0x2b, 0xff, 0x1f, 0x19, 0x00, 0x00, -======= -func init() { proto.RegisterFile("jobs/jobspb/jobs.proto", fileDescriptor_jobs_44de5c875f049a7e) } - -var fileDescriptor_jobs_44de5c875f049a7e = []byte{ - // 2506 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xdf, 0x6f, 0x23, 0x57, - 0xf5, 0xf7, 0xd8, 0x63, 0x7b, 0x7c, 0xfc, 0x23, 0x93, 0x9b, 0xb4, 0x9d, 0x5a, 0xdb, 0xd8, 0x5f, - 0x7f, 0x69, 0x9b, 0xdd, 0x52, 0x1b, 0x52, 0xd1, 0xd2, 0x0a, 0x2a, 0xfc, 0x2b, 0x1b, 0xbb, 0xbb, - 0x76, 0x3a, 0x76, 0x5a, 0x28, 0x82, 0x61, 0xec, 0xb9, 0xb1, 0x87, 0xd8, 0x9e, 0xc9, 0xdc, 0xf1, - 0x6e, 0xb7, 0x42, 0x42, 0x42, 0x3c, 0xa0, 0x7d, 0xe2, 0x15, 0xc1, 0x4a, 0x20, 0x40, 0xe2, 0x05, - 0xd1, 0x3f, 0xa3, 0x2f, 0x88, 0x22, 0x5e, 0x8a, 0x90, 0x0c, 0xb8, 0x0f, 0xf0, 0x37, 0xec, 0x13, - 0xba, 0xf7, 0xce, 0x8c, 0xc7, 0xd9, 0x90, 0x64, 0x23, 0xf1, 0xb2, 0xeb, 0x39, 0xf7, 0x9c, 0x33, - 0xf7, 0x9c, 0xf3, 0x39, 0x9f, 0x7b, 0xee, 0x04, 0x9e, 0xfd, 0xbe, 0x35, 0x20, 0x15, 0xfa, 0x8f, - 0x3d, 0x60, 0xff, 0x95, 0x6d, 0xc7, 0x72, 0x2d, 0xf4, 0xfc, 0xd0, 0x1a, 0x9e, 0x38, 0x96, 0x3e, - 0x1c, 0x97, 0xc9, 0xe9, 0xa4, 0xcc, 0x56, 0xb8, 0x56, 0x7e, 0x7b, 0x64, 0x8d, 0x2c, 0xa6, 0x55, - 0xa1, 0xbf, 0xb8, 0x41, 0x1e, 0x31, 0x65, 0x7b, 0x50, 0x31, 0x74, 0x57, 0xf7, 0x64, 0x8a, 0x2f, - 0x33, 0xad, 0x57, 0x8f, 0x2d, 0x67, 0xaa, 0xbb, 0x9e, 0xfb, 0xfc, 0x0d, 0x72, 0x3a, 0xa9, 0x90, - 0xd3, 0xc9, 0x40, 0x27, 0xb8, 0x42, 0x5c, 0x67, 0x3e, 0x74, 0xe7, 0x0e, 0x36, 0x7c, 0xbb, 0xb9, - 0x6b, 0x4e, 0x2a, 0xe3, 0xc9, 0xb0, 0xe2, 0x9a, 0x53, 0x4c, 0x5c, 0x7d, 0x6a, 0xf3, 0x95, 0xd2, - 0x0f, 0x21, 0x7e, 0x07, 0xeb, 0x04, 0xa3, 0x0f, 0x20, 0x39, 0xb3, 0x0c, 0xac, 0x99, 0x86, 0x22, - 0x14, 0x85, 0xdd, 0x6c, 0xad, 0xba, 0x5c, 0x14, 0x12, 0x1d, 0xcb, 0xc0, 0xad, 0xc6, 0xe3, 0x45, - 0xe1, 0xb5, 0x91, 0xe9, 0x8e, 0xe7, 0x83, 0xf2, 0xd0, 0x9a, 0x56, 0x82, 0x48, 0x8c, 0xc1, 0xea, - 0x77, 0xc5, 0x3e, 0x19, 0x55, 0xbc, 0xed, 0x95, 0xb9, 0x99, 0x9a, 0xa0, 0x1e, 0x5b, 0x06, 0xda, - 0x86, 0x38, 0xb6, 0xad, 0xe1, 0x58, 0x89, 0x16, 0x85, 0xdd, 0x98, 0xca, 0x1f, 0xde, 0x12, 0xff, - 0xfd, 0xcb, 0x82, 0x50, 0xfa, 0x9b, 0x00, 0xd9, 0x9a, 0x3e, 0x3c, 0x99, 0xdb, 0x0d, 0xec, 0xea, - 0xe6, 0x84, 0xa0, 0x1a, 0x00, 0x71, 0x75, 0xc7, 0xd5, 0xe8, 0x5e, 0xd9, 0x66, 0xd2, 0x7b, 0x2f, - 0x94, 0x57, 0xe9, 0xa3, 0xb1, 0x94, 0xc7, 0x93, 0x61, 0xb9, 0xef, 0xc7, 0x52, 0x13, 0x3f, 0x59, - 0x14, 0x22, 0x6a, 0x8a, 0x99, 0x51, 0x29, 0x7a, 0x1b, 0x24, 0x3c, 0x33, 0xb8, 0x87, 0xe8, 0xd5, - 0x3d, 0x24, 0xf1, 0xcc, 0x60, 0xf6, 0xcf, 0x43, 0x6c, 0xee, 0x98, 0x4a, 0xac, 0x28, 0xec, 0xa6, - 0x6a, 0xc9, 0xe5, 0xa2, 0x10, 0x3b, 0x52, 0x5b, 0x2a, 0x95, 0xa1, 0x57, 0x60, 0x73, 0xc0, 0xf6, - 0xab, 0x19, 0x98, 0x0c, 0x1d, 0xd3, 0x76, 0x2d, 0x47, 0x11, 0x8b, 0xc2, 0x6e, 0x46, 0x95, 0x07, - 0x5e, 0x20, 0xbe, 0xbc, 0x24, 0x43, 0x8e, 0x07, 0x77, 0xe8, 0x58, 0x23, 0x07, 0x13, 0x52, 0xfa, - 0x6b, 0x1c, 0x72, 0x2a, 0x26, 0xae, 0xe5, 0x60, 0x3f, 0xe0, 0x5f, 0x08, 0x90, 0x73, 0xf5, 0xc1, - 0x04, 0x6b, 0x0e, 0xbe, 0xef, 0x98, 0x2e, 0x26, 0x4a, 0xb4, 0x18, 0xdb, 0x4d, 0xef, 0x7d, 0xad, - 0xfc, 0x5f, 0x41, 0x53, 0x5e, 0xf7, 0x51, 0xee, 0x53, 0x7b, 0xd5, 0x33, 0x6f, 0xce, 0x5c, 0xe7, - 0x41, 0xed, 0x8d, 0x1f, 0xfd, 0xfd, 0x8a, 0x65, 0x0b, 0x61, 0xa7, 0xdc, 0x6a, 0xa8, 0x59, 0x37, - 0xec, 0x0c, 0xdd, 0x00, 0x71, 0xee, 0x98, 0x44, 0x89, 0x15, 0x63, 0xbb, 0xa9, 0x9a, 0xb4, 0x5c, - 0x14, 0xc4, 0x23, 0xb5, 0x45, 0x54, 0x26, 0x5d, 0xcb, 0xb4, 0x78, 0x8d, 0x4c, 0xdf, 0x86, 0x34, - 0x8f, 0x9d, 0x66, 0x93, 0x28, 0x71, 0x16, 0xf8, 0x4b, 0x67, 0x02, 0xf7, 0x37, 0xc7, 0xa2, 0x5c, - 0xa5, 0x57, 0x05, 0xd7, 0x17, 0x10, 0x54, 0x81, 0xb4, 0x75, 0x0f, 0x3b, 0x8e, 0x69, 0x60, 0xcd, - 0x18, 0x28, 0x09, 0x56, 0xba, 0xdc, 0x72, 0x51, 0x80, 0xae, 0x27, 0x6e, 0xd4, 0x54, 0xf0, 0x55, - 0x1a, 0x83, 0xfc, 0x9f, 0x04, 0xc8, 0x84, 0xd3, 0x86, 0xbe, 0x03, 0x12, 0xdf, 0x4a, 0xd0, 0x03, - 0xb5, 0xe5, 0xa2, 0x90, 0x64, 0x3a, 0x4f, 0xd1, 0x04, 0x67, 0xb2, 0x99, 0x64, 0x3e, 0x5b, 0x06, - 0xfa, 0x1e, 0xa4, 0x6c, 0xdd, 0xc1, 0x33, 0x97, 0xfa, 0x8f, 0x32, 0xff, 0xf5, 0xe5, 0xa2, 0x20, - 0x1d, 0x32, 0xe1, 0xf5, 0x5f, 0x20, 0x71, 0xaf, 0x2d, 0x23, 0xff, 0x21, 0xa0, 0x27, 0x71, 0x80, - 0x64, 0x88, 0x9d, 0xe0, 0x07, 0x3c, 0x22, 0x95, 0xfe, 0x44, 0x77, 0x20, 0x7e, 0x4f, 0x9f, 0xcc, - 0xfd, 0xd6, 0x78, 0xfd, 0x7a, 0x30, 0x53, 0xb9, 0x93, 0xb7, 0xa2, 0x5f, 0x15, 0xda, 0xa2, 0x24, - 0xc8, 0xd1, 0xd2, 0x97, 0x60, 0xc3, 0xd3, 0xf7, 0xe1, 0x8e, 0x5e, 0x00, 0x18, 0x9b, 0xa3, 0xb1, - 0x76, 0x5f, 0x77, 0xb1, 0xc3, 0xf6, 0x90, 0x51, 0x53, 0x54, 0xf2, 0x3e, 0x15, 0x94, 0x7e, 0x95, - 0x80, 0x6c, 0x6b, 0x6a, 0x5b, 0x8e, 0xeb, 0x37, 0xc3, 0x1d, 0x48, 0xb0, 0x84, 0x11, 0x45, 0x60, - 0x50, 0x28, 0x5f, 0xb0, 0xb9, 0x35, 0x4b, 0xbe, 0x37, 0x0f, 0x5e, 0x9e, 0x8f, 0x00, 0xbb, 0xd1, - 0x73, 0xb1, 0xfb, 0x75, 0x48, 0x70, 0x16, 0x65, 0x8d, 0x9e, 0xde, 0x2b, 0x84, 0xde, 0xe5, 0x53, - 0x59, 0xab, 0xbb, 0x6f, 0x4e, 0xf0, 0x3e, 0x53, 0xf3, 0x9d, 0x73, 0x23, 0xf4, 0x12, 0x48, 0x84, - 0xb8, 0x1a, 0x31, 0x3f, 0xe2, 0xd0, 0x8f, 0xd5, 0xd2, 0x14, 0x2f, 0xbd, 0x5e, 0xbf, 0x67, 0x7e, - 0x84, 0xd5, 0x24, 0x21, 0x2e, 0xfd, 0x81, 0xf2, 0x20, 0xdd, 0xd7, 0x27, 0x13, 0xd6, 0x22, 0x71, - 0xc6, 0x80, 0xc1, 0xf3, 0x3a, 0x28, 0x12, 0xff, 0x03, 0x50, 0xa0, 0x02, 0xa4, 0x3d, 0xbe, 0xb2, - 0x75, 0x77, 0xac, 0x24, 0x69, 0x5f, 0xa8, 0xc0, 0x45, 0x87, 0xba, 0x3b, 0x46, 0x0a, 0x24, 0x89, - 0x3e, 0xb5, 0x69, 0xca, 0xa5, 0x62, 0x6c, 0x37, 0xa3, 0xfa, 0x8f, 0x68, 0x07, 0x58, 0xbf, 0xf0, - 0x47, 0x25, 0xc5, 0xb6, 0x1e, 0x92, 0xb0, 0x04, 0x9c, 0x98, 0xb6, 0x76, 0x7c, 0x42, 0x14, 0x28, - 0x0a, 0xbb, 0x92, 0x97, 0x80, 0x13, 0xd3, 0xde, 0x7f, 0x87, 0xa8, 0x49, 0xba, 0xb8, 0x7f, 0x42, - 0xd0, 0xcb, 0xb0, 0x61, 0xce, 0x46, 0x98, 0xb8, 0x9a, 0x61, 0x3a, 0x78, 0xe8, 0x4e, 0x1e, 0x28, - 0x69, 0xaa, 0xae, 0xe6, 0xb8, 0xb8, 0xe1, 0x49, 0xd1, 0x4d, 0x90, 0x6d, 0x07, 0xd3, 0xad, 0x6b, - 0x43, 0x8b, 0xbe, 0xc2, 0xc5, 0x4a, 0x86, 0x69, 0x6e, 0x78, 0xf2, 0xba, 0x27, 0xce, 0xff, 0x4b, - 0x80, 0x38, 0xab, 0x38, 0x7a, 0x0b, 0x44, 0xca, 0x1d, 0xde, 0x49, 0x71, 0x55, 0xea, 0x60, 0x36, - 0x08, 0x81, 0x38, 0xd3, 0xa7, 0x58, 0x41, 0x2c, 0x2b, 0xec, 0x37, 0x7a, 0x0e, 0x92, 0x04, 0x9f, - 0x6a, 0xf7, 0xf4, 0x89, 0xb2, 0xc5, 0x42, 0x4e, 0x10, 0x7c, 0xfa, 0x9e, 0x3e, 0x41, 0xcf, 0x40, - 0xc2, 0x24, 0xda, 0x0c, 0xdf, 0x57, 0xb6, 0xd9, 0x9e, 0xe2, 0x26, 0xe9, 0xe0, 0xfb, 0x6d, 0x51, - 0x8a, 0xca, 0xb1, 0xb6, 0x28, 0xc5, 0x64, 0xb1, 0x2d, 0x4a, 0xa2, 0x1c, 0x6f, 0x8b, 0x52, 0x5c, - 0x4e, 0xb4, 0x45, 0x29, 0x21, 0x27, 0xdb, 0xa2, 0x94, 0x94, 0xa5, 0xb6, 0x28, 0x49, 0x72, 0xaa, - 0x2d, 0x4a, 0x29, 0x19, 0xda, 0xa2, 0x04, 0x72, 0xba, 0x2d, 0x4a, 0x69, 0x39, 0xd3, 0x16, 0xa5, - 0x8c, 0x9c, 0x6d, 0x8b, 0x52, 0x56, 0xce, 0xb5, 0x45, 0x29, 0x27, 0x6f, 0xb4, 0x45, 0x69, 0x43, - 0x96, 0xdb, 0xa2, 0x24, 0xcb, 0x9b, 0x6d, 0x51, 0xda, 0x94, 0x51, 0xe9, 0x8f, 0x02, 0xe4, 0x38, - 0xd2, 0x83, 0xae, 0x7a, 0x05, 0x36, 0x59, 0x09, 0xcc, 0xd9, 0x48, 0xb3, 0x3d, 0x21, 0xeb, 0x97, - 0xa8, 0x2a, 0xfb, 0x0b, 0x81, 0xf2, 0xff, 0x43, 0xd6, 0xc1, 0xba, 0xb1, 0x52, 0x8c, 0x32, 0xc5, - 0x0c, 0x15, 0x06, 0x4a, 0x2f, 0x42, 0x8e, 0x35, 0xf5, 0x4a, 0x2b, 0xc6, 0xb4, 0xb2, 0x4c, 0x1a, - 0xa8, 0xd5, 0x20, 0x4b, 0x6c, 0x7d, 0xb6, 0xd2, 0x12, 0x59, 0x93, 0x3e, 0x77, 0x4e, 0xe3, 0xf4, - 0x6c, 0x7d, 0xe6, 0x35, 0x4c, 0x86, 0xda, 0x04, 0x27, 0xa0, 0xca, 0x0e, 0xc0, 0xf9, 0x14, 0x53, - 0x8d, 0x3b, 0x26, 0x71, 0xd1, 0x37, 0x20, 0xe3, 0x30, 0x89, 0x46, 0x15, 0xfd, 0xce, 0xbf, 0xc4, - 0x69, 0xda, 0x09, 0x9c, 0x90, 0xd2, 0xef, 0x05, 0xd8, 0x6a, 0x38, 0x96, 0x6d, 0x63, 0xc3, 0x2b, - 0x34, 0x67, 0x13, 0xbf, 0xbe, 0x42, 0xa8, 0xbe, 0xb7, 0x21, 0xda, 0x6a, 0x78, 0x04, 0xfc, 0xc6, - 0x75, 0xfb, 0x2b, 0xda, 0x6a, 0xa0, 0x37, 0x21, 0x41, 0x5c, 0xdd, 0x9d, 0x13, 0x46, 0x1f, 0xb9, - 0xbd, 0xff, 0xbb, 0x80, 0xaa, 0x7a, 0x4c, 0x51, 0xf5, 0x0c, 0x4a, 0x7f, 0x8e, 0xc2, 0x56, 0x6f, - 0x38, 0xc6, 0x53, 0xbd, 0x3e, 0xd6, 0x67, 0xa3, 0x60, 0xbf, 0xdf, 0x02, 0x39, 0x94, 0x09, 0x6d, - 0x62, 0x12, 0xd7, 0x9b, 0x05, 0x6e, 0x5e, 0x4c, 0xd2, 0xa1, 0x74, 0x7a, 0xf9, 0xc9, 0x39, 0xeb, - 0x49, 0xfe, 0x36, 0xe4, 0x0c, 0x9e, 0x21, 0xcd, 0x23, 0xd8, 0xd8, 0xa5, 0x04, 0x7b, 0x4e, 0x4a, - 0x3d, 0xef, 0x59, 0x23, 0xb4, 0x44, 0xd0, 0x0f, 0x60, 0xcb, 0x77, 0x4e, 0xc7, 0x55, 0x9a, 0x25, - 0x4a, 0x68, 0x22, 0x4b, 0xf2, 0x9d, 0xe5, 0xa2, 0xb0, 0xe9, 0xb9, 0x6a, 0x78, 0xab, 0xd7, 0x67, - 0xb6, 0x4d, 0xe3, 0x8c, 0x27, 0xc3, 0x3b, 0x7d, 0x9e, 0x85, 0xed, 0x70, 0x4a, 0x03, 0xbc, 0xd5, - 0x40, 0xe6, 0x92, 0x63, 0x4c, 0xf7, 0xeb, 0x8c, 0xb0, 0x8b, 0xca, 0xb0, 0x45, 0x2b, 0x81, 0xa7, - 0x94, 0x79, 0x29, 0x11, 0x6b, 0x21, 0x98, 0x6c, 0x06, 0x4b, 0x74, 0x42, 0xe9, 0xe8, 0x53, 0x5c, - 0xfa, 0x83, 0x08, 0x9b, 0x2b, 0x27, 0x7e, 0xb5, 0x28, 0xff, 0x99, 0xb3, 0x13, 0x6d, 0x35, 0x2a, - 0x72, 0xfe, 0x33, 0x67, 0x27, 0x74, 0x5c, 0x4c, 0xd2, 0xc5, 0x23, 0xc7, 0x44, 0x6d, 0x10, 0x2d, - 0xdb, 0xf5, 0x9b, 0xe5, 0xa2, 0xe3, 0xf6, 0x89, 0x77, 0x94, 0xbb, 0xb6, 0xcb, 0xcf, 0x71, 0x95, - 0xf9, 0x40, 0xbf, 0x15, 0x20, 0xe9, 0xb2, 0x20, 0x88, 0x92, 0x60, 0xfe, 0xde, 0x7c, 0x2a, 0x7f, - 0x3c, 0x01, 0xde, 0x88, 0x78, 0x48, 0x6b, 0xf9, 0x78, 0x51, 0xd8, 0x3c, 0x9b, 0x20, 0x72, 0xdd, - 0xd9, 0xd1, 0xdf, 0x1b, 0x6a, 0x43, 0x6e, 0x3d, 0xc3, 0xec, 0xe4, 0xb9, 0xe2, 0x74, 0x98, 0x5d, - 0xab, 0x40, 0x7e, 0x44, 0x07, 0xb5, 0xd5, 0xb6, 0xcf, 0x99, 0x68, 0xaa, 0xeb, 0x13, 0xcd, 0x2b, - 0x57, 0x4a, 0x09, 0xf7, 0x19, 0x1a, 0x63, 0xf2, 0x6f, 0x40, 0x2a, 0xc8, 0x77, 0xf8, 0x2d, 0x29, - 0xfe, 0x96, 0xed, 0xf0, 0x5b, 0x52, 0x4f, 0xcc, 0x3f, 0xc1, 0x49, 0x10, 0x97, 0x13, 0xa5, 0x1f, - 0x0b, 0x90, 0x51, 0x31, 0xb1, 0x26, 0xf7, 0xb0, 0x41, 0x7b, 0x10, 0x7d, 0x19, 0x44, 0xda, 0xd3, - 0xde, 0x31, 0x75, 0x09, 0xb9, 0x31, 0x55, 0x54, 0x85, 0x54, 0x70, 0x5f, 0x7b, 0x9a, 0x6b, 0xcc, - 0xca, 0xaa, 0x64, 0x03, 0x5a, 0x05, 0x1c, 0xd0, 0x78, 0x1f, 0x28, 0x3b, 0xb0, 0xbd, 0x79, 0x94, - 0xcb, 0x49, 0xe6, 0xe5, 0x8b, 0x49, 0x26, 0x08, 0xc6, 0x2f, 0x93, 0x13, 0x92, 0x11, 0xaf, 0x0d, - 0x7f, 0x2e, 0x02, 0xaa, 0x3b, 0x58, 0x77, 0x31, 0xe5, 0x3c, 0x72, 0x11, 0x13, 0xd7, 0x20, 0xce, - 0xa8, 0xc8, 0x8b, 0xed, 0x8a, 0x47, 0xb7, 0xf7, 0x72, 0x6e, 0x8a, 0xbe, 0x0b, 0x99, 0xa1, 0x35, - 0x99, 0x4f, 0x67, 0x1a, 0xc5, 0x8c, 0x4f, 0x6a, 0x5f, 0xb9, 0x08, 0x00, 0x4f, 0x6c, 0xae, 0x5c, - 0xb7, 0x26, 0xf4, 0xd9, 0x3f, 0x59, 0xb8, 0x43, 0xa6, 0x81, 0x6e, 0x40, 0x2a, 0x00, 0x23, 0xe3, - 0xb3, 0x94, 0xba, 0x12, 0xa0, 0x3d, 0x88, 0xeb, 0x44, 0xb3, 0x8e, 0xd9, 0x5c, 0x77, 0x59, 0x75, - 0x54, 0x51, 0x27, 0xdd, 0x63, 0xf4, 0x1a, 0x64, 0x8f, 0x4f, 0x39, 0x07, 0x73, 0xd6, 0xe1, 0x57, - 0x95, 0x8d, 0xe5, 0xa2, 0x90, 0xde, 0x7f, 0x97, 0x05, 0x4b, 0x39, 0x47, 0x4d, 0x1f, 0x9f, 0x06, - 0x0f, 0xe8, 0x16, 0x6c, 0x4e, 0xf5, 0x0f, 0xb5, 0x63, 0x47, 0x1f, 0xba, 0xa6, 0x35, 0xd3, 0x4c, - 0x63, 0xc2, 0x3b, 0x4a, 0x50, 0x37, 0xa6, 0xfa, 0x87, 0xfb, 0x9e, 0xbc, 0x65, 0x4c, 0x70, 0xfe, - 0x67, 0x02, 0x24, 0xbd, 0x88, 0x90, 0x09, 0xe0, 0xa5, 0xc7, 0x34, 0xf8, 0xc1, 0x9a, 0xad, 0xb5, - 0x97, 0x8b, 0x42, 0xaa, 0xce, 0xa4, 0xad, 0x06, 0x79, 0xbc, 0x28, 0xbc, 0xf9, 0xd4, 0x9d, 0xee, - 0x5b, 0xab, 0x29, 0xee, 0xbd, 0x65, 0xb0, 0x39, 0x63, 0xac, 0x13, 0x6d, 0x6c, 0x12, 0xd7, 0x1a, - 0x39, 0xfa, 0x94, 0x55, 0x55, 0x52, 0x33, 0x63, 0x9d, 0x1c, 0xf8, 0xb2, 0xd2, 0x33, 0xb0, 0x15, - 0xca, 0x7f, 0xc0, 0xd1, 0x7f, 0x49, 0x40, 0xf2, 0x50, 0x7f, 0x30, 0xb1, 0x74, 0x03, 0x15, 0x21, - 0xed, 0xdf, 0xac, 0x4d, 0x6b, 0xe6, 0x01, 0x26, 0x2c, 0xa2, 0x03, 0xf5, 0x9c, 0x60, 0x87, 0x25, - 0x8f, 0xb7, 0x62, 0xf0, 0x4c, 0x07, 0x19, 0xf6, 0x19, 0x00, 0x1b, 0xda, 0xd4, 0x1c, 0x3a, 0x16, - 0x3f, 0x9c, 0x63, 0x8c, 0x52, 0xa8, 0xf4, 0x2e, 0x13, 0xd2, 0x91, 0xf4, 0xd8, 0x9c, 0x99, 0x64, - 0xbc, 0xd2, 0x63, 0x23, 0xbc, 0x9a, 0xf3, 0xc5, 0x9e, 0xa2, 0x05, 0xb9, 0xd5, 0x3d, 0x9f, 0x25, - 0x31, 0xc1, 0x92, 0x78, 0xb0, 0x5c, 0x14, 0xb2, 0x2b, 0x50, 0xf2, 0x44, 0x5e, 0xef, 0xba, 0xbd, - 0xf2, 0x4f, 0xd3, 0xb8, 0x0d, 0x71, 0xec, 0x38, 0x96, 0xa3, 0x48, 0x9c, 0x64, 0xd8, 0x03, 0x7a, - 0x1d, 0xe2, 0x13, 0xac, 0x13, 0x3e, 0x85, 0xa7, 0xf7, 0x8a, 0x17, 0xe0, 0x9b, 0x7d, 0xcf, 0x51, - 0xb9, 0x3a, 0xaa, 0x41, 0x82, 0x8f, 0xfa, 0x6c, 0x40, 0x4f, 0xef, 0xed, 0x5e, 0x60, 0xb8, 0xf6, - 0x19, 0xe6, 0x20, 0xa2, 0x7a, 0x96, 0xa8, 0x09, 0x49, 0x87, 0x5f, 0xeb, 0xd8, 0xd8, 0x7e, 0xe9, - 0x2c, 0x12, 0xba, 0x30, 0x1e, 0x44, 0x54, 0xdf, 0x16, 0xf5, 0x21, 0x43, 0x42, 0xe7, 0x33, 0x1b, - 0xec, 0x2f, 0x1e, 0x3f, 0xce, 0x99, 0x90, 0x0e, 0xe8, 0x34, 0x19, 0x12, 0xd3, 0x00, 0x4d, 0x36, - 0x1c, 0x2b, 0xd9, 0x4b, 0x03, 0x5c, 0xbb, 0x2f, 0xd2, 0x00, 0xb9, 0x25, 0xea, 0x00, 0x0c, 0x03, - 0x92, 0x54, 0x72, 0xcc, 0xcf, 0x17, 0x9f, 0xe6, 0x54, 0x3d, 0x88, 0xa8, 0x21, 0x0f, 0xe8, 0x5d, - 0x48, 0x0f, 0x57, 0x20, 0x57, 0x36, 0x98, 0xc3, 0x57, 0x9f, 0x8a, 0x92, 0x0e, 0x28, 0x0d, 0xad, - 0xa4, 0xeb, 0x34, 0x24, 0x9f, 0xa1, 0xa1, 0x5a, 0x0a, 0x92, 0x06, 0xb7, 0x0b, 0xee, 0x1e, 0x49, - 0x59, 0x2a, 0x7d, 0x1c, 0x07, 0x29, 0xe0, 0xfc, 0x0a, 0xa0, 0x80, 0x3d, 0xfc, 0xcb, 0x15, 0xff, - 0xce, 0x11, 0x3d, 0x88, 0xa8, 0x9b, 0xfe, 0x9a, 0x7f, 0xc1, 0x32, 0x68, 0x8b, 0x4c, 0x2d, 0xc3, - 0x3c, 0x36, 0x57, 0x2d, 0xc2, 0xbf, 0xdf, 0xe5, 0x7c, 0xb1, 0xd7, 0x22, 0x6f, 0xaf, 0xdd, 0xf1, - 0x63, 0x57, 0x60, 0xc2, 0x83, 0x48, 0xe8, 0x23, 0x00, 0x6d, 0x59, 0x67, 0x3e, 0x9b, 0xd1, 0xcb, - 0x8c, 0x37, 0x4f, 0x73, 0x9e, 0xcd, 0x7a, 0x52, 0x3e, 0x3b, 0xa3, 0xfa, 0x19, 0x28, 0xdf, 0xbc, - 0x14, 0xca, 0x7e, 0xec, 0x07, 0x42, 0x80, 0xe5, 0xfd, 0xb3, 0x58, 0xbe, 0x75, 0x39, 0x96, 0x43, - 0x6e, 0x02, 0x30, 0x1f, 0x9d, 0x0b, 0xe6, 0xca, 0x15, 0xc1, 0x1c, 0xf2, 0xb8, 0x8e, 0xe6, 0xfa, - 0x19, 0x34, 0xdf, 0xbc, 0x14, 0xcd, 0xe1, 0x18, 0x3d, 0x38, 0x77, 0xcf, 0x81, 0xf3, 0xab, 0x57, - 0x82, 0x73, 0xc8, 0x59, 0x18, 0xcf, 0xea, 0x79, 0x78, 0x2e, 0x5f, 0x0d, 0xcf, 0x21, 0x97, 0x61, - 0x27, 0x35, 0x00, 0xc9, 0xbf, 0x44, 0x86, 0xe0, 0x7b, 0xeb, 0x9b, 0x90, 0xf0, 0xca, 0x8d, 0x20, - 0xd7, 0x50, 0xab, 0xad, 0x4e, 0xab, 0x73, 0x5b, 0xeb, 0x54, 0xef, 0x36, 0x7b, 0x72, 0x04, 0x29, - 0xb0, 0xfd, 0x7e, 0xb5, 0xd5, 0xd7, 0xf6, 0xbb, 0xaa, 0x76, 0xbb, 0xae, 0xb5, 0x3a, 0xfd, 0xa6, - 0xfa, 0x5e, 0xf5, 0x8e, 0x2c, 0xa0, 0x67, 0x01, 0xa9, 0xdd, 0xfa, 0x3b, 0xbd, 0x46, 0x4d, 0xab, - 0x77, 0xef, 0x1e, 0x56, 0xeb, 0xfd, 0x56, 0xb7, 0x23, 0x47, 0x91, 0x04, 0x62, 0xa3, 0xdb, 0x69, - 0xca, 0x70, 0xeb, 0xe3, 0x28, 0x88, 0xfd, 0x07, 0x36, 0x46, 0x5f, 0x80, 0xf4, 0x51, 0xa7, 0x77, - 0xd8, 0xac, 0xb7, 0xf6, 0x5b, 0xcd, 0x86, 0x1c, 0xc9, 0x6f, 0x3d, 0x7c, 0x54, 0xdc, 0xa0, 0x4b, - 0x47, 0x33, 0x62, 0xe3, 0x21, 0x83, 0x36, 0xca, 0x43, 0xa2, 0x56, 0xad, 0xbf, 0x73, 0x74, 0x28, - 0x0b, 0xf9, 0xdc, 0xc3, 0x47, 0x45, 0xa0, 0x0a, 0x1c, 0x56, 0xe8, 0x06, 0x24, 0xd5, 0x66, 0xaf, - 0xdf, 0x55, 0x9b, 0x72, 0x34, 0xbf, 0xf1, 0xf0, 0x51, 0x31, 0x4d, 0x17, 0x3d, 0xb4, 0xa0, 0x97, - 0x21, 0xdb, 0xab, 0x1f, 0x34, 0xef, 0x56, 0xb5, 0xfa, 0x41, 0xb5, 0x73, 0xbb, 0x29, 0xc7, 0xf2, - 0xdb, 0x0f, 0x1f, 0x15, 0x65, 0xaa, 0x13, 0x06, 0x01, 0x7d, 0x45, 0xeb, 0xee, 0x61, 0x57, 0xed, - 0xcb, 0xe2, 0xea, 0x15, 0xbc, 0xaa, 0xa8, 0x04, 0xc0, 0xad, 0xf7, 0x9b, 0xcd, 0x86, 0x1c, 0xcf, - 0xa3, 0x87, 0x8f, 0x8a, 0x39, 0xba, 0xbe, 0x2a, 0x16, 0x7a, 0x11, 0x32, 0x75, 0xb5, 0x59, 0xed, - 0x37, 0xb5, 0x5e, 0xbf, 0xda, 0xef, 0xc9, 0x89, 0x55, 0x24, 0xa1, 0x02, 0xa0, 0x32, 0x6c, 0x56, - 0x8f, 0xfa, 0x5d, 0x6d, 0x4d, 0x37, 0x99, 0x7f, 0xee, 0xe1, 0xa3, 0xe2, 0x16, 0xd5, 0xad, 0xce, - 0x5d, 0x2b, 0xa4, 0x9f, 0x97, 0x7e, 0xf2, 0xeb, 0x9d, 0xc8, 0xef, 0x7e, 0xb3, 0x13, 0xa9, 0xed, - 0x7e, 0xf2, 0xcf, 0x9d, 0xc8, 0x27, 0xcb, 0x1d, 0xe1, 0xd3, 0xe5, 0x8e, 0xf0, 0xd9, 0x72, 0x47, - 0xf8, 0xc7, 0x72, 0x47, 0xf8, 0xe9, 0xe7, 0x3b, 0x91, 0x4f, 0x3f, 0xdf, 0x89, 0x7c, 0xf6, 0xf9, - 0x4e, 0xe4, 0x83, 0x04, 0x2f, 0xf8, 0x20, 0xc1, 0xfe, 0x9a, 0xf0, 0xda, 0x7f, 0x02, 0x00, 0x00, - 0xff, 0xff, 0xa1, 0xff, 0x25, 0xd7, 0xfe, 0x18, 0x00, 0x00, ->>>>>>> 91221dc63d... importccl: Move the desc preparation from planHook to IMPORT job. }