Skip to content
Snippets Groups Projects
Commit 40cc14f3 authored by craig[bot]'s avatar craig[bot]
Browse files

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: default avatarSteven Danna <danna@cockroachlabs.com>
Co-authored-by: default avatarRebecca Taft <becca@cockroachlabs.com>
Co-authored-by: default avatarRicky Stewart <ricky@cockroachlabs.com>
No related branches found
No related merge requests found
Showing
with 180 additions and 137 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment