From bbcbe7be278ed9d119416d54c66b57c4ebc6107c Mon Sep 17 00:00:00 2001 From: Jan Teske Date: Fri, 8 Nov 2024 14:12:18 +0100 Subject: [PATCH] Disable the new instrospection sources This commit disables the newly added introspection sources `mz_compute_dataflow_global_ids_per_worker` and `mz_compute_lir_mapping_per_worker`, because Mz's 0dt mechanism is currently not prepared to handle new introspection sources. "Disabling" here means removing the registration of the new `Log` builtins and the `View`s depending on them. The intention is to keep the diff as small as possible, to make this change less risky. --- .../sql/system-catalog/mz_introspection.md | 36 --- src/catalog/src/builtin.rs | 4 - .../autogenerated/mz_introspection.slt | 21 -- test/sqllogictest/cluster.slt | 5 - .../information_schema_tables.slt | 16 -- .../introspection/attribution_sources.slt | 208 ------------------ .../mz_catalog_server_index_accounting.slt | 13 -- .../testdrive-old-kafka-src-syntax/indexes.td | 2 - test/testdrive/catalog.td | 4 - test/testdrive/indexes.td | 2 - 10 files changed, 311 deletions(-) delete mode 100644 test/sqllogictest/introspection/attribution_sources.slt diff --git a/doc/user/content/sql/system-catalog/mz_introspection.md b/doc/user/content/sql/system-catalog/mz_introspection.md index 46836ff521e16..ade7e4602a985 100644 --- 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 -## `mz_dataflow_global_ids` - -The `mz_dataflow_global_ids` view associates [dataflow] ids with global ids (ids of the form `u8` or `t5`). - - - -| Field | Type | Meaning | -|------------- | ------- | -------- | -| `id` | [`uint8`] | The dataflow ID. | -| `global_id` | [`text`] | A global ID associated with that dataflow. | - - - ## `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`. - - -| 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). - - - ## `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 index a273a486724ac..963897ec0c76b 100644 --- a/src/catalog/src/builtin.rs +++ b/src/catalog/src/builtin.rs @@ -9136,7 +9136,6 @@ pub static BUILTINS_STATIC: LazyLock>> = 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>> = 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>> = 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/test/sqllogictest/autogenerated/mz_introspection.slt b/test/sqllogictest/autogenerated/mz_introspection.slt index b90f36fc63a42..9805b1b825070 100644 --- 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 index 9e8ca980ca70b..72bb05005478d 100644 --- 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 diff --git a/test/sqllogictest/information_schema_tables.slt b/test/sqllogictest/information_schema_tables.slt index 4d439cf53f0e6..04758cd6a92ec 100644 --- 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 diff --git a/test/sqllogictest/introspection/attribution_sources.slt b/test/sqllogictest/introspection/attribution_sources.slt deleted file mode 100644 index eb82c2d4dd717..0000000000000 --- a/test/sqllogictest/introspection/attribution_sources.slt +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright Materialize, Inc. and contributors. All rights reserved. -# -# Use of this software is governed by the Business Source License -# included in the LICENSE file at the root of this repository. -# -# As of the Change Date specified in that file, in accordance with -# the Business Source License, use of this software will be governed -# by the Apache License, Version 2.0. - -# Ensure attribution sources function (are created, dropped appropriately) - -mode cockroach - -# VIEW + INDEX - -statement ok -CREATE TABLE t(x INT NOT NULL, y INT, z TEXT); - -statement ok -CREATE VIEW v AS - SELECT t1.x AS x, t1.z AS z1, t2.z AS z2 - FROM t AS t1, t AS t2 - WHERE t1.x = t2.y; - -statement ok -CREATE INDEX v_idx_x ON v(x); - -# let the introspection sources update -statement ok -SELECT mz_unsafe.mz_sleep(2) - -query IT -SELECT id, global_id FROM mz_internal.mz_dataflow_global_ids ORDER BY id, global_id; ----- -8 u2 -8 u3 - -query TI -SELECT global_id, lir_id FROM mz_internal.mz_lir_mapping ORDER BY global_id, lir_id DESC; ----- -u2 5 -u2 4 -u2 3 -u2 2 -u2 1 -u3 7 -u3 6 - -## attribution queries - -# omitting sum(duration_ns) as duration, sum(count) as count -query TIIT -SELECT global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS operator - FROM mz_internal.mz_lir_mapping mlm - LEFT JOIN mz_introspection.mz_compute_operator_durations_histogram mcodh - ON (mlm.operator_id_start <= mcodh.id AND mcodh.id < mlm.operator_id_end) -GROUP BY global_id, lir_id, operator, parent_lir_id, nesting -ORDER BY global_id, lir_id DESC; ----- -u2 5 NULL Join::Differential␠2»␠4 -u2 4 5 ␠␠Arrange␠3 -u2 3 4 ␠␠␠␠Get::Collection␠u1 -u2 2 5 ␠␠Arrange␠1 -u2 1 2 ␠␠␠␠Get::Collection␠u1 -u3 7 NULL Arrange␠6 -u3 6 7 ␠␠Get::PassArrangements␠u2 - -# omitting pg_size_pretty(sum(size)) as size -query TIIT -SELECT global_id, lir_id, parent_lir_id, repeat(' ', nesting * 2) || operator AS operator - FROM mz_internal.mz_lir_mapping mlm - LEFT JOIN mz_introspection.mz_arrangement_sizes mas - ON (mlm.operator_id_start <= mas.operator_id AND mas.operator_id < mlm.operator_id_end) -GROUP BY global_id, lir_id, operator, parent_lir_id, nesting -ORDER BY global_id, lir_id DESC; ----- -u2 5 NULL Join::Differential␠2»␠4 -u2 4 5 ␠␠Arrange␠3 -u2 3 4 ␠␠␠␠Get::Collection␠u1 -u2 2 5 ␠␠Arrange␠1 -u2 1 2 ␠␠␠␠Get::Collection␠u1 -u3 7 NULL Arrange␠6 -u3 6 7 ␠␠Get::PassArrangements␠u2 - -statement ok -DROP TABLE t CASCADE; - -# we need the dataflow to actually drop to see the updates -statement ok -SELECT mz_unsafe.mz_sleep(3) - -query I -SELECT COUNT(*) FROM mz_internal.mz_dataflow_global_ids; ----- -0 - -query I -SELECT COUNT(*) FROM mz_internal.mz_lir_mapping; ----- -0 - -# MATERIALIZED VIEW - -statement ok -CREATE TABLE u(x INT NOT NULL, y INT, z TEXT); - -statement ok -CREATE MATERIALIZED VIEW w AS - SELECT t1.x AS x, t1.z AS z1, t2.z AS z2 - FROM u AS t1, u AS t2 - WHERE t1.x = t2.y; - -# let the introspection sources update -statement ok -SELECT mz_unsafe.mz_sleep(2) - -query IT -SELECT id, global_id FROM mz_internal.mz_dataflow_global_ids ORDER BY id, global_id; ----- -13 t59 - - -query TI -SELECT global_id, lir_id FROM mz_internal.mz_lir_mapping ORDER BY global_id, lir_id DESC; ----- -t59 5 -t59 4 -t59 3 -t59 2 -t59 1 - -## attribution queries - -# omitting sum(duration_ns) as duration, sum(count) as count -query TIIT -SELECT global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS operator - FROM mz_internal.mz_lir_mapping mlm - LEFT JOIN mz_introspection.mz_compute_operator_durations_histogram mcodh - ON (mlm.operator_id_start <= mcodh.id AND mcodh.id < mlm.operator_id_end) -GROUP BY global_id, lir_id, operator, parent_lir_id, nesting -ORDER BY global_id, lir_id DESC; ----- -t59 5 NULL Join::Differential␠2»␠4 -t59 4 5 ␠␠Arrange␠3 -t59 3 4 ␠␠␠␠Get::Collection␠u4 -t59 2 5 ␠␠Arrange␠1 -t59 1 2 ␠␠␠␠Get::Collection␠u4 - -# omitting pg_size_pretty(sum(size)) as size -query TIIT -SELECT global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS operator - FROM mz_internal.mz_lir_mapping mlm - LEFT JOIN mz_introspection.mz_arrangement_sizes mas - ON (mlm.operator_id_start <= mas.operator_id AND mas.operator_id < mlm.operator_id_end) -GROUP BY global_id, lir_id, operator, parent_lir_id, nesting -ORDER BY global_id, lir_id DESC; ----- -t59 5 NULL Join::Differential␠2»␠4 -t59 4 5 ␠␠Arrange␠3 -t59 3 4 ␠␠␠␠Get::Collection␠u4 -t59 2 5 ␠␠Arrange␠1 -t59 1 2 ␠␠␠␠Get::Collection␠u4 - -statement ok -DROP TABLE u CASCADE; - -# we need the dataflow to actually drop to see the updates -statement ok -SELECT mz_unsafe.mz_sleep(3) - -query I -SELECT COUNT(*) FROM mz_internal.mz_dataflow_global_ids; ----- -0 - -query I -SELECT COUNT(*) FROM mz_internal.mz_lir_mapping; ----- -0 - -# ATTRIBUTING TOP K HINTS - -statement ok -CREATE TABLE t(x INT NOT NULL, y INT, z TEXT); - -statement ok -CREATE VIEW v2 AS SELECT DISTINCT ON(x, y) * FROM t ORDER BY x, y; - -statement ok -CREATE INDEX v2_idx_x ON v2(x); - -statement ok -SELECT mz_unsafe.mz_sleep(2) - -query TIITIIIT -SELECT mlm.global_id AS global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS operator, levels, to_cut, savings, hint - FROM mz_internal.mz_lir_mapping mlm - JOIN mz_introspection.mz_dataflow_global_ids mdgi - ON (mlm.global_id = mdgi.global_id) - LEFT JOIN mz_introspection.mz_expected_group_size_advice megsa - ON (megsa.dataflow_id = mdgi.id AND - mlm.operator_id_start <= megsa.region_id AND megsa.region_id < mlm.operator_id_end) -ORDER BY mlm.global_id, lir_id DESC; ----- -u7 2 NULL TopK::Basic␠1 8 7 3584 15.000 -u7 1 2 ␠␠Get::PassArrangements␠u6 NULL NULL NULL NULL -u8 4 NULL Arrange␠3 NULL NULL NULL NULL -u8 3 4 ␠␠Get::PassArrangements␠u7 NULL NULL NULL NULL diff --git a/test/sqllogictest/mz_catalog_server_index_accounting.slt b/test/sqllogictest/mz_catalog_server_index_accounting.slt index ea5e1ff16c220..493d5a4deb9b4 100644 --- a/test/sqllogictest/mz_catalog_server_index_accounting.slt +++ b/test/sqllogictest/mz_catalog_server_index_accounting.slt @@ -48,14 +48,12 @@ mz_cluster_replicas_ind CREATE␠INDEX␠"mz_cluster_replicas_ind"␠IN␠CLUST mz_clusters_ind CREATE␠INDEX␠"mz_clusters_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s484␠AS␠"mz_catalog"."mz_clusters"]␠("id") mz_columns_ind CREATE␠INDEX␠"mz_columns_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s457␠AS␠"mz_catalog"."mz_columns"]␠("name") mz_comments_ind CREATE␠INDEX␠"mz_comments_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s507␠AS␠"mz_internal"."mz_comments"]␠("id") -mz_compute_dataflow_global_ids_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_dataflow_global_ids_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_dataflow_global_ids_per_worker"␠("id",␠"worker_id") mz_compute_dependencies_ind CREATE␠INDEX␠"mz_compute_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s700␠AS␠"mz_internal"."mz_compute_dependencies"]␠("dependency_id") mz_compute_error_counts_raw_s2_primary_idx CREATE␠INDEX␠"mz_compute_error_counts_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_error_counts_raw"␠("export_id",␠"worker_id") mz_compute_exports_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_exports_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_exports_per_worker"␠("export_id",␠"worker_id") mz_compute_frontiers_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_frontiers_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_frontiers_per_worker"␠("export_id",␠"worker_id") mz_compute_hydration_times_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_hydration_times_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_hydration_times_per_worker"␠("export_id",␠"worker_id") mz_compute_import_frontiers_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_import_frontiers_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_import_frontiers_per_worker"␠("export_id",␠"import_id",␠"worker_id") -mz_compute_lir_mapping_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_lir_mapping_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_lir_mapping_per_worker"␠("global_id",␠"lir_id",␠"worker_id") mz_compute_operator_durations_histogram_raw_s2_primary_idx CREATE␠INDEX␠"mz_compute_operator_durations_histogram_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_operator_durations_histogram_raw"␠("id",␠"worker_id",␠"duration_ns") mz_connections_ind CREATE␠INDEX␠"mz_connections_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s488␠AS␠"mz_catalog"."mz_connections"]␠("schema_id") mz_console_cluster_utilization_overview_ind CREATE␠INDEX␠"mz_console_cluster_utilization_overview_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s704␠AS␠"mz_internal"."mz_console_cluster_utilization_overview"]␠("cluster_id") @@ -275,9 +273,6 @@ mz_comments comment mz_comments id mz_comments object_sub_id mz_comments object_type -mz_compute_dataflow_global_ids_per_worker global_id -mz_compute_dataflow_global_ids_per_worker id -mz_compute_dataflow_global_ids_per_worker worker_id mz_compute_dependencies dependency_id mz_compute_dependencies object_id mz_compute_error_counts_raw count @@ -303,14 +298,6 @@ mz_compute_import_frontiers_per_worker export_id mz_compute_import_frontiers_per_worker import_id mz_compute_import_frontiers_per_worker time mz_compute_import_frontiers_per_worker worker_id -mz_compute_lir_mapping_per_worker global_id -mz_compute_lir_mapping_per_worker lir_id -mz_compute_lir_mapping_per_worker nesting -mz_compute_lir_mapping_per_worker operator -mz_compute_lir_mapping_per_worker operator_id_end -mz_compute_lir_mapping_per_worker operator_id_start -mz_compute_lir_mapping_per_worker parent_lir_id -mz_compute_lir_mapping_per_worker worker_id mz_compute_operator_durations_histogram_raw duration_ns mz_compute_operator_durations_histogram_raw id mz_compute_operator_durations_histogram_raw worker_id diff --git a/test/testdrive-old-kafka-src-syntax/indexes.td b/test/testdrive-old-kafka-src-syntax/indexes.td index 0547741dd4e7e..b16708bbe6a97 100644 --- a/test/testdrive-old-kafka-src-syntax/indexes.td +++ b/test/testdrive-old-kafka-src-syntax/indexes.td @@ -303,13 +303,11 @@ mz_clusters_ind mz_clusters mz_columns_ind mz_columns mz_catalog_server {name} "" mz_comments_ind mz_comments mz_catalog_server {id} "" mz_compute_dependencies_ind mz_compute_dependencies mz_catalog_server {dependency_id} "" -mz_compute_dataflow_global_ids_per_worker_s2_primary_idx mz_compute_dataflow_global_ids_per_worker mz_catalog_server {id,worker_id} "" mz_compute_error_counts_raw_s2_primary_idx mz_compute_error_counts_raw mz_catalog_server {export_id,worker_id} "" mz_compute_exports_per_worker_s2_primary_idx mz_compute_exports_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_frontiers_per_worker_s2_primary_idx mz_compute_frontiers_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_hydration_times_per_worker_s2_primary_idx mz_compute_hydration_times_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_import_frontiers_per_worker_s2_primary_idx mz_compute_import_frontiers_per_worker mz_catalog_server {export_id,import_id,worker_id} "" -mz_compute_lir_mapping_per_worker_s2_primary_idx mz_compute_lir_mapping_per_worker mz_catalog_server {global_id,lir_id,worker_id} "" mz_compute_operator_durations_histogram_raw_s2_primary_idx mz_compute_operator_durations_histogram_raw mz_catalog_server {id,worker_id,duration_ns} "" mz_connections_ind mz_connections mz_catalog_server {schema_id} "" mz_console_cluster_utilization_overview_ind mz_console_cluster_utilization_overview mz_catalog_server {cluster_id} "" diff --git a/test/testdrive/catalog.td b/test/testdrive/catalog.td index 044f37c5aa0bb..08ac26af2ff69 100644 --- a/test/testdrive/catalog.td +++ b/test/testdrive/catalog.td @@ -715,13 +715,11 @@ mz_arrangement_heap_capacity_raw log "" mz_arrangement_heap_size_raw log "" mz_arrangement_records_raw log "" mz_arrangement_sharing_raw log "" -mz_compute_dataflow_global_ids_per_worker log "" mz_compute_error_counts_raw log "" mz_compute_exports_per_worker log "" mz_compute_frontiers_per_worker log "" mz_compute_hydration_times_per_worker log "" mz_compute_import_frontiers_per_worker log "" -mz_compute_lir_mapping_per_worker log "" mz_compute_operator_durations_histogram_raw log "" mz_dataflow_addresses_per_worker log "" mz_dataflow_channels_per_worker log "" @@ -756,7 +754,6 @@ mz_dataflow_arrangement_sizes "" mz_dataflow_channel_operators "" mz_dataflow_channel_operators_per_worker "" mz_dataflow_channels "" -mz_dataflow_global_ids "" mz_dataflow_operator_dataflows "" mz_dataflow_operator_dataflows_per_worker "" mz_dataflow_operator_parents "" @@ -769,7 +766,6 @@ mz_dataflow_shutdown_durations_histogram_per_worker "" mz_dataflows "" mz_dataflows_per_worker "" mz_expected_group_size_advice "" -mz_lir_mapping "" mz_message_counts "" mz_message_counts_per_worker "" mz_peek_durations_histogram "" diff --git a/test/testdrive/indexes.td b/test/testdrive/indexes.td index 620c8a3de8d61..4e7799538fcf5 100644 --- a/test/testdrive/indexes.td +++ b/test/testdrive/indexes.td @@ -320,13 +320,11 @@ mz_clusters_ind mz_clusters mz_columns_ind mz_columns mz_catalog_server {name} "" mz_comments_ind mz_comments mz_catalog_server {id} "" mz_compute_dependencies_ind mz_compute_dependencies mz_catalog_server {dependency_id} "" -mz_compute_dataflow_global_ids_per_worker_s2_primary_idx mz_compute_dataflow_global_ids_per_worker mz_catalog_server {id,worker_id} "" mz_compute_error_counts_raw_s2_primary_idx mz_compute_error_counts_raw mz_catalog_server {export_id,worker_id} "" mz_compute_exports_per_worker_s2_primary_idx mz_compute_exports_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_frontiers_per_worker_s2_primary_idx mz_compute_frontiers_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_hydration_times_per_worker_s2_primary_idx mz_compute_hydration_times_per_worker mz_catalog_server {export_id,worker_id} "" mz_compute_import_frontiers_per_worker_s2_primary_idx mz_compute_import_frontiers_per_worker mz_catalog_server {export_id,import_id,worker_id} "" -mz_compute_lir_mapping_per_worker_s2_primary_idx mz_compute_lir_mapping_per_worker mz_catalog_server {global_id,lir_id,worker_id} "" mz_compute_operator_durations_histogram_raw_s2_primary_idx mz_compute_operator_durations_histogram_raw mz_catalog_server {id,worker_id,duration_ns} "" mz_connections_ind mz_connections mz_catalog_server {schema_id} "" mz_console_cluster_utilization_overview_ind mz_console_cluster_utilization_overview mz_catalog_server {cluster_id} ""