Skip to content

Commit ff5c3f4

Browse files
zhang2014zhang2014
authored
refactor(query): remove useless system tables (#15400)
* refactor(query): remove useless system tables * refactor(query): remove useless system tables
1 parent d9d2ad7 commit ff5c3f4

File tree

10 files changed

+2
-374
lines changed

10 files changed

+2
-374
lines changed

‎src/query/service/src/databases/system/system_database.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ use databend_common_storages_system::OneTable;
4747
use databend_common_storages_system::PasswordPoliciesTable;
4848
use databend_common_storages_system::ProcessesTable;
4949
use databend_common_storages_system::ProcessorProfileTable;
50-
use databend_common_storages_system::QueriesQueueTable;
5150
use databend_common_storages_system::QueryCacheTable;
5251
use databend_common_storages_system::QueryLogTable;
5352
use databend_common_storages_system::RolesTable;
@@ -60,7 +59,6 @@ use databend_common_storages_system::TablesTableWithoutHistory;
6059
use databend_common_storages_system::TaskHistoryTable;
6160
use databend_common_storages_system::TasksTable;
6261
use databend_common_storages_system::TempFilesTable;
63-
use databend_common_storages_system::TracingTable;
6462
use databend_common_storages_system::UserFunctionsTable;
6563
use databend_common_storages_system::UsersTable;
6664
use databend_common_storages_system::ViewsTableWithHistory;
@@ -100,9 +98,7 @@ impl SystemDatabase {
10098
ClustersTable::create(sys_db_meta.next_table_id()),
10199
DatabasesTable::create(sys_db_meta.next_table_id()),
102100
StreamsTable::create(sys_db_meta.next_table_id()),
103-
Arc::new(TracingTable::create(sys_db_meta.next_table_id())),
104101
ProcessesTable::create(sys_db_meta.next_table_id()),
105-
QueriesQueueTable::create(sys_db_meta.next_table_id()),
106102
ConfigsTable::create(sys_db_meta.next_table_id()),
107103
MetricsTable::create(sys_db_meta.next_table_id()),
108104
MallocStatsTable::create(sys_db_meta.next_table_id()),

‎src/query/service/src/servers/admin/admin_service.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ use poem::post;
3636
use poem::Endpoint;
3737
use poem::Route;
3838

39-
use crate::servers::admin::v1::queries_queue::queries_queue_handler;
4039
use crate::servers::Server;
4140

4241
pub struct AdminService {
@@ -56,10 +55,8 @@ impl AdminService {
5655
#[cfg_attr(not(feature = "memory-profiling"), allow(unused_mut))]
5756
let mut route = Route::new()
5857
.at("/v1/health", get(health_handler))
59-
.at("/v1/queries_queue", get(queries_queue_handler))
6058
.at("/v1/config", get(super::v1::config::config_handler))
6159
.at("/v1/system", get(super::v1::system::system_handler))
62-
.at("/v1/logs", get(super::v1::logs::logs_handler))
6360
.at(
6461
"/v1/status",
6562
get(super::v1::instance_status::instance_status_handler),

‎src/query/service/src/servers/admin/v1/logs.rs

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/query/service/src/servers/admin/v1/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ pub mod background_tasks;
1616
pub mod cluster;
1717
pub mod config;
1818
pub mod instance_status;
19-
pub mod logs;
2019
pub mod processes;
21-
pub mod queries_queue;
2220
pub mod settings;
2321
pub mod stream_status;
2422
pub mod system;

‎src/query/service/src/servers/admin/v1/queries_queue.rs

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎src/query/service/tests/it/sessions/queue_mgr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ async fn test_heavy_actions() -> Result<()> {
239239
add_to_queue: false,
240240
},
241241
Query {
242-
sql: "select * from system.queries_queue", // SYSTEM
242+
sql: "select * from system.one", // SYSTEM
243243
add_to_queue: false,
244244
},
245245
Query {
246-
sql: "explain select * from system.queries_queue", // EXPLAIN SYSTEM
246+
sql: "explain select * from system.one", // EXPLAIN SYSTEM
247247
add_to_queue: false,
248248
},
249249
Query {

‎src/query/service/tests/it/storages/testdata/columns_table.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
157157
| 'engine_full' | 'system' | 'tables_with_history' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
158158
| 'engine_full' | 'system' | 'views' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
159159
| 'engine_full' | 'system' | 'views_with_history' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
160-
| 'entry' | 'system' | 'tracing' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
161160
| 'error_integration' | 'system' | 'tasks' | 'Nullable(String)' | 'VARCHAR' | '' | '' | 'YES' | '' |
162161
| 'error_message' | 'system' | 'notification_history' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
163162
| 'event_date' | 'system' | 'query_log' | 'Date' | 'DATE' | '' | '' | 'NO' | '' |
@@ -183,12 +182,10 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
183182
| 'has_profile' | 'system' | 'query_log' | 'Boolean' | 'BOOLEAN' | '' | '' | 'NO' | '' |
184183
| 'host' | 'system' | 'clusters' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
185184
| 'host' | 'system' | 'processes' | 'Nullable(String)' | 'VARCHAR' | '' | '' | 'YES' | '' |
186-
| 'host' | 'system' | 'queries_queue' | 'Nullable(String)' | 'VARCHAR' | '' | '' | 'YES' | '' |
187185
| 'hostname' | 'system' | 'users' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
188186
| 'id' | 'system' | 'background_tasks' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
189187
| 'id' | 'system' | 'notifications' | 'UInt64' | 'BIGINT UNSIGNED' | '' | '' | 'NO' | '' |
190188
| 'id' | 'system' | 'processes' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
191-
| 'id' | 'system' | 'queries_queue' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
192189
| 'id' | 'system' | 'task_history' | 'UInt64' | 'BIGINT UNSIGNED' | '' | '' | 'NO' | '' |
193190
| 'id' | 'system' | 'tasks' | 'UInt64' | 'BIGINT UNSIGNED' | '' | '' | 'NO' | '' |
194191
| 'index_comment' | 'information_schema' | 'statistics' | 'NULL' | 'NULL' | '' | '' | 'NO' | '' |
@@ -240,7 +237,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
240237
| 'metric' | 'system' | 'metrics' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
241238
| 'mode' | 'system' | 'streams' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
242239
| 'mysql_connection_id' | 'system' | 'processes' | 'Nullable(UInt32)' | 'INT UNSIGNED' | '' | '' | 'YES' | '' |
243-
| 'mysql_connection_id' | 'system' | 'queries_queue' | 'Nullable(UInt32)' | 'INT UNSIGNED' | '' | '' | 'YES' | '' |
244240
| 'name' | 'system' | 'background_jobs' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
245241
| 'name' | 'system' | 'caches' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
246242
| 'name' | 'system' | 'catalogs' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
@@ -276,7 +272,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
276272
| 'node' | 'system' | 'metrics' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
277273
| 'node' | 'system' | 'processes' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
278274
| 'node' | 'system' | 'processor_profile' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
279-
| 'node' | 'system' | 'queries_queue' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
280275
| 'node_id' | 'system' | 'query_log' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
281276
| 'non_unique' | 'information_schema' | 'statistics' | 'NULL' | 'NULL' | '' | '' | 'NO' | '' |
282277
| 'nullable' | 'information_schema' | 'columns' | 'Nullable(UInt8)' | 'TINYINT UNSIGNED' | '' | '' | 'YES' | '' |
@@ -431,7 +426,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
431426
| 'type' | 'system' | 'locks' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
432427
| 'type' | 'system' | 'notifications' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
433428
| 'type' | 'system' | 'processes' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
434-
| 'type' | 'system' | 'queries_queue' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
435429
| 'type' | 'system' | 'settings' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
436430
| 'updated_on' | 'system' | 'background_tasks' | 'Timestamp' | 'TIMESTAMP' | '' | '' | 'NO' | '' |
437431
| 'updated_on' | 'system' | 'indexes' | 'Nullable(Timestamp)' | 'TIMESTAMP' | '' | '' | 'YES' | '' |
@@ -444,7 +438,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
444438
| 'updated_on' | 'system' | 'virtual_columns' | 'Nullable(Timestamp)' | 'TIMESTAMP' | '' | '' | 'YES' | '' |
445439
| 'user' | 'system' | 'locks' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
446440
| 'user' | 'system' | 'processes' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
447-
| 'user' | 'system' | 'queries_queue' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
448441
| 'user_agent' | 'system' | 'query_log' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
449442
| 'vacuum_stats' | 'system' | 'background_tasks' | 'Nullable(Variant)' | 'VARIANT' | '' | '' | 'YES' | '' |
450443
| 'value' | 'system' | 'configs' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
@@ -457,7 +450,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
457450
| 'view_query' | 'system' | 'views' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
458451
| 'view_query' | 'system' | 'views_with_history' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
459452
| 'virtual_columns' | 'system' | 'virtual_columns' | 'String' | 'VARCHAR' | '' | '' | 'NO' | '' |
460-
| 'wait_time' | 'system' | 'queries_queue' | 'UInt64' | 'BIGINT UNSIGNED' | '' | '' | 'NO' | '' |
461453
| 'warehouse' | 'system' | 'task_history' | 'Nullable(String)' | 'VARCHAR' | '' | '' | 'YES' | '' |
462454
| 'warehouse' | 'system' | 'tasks' | 'Nullable(String)' | 'VARCHAR' | '' | '' | 'YES' | '' |
463455
| 'webhook_options' | 'system' | 'notifications' | 'Nullable(Variant)' | 'VARIANT' | '' | '' | 'YES' | '' |

‎src/query/storages/system/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ mod one_table;
4747
mod password_policies_table;
4848
mod processes_table;
4949
mod processor_profile_table;
50-
mod queries_queue;
5150
mod query_cache_table;
5251
mod query_log_table;
5352
mod roles_table;
@@ -60,7 +59,6 @@ mod tables_table;
6059
mod task_history_table;
6160
mod tasks_table;
6261
mod temp_files_table;
63-
mod tracing_table;
6462
mod user_functions_table;
6563
mod users_table;
6664
mod util;
@@ -98,7 +96,6 @@ pub use one_table::OneTable;
9896
pub use password_policies_table::PasswordPoliciesTable;
9997
pub use processes_table::ProcessesTable;
10098
pub use processor_profile_table::ProcessorProfileTable;
101-
pub use queries_queue::QueriesQueueTable;
10299
pub use query_cache_table::QueryCacheTable;
103100
pub use query_log_table::LogType;
104101
pub use query_log_table::QueryLogElement;
@@ -121,7 +118,6 @@ pub use task_history_table::TaskHistoryTable;
121118
pub use tasks_table::parse_tasks_to_datablock;
122119
pub use tasks_table::TasksTable;
123120
pub use temp_files_table::TempFilesTable;
124-
pub use tracing_table::TracingTable;
125121
pub use user_functions_table::UserFunctionsTable;
126122
pub use users_table::UsersTable;
127123
pub use virtual_columns_table::VirtualColumnsTable;

0 commit comments

Comments
 (0)