Merge pull request databendlabs#3295 from PsiACE/new-query-tests

[test] apply the new test style to databend-query

query/Cargo.toml

@@ -7,6 +7,10 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+doctest = false
+test = false
+
 [[bin]]
 name = "databend-query"
 path = "src/bin/databend-query.rs"

query/src/api/http/v1/mod.rs

@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod cluster_test;
-#[cfg(test)]
-mod config_test;
-#[cfg(test)]
-mod health_test;
-#[cfg(test)]
-mod logs_test;
-
 pub mod cluster;
 pub mod config;
 pub mod health;

query/src/api/mod.rs

@@ -17,18 +17,16 @@
 pub use http_service::HttpService;
 pub use rpc::BroadcastAction;
 pub use rpc::CancelAction;
+pub use rpc::DatabendQueryFlightDispatcher;
+pub use rpc::DatabendQueryFlightService;
 pub use rpc::FlightAction;
 pub use rpc::FlightClient;
 pub use rpc::FlightTicket;
 pub use rpc::ShuffleAction;
+pub use rpc::StreamTicket;
 pub use rpc_service::RpcService;
 
-mod http;
+pub mod http;
 mod http_service;
 mod rpc;
 mod rpc_service;
-
-#[cfg(test)]
-mod http_service_test;
-#[cfg(test)]
-mod rpc_service_test;

query/src/api/rpc/mod.rs

@@ -12,18 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod flight_dispatcher_test;
-
-#[cfg(test)]
-mod flight_service_test;
-
-#[cfg(test)]
-mod flight_actions_test;
-
-#[cfg(test)]
-mod flight_tickets_test;
-
 pub use flight_actions::BroadcastAction;
 pub use flight_actions::CancelAction;
 pub use flight_actions::FlightAction;
@@ -32,6 +20,7 @@ pub use flight_client::FlightClient;
 pub use flight_dispatcher::DatabendQueryFlightDispatcher;
 pub use flight_service::DatabendQueryFlightService;
 pub use flight_tickets::FlightTicket;
+pub use flight_tickets::StreamTicket;
 
 mod flight_actions;
 mod flight_client;

query/src/api/rpc_service.rs

@@ -34,9 +34,9 @@ use crate::servers::Server as DatabendQueryServer;
 use crate::sessions::SessionManager;
 
 pub struct RpcService {
-    pub(crate) sessions: Arc<SessionManager>,
-    pub(crate) abort_notify: Arc<Notify>,
-    pub(crate) dispatcher: Arc<DatabendQueryFlightDispatcher>,
+    pub sessions: Arc<SessionManager>,
+    pub abort_notify: Arc<Notify>,
+    pub dispatcher: Arc<DatabendQueryFlightDispatcher>,
 }
 
 impl RpcService {

query/src/clusters/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod cluster_test;
-
 mod cluster;
 
 pub use cluster::Cluster;

query/src/common/hashtable/mod.rs

@@ -15,12 +15,10 @@
 pub use hash_table::HashTable;
 pub use hash_table_entity::HashTableEntity;
 pub use hash_table_entity::KeyValueEntity;
+pub use hash_table_grower::Grower;
 pub use hash_table_iter::HashTableIter;
 pub use hash_table_key::HashTableKeyable;
 
-#[cfg(test)]
-mod hash_table_grower_test;
-
 mod hash_table;
 #[allow(clippy::missing_safety_doc, clippy::not_unsafe_ptr_arg_deref)]
 mod hash_table_entity;

query/src/configs/mod.rs

@@ -15,9 +15,6 @@
 #[macro_use]
 mod macros;
 
-#[cfg(test)]
-mod config_test;
-
 mod config;
 pub mod config_log;
 pub mod config_meta;

query/src/functions/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod context_function_test;
-
 mod context_function;
 
 pub use context_function::ContextFunction;

query/src/interpreters/mod.rs

@@ -12,45 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod interpreter_database_create_test;
-#[cfg(test)]
-mod interpreter_database_drop_test;
-#[cfg(test)]
-mod interpreter_describe_table_test;
-#[cfg(test)]
-mod interpreter_explain_test;
-#[cfg(test)]
-mod interpreter_grant_privilege_test;
-#[cfg(test)]
-mod interpreter_insert_test;
-#[cfg(test)]
-mod interpreter_interceptor_test;
-#[cfg(test)]
-mod interpreter_revoke_previlege_test;
-#[cfg(test)]
-mod interpreter_select_test;
-#[cfg(test)]
-mod interpreter_setting_test;
-#[cfg(test)]
-mod interpreter_show_create_table_test;
-#[cfg(test)]
-mod interpreter_stage_create_test;
-#[cfg(test)]
-mod interpreter_table_create_test;
-#[cfg(test)]
-mod interpreter_table_drop_test;
-#[cfg(test)]
-mod interpreter_truncate_table_test;
-#[cfg(test)]
-mod interpreter_use_database_test;
-#[cfg(test)]
-mod interpreter_user_alter_test;
-#[cfg(test)]
-mod interpreter_user_create_test;
-#[cfg(test)]
-mod interpreter_user_drop_test;
-
 mod interpreter;
 mod interpreter_common;
 mod interpreter_copy;

query/src/interpreters/plan_schedulers/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod plan_scheduler_test;
-
 #[allow(clippy::needless_range_loop)]
 mod plan_scheduler;
 mod plan_scheduler_error;

query/src/lib.rs

@@ -16,9 +16,6 @@
 #![feature(core_intrinsics)]
 #![feature(arbitrary_self_types)]
 
-#[cfg(test)]
-pub mod tests;
-
 pub mod api;
 pub mod catalogs;
 pub mod clusters;

query/src/metrics/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod metric_service_test;
-
 mod metric_service;
 
 pub use metric_service::MetricService;

query/src/optimizers/mod.rs

@@ -12,22 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod optimizer_constant_folding_test;
-#[cfg(test)]
-mod optimizer_expression_transform_test;
-#[cfg(test)]
-mod optimizer_scatters_test;
-#[cfg(test)]
-mod optimizer_statistics_exact_test;
-#[cfg(test)]
-mod optimizer_test;
-#[cfg(test)]
-mod utils_test;
-
-#[cfg(test)]
-mod optimizer_top_n_push_down_test;
-
 mod metrics;
 mod optimizer;
 mod optimizer_constant_folding;