Skip to content

Avoid NULL dereference for ordered aggregates #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fallintoplace wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid NULL dereference for ordered aggregates #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb744f5
Avoid NULL dereference for ordered aggregates
fallintoplace Aug 3, 2026
64cc5f3
Avoid extension name allocation for ordered aggregates
fallintoplace Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/custom_types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,13 @@ chfdw_check_for_ordered_aggregate(Aggref* agg) {
}

/* Accept all ordered aggregates defined by pg_clickhouse. */
Oid extoid = getExtensionOfObject(ProcedureRelationId, agg->aggfnoid);
char* extname = get_extension_name(extoid);
Oid extoid = getExtensionOfObject(ProcedureRelationId, agg->aggfnoid);

return STR_EQUAL(extname, "pg_clickhouse");
if (!OidIsValid(extoid)) {
return false;
}

return get_extension_oid("pg_clickhouse", true) == extoid;
}

/*
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_0.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_3.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_4.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_5.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_6.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_7.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
29 changes: 29 additions & 0 deletions test/expected/functions_8.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,35 @@ SELECT percentile_disc(ARRAY[0.25, 0.5, 0.75]) WITHIN GROUP (ORDER BY a NULLS LA
{2,2,2}
(1 row)

CREATE FUNCTION local_ordered_sfunc(integer, integer)
RETURNS integer
LANGUAGE SQL
IMMUTABLE
AS 'SELECT $1 + 1';
CREATE AGGREGATE local_ordered_count(ORDER BY integer) (
SFUNC = local_ordered_sfunc,
STYPE = integer,
INITCOND = '0'
);
EXPLAIN (VERBOSE, COSTS OFF)
SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
QUERY PLAN
-----------------------------------------------------------
Aggregate
Output: local_ordered_count() WITHIN GROUP (ORDER BY a)
-> Foreign Scan on public.t1
Output: a, b, c
Remote SQL: SELECT a FROM functions_test.t1
(5 rows)

SELECT local_ordered_count() WITHIN GROUP (ORDER BY a) FROM t1;
local_ordered_count
---------------------
4
(1 row)

DROP AGGREGATE local_ordered_count(integer);
DROP FUNCTION local_ordered_sfunc(integer, integer);
EXPLAIN (VERBOSE, COSTS OFF) SELECT date_trunc('dAy', c at time zone 'UTC') as d1 FROM t1 GROUP BY d1 ORDER BY d1;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down
Loading