make all data types u64 instead of usize

xx01cyx · xx01cyx · commit 0059141e1121 · 2024-11-17T09:49:10.000-05:00
diff --git a/optd-cost-model/src/common/predicates/attr_ref_pred.rs b/optd-cost-model/src/common/predicates/attr_ref_pred.rs
@@ -33,7 +33,7 @@ impl AttributeRefPred {
             PredicateNode {
                 typ: PredicateType::AttributeRef,
                 children: vec![
-                    IdPred::new(table_id.0 as u64).into_pred_node(),
+                    IdPred::new(table_id.0).into_pred_node(),
                     IdPred::new(attribute_idx).into_pred_node(),
                 ],
                 data: None,
@@ -44,7 +44,7 @@ impl AttributeRefPred {
 
     /// Gets the table id.
     pub fn table_id(&self) -> TableId {
-        TableId(self.0.child(0).data.as_ref().unwrap().as_u64() as usize)
+        TableId(self.0.child(0).data.as_ref().unwrap().as_u64())
     }
 
     /// Gets the attribute index.
diff --git a/optd-cost-model/src/common/predicates/id_pred.rs b/optd-cost-model/src/common/predicates/id_pred.rs
@@ -23,8 +23,8 @@ impl IdPred {
     }
 
     /// Gets the id stored in the predicate.
-    pub fn id(&self) -> usize {
-        self.0.data.clone().unwrap().as_u64() as usize
+    pub fn id(&self) -> u64 {
+        self.0.data.clone().unwrap().as_u64()
     }
 }
 
diff --git a/optd-cost-model/src/common/types.rs b/optd-cost-model/src/common/types.rs
@@ -5,23 +5,23 @@ use std::fmt::Display;
 
 /// TODO: documentation
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Hash)]
-pub struct GroupId(pub usize);
+pub struct GroupId(pub u64);
 
 /// TODO: documentation
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Hash)]
-pub struct ExprId(pub usize);
+pub struct ExprId(pub u64);
 
 /// TODO: documentation
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Hash)]
-pub struct TableId(pub usize);
+pub struct TableId(pub u64);
 
 /// TODO: documentation
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Hash)]
-pub struct AttrId(pub usize);
+pub struct AttrId(pub u64);
 
 /// TODO: documentation
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Hash)]
-pub struct EpochId(pub usize);
+pub struct EpochId(pub u64);
 
 impl Display for GroupId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
