Skip to content

Commit 2b1ef37

Browse files
authored
refactor(query): remove system.query_log and system.queries_profile_log (#18155)
* refactor(query): remove system.query_log and system.queries_profile_log * refactor(query): remove system.query_log and system.queries_profile_log * refactor(query): remove system.query_log and system.queries_profile_log
1 parent 9c331cc commit 2b1ef37

File tree

28 files changed

+2
-1279
lines changed

28 files changed

+2
-1279
lines changed

โ€Žsrc/query/service/src/databases/system/system_database.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ use databend_common_storages_system::OneTable;
5151
use databend_common_storages_system::PasswordPoliciesTable;
5252
use databend_common_storages_system::ProceduresTable;
5353
use databend_common_storages_system::ProcessesTable;
54-
use databend_common_storages_system::QueriesProfilingTable;
5554
use databend_common_storages_system::QueryCacheTable;
56-
use databend_common_storages_system::QueryLogTable;
5755
use databend_common_storages_system::RolesTable;
5856
use databend_common_storages_system::SettingsTable;
5957
use databend_common_storages_system::StagesTable;
@@ -157,17 +155,12 @@ impl SystemDatabase {
157155
TempFilesTable::create(sys_db_meta.next_table_id()),
158156
TasksTable::create(sys_db_meta.next_table_id()),
159157
TaskHistoryTable::create(sys_db_meta.next_table_id()),
160-
QueriesProfilingTable::create(sys_db_meta.next_table_id()),
161158
LocksTable::create(sys_db_meta.next_table_id(), ctl_name),
162159
NotificationsTable::create(sys_db_meta.next_table_id()),
163160
NotificationHistoryTable::create(sys_db_meta.next_table_id()),
164161
ViewsTableWithHistory::create(sys_db_meta.next_table_id(), ctl_name),
165162
TemporaryTablesTable::create(sys_db_meta.next_table_id()),
166163
DictionariesTable::create(sys_db_meta.next_table_id()),
167-
Arc::new(QueryLogTable::create(
168-
sys_db_meta.next_table_id(),
169-
config.query.max_query_log_size,
170-
)),
171164
Arc::new(ClusteringHistoryTable::create(
172165
sys_db_meta.next_table_id(),
173166
config.query.max_query_log_size,

โ€Žsrc/query/service/src/global_services.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use databend_common_meta_store::MetaStoreProvider;
3434
use databend_common_storage::DataOperator;
3535
use databend_common_storage::ShareTableConfig;
3636
use databend_common_storages_hive::HiveCreator;
37-
use databend_common_storages_system::ProfilesLogQueue;
3837
use databend_common_tracing::GlobalLogger;
3938
use databend_common_users::builtin::BuiltIn;
4039
use databend_common_users::RoleCacheManager;
@@ -163,8 +162,6 @@ impl GlobalServices {
163162
CloudControlApiProvider::init(addr, config.query.cloud_control_grpc_timeout).await?;
164163
}
165164

166-
ProfilesLogQueue::init(config.query.max_cached_queries_profiles);
167-
168165
#[cfg(feature = "enable_queries_executor")]
169166
{
170167
GlobalQueriesExecutor::init()?;

โ€Žsrc/query/service/src/interpreters/common/query_log.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use databend_common_exception::ErrorCode;
2222
use databend_common_exception::Result;
2323
use databend_common_storages_system::LogType;
2424
use databend_common_storages_system::QueryLogElement;
25-
use databend_common_storages_system::QueryLogQueue;
2625
use databend_common_version::DATABEND_COMMIT_VERSION;
2726
use log::error;
2827
use log::info;
@@ -71,7 +70,7 @@ impl InterpreterQueryLog {
7170
info!(target: "databend::log::query", "{}", event_str);
7271
// log the query event in the system log
7372
info!("query: {} becomes {:?}", event.query_id, event.log_type);
74-
QueryLogQueue::instance()?.append_data(event)
73+
Ok(())
7574
}
7675

7776
pub fn fail_to_start(ctx: Arc<QueryContext>, err: ErrorCode) {

โ€Žsrc/query/service/src/interpreters/interpreter.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ use databend_common_pipeline_core::SourcePipeBuilder;
4141
use databend_common_sql::plans::Plan;
4242
use databend_common_sql::PlanExtras;
4343
use databend_common_sql::Planner;
44-
use databend_common_storages_system::ProfilesLogElement;
45-
use databend_common_storages_system::ProfilesLogQueue;
4644
use databend_storages_common_cache::CacheManager;
4745
use derive_visitor::DriveMut;
4846
use derive_visitor::VisitorMut;
@@ -363,11 +361,6 @@ pub fn on_execution_finished(info: &ExecutionInfo, query_ctx: Arc<QueryContext>)
363361
statistics_desc: get_statistics_desc(),
364362
})?
365363
);
366-
let profiles_queue = ProfilesLogQueue::instance()?;
367-
profiles_queue.append_data(ProfilesLogElement {
368-
query_id: query_ctx.get_id(),
369-
profiles: query_profiles,
370-
})?;
371364
}
372365

373366
hook_clear_m_cte_temp_table(&query_ctx)?;

โ€Žsrc/query/service/src/servers/admin/admin_service.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ impl AdminService {
7575
"/v1/cluster/list",
7676
get(super::v1::cluster::cluster_list_handler),
7777
)
78-
.at(
79-
"v1/queries/:query_id/profiling",
80-
get(super::v1::query_profiling::query_profiling_handler),
81-
)
8278
.at(
8379
"v1/queries/:query_id/graph_dump",
8480
get(super::v1::query_dump::running_query_dump),

โ€Žsrc/query/service/src/servers/admin/v1/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ pub mod config;
1717
pub mod instance_status;
1818
pub mod processes;
1919
pub mod query_dump;
20-
pub mod query_profiling;
2120
pub mod settings;
2221
pub mod stream_status;
2322
pub mod system;

โ€Žsrc/query/service/src/servers/admin/v1/query_profiling.rs

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

โ€Žsrc/query/service/src/servers/flight/v1/actions/flight_actions.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use futures_util::future::BoxFuture;
2525
use serde::Deserialize;
2626
use serde::Serialize;
2727

28-
use crate::servers::flight::v1::actions::get_profile::get_profile;
2928
use crate::servers::flight::v1::actions::get_running_query_dump::get_running_query_dump;
3029
use crate::servers::flight::v1::actions::init_query_env::init_query_env;
3130
use crate::servers::flight::v1::actions::init_query_env::INIT_QUERY_ENV;
@@ -37,7 +36,6 @@ use crate::servers::flight::v1::actions::start_prepared_query::start_prepared_qu
3736
use crate::servers::flight::v1::actions::system_action::system_action;
3837
use crate::servers::flight::v1::actions::truncate_table::truncate_table;
3938
use crate::servers::flight::v1::actions::truncate_table::TRUNCATE_TABLE;
40-
use crate::servers::flight::v1::actions::GET_PROFILE;
4139
use crate::servers::flight::v1::actions::GET_RUNNING_QUERY_DUMP;
4240
use crate::servers::flight::v1::actions::INIT_QUERY_FRAGMENTS;
4341
use crate::servers::flight::v1::actions::KILL_QUERY;
@@ -136,6 +134,5 @@ pub fn flight_actions() -> FlightActions {
136134
.action(KILL_QUERY, kill_query)
137135
.action(SET_PRIORITY, set_priority)
138136
.action(SYSTEM_ACTION, system_action)
139-
.action(GET_PROFILE, get_profile)
140137
.action(GET_RUNNING_QUERY_DUMP, get_running_query_dump)
141138
}

โ€Žsrc/query/service/src/servers/flight/v1/actions/get_profile.rs

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

โ€Žsrc/query/service/src/servers/flight/v1/actions/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// limitations under the License.
1414

1515
mod flight_actions;
16-
mod get_profile;
1716
mod get_running_query_dump;
1817
mod init_query_env;
1918
mod init_query_fragments;
@@ -31,7 +30,6 @@ use databend_common_exception::Result;
3130
use databend_common_settings::Settings;
3231
pub use flight_actions::flight_actions;
3332
pub use flight_actions::FlightActions;
34-
pub use get_profile::GET_PROFILE;
3533
pub use get_running_query_dump::GET_RUNNING_QUERY_DUMP;
3634
pub use init_query_env::INIT_QUERY_ENV;
3735
pub use init_query_fragments::init_query_fragments;

0 commit comments

Comments
ย (0)