Merge #120809 #121220 #121223
120809: sql: add ImportType to descriptor r=dt a=stevendanna This adds an ImportType field to table descriptors. We need this field if we want to support disabling ImportEpoch writing via a cluster setting since we won't necessarily be able to trust that a non-zero ImportEpoch is actually from the currently in-progress IMPORT. Epic: none Release note: None 121220: sql/importer: deflake TestExportImportBank r=rytaft a=rytaft This commit fixes an issue caused by running two tests on the same database. Each test creates a table `bank2` and drops it at the end of the test. However, if the first test fails after creating the table, the table might not be successfully dropped. Therefore, the second test would fail when attempting to create the table since it already exists. This commit fixes this problem by adding a line to defer the `DROP TABLE` command right after it's created.. Fixes #121176 Release note: None 121223: workflows: some small improvements r=rail a=rickystewart 1. Remember to use RBE for the build of `mirror` in `check-generated-code`. 2. Use the `build.sh` script for Windows builds. Epic: CRDB-8308 Release note: None Co-authored-by: Steven Danna <danna@cockroachlabs.com> Co-authored-by: Rebecca Taft <becca@cockroachlabs.com> Co-authored-by: Ricky Stewart <ricky@cockroachlabs.com>
No related branches found
Showing
- .github/workflows/github-actions-essential-ci.yml 1 addition, 1 deletion.github/workflows/github-actions-essential-ci.yml
- build/bazelutil/bazel-generate.sh 1 addition, 1 deletionbuild/bazelutil/bazel-generate.sh
- pkg/ccl/backupccl/restore_job.go 3 additions, 1 deletionpkg/ccl/backupccl/restore_job.go
- pkg/ccl/backupccl/testdata/backup-restore/import-epoch 24 additions, 7 deletionspkg/ccl/backupccl/testdata/backup-restore/import-epoch
- pkg/cli/testdata/doctor/test_recreate_zipdir 6 additions, 6 deletionspkg/cli/testdata/doctor/test_recreate_zipdir
- pkg/cli/testdata/doctor/test_recreate_zipdir-json 6 additions, 6 deletionspkg/cli/testdata/doctor/test_recreate_zipdir-json
- pkg/sql/catalog/bootstrap/bootstrap_test.go 1 addition, 1 deletionpkg/sql/catalog/bootstrap/bootstrap_test.go
- pkg/sql/catalog/bootstrap/testdata/testdata 106 additions, 106 deletionspkg/sql/catalog/bootstrap/testdata/testdata
- pkg/sql/catalog/descpb/structured.proto 22 additions, 1 deletionpkg/sql/catalog/descpb/structured.proto
- pkg/sql/catalog/tabledesc/table_desc.go 2 additions, 0 deletionspkg/sql/catalog/tabledesc/table_desc.go
- pkg/sql/catalog/tabledesc/validate_test.go 1 addition, 0 deletionspkg/sql/catalog/tabledesc/validate_test.go
- pkg/sql/importer/exportcsv_test.go 1 addition, 1 deletionpkg/sql/importer/exportcsv_test.go
- pkg/sql/opt/exec/execbuilder/testdata/show_trace 6 additions, 6 deletionspkg/sql/opt/exec/execbuilder/testdata/show_trace
Loading
Please register or sign in to comment