Merge pull request #30393 from teskje/disable-new-introspection-sources

Disable the new instrospection sources
MaterializeInc · Nov 8, 2024 · f53e72d · f53e72d
1 parent 4a04f03
commit f53e72d
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 402 deletions.
diff --git a/doc/user/content/sql/system-catalog/mz_introspection.md b/doc/user/content/sql/system-catalog/mz_introspection.md
@@ -222,19 +222,6 @@ The `mz_dataflow_channel_operators` view associates [dataflow] channels with the
 
 <!-- RELATION_SPEC_UNDOCUMENTED mz_introspection.mz_dataflow_channel_operators_per_worker -->
 
-## `mz_dataflow_global_ids`
-
-The `mz_dataflow_global_ids` view associates [dataflow] ids with global ids (ids of the form `u8` or `t5`).
-
-<!-- RELATION_SPEC mz_introspection.mz_dataflow_global_ids -->
-
-| Field        | Type      | Meaning                                    |
-|------------- | -------   | --------                                   |
-| `id`         | [`uint8`] | The dataflow ID.                           |
-| `global_id`  | [`text`]  | A global ID associated with that dataflow. |
-
-<!-- RELATION_SPEC_UNDOCUMENTED mz_introspection.mz_compute_dataflow_global_ids_per_worker -->
-
 ## `mz_dataflow_operators`
 
 The `mz_dataflow_operators` view describes the [dataflow] operators in the system.
@@ -305,29 +292,6 @@ through a hierarchical scheme for either aggregation or Top K computations.
 | `savings`       | [`numeric`]          | A conservative estimate of the amount of memory in bytes to be saved by applying the hint.                |
 | `hint`          | [`double precision`] | The hint value that will eliminate `to_cut` levels from the region's hierarchy.                           |
 
-## `mz_lir_mapping`
-
-The `mz_lir_mapping` view describes the low-level internal representation (LIR) plan that corresponds to global ids.
-LIR is a higher-level representation than dataflows; this view is used for profiling and debugging indices and materialized views.
-Note that LIR is not a stable interface and may change at any time.
-In particular, you should not attempt to parse `operator` descriptions.
-LIR nodes are implemented by zero or more dataflow operators with sequential ids.
-We use the range `[operator_id_start, operator_id_end)` to record this information.
-If an LIR node was implemented without any dataflow operators, `operator_id_start` will be equal to `operator_id_end`.
-
-<!-- RELATION_SPEC mz_introspection.mz_lir_mapping -->
-| Field             | Type      | Meaning
-| ---------         | --------  | -----------
-| global_id         | [`text`]  | The global ID.
-| lir_id            | [`uint8`] | The LIR node ID.
-| operator          | [`text`]  | The LIR operator, in the format `OperatorName INPUTS [OPTIONS]`.
-| parent_lir_id     | [`uint8`] | The parent of this LIR node. May be `NULL`.
-| nesting           | [`uint2`] | The nesting level of this LIR node.
-| operator_id_start | [`uint8`] | The first dataflow operator ID implementing this LIR operator (inclusive).
-| operator_id_end   | [`uint8`] | The first dataflow operator ID _after_ this LIR operator (exclusive).
-
-<!-- RELATION_SPEC_UNDOCUMENTED mz_introspection.mz_compute_lir_mapping_per_worker -->
-
 ## `mz_message_counts`
 
 The `mz_message_counts` view describes the messages and message batches sent and received over the [dataflow] channels in the system.

diff --git a/src/catalog/src/builtin.rs b/src/catalog/src/builtin.rs
@@ -9136,7 +9136,6 @@ pub static BUILTINS_STATIC: LazyLock<Vec<Builtin<NameReference>>> = LazyLock::ne
         Builtin::Log(&MZ_DATAFLOW_ADDRESSES_PER_WORKER),
         Builtin::Log(&MZ_DATAFLOW_OPERATOR_REACHABILITY_RAW),
         Builtin::Log(&MZ_COMPUTE_EXPORTS_PER_WORKER),
-        Builtin::Log(&MZ_COMPUTE_DATAFLOW_GLOBAL_IDS_PER_WORKER),
         Builtin::Log(&MZ_MESSAGE_COUNTS_RECEIVED_RAW),
         Builtin::Log(&MZ_MESSAGE_COUNTS_SENT_RAW),
         Builtin::Log(&MZ_MESSAGE_BATCH_COUNTS_RECEIVED_RAW),
