pg.ddx.io  pgdogdev/pgdog GitHub issues and pull requests  
help / color / mirror / Atom feed
From: murex971 (@murex971) <noreply+murex971@github.com>
To: pgdogdev/pgdog <noreply+pgdogdev-pgdog@github.com>
Subject: [pgdogdev/pgdog] PR #2071: fix(cross-shard): detect DISTINCT on aggregates behind a cast
Date: Thu, 19 Nov 2026 12:54:39 +0000
Message-ID: <gh-pgdogdev-pgdog-2071@github.com> (raw)

### Summary

A cross-shard `count(DISTINCT x)::int` returned the sum of each shard's
distinct count. The `DISTINCT` flag was only read when the aggregate was
the top-level expression, so a cast hid it and the query was merged as a
plain `count`.

The flag is now read from the same call node as the function name, after
unwrapping casts. These queries get the same `0A000` error as the uncast
form: "count(DISTINCT ...) is not yet supported".

The same applies to `sum`, `avg` and the variance functions.



inline patch 1: pgdog/src/frontend/client/query_engine/test/unsupported_aggregation.rs, pgdog/src/frontend/router/parser/aggregate.rs (+28/-11 lines) download inline-1.patchdiff --git a/pgdog/src/frontend/client/query_engine/test/unsupported_aggregation.rs b/pgdog/src/frontend/client/query_engine/test/unsupported_aggregation.rs index d8dcf4038..2a517aeff 100644 --- a/pgdog/src/frontend/client/query_engine/test/unsupported_aggregation.rs +++ b/pgdog/src/frontend/client/query_engine/test/unsupported_aggregation.rs @@ -18,6 +18,11 @@ async fn test_unsupported_aggregation_keeps_connection_usable() { "SELECT count(DISTINCT value) FROM sharded", "unsupported aggregation count: count(DISTINCT ...) is not yet supported", ), + ( + // The cast must not hide DISTINCT and let per-shard counts be summed. + "SELECT count(DISTINCT value)::int FROM sharded", + "unsupported aggregation count: count(DISTINCT ...) is not yet supported", + ), ( "SELECT count(*) FROM sharded HAVING count(*) > 0 LIMIT (SELECT 1)", "cross-shard HAVING is unsupported: \ diff --git a/pgdog/src/frontend/router/parser/aggregate.rs b/pgdog/src/frontend/router/parser/aggregate.rs index 4f10d2f54..730f2b24b 100644 --- a/pgdog/src/frontend/router/parser/aggregate.rs +++ b/pgdog/src/frontend/router/parser/aggregate.rs @@ -147,21 +147,19 @@ impl Aggregate { .iter() .enumerate() .filter_map(|(idx, node)| { - let func = Function::try_from(node.val()).ok()?; - let function = AggregateFunction::from_name(func.name, schema)?; - - // FIXME: This doesn't correctly handle distinct behind type - // casts any other nodes that Function::try_from handles - let distinct = if let Node::FuncCall(func) = node.val() { - func.agg_distinct - } else { - false - }; + // The call may sit behind a cast, e.g. `count(DISTINCT x)::int`. + let call = Function::extract_func_call(node.val())?; + let name = call + .funcname() + .iter() + .filter_map(Node::as_str) + .next_back()?; + let function = AggregateFunction::from_name(name, schema)?; Some(AggregateTarget { column: idx, function, - distinct, + distinct: call.agg_distinct, }) }) .collect(); @@ -269,6 +267,20 @@ mod test { assert!(!avg.is_distinct()); } + #[test] + fn test_parse_distinct_behind_cast() { + let aggr = parse( + "SELECT COUNT(DISTINCT price)::int, CAST(SUM(DISTINCT price) AS numeric)::text, \ + COUNT(price)::int FROM menu", + ); + let distinct = aggr + .targets() + .iter() + .map(AggregateTarget::is_distinct) + .collect::<Vec<_>>(); + assert_eq!(distinct, vec![true, true, false]); + } + #[test] fn test_parse_bool_and_bit_aggregates() { let aggr = parse(

view thread (5+ messages)  latest in thread

Message-ID: <gh-pgdogdev-pgdog-2071@github.com>
Permalink:  ../gh-pgdogdev-pgdog-2071@github.com/

 ·  · 


This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox