rename cascades_group to group

Author: connortsui20

optd-mvp/DESIGN.md

@@ -58,6 +58,8 @@ of a problem.
 
 TODO explain the fingerprinting algorithm and how it relates to group merging
 
+Union find data structure with a circular linked list for linear iteration
+
 When taking the fingerprint of an expression, the child groups of an expression need to be root groups. If they are not, we need to try again.
 Assuming that all children are root groups, the fingerprint we make for any expression that fulfills that is valid and can be looked up for duplicates.
 In order to maintain that correctness, on a merge of two sets, the smaller one requires that a new fingerprint be generated for every expression that has a group in that smaller set.

optd-mvp/src/entities/cascades_group.rs renamed to optd-mvp/src/entities/group.rs

@@ -3,26 +3,35 @@
 use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "cascades_group")]
+#[sea_orm(table_name = "group")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub status: i8,
     pub winner: Option<i32>,
     pub cost: Option<i64>,
     pub parent_id: Option<i32>,
+    pub next_id: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::NextId",
+        to = "Column::Id",
+        on_update = "Cascade",
+        on_delete = "SetNull"
+    )]
+    SelfRef2,
     #[sea_orm(
         belongs_to = "Entity",
         from = "Column::ParentId",
         to = "Column::Id",
         on_update = "Cascade",
         on_delete = "SetNull"
     )]
-    SelfRef,
+    SelfRef1,
     #[sea_orm(has_many = "super::logical_children::Entity")]
     LogicalChildren,
     #[sea_orm(has_many = "super::logical_expression::Entity")]
@@ -56,7 +65,7 @@ impl Related<super::logical_expression::Entity> for Entity {
         super::logical_children::Relation::LogicalExpression.def()
     }
     fn via() -> Option<RelationDef> {
-        Some(super::logical_children::Relation::CascadesGroup.def().rev())
+        Some(super::logical_children::Relation::Group.def().rev())
     }
 }
 
@@ -65,11 +74,7 @@ impl Related<super::physical_expression::Entity> for Entity {
         super::physical_children::Relation::PhysicalExpression.def()
     }
     fn via() -> Option<RelationDef> {
-        Some(
-            super::physical_children::Relation::CascadesGroup
-                .def()
-                .rev(),
-        )
+        Some(super::physical_children::Relation::Group.def().rev())
     }
 }
 

optd-mvp/src/entities/logical_children.rs

@@ -14,13 +14,13 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::cascades_group::Entity",
+        belongs_to = "super::group::Entity",
         from = "Column::GroupId",
-        to = "super::cascades_group::Column::Id",
+        to = "super::group::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    CascadesGroup,
+    Group,
     #[sea_orm(
         belongs_to = "super::logical_expression::Entity",
         from = "Column::LogicalExpressionId",
@@ -31,9 +31,9 @@ pub enum Relation {
     LogicalExpression,
 }
 
-impl Related<super::cascades_group::Entity> for Entity {
+impl Related<super::group::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::CascadesGroup.def()
+        Relation::Group.def()
     }
 }
 

optd-mvp/src/entities/logical_expression.rs

@@ -14,16 +14,16 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(has_many = "super::fingerprint::Entity")]
+    Fingerprint,
     #[sea_orm(
-        belongs_to = "super::cascades_group::Entity",
+        belongs_to = "super::group::Entity",
         from = "Column::GroupId",
-        to = "super::cascades_group::Column::Id",
+        to = "super::group::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    CascadesGroup,
-    #[sea_orm(has_many = "super::fingerprint::Entity")]
-    Fingerprint,
+    Group,
     #[sea_orm(has_many = "super::logical_children::Entity")]
     LogicalChildren,
 }
@@ -40,9 +40,9 @@ impl Related<super::logical_children::Entity> for Entity {
     }
 }
 
-impl Related<super::cascades_group::Entity> for Entity {
+impl Related<super::group::Entity> for Entity {
     fn to() -> RelationDef {
-        super::logical_children::Relation::CascadesGroup.def()
+        super::logical_children::Relation::Group.def()
     }
     fn via() -> Option<RelationDef> {
         Some(

optd-mvp/src/entities/mod.rs

@@ -2,8 +2,8 @@
 
 pub mod prelude;
 
-pub mod cascades_group;
 pub mod fingerprint;
+pub mod group;
 pub mod logical_children;
 pub mod logical_expression;
 pub mod physical_children;

optd-mvp/src/entities/physical_children.rs

@@ -14,13 +14,13 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::cascades_group::Entity",
+        belongs_to = "super::group::Entity",
         from = "Column::GroupId",
-        to = "super::cascades_group::Column::Id",
+        to = "super::group::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    CascadesGroup,
+    Group,
     #[sea_orm(
         belongs_to = "super::physical_expression::Entity",
         from = "Column::PhysicalExpressionId",
@@ -31,9 +31,9 @@ pub enum Relation {
     PhysicalExpression,
 }
 
-impl Related<super::cascades_group::Entity> for Entity {
+impl Related<super::group::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::CascadesGroup.def()
+        Relation::Group.def()
     }
 }
 

optd-mvp/src/entities/physical_expression.rs

@@ -15,13 +15,13 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::cascades_group::Entity",
+        belongs_to = "super::group::Entity",
         from = "Column::GroupId",
-        to = "super::cascades_group::Column::Id",
+        to = "super::group::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    CascadesGroup,
+    Group,
     #[sea_orm(has_many = "super::physical_children::Entity")]
     PhysicalChildren,
 }
@@ -32,9 +32,9 @@ impl Related<super::physical_children::Entity> for Entity {
     }
 }
 
-impl Related<super::cascades_group::Entity> for Entity {
+impl Related<super::group::Entity> for Entity {
     fn to() -> RelationDef {
-        super::physical_children::Relation::CascadesGroup.def()
+        super::physical_children::Relation::Group.def()
     }
     fn via() -> Option<RelationDef> {
         Some(

optd-mvp/src/entities/prelude.rs

@@ -2,8 +2,8 @@
 
 #![allow(unused_imports)]
 
-pub use super::cascades_group::Entity as CascadesGroup;
 pub use super::fingerprint::Entity as Fingerprint;
+pub use super::group::Entity as Group;
 pub use super::logical_children::Entity as LogicalChildren;
 pub use super::logical_expression::Entity as LogicalExpression;
 pub use super::physical_children::Entity as PhysicalChildren;

optd-mvp/src/expression/logical_expression.rs

@@ -1,4 +1,4 @@
-//! Definition of logical expressions / relations in the Cascades query optimization framework.
+//! Definition of logical expressions / relations in our query optimization framework.
 //!
 //! FIXME: All fields are placeholders.
 //!

optd-mvp/src/expression/mod.rs

@@ -1,4 +1,4 @@
-//! In-memory representation of Cascades logical and physical expression / operators / relations.
+//! In-memory representation of logical and physical expression / operators / relations.
 //!
 //! TODO more docs.
 
@@ -8,7 +8,7 @@ pub use logical_expression::*;
 mod physical_expression;
 pub use physical_expression::*;
 
-/// The representation of a Cascades expression.
+/// The representation of an expression.
 ///
 /// TODO more docs.
 #[derive(Clone, Debug)]