improve agg index rewrite matching

Author: forsaken628

src/query/sql/src/planner/binder/ddl/index.rs

@@ -47,6 +47,7 @@ use derive_visitor::Drive;
 use derive_visitor::DriveMut;
 use itertools::Itertools;
 
+use crate::AggIndexPlan;
 use crate::AggregatingIndexChecker;
 use crate::AggregatingIndexRewriter;
 use crate::BindContext;
@@ -179,7 +180,11 @@ impl Binder {
                     new_bind_context.planning_agg_index = true;
                     if let Statement::Query(query) = &stmt {
                         let (s_expr, _) = self.bind_query(&mut new_bind_context, query)?;
-                        s_exprs.push((index_id, index_meta.query.clone(), s_expr));
+                        s_exprs.push(AggIndexPlan {
+                            index_id,
+                            sql: index_meta.query.clone(),
+                            s_expr,
+                        });
                     }
                 }
                 agg_indexes.extend(s_exprs);

src/query/sql/src/planner/metadata/metadata.rs

@@ -75,7 +75,7 @@ pub struct Metadata {
     non_lazy_columns: ColumnSet,
     /// Mappings from table index to _row_id column index.
     table_row_id_index: HashMap<IndexType, Symbol>,
-    agg_indices: HashMap<String, Vec<(u64, String, SExpr)>>,
+    agg_indices: HashMap<String, Vec<AggIndexPlan>>,
     max_column_position: usize, // for CSV
 
     /// Scan id of each scan operator.
@@ -86,6 +86,13 @@ pub struct Metadata {
     next_logical_recursive_cte_id: u32,
 }
 
+#[derive(Clone, Debug)]
+pub struct AggIndexPlan {
+    pub index_id: u64,
+    pub sql: String,
+    pub s_expr: SExpr,
+}
+
 impl Metadata {
     fn next_column_index(&self) -> Symbol {
         Symbol::new(self.columns.len())
@@ -333,7 +340,7 @@ impl Metadata {
         column_index
     }
 
-    pub fn add_agg_indices(&mut self, table: String, agg_indices: Vec<(u64, String, SExpr)>) {
+    pub fn add_agg_indices(&mut self, table: String, agg_indices: Vec<AggIndexPlan>) {
         match self.agg_indices.entry(table) {
             Entry::Occupied(occupied) => occupied.into_mut().extend(agg_indices),
             Entry::Vacant(vacant) => {
@@ -342,15 +349,15 @@ impl Metadata {
         }
     }
 
-    pub fn agg_indices(&self) -> &HashMap<String, Vec<(u64, String, SExpr)>> {
+    pub fn agg_indices(&self) -> &HashMap<String, Vec<AggIndexPlan>> {
         &self.agg_indices
     }
 
-    pub fn replace_agg_indices(&mut self, agg_indices: HashMap<String, Vec<(u64, String, SExpr)>>) {
+    pub fn replace_agg_indices(&mut self, agg_indices: HashMap<String, Vec<AggIndexPlan>>) {
         self.agg_indices = agg_indices
     }
 
-    pub fn get_agg_indices(&self, table: &str) -> Option<&[(u64, String, SExpr)]> {
+    pub fn get_agg_indices(&self, table: &str) -> Option<&[AggIndexPlan]> {
         self.agg_indices.get(table).map(|v| v.as_slice())
     }