move test-related stuffs to test_utils

Author: xx01cyx

optd-cost-model/src/cost/agg.rs

@@ -71,12 +71,12 @@ mod tests {
 
     use crate::{
         common::predicates::constant_pred::ConstantType,
-        cost_model::tests::{
+        stats::{utilities::simple_map::SimpleMap, MostCommonValues, DEFAULT_NUM_DISTINCT},
+        test_utils::tests::{
             attr_index, create_mock_cost_model_with_attr_types, empty_list, list,
             TestPerAttributeStats, TEST_ATTR1_BASE_INDEX, TEST_ATTR2_BASE_INDEX,
             TEST_ATTR3_BASE_INDEX, TEST_GROUP1_ID, TEST_TABLE1_ID,
         },
-        stats::{utilities::simple_map::SimpleMap, MostCommonValues, DEFAULT_NUM_DISTINCT},
         EstimatedStatistic,
     };
 

optd-cost-model/src/cost/filter/core.rs

@@ -101,8 +101,8 @@ mod tests {
             types::TableId,
             values::Value,
         },
-        cost_model::tests::*,
         stats::{utilities::simple_map::SimpleMap, Distribution, MostCommonValues, DEFAULT_EQ_SEL},
+        test_utils::tests::*,
     };
     use arrow_schema::DataType;
 

optd-cost-model/src/cost/filter/in_list.rs

@@ -84,8 +84,8 @@ mod tests {
 
     use crate::{
         common::values::Value,
-        cost_model::tests::*,
         stats::{utilities::simple_map::SimpleMap, MostCommonValues},
+        test_utils::tests::*,
     };
 
     #[tokio::test]

optd-cost-model/src/cost/filter/like.rs

@@ -114,11 +114,11 @@ mod tests {
 
     use crate::{
         common::values::Value,
-        cost_model::tests::*,
         stats::{
             utilities::{counter::Counter, simple_map::SimpleMap},
             MostCommonValues, FIXED_CHAR_SEL_FACTOR, FULL_WILDCARD_SEL_FACTOR,
         },
+        test_utils::tests::*,
     };
 
     #[tokio::test]

optd-cost-model/src/cost/join/core.rs

@@ -415,16 +415,16 @@ mod tests {
             properties::{attr_ref, Attribute},
             values::Value,
         },
-        cost_model::tests::{
+        stats::DEFAULT_EQ_SEL,
+        test_utils::tests::MemoGroupInfo,
+        test_utils::tests::{
             attr_index, bin_op, cnst, create_four_table_mock_cost_model, create_mock_cost_model,
             create_three_table_mock_cost_model, create_two_table_mock_cost_model,
             create_two_table_mock_cost_model_custom_row_cnts, empty_per_attr_stats, log_op,
             per_attr_stats_with_dist_and_ndistinct, per_attr_stats_with_ndistinct,
             TestOptCostModelMock, TEST_ATTR1_NAME, TEST_ATTR2_NAME, TEST_TABLE1_ID, TEST_TABLE2_ID,
             TEST_TABLE3_ID, TEST_TABLE4_ID,
         },
-        memo_ext::tests::MemoGroupInfo,
-        stats::DEFAULT_EQ_SEL,
     };
 
     use super::*;