tracking column names

Author: mgree

misc/python/materialize/checks/all_checks/explain_catalog_item.py

@@ -76,22 +76,22 @@ def validate(self) -> Testdrive:
 
             ?[version>=13500] EXPLAIN OPTIMIZED PLAN AS VERBOSE TEXT FOR MATERIALIZED VIEW explain_mv2;
             materialize.public.explain_mv2:
-              Filter (#1 = 7)
+              Filter (#1{y} = 7)
                 ReadStorage materialize.public.explain_item_t2
 
             Source materialize.public.explain_item_t2
-              filter=((#1 = 7))
+              filter=((#1{y} = 7))
 
             Target cluster: quickstart
 
 
             ?[version<13500] EXPLAIN OPTIMIZED PLAN FOR MATERIALIZED VIEW explain_mv2;
             materialize.public.explain_mv2:
-              Filter (#1 = 7)
+              Filter (#1{y} = 7)
                 ReadStorage materialize.public.explain_item_t2
 
             Source materialize.public.explain_item_t2
-              filter=((#1 = 7))
+              filter=((#1{y} = 7))
 
             Target cluster: quickstart
 

src/adapter/src/catalog/apply.rs

@@ -1753,7 +1753,7 @@ impl CatalogState {
                 .variant
                 .index_by()
                 .into_iter()
-                .map(MirScalarExpr::Column)
+                .map(MirScalarExpr::column)
                 .collect(),
             create_sql: index_sql(
                 index_item_name,

src/adapter/src/catalog/builtin_table_updates.rs

@@ -1661,7 +1661,7 @@ impl CatalogState {
                 .expect("missing sql information for index key")
                 .to_ast_string_simple();
             let (field_number, expression) = match key {
-                MirScalarExpr::Column(col) => {
+                MirScalarExpr::Column(col, _) => {
                     (Datum::UInt64(u64::cast_from(*col + 1)), Datum::Null)
                 }
                 _ => (Datum::Null, Datum::String(&key_sql)),

src/adapter/src/coord/peek.rs

@@ -95,7 +95,7 @@ impl<T> PeekDataflowPlan<T> {
         let key = typ
             .default_key()
             .into_iter()
-            .map(MirScalarExpr::Column)
+            .map(MirScalarExpr::column)
             .collect::<Vec<_>>();
         let (permutation, thinning) = permutation_for_arrangement(&key, arity);
         Self {
@@ -397,7 +397,7 @@ pub fn create_fast_path_plan<T: Timestamp>(
                             if !preserves_order(&col.scalar_type) {
                                 break;
                             }
-                            let col_expr = MirScalarExpr::Column(idx);
+                            let col_expr = MirScalarExpr::column(idx);
 
                             let Some((literal, _)) = filters
                                 .iter()

src/adapter/src/optimize/peek.rs

@@ -244,7 +244,7 @@ impl<'s> Optimize<LocalMirPlan<Resolved<'s>>> for Optimizer {
         let key = typ
             .default_key()
             .iter()
-            .map(|k| MirScalarExpr::Column(*k))
+            .map(|k| MirScalarExpr::column(*k))
             .collect();
 
         // The assembled dataflow contains a view and an index of that view.

src/compute-types/src/plan/lowering.rs

@@ -575,7 +575,7 @@ impl Context {
                         // All columns of the constant input will be part of the arrangement key.
                         let source_arrangement = (
                             (0..key.len())
-                                .map(MirScalarExpr::Column)
+                                .map(MirScalarExpr::column)
                                 .collect::<Vec<_>>(),
                             (0..key.len()).collect::<Vec<_>>(),
                             Vec::<usize>::new(),

src/compute-types/src/plan/reduce.rs

@@ -807,7 +807,7 @@ impl ReducePlan {
     /// that key a single arrangement.
     pub fn keys(&self, key_arity: usize, arity: usize) -> AvailableCollections {
         let key = (0..key_arity)
-            .map(MirScalarExpr::Column)
+            .map(MirScalarExpr::column)
             .collect::<Vec<_>>();
         let (permutation, thinning) = permutation_for_arrangement(&key, arity);
         AvailableCollections::new_arranged(vec![(key, permutation, thinning)], None)

src/compute-types/src/plan/threshold.rs

@@ -126,7 +126,7 @@ impl ThresholdPlan {
         // Arrange the input by all columns in order.
         let mut all_columns = Vec::new();
         for column in 0..arity {
-            all_columns.push(mz_expr::MirScalarExpr::Column(column));
+            all_columns.push(mz_expr::MirScalarExpr::column(column));
         }
         let (permutation, thinning) = permutation_for_arrangement(&all_columns, arity);
         let ensure_arrangement = (all_columns, permutation, thinning);

src/compute/src/logging.rs

@@ -175,7 +175,7 @@ impl PermutedRowPacker {
         let (_, value) = permutation_for_arrangement(
             &key.iter()
                 .cloned()
-                .map(MirScalarExpr::Column)
+                .map(MirScalarExpr::column)
                 .collect::<Vec<_>>(),
             variant.desc().arity(),
         );

src/compute/src/render/context.rs

@@ -506,7 +506,7 @@ where
     ) -> Self {
         let mut keys = Vec::new();
         for column in columns {
-            keys.push(MirScalarExpr::Column(column));
+            keys.push(MirScalarExpr::column(column));
         }
         Self::from_expressions(keys, arrangements)
     }