-
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(eap): rewrite the meta tables to have lower cardinality (#6316)
We tried to improve performance of other queries with a subselect, but got disappointing results. This change: - Drops trace_id from both tables - Removes attr_value from the number tables (we'd never want to autocomplete numbers) - Adds the normalized columns (name, segment_name, service, duration_ms, exclusive_time_ms) to both meta tables
- Loading branch information
1 parent
2fad570
commit 157bd8e
Showing
5 changed files
with
290 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
250 changes: 250 additions & 0 deletions
250
snuba/snuba_migrations/events_analytics_platform/0014_span_attribute_table_smaller.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,250 @@ | ||
| from __future__ import annotations | ||
|
|
||
| from typing import Sequence | ||
|
|
||
| from snuba.clusters.storage_sets import StorageSetKey | ||
| from snuba.migrations import migration, operations, table_engines | ||
| from snuba.migrations.columns import MigrationModifiers as Modifiers | ||
| from snuba.migrations.operations import OperationTarget, SqlOperation | ||
| from snuba.utils.constants import ATTRIBUTE_BUCKETS | ||
| from snuba.utils.schemas import ( | ||
| Column, | ||
| DateTime, | ||
| Float, | ||
| SimpleAggregateFunction, | ||
| String, | ||
| UInt, | ||
| ) | ||
|
|
||
|
|
||
| class Migration(migration.ClickhouseNodeMigration): | ||
| """ | ||
| This migration creates a table meant to store just the attributes seen in a particular org. | ||
| The table is populated by a separate materialized view for each type of attribute. | ||
| """ | ||
|
|
||
| blocking = False | ||
| storage_set_key = StorageSetKey.EVENTS_ANALYTICS_PLATFORM | ||
| granularity = "8192" | ||
|
|
||
| old_str_mv = "spans_str_attrs_mv" | ||
| old_str_local_table = "spans_str_attrs_local" | ||
| old_str_dist_table = "spans_str_attrs_dist" | ||
| new_str_mv = "spans_str_attrs_2_mv" | ||
| new_str_local_table = "spans_str_attrs_2_local" | ||
| new_str_dist_table = "spans_str_attrs_2_dist" | ||
| str_columns: Sequence[Column[Modifiers]] = [ | ||
| Column("organization_id", UInt(64)), | ||
| Column("project_id", UInt(64)), | ||
| Column("attr_key", String(modifiers=Modifiers(codecs=["ZSTD(1)"]))), | ||
| Column("attr_value", String(modifiers=Modifiers(codecs=["ZSTD(1)"]))), | ||
| Column("timestamp", DateTime(modifiers=Modifiers(codecs=["ZSTD(1)"]))), | ||
| Column("retention_days", UInt(16)), | ||
| Column("count", SimpleAggregateFunction("sum", [UInt(64)])), | ||
| ] | ||
|
|
||
| old_num_mv = "spans_num_attrs_mv" | ||
| old_num_local_table = "spans_num_attrs_local" | ||
| old_num_dist_table = "spans_num_attrs_dist" | ||
| new_num_mv = "spans_num_attrs_2_mv" | ||
| new_num_local_table = "spans_num_attrs_2_local" | ||
| new_num_dist_table = "spans_num_attrs_2_dist" | ||
| num_columns: Sequence[Column[Modifiers]] = [ | ||
| Column("organization_id", UInt(64)), | ||
| Column("project_id", UInt(64)), | ||
| Column("attr_key", String()), | ||
| Column("attr_min_value", SimpleAggregateFunction("min", [Float(64)])), | ||
| Column("attr_max_value", SimpleAggregateFunction("max", [Float(64)])), | ||
| Column("timestamp", DateTime(modifiers=Modifiers(codecs=["ZSTD(1)"]))), | ||
| Column("retention_days", UInt(16)), | ||
| Column("count", SimpleAggregateFunction("sum", [UInt(64)])), | ||
| ] | ||
|
|
||
| def forwards_ops(self) -> Sequence[SqlOperation]: | ||
| return [ | ||
| # first, drop the old MVs | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_str_mv, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_num_mv, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| # next, drop the old dist tables | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_str_dist_table, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_num_dist_table, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| # next, drop the old local tables | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_str_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.old_num_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| # now, create new versions of the tables & MVs | ||
| operations.CreateTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_str_local_table, | ||
| engine=table_engines.AggregatingMergeTree( | ||
| storage_set=self.storage_set_key, | ||
| primary_key="(organization_id, attr_key)", | ||
| order_by="(organization_id, attr_key, attr_value, project_id, timestamp, retention_days)", | ||
| partition_by="toMonday(timestamp)", | ||
| settings={ | ||
| "index_granularity": self.granularity, | ||
| }, | ||
| ttl="timestamp + toIntervalDay(retention_days)", | ||
| ), | ||
| columns=self.str_columns, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.CreateTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_str_dist_table, | ||
| engine=table_engines.Distributed( | ||
| local_table_name=self.new_str_local_table, sharding_key=None | ||
| ), | ||
| columns=self.str_columns, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| operations.CreateMaterializedView( | ||
| storage_set=self.storage_set_key, | ||
| view_name=self.new_str_mv, | ||
| columns=self.str_columns, | ||
| destination_table_name=self.new_str_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| query=f""" | ||
| SELECT | ||
| organization_id, | ||
| project_id, | ||
| attrs.1 as attr_key, | ||
| attrs.2 as attr_value, | ||
| toStartOfDay(_sort_timestamp) AS timestamp, | ||
| retention_days, | ||
| 1 AS count | ||
| FROM eap_spans_local | ||
| LEFT ARRAY JOIN | ||
| arrayConcat( | ||
| {", ".join(f"CAST(attr_str_{n}, 'Array(Tuple(String, String))')" for n in range(ATTRIBUTE_BUCKETS))}, | ||
| array( | ||
| tuple('service', `service`), | ||
| tuple('segment_name', `segment_name`), | ||
| tuple('name', `name`) | ||
| ) | ||
| ) AS attrs | ||
| GROUP BY | ||
| organization_id, | ||
| project_id, | ||
| attr_key, | ||
| attr_value, | ||
| timestamp, | ||
| retention_days | ||
| """, | ||
| ), | ||
| operations.CreateTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_num_local_table, | ||
| engine=table_engines.AggregatingMergeTree( | ||
| storage_set=self.storage_set_key, | ||
| primary_key="(organization_id, attr_key)", | ||
| order_by="(organization_id, attr_key, attr_min_value, attr_max_value, timestamp, project_id, retention_days)", | ||
| partition_by="toMonday(timestamp)", | ||
| settings={ | ||
| "index_granularity": self.granularity, | ||
| }, | ||
| ttl="timestamp + toIntervalDay(retention_days)", | ||
| ), | ||
| columns=self.num_columns, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.CreateTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_num_dist_table, | ||
| engine=table_engines.Distributed( | ||
| local_table_name=self.new_num_local_table, sharding_key=None | ||
| ), | ||
| columns=self.num_columns, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| operations.CreateMaterializedView( | ||
| storage_set=self.storage_set_key, | ||
| view_name=self.new_num_mv, | ||
| columns=self.num_columns, | ||
| destination_table_name=self.new_num_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| query=f""" | ||
| SELECT | ||
| organization_id, | ||
| project_id, | ||
| attrs.1 as attr_key, | ||
| attrs.2 as attr_min_value, | ||
| attrs.2 as attr_max_value, | ||
| toStartOfDay(_sort_timestamp) AS timestamp, | ||
| retention_days, | ||
| 1 AS count | ||
| FROM eap_spans_local | ||
| LEFT ARRAY JOIN | ||
| arrayConcat( | ||
| {",".join(f"CAST(attr_num_{n}, 'Array(Tuple(String, Float64))')" for n in range(ATTRIBUTE_BUCKETS))}, | ||
| array( | ||
| tuple('duration_ms', `duration_ms`::Float64) | ||
| ) | ||
| ) AS attrs | ||
| GROUP BY | ||
| organization_id, | ||
| project_id, | ||
| attrs.1, | ||
| attrs.2, | ||
| timestamp, | ||
| retention_days | ||
| """, | ||
| ), | ||
| ] | ||
|
|
||
| def backwards_ops(self) -> Sequence[SqlOperation]: | ||
| return [ | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_str_mv, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_str_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_str_dist_table, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_num_mv, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_num_local_table, | ||
| target=OperationTarget.LOCAL, | ||
| ), | ||
| operations.DropTable( | ||
| storage_set=self.storage_set_key, | ||
| table_name=self.new_num_dist_table, | ||
| target=OperationTarget.DISTRIBUTED, | ||
| ), | ||
| ] |