fix: optimize second node for queryActivities

Author: ulemons

services/libs/tinybird/pipes/activities_relations_filtered.pipe

@@ -422,63 +422,67 @@ SQL >
 NODE activities_enriched_v1
 SQL >
     %
-    {% set has_start = defined(startDate) %}
-    {% set has_end = defined(endDate) %}
-    {% if defined(countOnly) and countOnly == '1' %}
-        -- If IDs are guaranteed unique in filtered_relations, use COUNT().
-        -- Otherwise use countDistinct for correctness.
+{% set has_start = defined(startDate) %}
+{% set has_end   = defined(endDate) %}
+
+{% if defined(countOnly) and countOnly == '1' %}
+    -- If IDs are guaranteed unique in filtered_relations, use COUNT().
+    -- Otherwise use countDistinct for correctness.
+    SELECT
+        {% if defined(fr_ids_are_unique) and fr_ids_are_unique == '1' %}
+            count()
+        {% else %}
+            countDistinct(fr.id)
+        {% end %} AS count
+    FROM filtered_relations AS fr
+{% else %}
+    SELECT
+        fr.id_str           AS id,
+        fr.channel,
+        fr.isContribution,
+        fr.memberId,
+        fr.organizationId,
+        fr.platform,
+        fr.segmentId,
+        fr.sourceId,
+        fr.sourceParentId,
+        fr.timestamp,
+        fr.type,
+        a.attributes,
+        a.url,
+        a.body,
+        a.title
+    FROM
+    (
+        -- Cast IDs only once here and keep alias fr
         SELECT
-            {% if defined(fr_ids_are_unique) and fr_ids_are_unique == '1' %} count()
-            {% else %} countDistinct(fr.id)
-            {% end %} AS count
-        FROM filtered_relations AS fr
-    {% else %}
+          CAST(id AS String) AS id_str,
+          channel,
+          isContribution,
+          memberId,
+          organizationId,
+          platform,
+          segmentId,
+          sourceId,
+          sourceParentId,
+          timestamp,
+          type
+        FROM filtered_relations
+    ) AS fr
+    ANY LEFT JOIN
+    (
         SELECT
-            fr.id_str AS id,
-            fr.channel,
-            fr.isContribution,
-            fr.memberId,
-            fr.organizationId,
-            fr.platform,
-            fr.segmentId,
-            fr.sourceId,
-            fr.sourceParentId,
-            fr.timestamp,
-            fr.type,
-            a.attributes,
-            a.url,
-            a.body,
-            a.title
-        FROM
-            (
-                -- Cast IDs only once here and keep alias fr
-                SELECT
-                    CAST(id AS String) AS id_str,
-                    channel,
-                    isContribution,
-                    memberId,
-                    organizationId,
-                    platform,
-                    segmentId,
-                    sourceId,
-                    sourceParentId,
-                    timestamp,
-                    type
-                FROM filtered_relations
-            ) AS fr
-            ANY
-        LEFT JOIN
-            (
-                SELECT CAST(id AS String) AS id_str, attributes, url, body, title
-                FROM activities_deduplicated_ds
-                WHERE
-                    1
-                    {% if has_start %} AND timestamp > parseDateTimeBestEffort({{ String(startDate) }})
-                    {% end %}
-                    {% if has_end %} AND timestamp < parseDateTimeBestEffort({{ String(endDate) }})
-                    {% end %}
-            -- If activities_deduplicated_ds is partitioned by timestamp,
-            -- this WHERE clause allows partition pruning
-            ) AS a
-            ON a.id_str = fr.id_str
-    {% end %}
+            CAST(id AS String) AS id_str,
+            attributes,
+            url,
+            body,
+            title
+        FROM activities_deduplicated_ds
+        WHERE 1
+        {% if has_start %} AND timestamp > parseDateTimeBestEffort({{ String(startDate) }}) {% end %}
+        {% if has_end   %} AND timestamp < parseDateTimeBestEffort({{ String(endDate) }})   {% end %}
+        -- If activities_deduplicated_ds is partitioned by timestamp,
+        -- this WHERE clause allows partition pruning
+    ) AS a
+    ON a.id_str = fr.id_str
+{% end %}