Merge pull request #8612 from Xuanwo/code-cleanup

refactor: Remove not needed re-export
databendlabs · Nov 3, 2022 · 97bbc68 · 97bbc68 · vercel · Nov 3, 2022
2 parents 2fdfcaa + d24f76b
commit 97bbc68
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/service/src/sessions/mod.rs b/src/query/service/src/sessions/mod.rs
@@ -21,7 +21,6 @@ mod session_ctx;
 mod session_info;
 mod session_mgr;
 mod session_mgr_status;
-mod session_settings;
 mod session_status;
 mod session_type;
 
@@ -34,6 +33,5 @@ pub use session_ctx::SessionContext;
 pub use session_info::ProcessInfo;
 pub use session_mgr::SessionManager;
 pub use session_mgr_status::SessionManagerStatus;
-pub use session_settings::Settings;
 pub use session_status::SessionStatus;
 pub use session_type::SessionType;
diff --git a/src/query/service/src/sessions/query_ctx.rs b/src/query/service/src/sessions/query_ctx.rs
@@ -43,6 +43,7 @@ use common_planner::PartInfoPtr;
 use common_planner::Partitions;
 use common_planner::ReadDataSourcePlan;
 use common_planner::SourceInfo;
+use common_settings::Settings;
 use common_storage::DataOperator;
 use common_storage::StorageMetrics;
 use common_storages_preludes::stage::StageTable;
@@ -60,7 +61,6 @@ use crate::sessions::ProcessInfo;
 use crate::sessions::QueryContextShared;
 use crate::sessions::Session;
 use crate::sessions::SessionManager;
-use crate::sessions::Settings;
 use crate::sessions::TableContext;
 use crate::storages::Table;
 

diff --git a/src/query/service/src/sessions/query_ctx_shared.rs b/src/query/service/src/sessions/query_ctx_shared.rs
@@ -28,6 +28,7 @@ use common_exception::ErrorCode;
 use common_exception::Result;
 use common_meta_types::RoleInfo;
 use common_meta_types::UserInfo;
+use common_settings::Settings;
 use common_storage::DataOperator;
 use common_storage::StorageMetrics;
 use common_storage::StorageParams;
@@ -42,7 +43,6 @@ use crate::pipelines::executor::PipelineExecutor;
 use crate::servers::http::v1::HttpQueryHandle;
 use crate::sessions::query_affect::QueryAffect;
 use crate::sessions::Session;
-use crate::sessions::Settings;
 use crate::storages::Table;
 
 type DatabaseAndTable = (String, String, String);

diff --git a/src/query/service/src/sessions/session.rs b/src/query/service/src/sessions/session.rs
@@ -24,6 +24,7 @@ use common_meta_types::GrantObject;
 use common_meta_types::RoleInfo;
 use common_meta_types::UserInfo;
 use common_meta_types::UserPrivilegeType;
+use common_settings::Settings;
 use common_users::RoleCacheManager;
 use common_users::BUILTIN_ROLE_PUBLIC;
 use futures::channel::*;
@@ -37,7 +38,6 @@ use crate::sessions::SessionContext;
 use crate::sessions::SessionManager;
 use crate::sessions::SessionStatus;
 use crate::sessions::SessionType;
-use crate::sessions::Settings;
 
 pub struct Session {
     pub(in crate::sessions) id: String,

diff --git a/src/query/service/src/sessions/session_settings.rs b/src/query/service/src/sessions/session_settings.rs