diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go index 3dbf25072e8a..95ab320b0f75 100644 --- a/pkg/ccl/backupccl/backup_test.go +++ b/pkg/ccl/backupccl/backup_test.go @@ -1266,7 +1266,7 @@ func TestBackupRestoreCrossTableReferences(t *testing.T) { )`) // and a few views for good measure. - origDB.Exec(t, `CREATE VIEW store.early_customers AS SELECT id from store.customers WHERE id < 5`) + origDB.Exec(t, `CREATE VIEW store.early_customers AS SELECT id, email from store.customers WHERE id < 5`) origDB.Exec(t, `CREATE VIEW storestats.ordercounts AS SELECT c.id, c.email, COUNT(o.id) FROM store.customers AS c @@ -1475,6 +1475,13 @@ func TestBackupRestoreCrossTableReferences(t *testing.T) { tc := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ServerArgs: args}) defer tc.Stopper().Stop(context.TODO()) db := sqlutils.MakeSQLRunner(tc.Conns[0]) + + if _, err := db.DB.Exec( + `RESTORE DATABASE storestats FROM $1`, localFoo, + ); !testutils.IsError(err, `cannot restore "ordercounts" without restoring referenced table`) { + t.Fatal(err) + } + db.Exec(t, createStore) db.Exec(t, createStoreStats) @@ -1508,6 +1515,25 @@ func TestBackupRestoreCrossTableReferences(t *testing.T) { } db.CheckQueryResults(t, `SELECT * FROM storestats.ordercounts ORDER BY id`, origOrderCounts) + + db.Exec(t, `CREATE DATABASE otherstore`) + db.Exec(t, `RESTORE store.* FROM $1 WITH into_db = 'otherstore'`, localFoo) + // we want to observe just the view-related errors, not fk errors below. + db.Exec(t, `ALTER TABLE otherstore.orders DROP CONSTRAINT fk_customerid_ref_customers`) + db.Exec(t, `DROP TABLE otherstore.receipts`) + + if _, err := db.DB.Exec(`DROP TABLE otherstore.customers`); !testutils.IsError(err, + `cannot drop relation "customers" because view "early_customers" depends on it`, + ) { + t.Fatal(err) + } + if _, err := db.DB.Exec(`ALTER TABLE otherstore.customers DROP COLUMN email`); !testutils.IsError( + err, `cannot drop column "email" because view "early_customers" depends on it`) { + t.Fatal(err) + } + db.Exec(t, `DROP DATABASE store CASCADE`) + db.CheckQueryResults(t, `SELECT * FROM otherstore.early_customers ORDER BY id`, origEarlyCustomers) + }) } diff --git a/pkg/ccl/backupccl/restore.go b/pkg/ccl/backupccl/restore.go index a1d81940d177..fd57b1685cdd 100644 --- a/pkg/ccl/backupccl/restore.go +++ b/pkg/ccl/backupccl/restore.go @@ -29,6 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/jobs" + "github.com/cockroachdb/cockroach/pkg/sql/parser" "github.com/cockroachdb/cockroach/pkg/sql/privilege" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sem/types" @@ -152,6 +153,34 @@ func selectTargets( return matched.descs, matched.requestedDBs, nil } +// rewriteViewQueryDBNames rewrites the passed table's ViewQuery replacing all +// non-empty db qualifiers with `newDB`. +// +// TODO: this AST traversal misses tables named in strings (#24556). +func rewriteViewQueryDBNames(table *sqlbase.TableDescriptor, newDB string) error { + stmt, err := parser.ParseOne(table.ViewQuery) + if err != nil { + return errors.Wrapf(err, "failed to parse underlying query from view %q", table.Name) + } + // Re-format to change all DB names to `newDB`. + f := tree.NewFmtCtxWithBuf(tree.FmtParsable) + f.WithReformatTableNames( + func(ctx *tree.FmtCtx, t *tree.NormalizableTableName) { + tn, err := t.Normalize() + if err != nil { + return + } + // empty catalog e.g. ``"".information_schema.tables` should stay empty. + if tn.CatalogName != "" { + tn.CatalogName = tree.Name(newDB) + } + ctx.FormatNode(tn) + }) + f.FormatNode(stmt) + table.ViewQuery = f.CloseAndGetString() + return nil +} + // allocateTableRewrites determines the new ID and parentID (a "TableRewrite") // for each table in sqlDescs and returns a mapping from old ID to said // TableRewrite. It first validates that the provided sqlDescs can be restored @@ -165,7 +194,7 @@ func allocateTableRewrites( opts map[string]string, ) (tableRewriteMap, error) { tableRewrites := make(tableRewriteMap) - _, renaming := opts[restoreOptIntoDB] + overrideDB, renaming := opts[restoreOptIntoDB] restoreDBNames := make(map[string]*sqlbase.DatabaseDescriptor, len(restoreDBs)) for _, db := range restoreDBs { @@ -193,10 +222,6 @@ func allocateTableRewrites( // options. // Check that foreign key targets exist. for _, table := range tablesByID { - if renaming && table.IsView() { - return nil, errors.Errorf("cannot restore view when using %q option", restoreOptIntoDB) - } - if err := table.ForeachNonDropIndex(func(index *sqlbase.IndexDescriptor) error { if index.ForeignKey.IsSet() { to := index.ForeignKey.Table @@ -247,8 +272,8 @@ func allocateTableRewrites( for _, table := range tablesByID { var targetDB string - if override, ok := opts[restoreOptIntoDB]; ok { - targetDB = override + if renaming { + targetDB = overrideDB } else { database, ok := databasesByID[table.ParentID] if !ok { @@ -366,12 +391,26 @@ func CheckTableExists( // rewriteTableDescs mutates tables to match the ID and privilege specified in // tableRewrites, as well as adjusting cross-table references to use the new // IDs. -func rewriteTableDescs(tables []*sqlbase.TableDescriptor, tableRewrites tableRewriteMap) error { +func rewriteTableDescs( + tables []*sqlbase.TableDescriptor, tableRewrites tableRewriteMap, overrideDB string, +) error { for _, table := range tables { tableRewrite, ok := tableRewrites[table.ID] if !ok { return errors.Errorf("missing table rewrite for table %d", table.ID) } + if table.IsView() && overrideDB != "" { + // restore checks that all dependencies are also being restored, but if + // the restore is overriding the destination database, qualifiers in the + // view query string may be wrong. Since the destination override is + // applied to everything being restored, anything the view query + // references will be in the override DB post-restore, so all database + // qualifiers in the view query should be replaced with overrideDB. + if err := rewriteViewQueryDBNames(table, overrideDB); err != nil { + return err + } + } + table.ID = tableRewrite.TableID table.ParentID = tableRewrite.ParentID @@ -914,6 +953,7 @@ func restore( endTime hlc.Timestamp, sqlDescs []sqlbase.Descriptor, tableRewrites tableRewriteMap, + overrideDB string, job *jobs.Job, resultsCh chan<- tree.Datums, ) (roachpb.BulkOpSummary, []*sqlbase.DatabaseDescriptor, []*sqlbase.TableDescriptor, error) { @@ -954,7 +994,7 @@ func restore( // Assign new IDs and privileges to the tables, and update all references to // use the new IDs. - if err := rewriteTableDescs(tables, tableRewrites); err != nil { + if err := rewriteTableDescs(tables, tableRewrites, overrideDB); err != nil { return mu.res, nil, nil, err } @@ -1266,7 +1306,7 @@ func doRestorePlan( tables = append(tables, tableDesc) } } - if err := rewriteTableDescs(tables, tableRewrites); err != nil { + if err := rewriteTableDescs(tables, tableRewrites, opts[restoreOptIntoDB]); err != nil { return err } @@ -1284,6 +1324,7 @@ func doRestorePlan( TableRewrites: tableRewrites, URIs: from, TableDescs: tables, + OverrideDB: opts[restoreOptIntoDB], }, }) if err != nil { @@ -1337,6 +1378,7 @@ func (r *restoreResumer) Resume( details.EndTime, sqlDescs, details.TableRewrites, + details.OverrideDB, job, resultsCh, ) diff --git a/pkg/sql/jobs/jobs.pb.go b/pkg/sql/jobs/jobs.pb.go index 6eb539e417ed..3926a629bde6 100644 --- a/pkg/sql/jobs/jobs.pb.go +++ b/pkg/sql/jobs/jobs.pb.go @@ -102,6 +102,7 @@ type RestoreDetails struct { TableRewrites map[github_com_cockroachdb_cockroach_pkg_sql_sqlbase.ID]*RestoreDetails_TableRewrite `protobuf:"bytes,2,rep,name=table_rewrites,json=tableRewrites,castkey=github.com/cockroachdb/cockroach/pkg/sql/sqlbase.ID" json:"table_rewrites,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value"` URIs []string `protobuf:"bytes,3,rep,name=uris" json:"uris,omitempty"` TableDescs []*cockroach_sql_sqlbase1.TableDescriptor `protobuf:"bytes,5,rep,name=table_descs,json=tableDescs" json:"table_descs,omitempty"` + OverrideDB string `protobuf:"bytes,6,opt,name=override_db,json=overrideDb,proto3" json:"override_db,omitempty"` } func (m *RestoreDetails) Reset() { *m = RestoreDetails{} } @@ -593,6 +594,12 @@ func (m *RestoreDetails) MarshalTo(dAtA []byte) (int, error) { i += n } } + if len(m.OverrideDB) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintJobs(dAtA, i, uint64(len(m.OverrideDB))) + i += copy(dAtA[i:], m.OverrideDB) + } return i, nil } @@ -1108,6 +1115,10 @@ func (m *RestoreDetails) Size() (n int) { n += 1 + l + sovJobs(uint64(l)) } } + l = len(m.OverrideDB) + if l > 0 { + n += 1 + l + sovJobs(uint64(l)) + } return n } @@ -1846,6 +1857,35 @@ func (m *RestoreDetails) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OverrideDB", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowJobs + } + 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 ErrInvalidLengthJobs + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.OverrideDB = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipJobs(dAtA[iNdEx:]) @@ -3332,94 +3372,95 @@ var ( func init() { proto.RegisterFile("sql/jobs/jobs.proto", fileDescriptorJobs) } var fileDescriptorJobs = []byte{ - // 1411 bytes of a gzipped FileDescriptorProto + // 1440 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4b, 0x8b, 0x1b, 0xc7, - 0x16, 0x56, 0xeb, 0xad, 0xd2, 0x63, 0xe4, 0xb2, 0xb9, 0xb7, 0x2d, 0x7c, 0xa5, 0xbe, 0xba, 0xbe, - 0xb6, 0x48, 0x88, 0x04, 0x63, 0x82, 0x83, 0x03, 0x26, 0x23, 0x8d, 0xec, 0x11, 0xf1, 0x3c, 0x28, - 0xcd, 0x24, 0x60, 0x08, 0x9d, 0x52, 0x77, 0xcd, 0xa8, 0x33, 0xad, 0xae, 0x9e, 0xaa, 0x92, 0x87, - 0xf1, 0x26, 0x90, 0x55, 0x98, 0x55, 0x36, 0x59, 0x0e, 0x04, 0xe2, 0x45, 0x16, 0xd9, 0x66, 0x93, - 0xfc, 0x01, 0xef, 0x92, 0x65, 0x20, 0xa0, 0x24, 0xca, 0x26, 0xbf, 0x21, 0x10, 0x08, 0x55, 0xdd, - 0xad, 0x87, 0x3d, 0x26, 0x63, 0x43, 0x36, 0x4d, 0xd7, 0x57, 0xdf, 0x39, 0x5d, 0xe7, 0xd4, 0x77, - 0xce, 0x69, 0x70, 0x99, 0x1f, 0xb9, 0xad, 0x8f, 0xe8, 0x80, 0xab, 0x47, 0xd3, 0x67, 0x54, 0x50, - 0x08, 0x2d, 0x6a, 0x1d, 0x32, 0x8a, 0xad, 0x61, 0x93, 0x1f, 0xb9, 0x4d, 0xb9, 0x53, 0xb9, 0x72, - 0x40, 0x0f, 0xa8, 0xda, 0x6e, 0xc9, 0xb7, 0x80, 0x59, 0xb9, 0xa4, 0x58, 0xfe, 0xa0, 0x65, 0xf1, - 0x47, 0x21, 0x04, 0x23, 0xc8, 0xc6, 0x02, 0x87, 0xd8, 0x35, 0xf9, 0x15, 0x7e, 0xe4, 0x0e, 0x30, - 0x27, 0x2d, 0x2e, 0xd8, 0xd8, 0x12, 0x63, 0x46, 0xec, 0x70, 0x57, 0x1f, 0x0b, 0xc7, 0x6d, 0x0d, - 0x5d, 0xab, 0x25, 0x9c, 0x11, 0xe1, 0x02, 0x8f, 0xfc, 0x60, 0xa7, 0xfe, 0x31, 0x48, 0x3d, 0x20, - 0x98, 0x13, 0xf8, 0x10, 0x64, 0x3c, 0x6a, 0x13, 0xd3, 0xb1, 0x75, 0xcd, 0xd0, 0x1a, 0xc5, 0xf6, - 0xda, 0x74, 0x52, 0x4b, 0x6f, 0x51, 0x9b, 0xf4, 0xd6, 0xff, 0x98, 0xd4, 0x6e, 0x1d, 0x38, 0x62, - 0x38, 0x1e, 0x34, 0x2d, 0x3a, 0x6a, 0xcd, 0xce, 0x6e, 0x0f, 0xe6, 0xef, 0x2d, 0xff, 0xf0, 0xa0, - 0x15, 0x1e, 0xac, 0x19, 0x98, 0xa1, 0xb4, 0xf4, 0xd8, 0xb3, 0xe1, 0x15, 0x90, 0x22, 0x3e, 0xb5, - 0x86, 0x7a, 0xdc, 0xd0, 0x1a, 0x09, 0x14, 0x2c, 0xee, 0x24, 0x7f, 0xff, 0xa2, 0xa6, 0xd5, 0x7f, - 0xd2, 0x40, 0xb1, 0x8d, 0xad, 0xc3, 0xb1, 0xbf, 0x4e, 0x04, 0x76, 0x5c, 0x0e, 0xdb, 0x00, 0x70, - 0x81, 0x99, 0x30, 0xe5, 0x59, 0xd5, 0x61, 0xf2, 0xab, 0xff, 0x69, 0xce, 0x13, 0x26, 0x63, 0x69, - 0x0e, 0x5d, 0xab, 0xb9, 0x1b, 0xc5, 0xd2, 0x4e, 0x3e, 0x9d, 0xd4, 0x62, 0x28, 0xa7, 0xcc, 0x24, - 0x0a, 0xef, 0x82, 0x2c, 0xf1, 0xec, 0xc0, 0x43, 0xfc, 0xe2, 0x1e, 0x32, 0xc4, 0xb3, 0x95, 0xfd, - 0x55, 0x90, 0x18, 0x33, 0x47, 0x4f, 0x18, 0x5a, 0x23, 0xd7, 0xce, 0x4c, 0x27, 0xb5, 0xc4, 0x1e, - 0xea, 0x21, 0x89, 0xc1, 0xd7, 0xc1, 0xa5, 0x81, 0x3a, 0xaf, 0x69, 0x13, 0x6e, 0x31, 0xc7, 0x17, - 0x94, 0xe9, 0x49, 0x43, 0x6b, 0x14, 0x50, 0x79, 0x10, 0x06, 0x12, 0xe1, 0xf5, 0x6f, 0x53, 0xa0, - 0x84, 0x08, 0x17, 0x94, 0x91, 0x28, 0xbc, 0xeb, 0xa0, 0xe4, 0xd2, 0x63, 0xf3, 0x18, 0x0b, 0xc2, - 0xcc, 0x11, 0x66, 0x87, 0x2a, 0xc4, 0x02, 0x2a, 0xb8, 0xf4, 0xf8, 0x7d, 0x09, 0x6e, 0x62, 0x76, - 0x08, 0x3f, 0xd7, 0x40, 0x49, 0xe0, 0x81, 0x4b, 0x4c, 0x46, 0x8e, 0x99, 0x23, 0x08, 0xd7, 0xe3, - 0x46, 0xa2, 0x91, 0x5f, 0x7d, 0xb3, 0xf9, 0xbc, 0x74, 0x9a, 0xcb, 0x9f, 0x68, 0xee, 0x4a, 0x43, - 0x14, 0xda, 0x75, 0x3d, 0xc1, 0x4e, 0xda, 0xb7, 0x3f, 0xf9, 0xf9, 0x82, 0x77, 0xb8, 0x20, 0xa4, - 0x66, 0x6f, 0x1d, 0x15, 0xc5, 0xa2, 0x33, 0x78, 0x0d, 0x24, 0xc7, 0xcc, 0xe1, 0x7a, 0xc2, 0x48, - 0x34, 0x72, 0xed, 0xec, 0x74, 0x52, 0x4b, 0xee, 0xa1, 0x1e, 0x47, 0x0a, 0x5d, 0x4a, 0x7b, 0xf2, - 0x15, 0xd2, 0x7e, 0x1f, 0xe4, 0x83, 0xa0, 0x65, 0x6a, 0xb9, 0x9e, 0x52, 0x11, 0xdf, 0x78, 0x26, - 0xe2, 0xe8, 0x70, 0x2a, 0xca, 0x79, 0xae, 0x11, 0x10, 0x11, 0xc0, 0x2b, 0xdf, 0x6b, 0xa0, 0xb0, - 0x98, 0x05, 0xf8, 0x01, 0xc8, 0x06, 0x9e, 0x67, 0xfa, 0x6e, 0x4f, 0x27, 0xb5, 0x8c, 0xe2, 0xbc, - 0x84, 0xc0, 0x9f, 0x49, 0x4e, 0x46, 0xf9, 0xec, 0xd9, 0xf0, 0x43, 0x90, 0xf3, 0x31, 0x23, 0x9e, - 0x90, 0xfe, 0xe3, 0xca, 0x7f, 0x67, 0x3a, 0xa9, 0x65, 0x77, 0x14, 0xf8, 0xea, 0x1f, 0xc8, 0x06, - 0x5e, 0x7b, 0x76, 0xe5, 0x08, 0xc0, 0xe7, 0xaf, 0x15, 0x96, 0x41, 0xe2, 0x90, 0x9c, 0x04, 0x11, - 0x21, 0xf9, 0x0a, 0xbb, 0x20, 0xf5, 0x08, 0xbb, 0xe3, 0x48, 0xf6, 0xad, 0x97, 0x94, 0x0b, 0x0a, - 0xac, 0xef, 0xc4, 0xdf, 0xd2, 0xea, 0x7f, 0xa6, 0x40, 0xb1, 0x37, 0xf2, 0x29, 0x13, 0x91, 0x76, - 0xbb, 0x20, 0xad, 0x22, 0xe6, 0xba, 0xa6, 0xae, 0xe6, 0xe6, 0x79, 0xde, 0x97, 0x4c, 0x02, 0xe7, - 0xe1, 0x3d, 0x87, 0xc6, 0x95, 0x27, 0x29, 0x90, 0x52, 0x38, 0xbc, 0x03, 0x92, 0xf2, 0xaa, 0xc3, - 0x2a, 0xbf, 0xe8, 0x4d, 0x2b, 0x9b, 0x99, 0x14, 0xe3, 0xe7, 0x4a, 0xf1, 0x36, 0xc8, 0x50, 0x5f, - 0x38, 0xd4, 0xe3, 0xaa, 0x8a, 0x97, 0x95, 0x18, 0xf5, 0xa9, 0x4e, 0xff, 0xbd, 0xed, 0x80, 0x84, - 0x22, 0x36, 0xac, 0x81, 0x7c, 0x58, 0xdf, 0x3e, 0x16, 0x43, 0x25, 0xe3, 0x1c, 0x02, 0x01, 0xb4, - 0x83, 0xc5, 0x50, 0x36, 0x00, 0x8e, 0x47, 0xbe, 0xeb, 0x78, 0x07, 0xa6, 0xcf, 0xe8, 0x01, 0x23, - 0x3c, 0x90, 0x6a, 0x1c, 0x95, 0xa3, 0x8d, 0x9d, 0x10, 0x87, 0xff, 0x03, 0x45, 0x46, 0xb0, 0x3d, - 0x27, 0xa6, 0x15, 0xb1, 0x20, 0xc1, 0x19, 0xe9, 0xff, 0xa0, 0xa4, 0x92, 0x3f, 0x67, 0x65, 0x14, - 0xab, 0xa8, 0xd0, 0x19, 0x6d, 0x49, 0x64, 0xd9, 0x7f, 0x40, 0x64, 0xb2, 0x51, 0x5b, 0x74, 0x34, - 0xc2, 0x7a, 0xce, 0xd0, 0x1a, 0x29, 0x14, 0x2c, 0xa0, 0x0e, 0x32, 0xf2, 0x85, 0x78, 0x42, 0x07, - 0x0a, 0x8f, 0x96, 0xf0, 0x1e, 0x48, 0x7b, 0x63, 0xd7, 0x75, 0xf6, 0xf5, 0xbc, 0xca, 0x71, 0xf3, - 0x82, 0x7a, 0x68, 0x6e, 0x29, 0x2b, 0x14, 0x5a, 0xc3, 0x1b, 0x20, 0xcb, 0xb9, 0x30, 0xb9, 0xf3, - 0x98, 0xe8, 0x05, 0x39, 0x23, 0xda, 0x79, 0x59, 0x9d, 0xfd, 0xfe, 0x6e, 0xdf, 0x79, 0x4c, 0x50, - 0x86, 0x73, 0x21, 0x5f, 0x60, 0x05, 0x64, 0x8f, 0xb1, 0xeb, 0xaa, 0xfe, 0x52, 0x54, 0xb3, 0x64, - 0xb6, 0x96, 0x67, 0x77, 0xa9, 0x85, 0x5d, 0xbd, 0x64, 0x68, 0x8d, 0x2c, 0x0a, 0x16, 0xf2, 0xec, - 0xea, 0x4e, 0x08, 0xd7, 0x57, 0x8c, 0x44, 0xa3, 0x80, 0xa2, 0x65, 0xc5, 0x00, 0xe9, 0xe0, 0x14, - 0xf0, 0x5f, 0xb3, 0x28, 0x34, 0x75, 0xd9, 0xe1, 0xaa, 0x8e, 0x54, 0xef, 0x1e, 0x8f, 0x48, 0xdf, - 0xc7, 0xde, 0x03, 0x87, 0x0b, 0xf8, 0x0e, 0x28, 0x30, 0x85, 0x98, 0xdc, 0xc7, 0x5e, 0x54, 0x05, - 0xff, 0x3e, 0x47, 0x59, 0xd2, 0x24, 0x54, 0x7d, 0x9e, 0xcd, 0x9c, 0xf0, 0xfa, 0xd7, 0x1a, 0xb8, - 0xdc, 0xb7, 0x86, 0x64, 0x84, 0x3b, 0x43, 0xec, 0x1d, 0xcc, 0xa6, 0xc2, 0x1a, 0x00, 0x4a, 0x27, - 0x98, 0x9b, 0x74, 0xff, 0x65, 0x86, 0x5e, 0x56, 0x9a, 0xad, 0xf1, 0xed, 0x7d, 0x88, 0x40, 0x79, - 0xe1, 0x70, 0xa6, 0xeb, 0x70, 0x11, 0xce, 0x8c, 0xfa, 0x0b, 0x9a, 0xc0, 0x42, 0x68, 0xa1, 0xb7, - 0x12, 0x5b, 0x42, 0xeb, 0xdf, 0xa5, 0x40, 0x66, 0x07, 0x9f, 0xb8, 0x14, 0xdb, 0xd0, 0x00, 0xf9, - 0x68, 0xe2, 0x39, 0xd4, 0x0b, 0x73, 0xb5, 0x08, 0xc9, 0xeb, 0x19, 0x73, 0xc2, 0x3c, 0x1c, 0x4e, - 0xdd, 0x1c, 0x9a, 0xad, 0xa5, 0xc6, 0xd5, 0x78, 0x26, 0xb6, 0x39, 0x72, 0x2c, 0x46, 0x83, 0xb2, - 0x4c, 0xa0, 0x62, 0x88, 0x6e, 0x2a, 0x10, 0xde, 0x04, 0x2b, 0xfb, 0x8e, 0xe7, 0xf0, 0xe1, 0x9c, - 0x97, 0x54, 0xbc, 0x52, 0x04, 0xcf, 0x89, 0x23, 0x6a, 0x3b, 0xfb, 0xce, 0x9c, 0x98, 0x0a, 0x88, - 0x11, 0x1c, 0x12, 0x29, 0x28, 0xcd, 0x07, 0xb5, 0xe9, 0xd8, 0x41, 0x09, 0x16, 0xdb, 0x1b, 0xd3, - 0x49, 0xad, 0x38, 0x6f, 0x2a, 0xbd, 0x75, 0xfe, 0xaa, 0xf5, 0x53, 0x9c, 0xfb, 0xef, 0xd9, 0x1c, - 0xbe, 0x01, 0xe0, 0x3e, 0xc3, 0x96, 0xcc, 0x88, 0x69, 0x51, 0x29, 0x36, 0x41, 0x6c, 0x3d, 0x63, - 0x68, 0x8d, 0x38, 0xba, 0x14, 0xed, 0x74, 0xa2, 0x0d, 0xf5, 0x73, 0xc4, 0x18, 0x65, 0xaa, 0xa2, - 0x73, 0x28, 0x58, 0xc0, 0x16, 0x48, 0xb9, 0xf2, 0xbf, 0x4c, 0x55, 0x62, 0x7e, 0xf5, 0xea, 0x79, - 0x37, 0xa8, 0x7e, 0xdc, 0x50, 0xc0, 0x83, 0x6f, 0x83, 0x74, 0xd0, 0xa3, 0x54, 0x8d, 0xe6, 0x57, - 0xff, 0x7b, 0x9e, 0xc5, 0xd2, 0x8f, 0xd6, 0x46, 0x0c, 0x85, 0x26, 0xf0, 0x2e, 0xc8, 0xb0, 0x60, - 0x26, 0x84, 0x85, 0x5c, 0xff, 0xfb, 0xb1, 0xb1, 0x11, 0x43, 0x91, 0x11, 0xdc, 0x04, 0x05, 0xbe, - 0x20, 0x6a, 0x55, 0xc3, 0x2f, 0x98, 0x0e, 0xe7, 0x88, 0x7f, 0x23, 0x86, 0x96, 0xcc, 0x65, 0x2c, - 0x8e, 0x6a, 0x1a, 0xaa, 0xc8, 0x5f, 0x10, 0xcb, 0x52, 0x5b, 0x91, 0xb1, 0x04, 0x26, 0xed, 0x1c, - 0xc8, 0xd8, 0x01, 0xf8, 0xda, 0x37, 0x1a, 0x48, 0xee, 0x9e, 0xf8, 0x04, 0x5e, 0x07, 0xf9, 0xbd, - 0xad, 0xfe, 0x4e, 0xb7, 0xd3, 0xbb, 0xd7, 0xeb, 0xae, 0x97, 0x63, 0x95, 0xcb, 0xa7, 0x67, 0xc6, - 0x8a, 0xdc, 0xda, 0xf3, 0xb8, 0x4f, 0x2c, 0xa5, 0x17, 0x58, 0x01, 0xe9, 0xf6, 0x5a, 0xe7, 0xdd, - 0xbd, 0x9d, 0xb2, 0x56, 0x29, 0x9d, 0x9e, 0x19, 0x40, 0x12, 0x82, 0x94, 0xc1, 0x6b, 0x20, 0x83, - 0xba, 0xfd, 0xdd, 0x6d, 0xd4, 0x2d, 0xc7, 0x2b, 0x2b, 0xa7, 0x67, 0x46, 0x5e, 0x6e, 0x86, 0x19, - 0x81, 0x37, 0x41, 0xb1, 0xdf, 0xd9, 0xe8, 0x6e, 0xae, 0x99, 0x9d, 0x8d, 0xb5, 0xad, 0xfb, 0xdd, - 0x72, 0xa2, 0x72, 0xe5, 0xf4, 0xcc, 0x28, 0x4b, 0xce, 0x62, 0xc0, 0xf2, 0x13, 0xbd, 0xcd, 0x9d, - 0x6d, 0xb4, 0x5b, 0x4e, 0xce, 0x3f, 0x11, 0x44, 0x52, 0xc9, 0x7e, 0xfa, 0x65, 0x35, 0xf6, 0xd5, - 0x93, 0x6a, 0xac, 0x5d, 0x7d, 0xfa, 0x6b, 0x35, 0xf6, 0x74, 0x5a, 0xd5, 0x7e, 0x98, 0x56, 0xb5, - 0x1f, 0xa7, 0x55, 0xed, 0x97, 0x69, 0x55, 0xfb, 0xec, 0xb7, 0x6a, 0xec, 0x61, 0x52, 0x86, 0x3e, - 0x48, 0xab, 0x7f, 0xf7, 0x5b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x93, 0x7d, 0x6b, 0xb4, 0x5b, - 0x0c, 0x00, 0x00, + 0x16, 0x56, 0xeb, 0xad, 0xa3, 0xc7, 0xc8, 0x65, 0x73, 0x6f, 0x5b, 0xf8, 0x4a, 0x7d, 0x75, 0x7d, + 0x6d, 0x91, 0x10, 0x09, 0xc6, 0x04, 0x07, 0x07, 0x4c, 0x46, 0x1a, 0xd9, 0x23, 0xe2, 0x79, 0x50, + 0x9a, 0x49, 0xc0, 0x10, 0x3a, 0xa5, 0xee, 0x9a, 0x51, 0x67, 0x5a, 0xdd, 0x3d, 0x55, 0x2d, 0x0f, + 0xe3, 0x4d, 0x20, 0xab, 0x30, 0xab, 0x6c, 0xb2, 0x1c, 0x08, 0xc4, 0x8b, 0x2c, 0xb2, 0xcd, 0x2a, + 0x7f, 0xc0, 0xbb, 0x64, 0x19, 0x08, 0x28, 0x89, 0xb2, 0x09, 0xe4, 0x1f, 0x04, 0x02, 0xa1, 0xaa, + 0xbb, 0xf5, 0xb0, 0xc7, 0x64, 0x6c, 0xc8, 0xa6, 0xe9, 0xfa, 0xea, 0x3b, 0xa7, 0xeb, 0x9c, 0xfa, + 0xce, 0x39, 0x0d, 0x97, 0xf9, 0x91, 0xdd, 0xfa, 0xc8, 0x1d, 0x70, 0xf9, 0x68, 0x7a, 0xcc, 0xf5, + 0x5d, 0x84, 0x0c, 0xd7, 0x38, 0x64, 0x2e, 0x31, 0x86, 0x4d, 0x7e, 0x64, 0x37, 0xc5, 0x4e, 0xe5, + 0xca, 0x81, 0x7b, 0xe0, 0xca, 0xed, 0x96, 0x78, 0x0b, 0x98, 0x95, 0x4b, 0x92, 0xe5, 0x0d, 0x5a, + 0x06, 0x7f, 0x14, 0x42, 0x28, 0x82, 0x4c, 0xe2, 0x93, 0x10, 0xbb, 0x26, 0xbe, 0xc2, 0x8f, 0xec, + 0x01, 0xe1, 0xb4, 0xc5, 0x7d, 0x36, 0x36, 0xfc, 0x31, 0xa3, 0x66, 0xb8, 0xab, 0x8e, 0x7d, 0xcb, + 0x6e, 0x0d, 0x6d, 0xa3, 0xe5, 0x5b, 0x23, 0xca, 0x7d, 0x32, 0xf2, 0x82, 0x9d, 0xfa, 0xc7, 0x90, + 0x7a, 0x40, 0x09, 0xa7, 0xe8, 0x21, 0x64, 0x1c, 0xd7, 0xa4, 0xba, 0x65, 0xaa, 0x8a, 0xa6, 0x34, + 0x8a, 0xed, 0xb5, 0xe9, 0xa4, 0x96, 0xde, 0x72, 0x4d, 0xda, 0x5b, 0xff, 0x63, 0x52, 0xbb, 0x75, + 0x60, 0xf9, 0xc3, 0xf1, 0xa0, 0x69, 0xb8, 0xa3, 0xd6, 0xec, 0xec, 0xe6, 0x60, 0xfe, 0xde, 0xf2, + 0x0e, 0x0f, 0x5a, 0xe1, 0xc1, 0x9a, 0x81, 0x19, 0x4e, 0x0b, 0x8f, 0x3d, 0x13, 0x5d, 0x81, 0x14, + 0xf5, 0x5c, 0x63, 0xa8, 0xc6, 0x35, 0xa5, 0x91, 0xc0, 0xc1, 0xe2, 0x4e, 0xf2, 0xb7, 0x2f, 0x6a, + 0x4a, 0xfd, 0x47, 0x05, 0x8a, 0x6d, 0x62, 0x1c, 0x8e, 0xbd, 0x75, 0xea, 0x13, 0xcb, 0xe6, 0xa8, + 0x0d, 0xc0, 0x7d, 0xc2, 0x7c, 0x5d, 0x9c, 0x55, 0x1e, 0x26, 0xbf, 0xfa, 0x9f, 0xe6, 0x3c, 0x61, + 0x22, 0x96, 0xe6, 0xd0, 0x36, 0x9a, 0xbb, 0x51, 0x2c, 0xed, 0xe4, 0xd3, 0x49, 0x2d, 0x86, 0x73, + 0xd2, 0x4c, 0xa0, 0xe8, 0x2e, 0x64, 0xa9, 0x63, 0x06, 0x1e, 0xe2, 0x17, 0xf7, 0x90, 0xa1, 0x8e, + 0x29, 0xed, 0xaf, 0x42, 0x62, 0xcc, 0x2c, 0x35, 0xa1, 0x29, 0x8d, 0x5c, 0x3b, 0x33, 0x9d, 0xd4, + 0x12, 0x7b, 0xb8, 0x87, 0x05, 0x86, 0x5e, 0x87, 0x4b, 0x03, 0x79, 0x5e, 0xdd, 0xa4, 0xdc, 0x60, + 0x96, 0xe7, 0xbb, 0x4c, 0x4d, 0x6a, 0x4a, 0xa3, 0x80, 0xcb, 0x83, 0x30, 0x90, 0x08, 0xaf, 0xff, + 0x9e, 0x82, 0x12, 0xa6, 0xdc, 0x77, 0x19, 0x8d, 0xc2, 0xbb, 0x0e, 0x25, 0xdb, 0x3d, 0xd6, 0x8f, + 0x89, 0x4f, 0x99, 0x3e, 0x22, 0xec, 0x50, 0x86, 0x58, 0xc0, 0x05, 0xdb, 0x3d, 0x7e, 0x5f, 0x80, + 0x9b, 0x84, 0x1d, 0xa2, 0xcf, 0x15, 0x28, 0xf9, 0x64, 0x60, 0x53, 0x9d, 0xd1, 0x63, 0x66, 0xf9, + 0x94, 0xab, 0x71, 0x2d, 0xd1, 0xc8, 0xaf, 0xbe, 0xd9, 0x7c, 0x5e, 0x3a, 0xcd, 0xe5, 0x4f, 0x34, + 0x77, 0x85, 0x21, 0x0e, 0xed, 0xba, 0x8e, 0xcf, 0x4e, 0xda, 0xb7, 0x3f, 0xf9, 0xe9, 0x82, 0x77, + 0xb8, 0x20, 0xa4, 0x66, 0x6f, 0x1d, 0x17, 0xfd, 0x45, 0x67, 0xe8, 0x1a, 0x24, 0xc7, 0xcc, 0xe2, + 0x6a, 0x42, 0x4b, 0x34, 0x72, 0xed, 0xec, 0x74, 0x52, 0x4b, 0xee, 0xe1, 0x1e, 0xc7, 0x12, 0x5d, + 0x4a, 0x7b, 0xf2, 0x15, 0xd2, 0x7e, 0x1f, 0xf2, 0x41, 0xd0, 0x22, 0xb5, 0x5c, 0x4d, 0xc9, 0x88, + 0x6f, 0x3c, 0x13, 0x71, 0x74, 0x38, 0x19, 0xe5, 0x3c, 0xd7, 0x18, 0xfc, 0x08, 0xe0, 0xa8, 0x05, + 0x79, 0xf7, 0x11, 0x65, 0xcc, 0x32, 0xa9, 0x6e, 0x0e, 0xd4, 0xb4, 0xbc, 0xc7, 0xd2, 0x74, 0x52, + 0x83, 0xed, 0x10, 0x5e, 0x6f, 0x63, 0x88, 0x28, 0xeb, 0x83, 0xca, 0x77, 0x0a, 0x14, 0x16, 0xd3, + 0x86, 0x3e, 0x80, 0x6c, 0x70, 0x94, 0x59, 0x41, 0xb4, 0xa7, 0x93, 0x5a, 0x46, 0x72, 0x5e, 0xa2, + 0x22, 0x9e, 0xc9, 0x66, 0x46, 0xfa, 0xec, 0x99, 0xe8, 0x43, 0xc8, 0x79, 0x84, 0x51, 0xc7, 0x17, + 0xfe, 0xe3, 0xd2, 0x7f, 0x67, 0x3a, 0xa9, 0x65, 0x77, 0x24, 0xf8, 0xea, 0x1f, 0xc8, 0x06, 0x5e, + 0x7b, 0x66, 0xe5, 0x08, 0xd0, 0xf3, 0x3a, 0x40, 0x65, 0x48, 0x1c, 0xd2, 0x93, 0x20, 0x22, 0x2c, + 0x5e, 0x51, 0x17, 0x52, 0x8f, 0x88, 0x3d, 0x8e, 0xea, 0xa4, 0xf5, 0x92, 0xfa, 0xc2, 0x81, 0xf5, + 0x9d, 0xf8, 0x5b, 0x4a, 0xfd, 0xcf, 0x14, 0x14, 0x7b, 0x23, 0xcf, 0x65, 0x7e, 0x24, 0xf6, 0x2e, + 0xa4, 0x65, 0xc4, 0x5c, 0x55, 0xe4, 0x5d, 0xde, 0x3c, 0xcf, 0xfb, 0x92, 0x49, 0xe0, 0x3c, 0x14, + 0x46, 0x68, 0x5c, 0x79, 0x92, 0x82, 0x94, 0xc4, 0xd1, 0x1d, 0x48, 0x0a, 0x6d, 0x84, 0x6d, 0xe1, + 0xa2, 0xd2, 0x90, 0x36, 0x33, 0xed, 0xc6, 0xcf, 0xd5, 0xee, 0x6d, 0xc8, 0xb8, 0x9e, 0x6f, 0xb9, + 0x0e, 0x97, 0x65, 0xbf, 0x2c, 0xdd, 0xa8, 0xb1, 0x75, 0xfa, 0xef, 0x6d, 0x07, 0x24, 0x1c, 0xb1, + 0x51, 0x0d, 0xf2, 0x61, 0x43, 0xf0, 0x88, 0x3f, 0x94, 0xba, 0xcf, 0x61, 0x08, 0xa0, 0x1d, 0xe2, + 0x0f, 0x45, 0xc7, 0xe0, 0x64, 0xe4, 0xd9, 0x96, 0x73, 0xa0, 0x7b, 0xcc, 0x3d, 0x60, 0x94, 0x07, + 0xda, 0x8e, 0xe3, 0x72, 0xb4, 0xb1, 0x13, 0xe2, 0xe8, 0x7f, 0x50, 0x64, 0x94, 0x98, 0x73, 0x62, + 0x5a, 0x12, 0x0b, 0x02, 0x9c, 0x91, 0xfe, 0x0f, 0x25, 0x99, 0xfc, 0x39, 0x2b, 0x23, 0x59, 0x45, + 0x89, 0xce, 0x68, 0x4b, 0x22, 0xcb, 0xfe, 0x03, 0x22, 0x13, 0x9d, 0xdd, 0x70, 0x47, 0x23, 0xa2, + 0xe6, 0x34, 0xa5, 0x91, 0xc2, 0xc1, 0x02, 0xa9, 0x90, 0x11, 0x2f, 0xd4, 0xf1, 0x55, 0x90, 0x78, + 0xb4, 0x44, 0xf7, 0x20, 0xed, 0x8c, 0x6d, 0xdb, 0xda, 0x57, 0xf3, 0x32, 0xc7, 0xcd, 0x0b, 0xea, + 0xa1, 0xb9, 0x25, 0xad, 0x70, 0x68, 0x8d, 0x6e, 0x40, 0x96, 0x73, 0x5f, 0xe7, 0xd6, 0x63, 0xaa, + 0x16, 0xc4, 0x50, 0x69, 0xe7, 0x45, 0x75, 0xf6, 0xfb, 0xbb, 0x7d, 0xeb, 0x31, 0xc5, 0x19, 0xce, + 0x7d, 0xf1, 0x82, 0x2a, 0x90, 0x3d, 0x26, 0xb6, 0x2d, 0x1b, 0x52, 0x51, 0x0e, 0x9f, 0xd9, 0x5a, + 0x9c, 0xdd, 0x76, 0x0d, 0x62, 0xab, 0x25, 0x4d, 0x69, 0x64, 0x71, 0xb0, 0x10, 0x67, 0x97, 0x77, + 0x42, 0xb9, 0xba, 0xa2, 0x25, 0x1a, 0x05, 0x1c, 0x2d, 0x2b, 0x1a, 0xa4, 0x83, 0x53, 0xa0, 0x7f, + 0xcd, 0xa2, 0x50, 0xe4, 0x65, 0x87, 0xab, 0x3a, 0x96, 0xcd, 0x7e, 0x3c, 0xa2, 0x7d, 0x8f, 0x38, + 0x0f, 0x2c, 0xee, 0xa3, 0x77, 0xa0, 0xc0, 0x24, 0xa2, 0x73, 0x8f, 0x38, 0x51, 0x15, 0xfc, 0xfb, + 0x1c, 0x65, 0x09, 0x93, 0x50, 0xf5, 0x79, 0x36, 0x73, 0xc2, 0xeb, 0x5f, 0x2b, 0x70, 0xb9, 0x6f, + 0x0c, 0xe9, 0x88, 0x74, 0x86, 0xc4, 0x39, 0x98, 0x8d, 0x91, 0x35, 0x00, 0xa9, 0x13, 0xc2, 0x75, + 0x77, 0xff, 0x65, 0xa6, 0x64, 0x56, 0x98, 0xad, 0xf1, 0xed, 0x7d, 0x84, 0xa1, 0xbc, 0x70, 0x38, + 0xdd, 0xb6, 0xb8, 0x1f, 0x0e, 0x99, 0xfa, 0x0b, 0x9a, 0xc0, 0x42, 0x68, 0xa1, 0xb7, 0x12, 0x5b, + 0x42, 0xeb, 0xdf, 0xa6, 0x20, 0xb3, 0x43, 0x4e, 0x6c, 0x97, 0x98, 0x48, 0x83, 0x7c, 0x34, 0x22, + 0x2d, 0xd7, 0x09, 0x73, 0xb5, 0x08, 0x89, 0xeb, 0x19, 0x73, 0xca, 0x1c, 0x12, 0x8e, 0xe9, 0x1c, + 0x9e, 0xad, 0x85, 0xc6, 0xe5, 0x3c, 0xa7, 0xa6, 0x3e, 0xb2, 0x0c, 0xe6, 0x06, 0x65, 0x99, 0xc0, + 0xc5, 0x10, 0xdd, 0x94, 0x20, 0xba, 0x09, 0x2b, 0xfb, 0x96, 0x63, 0xf1, 0xe1, 0x9c, 0x97, 0x94, + 0xbc, 0x52, 0x04, 0xcf, 0x89, 0x23, 0xd7, 0xb4, 0xf6, 0xad, 0x39, 0x31, 0x15, 0x10, 0x23, 0x38, + 0x24, 0xba, 0x50, 0x9a, 0x4f, 0x76, 0xdd, 0x32, 0x83, 0x12, 0x2c, 0xb6, 0x37, 0xa6, 0x93, 0x5a, + 0x71, 0xde, 0x54, 0x7a, 0xeb, 0xfc, 0x55, 0xeb, 0xa7, 0x38, 0xf7, 0xdf, 0x33, 0x39, 0x7a, 0x03, + 0xd0, 0x3e, 0x23, 0x86, 0xc8, 0x88, 0x6e, 0xb8, 0x42, 0x6c, 0x3e, 0x35, 0xd5, 0x8c, 0xa6, 0x34, + 0xe2, 0xf8, 0x52, 0xb4, 0xd3, 0x89, 0x36, 0xe4, 0xdf, 0x14, 0x63, 0x2e, 0x93, 0x15, 0x9d, 0xc3, + 0xc1, 0x02, 0xb5, 0x20, 0x65, 0x8b, 0x1f, 0x39, 0x59, 0x89, 0xf9, 0xd5, 0xab, 0xe7, 0xdd, 0xa0, + 0xfc, 0xd3, 0xc3, 0x01, 0x0f, 0xbd, 0x0d, 0xe9, 0xa0, 0x47, 0xc9, 0x1a, 0xcd, 0xaf, 0xfe, 0xf7, + 0x3c, 0x8b, 0xa5, 0x3f, 0xb3, 0x8d, 0x18, 0x0e, 0x4d, 0xd0, 0x5d, 0xc8, 0xb0, 0x60, 0x26, 0x84, + 0x85, 0x5c, 0xff, 0xfb, 0xb1, 0xb1, 0x11, 0xc3, 0x91, 0x11, 0xda, 0x84, 0x02, 0x5f, 0x10, 0xb5, + 0xac, 0xe1, 0x17, 0x4c, 0x87, 0x73, 0xc4, 0xbf, 0x11, 0xc3, 0x4b, 0xe6, 0x22, 0x16, 0x4b, 0x36, + 0x0d, 0x59, 0xe4, 0x2f, 0x88, 0x65, 0xa9, 0xad, 0x88, 0x58, 0x02, 0x93, 0x76, 0x0e, 0x32, 0x66, + 0x00, 0xbe, 0xf6, 0x8d, 0x02, 0xc9, 0xdd, 0x13, 0x8f, 0xa2, 0xeb, 0x90, 0xdf, 0xdb, 0xea, 0xef, + 0x74, 0x3b, 0xbd, 0x7b, 0xbd, 0xee, 0x7a, 0x39, 0x56, 0xb9, 0x7c, 0x7a, 0xa6, 0xad, 0x88, 0xad, + 0x3d, 0x87, 0x7b, 0xd4, 0x90, 0x7a, 0x41, 0x15, 0x48, 0xb7, 0xd7, 0x3a, 0xef, 0xee, 0xed, 0x94, + 0x95, 0x4a, 0xe9, 0xf4, 0x4c, 0x03, 0x41, 0x08, 0x52, 0x86, 0xae, 0x41, 0x06, 0x77, 0xfb, 0xbb, + 0xdb, 0xb8, 0x5b, 0x8e, 0x57, 0x56, 0x4e, 0xcf, 0xb4, 0xbc, 0xd8, 0x0c, 0x33, 0x82, 0x6e, 0x42, + 0xb1, 0xdf, 0xd9, 0xe8, 0x6e, 0xae, 0xe9, 0x9d, 0x8d, 0xb5, 0xad, 0xfb, 0xdd, 0x72, 0xa2, 0x72, + 0xe5, 0xf4, 0x4c, 0x2b, 0x0b, 0xce, 0x62, 0xc0, 0xe2, 0x13, 0xbd, 0xcd, 0x9d, 0x6d, 0xbc, 0x5b, + 0x4e, 0xce, 0x3f, 0x11, 0x44, 0x52, 0xc9, 0x7e, 0xfa, 0x65, 0x35, 0xf6, 0xd5, 0x93, 0x6a, 0xac, + 0x5d, 0x7d, 0xfa, 0x4b, 0x35, 0xf6, 0x74, 0x5a, 0x55, 0xbe, 0x9f, 0x56, 0x95, 0x1f, 0xa6, 0x55, + 0xe5, 0xe7, 0x69, 0x55, 0xf9, 0xec, 0xd7, 0x6a, 0xec, 0x61, 0x52, 0x84, 0x3e, 0x48, 0xcb, 0x9f, + 0xfd, 0x5b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x29, 0x96, 0x58, 0x1b, 0x8c, 0x0c, 0x00, 0x00, } diff --git a/pkg/sql/jobs/jobs.proto b/pkg/sql/jobs/jobs.proto index c26c3677cd54..35ce42c9bbfc 100644 --- a/pkg/sql/jobs/jobs.proto +++ b/pkg/sql/jobs/jobs.proto @@ -59,6 +59,7 @@ message RestoreDetails { ]; repeated string uris = 3 [(gogoproto.customname) = "URIs"]; repeated sqlbase.TableDescriptor table_descs = 5; + string override_db = 6 [(gogoproto.customname) = "OverrideDB"]; } message ImportDetails {