fix: improve the statistic type

Author: lanlou1554

optd-persistent/src/bin/init.rs

@@ -105,7 +105,7 @@ async fn init_all_tables() -> Result<(), sea_orm::error::DbErr> {
         table_id: Set(Some(1)),
         creation_time: Set(Utc::now()),
         number_of_attributes: Set(0),
-        variant_tag: Set(StatType::Count as i32),
+        variant_tag: Set(StatType::TableRowCount as i32),
         description: Set("".to_owned()),
     };
     let table_versioned_statistic = versioned_statistic::ActiveModel {

optd-persistent/src/cost_model/catalog/mock_catalog.rs

@@ -112,23 +112,23 @@ impl MockCatalog {
         let statistics: Vec<MockStatistic> = vec![
             MockStatistic {
                 id: 1,
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::NotNullCount as i32,
                 stat_value: json!(100),
                 attr_ids: vec![1],
                 table_id: None,
                 name: "CountAttr1".to_string(),
             },
             MockStatistic {
                 id: 2,
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::NotNullCount as i32,
                 stat_value: json!(200),
                 attr_ids: vec![2],
                 table_id: None,
                 name: "CountAttr2".to_string(),
             },
             MockStatistic {
                 id: 3,
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::TableRowCount as i32,
                 stat_value: json!(300),
                 attr_ids: vec![],
                 table_id: Some(1),

optd-persistent/src/cost_model/interface.rs

@@ -36,15 +36,9 @@ pub enum ConstraintType {
 }
 
 pub enum StatType {
-    // TODO(lanlou): I am not sure which way to represent the type is better.
-    // 1. `Count` means row count, (i.e. record count), and it only applies to
-    // table statistics. In this way, we should introduce `NotNullCount` for attribute
-    // statistics to indicate the number of non-null values.
-    // 2. `Count` means the number of non-null values, and it applies to both table
-    // and attribute statistics. (Will a table have a record with null values in all
-    // attributes?)
-    // For now, we just use the second way for simplicity.
-    Count,
+    /// `TableRowCount` only applies to table statistics.
+    TableRowCount,
+    NotNullCount,
     Cardinality,
     Min,
     Max,

optd-persistent/src/cost_model/orm.rs

@@ -611,12 +611,12 @@ mod tests {
         assert_eq!(lookup_res.len(), 3);
 
         let stat_res = backend_manager
-            .get_stats_for_table(1, StatType::Count as i32, Some(epoch_id))
+            .get_stats_for_table(1, StatType::TableRowCount as i32, Some(epoch_id))
             .await;
         assert!(stat_res.is_ok());
         assert_eq!(stat_res.unwrap().unwrap(), json!(300));
         let stat_res = backend_manager
-            .get_stats_for_attr([2].to_vec(), StatType::Count as i32, None)
+            .get_stats_for_attr([2].to_vec(), StatType::NotNullCount as i32, None)
             .await;
         assert!(stat_res.is_ok());
         assert_eq!(stat_res.unwrap().unwrap(), json!(200));
@@ -636,7 +636,7 @@ mod tests {
             .await
             .unwrap();
         let stat = Stat {
-            stat_type: StatType::Count as i32,
+            stat_type: StatType::NotNullCount as i32,
             stat_value: json!(100),
             attr_ids: vec![1],
             table_id: None,
@@ -655,7 +655,7 @@ mod tests {
         println!("{:?}", stat_res);
         assert_eq!(stat_res[0].number_of_attributes, 1);
         assert_eq!(stat_res[0].description, "1".to_string());
-        assert_eq!(stat_res[0].variant_tag, StatType::Count as i32);
+        assert_eq!(stat_res[0].variant_tag, StatType::NotNullCount as i32);
         let stat_attr_res = StatisticToAttributeJunction::find()
             .filter(statistic_to_attribute_junction::Column::StatisticId.eq(stat_res[0].id))
             .all(&backend_manager.db)
@@ -708,7 +708,7 @@ mod tests {
             .await
             .unwrap();
         let stat2 = Stat {
-            stat_type: StatType::Count as i32,
+            stat_type: StatType::NotNullCount as i32,
             stat_value: json!(200),
             attr_ids: vec![1],
             table_id: None,
@@ -762,7 +762,7 @@ mod tests {
         // 3. Update existed stat with the same value
         let epoch_num = Event::find().all(&backend_manager.db).await.unwrap().len();
         let stat3 = Stat {
-            stat_type: StatType::Count as i32,
+            stat_type: StatType::NotNullCount as i32,
             stat_value: json!(200),
             attr_ids: vec![1],
             table_id: None,
@@ -803,21 +803,21 @@ mod tests {
 
         let statistics: Vec<Stat> = vec![
             Stat {
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::TableRowCount as i32,
                 stat_value: json!(0),
                 attr_ids: vec![],
                 table_id: Some(1),
                 name: "row_count".to_string(),
             },
             Stat {
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::TableRowCount as i32,
                 stat_value: json!(20),
                 attr_ids: vec![],
                 table_id: Some(1),
                 name: "row_count".to_string(),
             },
             Stat {
-                stat_type: StatType::Count as i32,
+                stat_type: StatType::TableRowCount as i32,
                 stat_value: json!(100),
                 attr_ids: vec![],
                 table_id: Some(table_inserted_res.last_insert_id),
@@ -981,7 +981,7 @@ mod tests {
         let backend_manager = binding.as_mut().unwrap();
         let epoch_id = 1;
         let table_id = 1;
-        let stat_type = StatType::Count as i32;
+        let stat_type = StatType::TableRowCount as i32;
 
         // Get initial stats
         let res = backend_manager
@@ -998,7 +998,7 @@ mod tests {
             .await
             .unwrap();
         let stat = Stat {
-            stat_type: StatType::Count as i32,
+            stat_type: StatType::TableRowCount as i32,
             stat_value: json!(100),
             attr_ids: vec![],
             table_id: Some(table_id),