Skip to content

Commit c4edcf5

Browse files
committed
fix: revert is count from filtere_relations
1 parent d44c11b commit c4edcf5

1 file changed

Lines changed: 23 additions & 34 deletions

File tree

services/libs/tinybird/pipes/activities_relations_filtered.pipe

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -446,40 +446,29 @@ SQL >
446446
{% if defined(countOnly) %}
447447
{% if String(countOnly) == '1' or Int8(countOnly, 0) == 1 %} {% set is_count = 1 %} {% end %}
448448
{% end %}
449-
WITH
450-
{% if defined(segments) %} arrayDistinct({{ Array(segments, 'String') }}) AS segments_arr
451-
{% else %} [] AS segments_arr
452-
{% end %},
453-
base_ar AS (
454-
SELECT
455-
ar.activityId AS id,
456-
ar.channel,
457-
ar.memberId,
458-
ar.organizationId,
459-
ar.platform,
460-
ar.segmentId,
461-
ar.sourceId,
462-
ar.sourceParentId,
463-
ar.timestamp,
464-
ar.type
465-
FROM activityRelations_deduplicated_ds AS ar
466-
WHERE (length(segments_arr) = 0 OR ar.segmentId IN segments_arr)
467-
)
468-
{% if is_count %} SELECT count() AS count FROM base_ar AS ar
449+
{% if is_count %} SELECT count FROM filtered_relations
469450
{% else %}
470451
SELECT
471-
ar.id,
472-
ar.channel,
473-
ar.memberId,
474-
ar.organizationId,
475-
ar.platform,
476-
ar.segmentId,
477-
ar.sourceId,
478-
ar.sourceParentId,
479-
ar.timestamp,
480-
ar.type
481-
FROM base_ar AS ar
482-
ORDER BY ar.timestamp DESC, ar.id DESC
483-
LIMIT {{ Int32(pageSize, 10) }}
484-
OFFSET {{ Int32(page, 0) * Int32(pageSize, 10) }}
452+
fr.id,
453+
fr.channel,
454+
fr.memberId,
455+
fr.organizationId,
456+
fr.platform,
457+
fr.segmentId,
458+
fr.sourceId,
459+
fr.sourceParentId,
460+
fr.timestamp,
461+
fr.type,
462+
a.attributes,
463+
a.url,
464+
a.body,
465+
a.title
466+
FROM filtered_relations AS fr ANY
467+
LEFT JOIN
468+
(
469+
SELECT CAST(id AS String) AS activity_id, attributes, url, body, title
470+
FROM activities_deduplicated_ds
471+
WHERE CAST(id AS String) IN (SELECT DISTINCT CAST(id AS String) FROM filtered_relations)
472+
) AS a
473+
ON CAST(fr.id AS String) = a.activity_id
485474
{% end %}

0 commit comments

Comments
 (0)