From c1146cc0f2893697d736dca9ecda4cbb98bd39fa Mon Sep 17 00:00:00 2001 From: WenyXu Date: Fri, 11 Sep 2026 07:58:51 +0000 Subject: [PATCH] refactor: expose shared operator test fixtures Signed-off-by: WenyXu --- src/operator/src/insert.rs | 2 +- src/operator/src/lib.rs | 4 ++-- src/operator/src/req_convert/delete/table_to_region.rs | 2 +- src/operator/src/req_convert/insert/row_to_region.rs | 2 +- src/operator/src/req_convert/insert/table_to_region.rs | 2 +- src/operator/src/{tests.rs => test_util.rs} | 4 ++-- src/operator/src/{tests => test_util}/kv_backend.rs | 0 .../src/{tests => test_util}/partition_manager.rs | 10 +++++++--- 8 files changed, 15 insertions(+), 11 deletions(-) rename src/operator/src/{tests.rs => test_util.rs} (79%) rename src/operator/src/{tests => test_util}/kv_backend.rs (100%) rename src/operator/src/{tests => test_util}/partition_manager.rs (98%) diff --git a/src/operator/src/insert.rs b/src/operator/src/insert.rs index a4a69ef8ba9..c84dda19991 100644 --- a/src/operator/src/insert.rs +++ b/src/operator/src/insert.rs @@ -1559,7 +1559,7 @@ mod tests { use table::metadata::{TableInfoBuilder, TableMetaBuilder, TableType}; use super::*; - use crate::tests::{create_partition_rule_manager, prepare_mocked_backend}; + use crate::test_util::{create_partition_rule_manager, prepare_mocked_backend}; fn make_table_ref_with_schema( ts_name: &str, diff --git a/src/operator/src/lib.rs b/src/operator/src/lib.rs index 5e723faeb5c..477fa7b74b5 100644 --- a/src/operator/src/lib.rs +++ b/src/operator/src/lib.rs @@ -25,6 +25,6 @@ pub mod req_convert; pub mod request; pub mod statement; pub mod table; -#[cfg(test)] -pub(crate) mod tests; +#[cfg(any(test, feature = "testing"))] +pub mod test_util; pub mod utils; diff --git a/src/operator/src/req_convert/delete/table_to_region.rs b/src/operator/src/req_convert/delete/table_to_region.rs index b6fde9b1051..0d40e30350e 100644 --- a/src/operator/src/req_convert/delete/table_to_region.rs +++ b/src/operator/src/req_convert/delete/table_to_region.rs @@ -62,7 +62,7 @@ mod tests { use store_api::storage::RegionId; use super::*; - use crate::tests::{ + use crate::test_util::{ create_partition_rule_manager, new_test_table_info, prepare_mocked_backend, }; diff --git a/src/operator/src/req_convert/insert/row_to_region.rs b/src/operator/src/req_convert/insert/row_to_region.rs index f512a6c9acb..08b960094b2 100644 --- a/src/operator/src/req_convert/insert/row_to_region.rs +++ b/src/operator/src/req_convert/insert/row_to_region.rs @@ -92,7 +92,7 @@ mod tests { use api::v1::{ColumnDataType, Row, RowInsertRequest, Rows, Value}; use super::*; - use crate::tests::{ + use crate::test_util::{ create_partition_rule_manager, new_test_table_info, prepare_mocked_backend, }; diff --git a/src/operator/src/req_convert/insert/table_to_region.rs b/src/operator/src/req_convert/insert/table_to_region.rs index 4fbbbaa02c4..adc40118ec3 100644 --- a/src/operator/src/req_convert/insert/table_to_region.rs +++ b/src/operator/src/req_convert/insert/table_to_region.rs @@ -78,7 +78,7 @@ mod tests { use store_api::storage::RegionId; use super::*; - use crate::tests::{ + use crate::test_util::{ create_partition_rule_manager, new_test_table_info, prepare_mocked_backend, }; diff --git a/src/operator/src/tests.rs b/src/operator/src/test_util.rs similarity index 79% rename from src/operator/src/tests.rs rename to src/operator/src/test_util.rs index 9263fa4cca7..aa4a2f30ab8 100644 --- a/src/operator/src/tests.rs +++ b/src/operator/src/test_util.rs @@ -15,5 +15,5 @@ mod kv_backend; mod partition_manager; -pub(crate) use kv_backend::prepare_mocked_backend; -pub(crate) use partition_manager::{create_partition_rule_manager, new_test_table_info}; +pub use crate::test_util::kv_backend::prepare_mocked_backend; +pub use crate::test_util::partition_manager::{create_partition_rule_manager, new_test_table_info}; diff --git a/src/operator/src/tests/kv_backend.rs b/src/operator/src/test_util/kv_backend.rs similarity index 100% rename from src/operator/src/tests/kv_backend.rs rename to src/operator/src/test_util/kv_backend.rs diff --git a/src/operator/src/tests/partition_manager.rs b/src/operator/src/test_util/partition_manager.rs similarity index 98% rename from src/operator/src/tests/partition_manager.rs rename to src/operator/src/test_util/partition_manager.rs index ecf87aedac9..e51ac49051e 100644 --- a/src/operator/src/tests/partition_manager.rs +++ b/src/operator/src/test_util/partition_manager.rs @@ -15,9 +15,13 @@ use std::collections::{BTreeMap, HashMap}; use std::sync::Arc; +#[cfg(test)] use api::v1::helper::tag_column_schema; +#[cfg(test)] use api::v1::value::ValueData; +#[cfg(test)] use api::v1::{ColumnDataType, Row, Rows}; +#[cfg(test)] use common_base::hash::partition_expr_version; use common_meta::cache::{TableRouteCacheRef, new_table_route_cache}; use common_meta::key::TableMetadataManager; @@ -93,10 +97,12 @@ fn new_test_table_info_with_columns( .unwrap() } +#[cfg(test)] fn new_physical_test_table_info(table_id: u32, table_name: &str) -> TableInfo { new_test_table_info_with_columns(table_id, table_name, test_column_schemas(true), vec![0, 2]) } +#[cfg(test)] fn new_logical_test_table_info(table_id: u32, table_name: &str) -> TableInfo { new_test_table_info_with_columns(table_id, table_name, test_column_schemas(false), vec![0]) } @@ -141,9 +147,7 @@ fn test_new_partition_info_cache(table_route_cache: TableRouteCacheRef) -> Parti /// PARTITION r2 VALUES LESS THAN (50, 'sh'), /// PARTITION r3 VALUES LESS THAN (MAXVALUE, MAXVALUE), /// ) -pub(crate) async fn create_partition_rule_manager( - kv_backend: KvBackendRef, -) -> PartitionRuleManagerRef { +pub async fn create_partition_rule_manager(kv_backend: KvBackendRef) -> PartitionRuleManagerRef { let table_metadata_manager = TableMetadataManager::new(kv_backend.clone()); let table_route_cache = test_new_table_route_cache(kv_backend.clone()); let partition_info_cache = test_new_partition_info_cache(table_route_cache.clone());