:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
perf(search): scope event and property definitions by the project index (#118942)
posthog[bot]169701ddc176
diff --git a/posthog/api/event_definition.py b/posthog/api/event_definition.pyindex faf63af2386b..d3f71aa017f7 100644--- a/posthog/api/event_definition.py+++ b/posthog/api/event_definition.py@@ -64,6 +64,8 @@ from posthog.taxonomy.definition_search import (from posthog.taxonomy.taxonomy import CORE_EVENTS, STALE_EVENT_DAYSfrom posthog.utils import get_safe_cache, relative_date_parse+from products.event_definitions.backend.models.property_definition import effective_project_id_expr+# If EE is enabled, we use ee.api.ee_event_definition.EnterpriseEventDefinitionSerializerEVENT_DEFINITIONS_TIMED_OUT_COUNTER = Counter(@@ -781,11 +783,17 @@ class EventDefinitionViewSet(if EE_AVAILABLE:from ee.models.event_definition import EnterpriseEventDefinition- enterprise_event = EnterpriseEventDefinition.objects.filter(**filters).first()+ enterprise_event = (+ EnterpriseEventDefinition.objects.alias(effective_project_id=effective_project_id_expr())+ .filter(**filters)+ .first()+ )if enterprise_event:return enterprise_event- non_enterprise_event = EventDefinition.objects.get(**filters)+ non_enterprise_event = EventDefinition.objects.alias(effective_project_id=effective_project_id_expr()).get(+ **filters+ )new_enterprise_event = EnterpriseEventDefinition(eventdefinition_ptr_id=non_enterprise_event.id, description="")@@ -802,7 +810,7 @@ class EventDefinitionViewSet(return existingreturn new_enterprise_event- return EventDefinition.objects.get(**filters)+ return EventDefinition.objects.alias(effective_project_id=effective_project_id_expr()).get(**filters)def get_serializer_class(self) -> type[serializers.ModelSerializer]:serializer_class = self.serializer_class@@ -1122,7 +1130,7 @@ class EventDefinitionViewSet()try:- event_def = self._get_event_definition(name=event_name, team__project_id=self.project_id)+ event_def = self._get_event_definition(name=event_name, effective_project_id=self.project_id)except EventDefinition.DoesNotExist:event_def = None@@ -1160,10 +1168,11 @@ class EventDefinitionViewSet(EventDefinition. Callers should fall back to the core taxonomy defaults client-sidefor names not present in the response."""- queryset = EventDefinition.objects.filter(- team__project_id=self.project_id,- primary_property__isnull=False,- ).exclude(primary_property="")+ queryset = (+ EventDefinition.objects.alias(effective_project_id=effective_project_id_expr())+ .filter(effective_project_id=self.project_id, primary_property__isnull=False)+ .exclude(primary_property="")+ )names = [name for name in request.query_params.getlist("names") if name]if names:diff --git a/posthog/api/event_definition_generators/base.py b/posthog/api/event_definition_generators/base.pyindex a86aacc87b1a..e3bd8d4a2c3e 100644--- a/posthog/api/event_definition_generators/base.py+++ b/posthog/api/event_definition_generators/base.py@@ -9,6 +9,8 @@ from posthog.event_usage import report_user_actionfrom posthog.models import EventDefinition, EventSchema, SchemaPropertyGroupPropertyfrom posthog.taxonomy.taxonomy import CORE_EVENTS+from products.event_definitions.backend.models.property_definition import effective_project_id_expr+class EventDefinitionGenerator(ABC):"""@@ -96,7 +98,8 @@ class EventDefinitionGenerator(ABC):has_schema = Exists(EventSchema.objects.filter(event_definition=OuterRef("pk")))event_definitions = (- EventDefinition.objects.filter(team__project_id=project_id)+ EventDefinition.objects.alias(effective_project_id=effective_project_id_expr())+ .filter(effective_project_id=project_id).filter(Q(name__in=CORE_EVENTS) # Core PostHog events from the taxonomy| Q(enterpriseeventdefinition__verified=True) # Any verified eventdiff --git a/posthog/api/search.py b/posthog/api/search.pyindex 2bfd0e5a8a01..cf5d471ad3cb 100644--- a/posthog/api/search.py+++ b/posthog/api/search.py@@ -23,6 +23,7 @@ from products.dashboards.backend.models.dashboard import Dashboardfrom products.data_modeling.backend.facade.models import DataWarehouseSavedQuery, Nodefrom products.early_access_features.backend.models import EarlyAccessFeaturefrom products.endpoints.backend.facade.models import Endpoint+from products.event_definitions.backend.models.property_definition import effective_project_id_exprfrom products.experiments.backend.models.experiment import Experimentfrom products.feature_flags.backend.models.feature_flag import FeatureFlagfrom products.notebooks.backend.models import Notebook@@ -333,7 +334,16 @@ def class_queryset(entity_type = entity_type or class_to_entity_name(klass)values = ["type", "result_id", "extra_fields", "_sort_name", "_pk", "_created_by_id"]- qs: QuerySet[Any] = cast(Any, klass).objects.filter(team__project_id=project_id) # filter team+ qs: QuerySet[Any]+ if klass in (EventDefinition, PropertyDefinition):+ # A join on team would bypass the project-leading unique index on these large tables.+ qs = (+ cast(Any, klass)+ .objects.alias(effective_project_id=effective_project_id_expr())+ .filter(effective_project_id=project_id)+ )+ else:+ qs = cast(Any, klass).objects.filter(team__project_id=project_id) # filter teamqs = view.user_access_control.filter_queryset_by_access_level(qs) # filter access levelif annotations: