Move storage attribute to mod

cmu-db · Nov 16, 2024 · a3b8088 · a3b8088
1 parent 03b6ec3
commit a3b8088
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/optd-cost-model/src/storage/mod.rs b/optd-cost-model/src/storage/mod.rs
@@ -1,10 +1,21 @@
-use persistent::Attribute;
+use serde::{Deserialize, Serialize};
 
-use crate::{common::types::TableId, stats::AttributeCombValueStats, CostModelResult};
+use crate::{
+    common::{predicates::constant_pred::ConstantType, types::TableId},
+    stats::AttributeCombValueStats,
+    CostModelResult,
+};
 
 pub mod mock;
 pub mod persistent;
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Attribute {
+    pub name: String,
+    pub typ: ConstantType,
+    pub nullable: bool,
+}
+
 #[trait_variant::make(Send)]
 pub trait CostModelStorageManager {
     async fn get_attribute_info(

diff --git a/optd-cost-model/src/storage/persistent.rs b/optd-cost-model/src/storage/persistent.rs
@@ -2,22 +2,14 @@
 use std::sync::Arc;
 
 use optd_persistent::{cost_model::interface::StatType, CostModelStorageLayer};
-use serde::{Deserialize, Serialize};
 
 use crate::{
     common::{predicates::constant_pred::ConstantType, types::TableId},
     stats::{counter::Counter, AttributeCombValueStats, Distribution, MostCommonValues},
     CostModelResult,
 };
 
-use super::CostModelStorageManager;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Attribute {
-    pub name: String,
-    pub typ: ConstantType,
-    pub nullable: bool,
-}
+use super::{Attribute, CostModelStorageManager};
 
 /// TODO: documentation
 pub struct CostModelStorageManagerImpl<S: CostModelStorageLayer + Send + Sync> {