Set fixed restore method for table engines and refactor #171
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
aalexfvk
reviewed
Jul 16, 2024
| return self._make_table(result[0]) | ||
|
|
||
| return None | ||
| tables = self.get_tables(db_name, [table_name], short_query) |
There was a problem hiding this comment.
Let's add an exception if it is returned > 1
ch_backup/clickhouse/models.py
Outdated
| """ | ||
| A static method for determining whether an engine is replicated or not. | ||
| """ | ||
| return Table("", "", engine, [], [], "", "", None).is_replicated() |
There was a problem hiding this comment.
Must be adjusted on every change of Table constructor.
Why not just "MergeTree" in engine and "Replicated" in engine and reuse it in is_replicated()
ch_backup/logic/table.py
Outdated
| # Fix https://github.com/ClickHouse/ClickHouse/pull/55540 is pesented since 23.8. | ||
| if not maybe_table_short.is_merge_tree(): | ||
| logging.debug( | ||
| 'Skiptable "{}.{}" data restore, because it is not MergeTree like.', |
There was a problem hiding this comment.
Suggested change
| 'Skiptable "{}.{}" data restore, because it is not MergeTree like.', | |
| 'Skip table "{}.{}" data restore, because it is not MergeTree family.', |
ch_backup/logic/table.py
Outdated
| maybe_table_short = context.ch_ctl.get_table( | ||
| table_meta.database, table_meta.name, short_query=True | ||
| ) | ||
| assert ( |
There was a problem hiding this comment.
Let's use if and an exception instead of assert. maybe_table_short can be None, but asserts can be disabled in runtime
kirillgarbar
requested changes
Jul 16, 2024
kirillgarbar
approved these changes
Jul 16, 2024
aalexfvk
approved these changes
Jul 16, 2024
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.
No description provided.