chadmin: additional filter options and configurable timeouts for tabl…

…e management commands (#173)
yandex · May 13, 2024 · 6a86ced · 6a86ced
1 parent 24f0d7f
commit 6a86ced
Show file tree

Hide file tree

Showing 8 changed files with 489 additions and 244 deletions.
diff --git a/ch_tools/chadmin/cli/chs3_backup_group.py b/ch_tools/chadmin/cli/chs3_backup_group.py
@@ -3,7 +3,6 @@
 from click import ClickException, argument, group, option, pass_context
 
 from ch_tools.chadmin.internal.backup import unfreeze_backup
-from ch_tools.chadmin.internal.table import list_tables
 from ch_tools.common import logging
 from ch_tools.common.backup import (
     CHS3_BACKUPS_DIRECTORY,
@@ -79,11 +78,6 @@ def delete_chs3_backups(ctx, chs3_backups, *, keep_going=False, dry_run=False):
                 raise
 
 
-def get_tables_dict(ctx):
-    tables = list_tables(ctx, engine="%MergeTree%")
-    return [{"database": item["database"], "table": item["table"]} for item in tables]
-
-
 def clear_empty_backup(orphaned_chs3_backup):
     backup_directory = os.path.join(CHS3_BACKUPS_DIRECTORY, orphaned_chs3_backup)
     try:

diff --git a/ch_tools/chadmin/cli/database_group.py b/ch_tools/chadmin/cli/database_group.py
@@ -150,7 +150,7 @@ def get_databases(
         {% if database %}
         WHERE database {{ format_str_match(database) }}
         {% else %}
-        WHERE database NOT IN ('system', 'INFORMATION_SCHEMA')
+        WHERE database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA')
         {% endif %}
         {% if exclude_database %}
           AND database != '{{ exclude_database }}'

diff --git a/ch_tools/chadmin/cli/partition_group.py b/ch_tools/chadmin/cli/partition_group.py
@@ -621,7 +621,7 @@ def get_partitions(
             {% if database -%}
               WHERE database {{ format_str_match(database) }}
             {% else -%}
-              WHERE database NOT IN ('system', 'INFORMATION_SCHEMA')
+              WHERE database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA')
             {% endif -%}
             {% if table -%}
               AND table {{ format_str_match(table) }}
@@ -664,7 +664,7 @@ def get_partitions(
             {% if database -%}
             WHERE database {{ format_str_match(database) }}
             {% else -%}
-            WHERE database NOT IN ('system', 'INFORMATION_SCHEMA')
+            WHERE database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA')
             {% endif -%}
             {% if active_parts -%}
               AND active