track nesting (to support indentation in SQL), remove newlines from o…

…perator rendering
MaterializeInc · Oct 23, 2024 · a1447ef · a1447ef
1 parent 6e5dd5f
commit a1447ef
Show file tree

Hide file tree

Showing 6 changed files with 205 additions and 91 deletions.
diff --git a/src/catalog/src/builtin.rs b/src/catalog/src/builtin.rs
@@ -4027,7 +4027,7 @@ pub static MZ_LIR_MAPPING: LazyLock<BuiltinView> = LazyLock::new(|| BuiltinView
     oid: oid::VIEW_MZ_LIR_MAPPING_OID,
     column_defs: None,
     sql: "
-SELECT global_id, lir_id, operator, operator_id_start, operator_id_end
+SELECT global_id, lir_id, operator, nesting, operator_id_start, operator_id_end
 FROM mz_internal.mz_compute_lir_mapping_per_worker
 WHERE worker_id = 0",
     access: vec![PUBLIC_SELECT],

diff --git a/src/compute-client/src/logging.rs b/src/compute-client/src/logging.rs
@@ -539,6 +539,7 @@ impl LogVariant {
                 .with_column("lir_id", ScalarType::UInt64.nullable(false))
                 .with_column("worker_id", ScalarType::UInt64.nullable(false))
                 .with_column("operator", ScalarType::String.nullable(false))
+                .with_column("nesting", ScalarType::UInt16.nullable(false))
                 .with_column("operator_id_start", ScalarType::UInt64.nullable(true))
                 .with_column("operator_id_end", ScalarType::UInt64.nullable(true))
                 .with_key(vec![0, 1])

diff --git a/src/compute-types/src/plan/flat_plan.proto b/src/compute-types/src/plan/flat_plan.proto
@@ -31,6 +31,13 @@ message ProtoFlatPlan {
   repeated ProtoNode nodes = 1;
   uint64 root = 2;
   repeated uint64 topological_order = 3;
+
+  message ProtoNest {
+    uint64 id = 1;
+    uint32 nest = 2;
+  }
+
+  repeated ProtoNest nesting = 4;
 }
 
 message ProtoFlatPlanNode {