@@ -9232,7 +9231,6 @@ pub static BUILTINS_STATIC: LazyLock<Vec<Builtin<NameReference>>> = LazyLock::ne
         Builtin::View(&MZ_DATAFLOW_ADDRESSES),
         Builtin::View(&MZ_DATAFLOW_CHANNELS),
         Builtin::View(&MZ_DATAFLOW_OPERATORS),
-        Builtin::View(&MZ_DATAFLOW_GLOBAL_IDS),
         Builtin::View(&MZ_DATAFLOW_OPERATOR_DATAFLOWS_PER_WORKER),
         Builtin::View(&MZ_DATAFLOW_OPERATOR_DATAFLOWS),
         Builtin::View(&MZ_OBJECT_TRANSITIVE_DEPENDENCIES),
@@ -9412,8 +9410,6 @@ pub static BUILTINS_STATIC: LazyLock<Vec<Builtin<NameReference>>> = LazyLock::ne
         Builtin::View(&MZ_COMPUTE_ERROR_COUNTS),
         Builtin::Source(&MZ_COMPUTE_ERROR_COUNTS_RAW_UNIFIED),
         Builtin::Source(&MZ_COMPUTE_HYDRATION_TIMES),
-        Builtin::Log(&MZ_COMPUTE_LIR_MAPPING_PER_WORKER),
-        Builtin::View(&MZ_LIR_MAPPING),
         Builtin::View(&MZ_COMPUTE_OPERATOR_HYDRATION_STATUSES),
         Builtin::Source(&MZ_CLUSTER_REPLICA_FRONTIERS),
         Builtin::View(&MZ_COMPUTE_HYDRATION_STATUSES),

diff --git a/src/environmentd/tests/testdata/http/ws b/src/environmentd/tests/testdata/http/ws
diff --git a/test/sqllogictest/autogenerated/mz_introspection.slt b/test/sqllogictest/autogenerated/mz_introspection.slt
@@ -126,12 +126,6 @@ SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND o
 4  to_operator_id  uint8
 5  to_operator_address  list
 
-query ITT
-SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND object = 'mz_dataflow_global_ids' ORDER BY position
-----
-1  id  uint8
-2  global_id  text
-
 query ITT
 SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND object = 'mz_dataflow_operators' ORDER BY position
 ----
@@ -170,17 +164,6 @@ SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND o
 7  savings  numeric
 8  hint  double␠precision
 
-query ITT
-SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND object = 'mz_lir_mapping' ORDER BY position
-----
-1  global_id           text
-2  lir_id              uint8
-3  operator            text
-4  parent_lir_id       uint8
-5  nesting             uint2
-6  operator_id_start   uint8
-7  operator_id_end     uint8
-
 query ITT
 SELECT position, name, type FROM objects WHERE schema = 'mz_introspection' AND object = 'mz_message_counts' ORDER BY position
 ----
@@ -252,7 +235,6 @@ mz_arrangement_sharing_per_worker
 mz_arrangement_sharing_raw
 mz_arrangement_sizes
 mz_arrangement_sizes_per_worker
-mz_compute_dataflow_global_ids_per_worker
 mz_compute_error_counts
 mz_compute_error_counts_per_worker
 mz_compute_error_counts_raw
@@ -263,7 +245,6 @@ mz_compute_frontiers_per_worker
 mz_compute_hydration_times_per_worker
 mz_compute_import_frontiers
 mz_compute_import_frontiers_per_worker
-mz_compute_lir_mapping_per_worker
 mz_compute_operator_durations_histogram
 mz_compute_operator_durations_histogram_per_worker
 mz_compute_operator_durations_histogram_raw
@@ -274,7 +255,6 @@ mz_dataflow_channel_operators
 mz_dataflow_channel_operators_per_worker
 mz_dataflow_channels
 mz_dataflow_channels_per_worker
-mz_dataflow_global_ids
 mz_dataflow_operator_dataflows
 mz_dataflow_operator_dataflows_per_worker
 mz_dataflow_operator_parents
@@ -290,7 +270,6 @@ mz_dataflow_shutdown_durations_histogram_raw
 mz_dataflows
 mz_dataflows_per_worker
 mz_expected_group_size_advice
-mz_lir_mapping
 mz_message_batch_counts_received_raw
 mz_message_batch_counts_sent_raw
 mz_message_counts

diff --git a/test/sqllogictest/cluster.slt b/test/sqllogictest/cluster.slt
@@ -210,8 +210,6 @@ bar  mz_arrangement_records_raw  mz_arrangement_records_raw_u7_primary_idx  1  o
 bar  mz_arrangement_records_raw  mz_arrangement_records_raw_u7_primary_idx  2  worker_id  NULL  false
 bar  mz_arrangement_sharing_raw  mz_arrangement_sharing_raw_u7_primary_idx  1  operator_id  NULL  false
 bar  mz_arrangement_sharing_raw  mz_arrangement_sharing_raw_u7_primary_idx  2  worker_id  NULL  false
-bar  mz_compute_dataflow_global_ids_per_worker  mz_compute_dataflow_global_ids_per_worker_u7_primary_idx  1  id  NULL  false
-bar  mz_compute_dataflow_global_ids_per_worker  mz_compute_dataflow_global_ids_per_worker_u7_primary_idx  2  worker_id  NULL  false
 bar  mz_compute_error_counts_raw  mz_compute_error_counts_raw_u7_primary_idx  1  export_id  NULL  false
 bar  mz_compute_error_counts_raw  mz_compute_error_counts_raw_u7_primary_idx  2  worker_id  NULL  false
 bar  mz_compute_exports_per_worker  mz_compute_exports_per_worker_u7_primary_idx  1  export_id  NULL  false
@@ -223,9 +221,6 @@ bar  mz_compute_hydration_times_per_worker  mz_compute_hydration_times_per_worke
 bar  mz_compute_import_frontiers_per_worker  mz_compute_import_frontiers_per_worker_u7_primary_idx  1  export_id  NULL  false
 bar  mz_compute_import_frontiers_per_worker  mz_compute_import_frontiers_per_worker_u7_primary_idx  2  import_id  NULL  false
 bar  mz_compute_import_frontiers_per_worker  mz_compute_import_frontiers_per_worker_u7_primary_idx  3  worker_id  NULL  false
-bar  mz_compute_lir_mapping_per_worker  mz_compute_lir_mapping_per_worker_u7_primary_idx  1  global_id  NULL  false
-bar  mz_compute_lir_mapping_per_worker  mz_compute_lir_mapping_per_worker_u7_primary_idx  2  lir_id  NULL  false
-bar  mz_compute_lir_mapping_per_worker  mz_compute_lir_mapping_per_worker_u7_primary_idx  3  worker_id  NULL  false
 bar  mz_compute_operator_durations_histogram_raw  mz_compute_operator_durations_histogram_raw_u7_primary_idx  1  id  NULL  false
 bar  mz_compute_operator_durations_histogram_raw  mz_compute_operator_durations_histogram_raw_u7_primary_idx  2  worker_id  NULL  false
 bar  mz_compute_operator_durations_histogram_raw  mz_compute_operator_durations_histogram_raw_u7_primary_idx  3  duration_ns  NULL  false
@@ -412,7 +407,7 @@ DROP CLUSTER foo, foo2, foo3, foo4 CASCADE
 query I
 SELECT COUNT(name) FROM mz_indexes WHERE cluster_id = 'u1';
 ----
-31
+29
 
 query I
 SELECT COUNT(name) FROM mz_indexes WHERE cluster_id <> 'u1' AND cluster_id NOT LIKE 's%';
@@ -425,15 +420,15 @@ CREATE CLUSTER test REPLICAS (foo (SIZE '1'));
 query I
 SELECT COUNT(name) FROM mz_indexes;
 ----
-285
+271
 
 statement ok
 DROP CLUSTER test CASCADE
 
 query T
 SELECT COUNT(name) FROM mz_indexes;
 ----
-254
+242
 
 simple conn=mz_system,user=mz_system
 ALTER CLUSTER quickstart OWNER TO materialize

diff --git a/test/sqllogictest/information_schema_tables.slt b/test/sqllogictest/information_schema_tables.slt
@@ -825,10 +825,6 @@ mz_arrangement_sizes_per_worker
 VIEW
 materialize
 mz_introspection
-mz_compute_dataflow_global_ids_per_worker
-SOURCE
-materialize
-mz_introspection
 mz_compute_error_counts
 VIEW
 materialize
@@ -869,10 +865,6 @@ mz_compute_import_frontiers_per_worker
 SOURCE
 materialize
 mz_introspection
-mz_compute_lir_mapping_per_worker
-SOURCE
-materialize
-mz_introspection
 mz_compute_operator_durations_histogram
 VIEW
 materialize
@@ -913,10 +905,6 @@ mz_dataflow_channels_per_worker
 SOURCE
 materialize
 mz_introspection
-mz_dataflow_global_ids
-VIEW
-materialize
-mz_introspection
 mz_dataflow_operator_dataflows
 VIEW
 materialize
@@ -977,10 +965,6 @@ mz_expected_group_size_advice
 VIEW
 materialize
 mz_introspection
-mz_lir_mapping
-VIEW
-materialize
-mz_introspection
 mz_message_batch_counts_received_raw
 SOURCE
 materialize