diff --git a/optd-cost-model/src/cost/filter/comp_op.rs b/optd-cost-model/src/cost/filter/comp_op.rs
@@ -183,11 +183,9 @@ impl<S: CostModelStorageManager> CostModelImpl<S> {
                         // **TODO**: What if this attribute is a derived attribute?
                         let attribute_info = self
                             .storage_manager
-                            .get_attribute_info(table_id, attr_ref_idx as i32)
+                            .get_attribute_info(table_id, attr_ref_idx)
                             .await?
-                            .ok_or({
-                                SemanticError::AttributeNotFound(table_id, attr_ref_idx as i32)
-                            })?;
+                            .ok_or({ SemanticError::AttributeNotFound(table_id, attr_ref_idx) })?;
 
                         let invert_cast_data_type = &attribute_info.typ.into_data_type();
 
diff --git a/optd-cost-model/src/cost_model.rs b/optd-cost-model/src/cost_model.rs
@@ -150,7 +150,7 @@ pub mod tests {
     pub fn create_cost_model_mock_storage(
         table_id: Vec<TableId>,
         per_attribute_stats: Vec<HashMap<u64, TestPerAttributeStats>>,
-        row_counts: Vec<Option<usize>>,
+        row_counts: Vec<Option<u64>>,
         per_table_attr_infos: BaseTableAttrInfo,
     ) -> TestOptCostModelMock {
         let storage_manager = CostModelStorageMockManagerImpl::new(
diff --git a/optd-cost-model/src/lib.rs b/optd-cost-model/src/lib.rs
@@ -41,7 +41,7 @@ pub enum SemanticError {
     // TODO: Add more error types
     UnknownStatisticType,
     VersionedStatisticNotFound,
-    AttributeNotFound(TableId, i32), // (table_id, attribute_base_index)
+    AttributeNotFound(TableId, u64), // (table_id, attribute_base_index)
     // FIXME: not sure if this should be put here
     InvalidPredicate(String),
 }
diff --git a/optd-cost-model/src/storage/mock.rs b/optd-cost-model/src/storage/mock.rs
@@ -12,14 +12,14 @@ pub type AttrIndices = Vec<u64>;
 #[serde_with::serde_as]
 #[derive(Serialize, Deserialize, Debug)]
 pub struct TableStats {
-    pub row_cnt: usize,
+    pub row_cnt: u64,
     #[serde_as(as = "HashMap<serde_with::json::JsonString, _>")]
     pub column_comb_stats: HashMap<AttrIndices, AttributeCombValueStats>,
 }
 
 impl TableStats {
     pub fn new(
-        row_cnt: usize,
+        row_cnt: u64,
         column_comb_stats: HashMap<AttrIndices, AttributeCombValueStats>,
     ) -> Self {
         Self {
@@ -53,12 +53,12 @@ impl CostModelStorageManager for CostModelStorageMockManagerImpl {
     async fn get_attribute_info(
         &self,
         table_id: TableId,
-        attr_base_index: i32,
+        attr_base_index: u64,
     ) -> CostModelResult<Option<Attribute>> {
         let table_attr_infos = self.per_table_attr_infos_map.get(&table_id);
         match table_attr_infos {
             None => Ok(None),
-            Some(table_attr_infos) => match table_attr_infos.get(&(attr_base_index as u64)) {
+            Some(table_attr_infos) => match table_attr_infos.get(&attr_base_index) {
                 None => Ok(None),
                 Some(attr) => Ok(Some(attr.clone())),
             },
diff --git a/optd-cost-model/src/storage/mod.rs b/optd-cost-model/src/storage/mod.rs
@@ -21,7 +21,7 @@ pub trait CostModelStorageManager {
     async fn get_attribute_info(
         &self,
         table_id: TableId,
-        attr_base_index: i32,
+        attr_base_index: u64,
     ) -> CostModelResult<Option<Attribute>>;
 
     async fn get_attributes_comb_statistics(
diff --git a/optd-cost-model/src/storage/persistent.rs b/optd-cost-model/src/storage/persistent.rs
@@ -35,11 +35,11 @@ impl<S: CostModelStorageLayer + Send + Sync> CostModelStorageManager
     async fn get_attribute_info(
         &self,
         table_id: TableId,
-        attr_base_index: i32,
+        attr_base_index: u64,
     ) -> CostModelResult<Option<Attribute>> {
         Ok(self
             .backend_manager
-            .get_attribute(table_id.into(), attr_base_index)
+            .get_attribute(table_id.into(), attr_base_index as i32)
             .await?
             .map(|attr| Attribute {
                 name: attr.name,
diff --git a/optd-persistent/src/cost_model/interface.rs b/optd-persistent/src/cost_model/interface.rs
@@ -17,6 +17,7 @@ pub type AttrId = i32;
 pub type ExprId = i32;
 pub type EpochId = i32;
 pub type StatId = i32;
+pub type AttrIndex = i32;
 
 /// TODO: documentation
 pub enum CatalogSource {
@@ -152,7 +153,7 @@ pub trait CostModelStorageLayer {
     async fn get_stats_for_attr_indices_based(
         &self,
         table_id: TableId,
-        attr_base_indices: Vec<i32>,
+        attr_base_indices: Vec<AttrIndex>,
         stat_type: StatType,
         epoch_id: Option<EpochId>,
     ) -> StorageResult<Option<Json>>;
@@ -168,6 +169,6 @@ pub trait CostModelStorageLayer {
     async fn get_attribute(
         &self,
         table_id: TableId,
-        attribute_base_index: i32,
+        attribute_base_index: AttrIndex,
     ) -> StorageResult<Option<Attr>>;
 }
diff --git a/optd-persistent/src/cost_model/orm.rs b/optd-persistent/src/cost_model/orm.rs
@@ -14,8 +14,8 @@ use serde_json::json;
 
 use super::catalog::mock_catalog::{self, MockCatalog};
 use super::interface::{
-    Attr, AttrId, AttrType, CatalogSource, EpochId, EpochOption, ExprId, Stat, StatId, StatType,
-    TableId,
+    Attr, AttrId, AttrIndex, AttrType, CatalogSource, EpochId, EpochOption, ExprId, Stat, StatId,
+    StatType, TableId,
 };
 
 impl BackendManager {
@@ -432,7 +432,7 @@ impl CostModelStorageLayer for BackendManager {
     async fn get_stats_for_attr_indices_based(
         &self,
         table_id: TableId,
-        attr_base_indices: Vec<i32>,
+        attr_base_indices: Vec<AttrIndex>,
         stat_type: StatType,
         epoch_id: Option<EpochId>,
     ) -> StorageResult<Option<Json>> {
@@ -542,7 +542,7 @@ impl CostModelStorageLayer for BackendManager {
     async fn get_attribute(
         &self,
         table_id: TableId,
-        attribute_base_index: i32,
+        attribute_base_index: AttrIndex,
     ) -> StorageResult<Option<Attr>> {
         let attr_res = Attribute::find()
             .filter(attribute::Column::TableId.eq(table_id))

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ impl IdPred {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// Gets the id stored in the predicate.`
`26`		`- pub fn id(&self) -> usize {`
`27`		`- self.0.data.clone().unwrap().as_u64() as usize`
	`26`	`+ pub fn id(&self) -> u64 {`
	`27`	`+ self.0.data.clone().unwrap().as_u64()`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ pub enum SemanticError {`
`41`	`41`	`// TODO: Add more error types`
`42`	`42`	`UnknownStatisticType,`
`43`	`43`	`VersionedStatisticNotFound,`
`44`		`- AttributeNotFound(TableId, i32), // (table_id, attribute_base_index)`
	`44`	`+ AttributeNotFound(TableId, u64), // (table_id, attribute_base_index)`
`45`	`45`	`// FIXME: not sure if this should be put here`
`46`	`46`	`InvalidPredicate(String),`
`47`	`47`	`}`