mirrors/posthog
0
0
Fork 0
mirror of https://github.com/PostHog/posthog.git synced 2024-11-25 11:17:50 +01:00
Code Issues Releases Activity

consolidate default expression

Browse Source
This commit is contained in:
Ted Kaemming 2024-11-15 16:59:30 -08:00
parent bd1e43d788
commit 6d75a507de
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ee/clickhouse/materialized_columns/columns.py
View File

@ -18,8 +18,6 @@ from posthog.settings import CLICKHOUSE_CLUSTER, CLICKHOUSE_DATABASE, TEST
DEFAULT_TABLE_COLUMN: Literal["properties"] = "properties"
TRIM_AND_EXTRACT_PROPERTY = trim_quotes_expr("JSONExtractRaw({table_column}, %(property)s)")
SHORT_TABLE_COLUMN_NAME = {
"properties": "p",
"group_properties": "gp",
@ -88,6 +86,10 @@ class MaterializedColumnDetails:
def get_column_type(self) -> str:
return "String"
def get_expression(self) -> str:
# XXX: assumes `property` is being provided as a parameter to the query
return trim_quotes_expr(f"JSONExtractRaw({self.table_column}, %(property)s)")
@classmethod
def from_column_comment(cls, comment: str) -> MaterializedColumnDetails:
match comment.split(cls.COMMENT_SEPARATOR, 3):
@ -160,7 +162,7 @@ def create_materialized_column(
ALTER TABLE sharded_{table} {on_cluster}
ADD COLUMN IF NOT EXISTS
{column_name} {column_details.get_column_type()}
MATERIALIZED {TRIM_AND_EXTRACT_PROPERTY.format(table_column=column_details.table_column)}
MATERIALIZED {column_details.get_expression()}
""",
{"property": column_details.property_name},
settings={"alter_sync": 2 if TEST else 1},
@ -179,7 +181,7 @@ def create_materialized_column(
ALTER TABLE {table} {on_cluster}
ADD COLUMN IF NOT EXISTS
{column_name} {column_details.get_column_type()}
MATERIALIZED {TRIM_AND_EXTRACT_PROPERTY.format(table_column=column_details.table_column)}
MATERIALIZED {column_details.get_expression()}
""",
{"property": column_details.property_name},
settings={"alter_sync": 2 if TEST else 1},
@ -291,7 +293,7 @@ def backfill_materialized_columns(
ALTER TABLE {updated_table} {on_cluster}
MODIFY COLUMN
{column_name} {column_details.get_column_type()}
DEFAULT {TRIM_AND_EXTRACT_PROPERTY.format(table_column=column_details.table_column)}
DEFAULT {column_details.get_expression()}
""",
{"property": column_details.property_name},
settings=test_settings,

3
ee/tasks/materialized_columns.py
View File

@ -2,7 +2,6 @@ from collections.abc import Iterator
from celery.utils.log import get_task_logger
from ee.clickhouse.materialized_columns.columns import (
TRIM_AND_EXTRACT_PROPERTY,
MaterializedColumn,
get_on_cluster_clause_for_table,
)
@ -27,7 +26,7 @@ def mark_all_materialized() -> None:
ALTER TABLE {updated_table} {on_cluster}
MODIFY COLUMN
{materialized_column.name} {materialized_column.details.get_column_type()}
MATERIALIZED {TRIM_AND_EXTRACT_PROPERTY.format(table_column=materialized_column.details.table_column)}
MATERIALIZED {materialized_column.details.get_expression()}
""",
{"property": materialized_column.details.property_name},
)