importer: clean up importResumer.dropTables #84872
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
adityamaru
suggested changes
Jul 21, 2022
pkg/sql/importer/import_job.go
Outdated
| // older-format (v1.1) descriptor. This enables ClearTableData to use a | ||
| // RangeClear for faster data removal, rather than removing by chunks. | ||
| intoTable.TableDesc().DropTime = int64(1) | ||
| if err := gcjob.ClearTableData( |
There was a problem hiding this comment.
hmm wasn't this previously conditional on the table actually being empty? What if we have a table that is !empty, I don't think we want to ClearRange it right?
There was a problem hiding this comment.
oooof. Good catch. Done.
Previously, importResumer.DropTables() assumed that IMPORT INTO could act upon multiple tables, which isn't actually the case, leading to overly complex code. This pr is a simple refactor, in preparation for more import rollback work in cockroachdb#76722 and cockroachdb#70428. Release note: none
msbutler
force-pushed
the
butler-import-rollbacks-refactor
branch
from
3750eed to
fbaf116
Compare
adityamaru
approved these changes
Jul 22, 2022
|
TFTR! bors=adityamaru |
|
bors r=adityamaru |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, importResumer.DropTables() assumed that IMPORT INTO could act upon
multiple tables, which isn't actually the case, leading to overly complex code.
This pr is a simple refactor, in preparation for more import rollback work
in #76722 and #70428.
Release note: none