Skip to content

Update pg 18 support #83

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

Merged
bonnefoa merged 3 commits into from
Jun 19, 2025
Merged

Update pg 18 support #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19dcec6
Remove ExecutorStart/Run pg18 function change
bonnefoa Jun 19, 2025
cacb384
Improve PG_VERSION extraction
bonnefoa Jun 19, 2025
5b1b438
Update pg18 test outputs
bonnefoa Jun 19, 2025
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
2 changes: 1 addition & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PG_CONFIG = pg_config
PG_CONFIG_EXISTS := $(shell command -v $(PG_CONFIG) 2> /dev/null)
ifdef PG_CONFIG_EXISTS
# Default to pg_config's advertised version
PG_VERSION ?= $(shell $(PG_CONFIG) --version | cut -d' ' -f2 | cut -d'.' -f1 | tr -d 'devel')
PG_VERSION ?= $(shell $(PG_CONFIG) --version | sed 's/PostgreSQL \([0-9]*\).*/\1/g')
else
# pg_config is not present, let's assume we are packaging and use the latest PG version
PG_VERSION ?= $(lastword $(PG_VERSIONS))
Expand Down
8 changes: 4 additions & 4 deletions regress/18/expected/cursor.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,19 @@ SELECT span_type, span_operation, lvl from peek_ordered_spans where trace_id='00
ProcessUtility | ProcessUtility | 2
Utility query | DECLARE c CURSOR FOR SELECT * from pg_tracing_test; | 1
ProcessUtility | ProcessUtility | 2
Select query | SELECT * from pg_tracing_test; | 3
Select query | DECLARE c CURSOR FOR SELECT * from pg_tracing_test; | 3
Planner | Planner | 4
Utility query | FETCH FORWARD 20 from c | 1
ProcessUtility | ProcessUtility | 2
Select query | SELECT * from pg_tracing_test; | 3
Select query | DECLARE c CURSOR FOR SELECT * from pg_tracing_test; | 3
ExecutorRun | ExecutorRun | 4
Utility query | FETCH BACKWARD 10 from c | 1
ProcessUtility | ProcessUtility | 2
Select query | SELECT * from pg_tracing_test; | 3
Select query | DECLARE c CURSOR FOR SELECT * from pg_tracing_test; | 3
ExecutorRun | ExecutorRun | 4
Utility query | CLOSE c; | 1
ProcessUtility | ProcessUtility | 2
Select query | SELECT * from pg_tracing_test; | 3
Select query | DECLARE c CURSOR FOR SELECT * from pg_tracing_test; | 3
Utility query | COMMIT; | 1
ProcessUtility | ProcessUtility | 2
(20 rows)
Expand Down
6 changes: 3 additions & 3 deletions regress/18/expected/planstate_bitmap.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ SELECT span_operation, deparse_info, parameters, pos_start, pos_end, lvl from pe
SELECT * from pg_tracing_test where a=$1 OR b=$2 OR c=$3 | | {1,'2',3} | 1 | 11 | 0
Planner | | | 2 | 3 | 1
ExecutorRun | | | 4 | 10 | 1
BitmapHeapScan on pg_tracing_test | Recheck Cond: ((c = 3) OR (b = '2'::bpchar) OR (a = 1)) | | 5 | 9 | 2
BitmapHeapScan on pg_tracing_test | Recheck Cond: ((a = 1) OR (b = '2'::bpchar) OR (c = 3)) | | 5 | 9 | 2
BitmapOr | | | 5 | 8 | 3
BitmapIndexScan on pg_tracing_index_c | Index Cond: (c = 3) | | 5 | 6 | 4
BitmapIndexScan on pg_tracing_index_a | Index Cond: (a = 1) | | 5 | 6 | 4
BitmapIndexScan on pg_tracing_index_b | Index Cond: (b = '2'::bpchar) | | 6 | 7 | 4
BitmapIndexScan on pg_tracing_index_a | Index Cond: (a = 1) | | 7 | 8 | 4
BitmapIndexScan on pg_tracing_index_c | Index Cond: (c = 3) | | 7 | 8 | 4
(8 rows)

-- Clean created spans
Expand Down
2 changes: 1 addition & 1 deletion regress/18/expected/planstate_projectset.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SELECT span_operation, deparse_info, parameters, lvl from peek_ordered_spans whe
ExecutorRun | | | 1
ProjectSet | | | 2
Result | | | 3
SELECT * FROM pg_catalog.unnest($1) WITH ORDINALITY | | | 3
SELECT * FROM pg_catalog.unnest($1) WITH ORDINALITY | | {"{0,1,2}"} | 3
Planner | | | 4
(7 rows)

Expand Down
52 changes: 26 additions & 26 deletions regress/18/expected/select.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,18 @@ SELECT lazy_function('{1,2,3,4}'::int[]) FROM (VALUES (1,2)) as t;
(4 rows)

SELECT span_type, span_operation, parameters, lvl from peek_ordered_spans;
span_type | span_operation | parameters | lvl
-------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------+-----
Utility query | CREATE OR REPLACE FUNCTION lazy_function(IN anyarray, OUT x anyelement) RETURNS SETOF anyelement LANGUAGE sql AS 'select * from pg_catalog.generate_series(array_lower($1, 1), array_upper($1, 1), 1)'; | | 0
ProcessUtility | ProcessUtility | | 1
TransactionCommit | TransactionCommit | | 0
Select query | SELECT lazy_function($1::int[]) FROM (VALUES ($2,$3)) as t | {"'{1,2,3,4}'",1,2} | 0
Planner | Planner | | 1
ExecutorRun | ExecutorRun | | 1
ProjectSet | ProjectSet | | 2
Result | Result | | 3
Select query | select * from pg_catalog.generate_series(array_lower($1, $2), array_upper($1, $3), $4) | {1,1,1} | 3
Planner | Planner | | 4
span_type | span_operation | parameters | lvl
-------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----
Utility query | CREATE OR REPLACE FUNCTION lazy_function(IN anyarray, OUT x anyelement) RETURNS SETOF anyelement LANGUAGE sql AS 'select * from pg_catalog.generate_series(array_lower($1, 1), array_upper($1, 1), 1)'; | | 0
ProcessUtility | ProcessUtility | | 1
TransactionCommit | TransactionCommit | | 0
Select query | SELECT lazy_function($1::int[]) FROM (VALUES ($2,$3)) as t | {"'{1,2,3,4}'",1,2} | 0
Planner | Planner | | 1
ExecutorRun | ExecutorRun | | 1
ProjectSet | ProjectSet | | 2
Result | Result | | 3
Select query | select * from pg_catalog.generate_series(array_lower($1, $2), array_upper($1, $3), $4) | {"{1,2,3,4}","select * from pg_catalog.generate_series(array_lower($1, $2), array_upper($1, $3), $4)","SELECT lazy_function($1::int[]) FROM (VALUES ($2,$3)) as t",T;} | 3
Planner | Planner | | 4
(10 rows)

CALL clean_spans();
Expand All @@ -221,20 +221,20 @@ SELECT information_schema._pg_truetypid(a, t) FROM pg_attribute a, pg_type t lim
(1 row)

SELECT span_type, span_operation, parameters, lvl from peek_ordered_spans;
span_type | span_operation | parameters | lvl
--------------+---------------------------------------------------------------------------------------+------------+-----
Select query | SELECT information_schema._pg_truetypid(a, t) FROM pg_attribute a, pg_type t limit $1 | {1} | 0
Planner | Planner | | 1
ExecutorRun | ExecutorRun | | 1
Limit | Limit | | 2
NestedLoop | NestedLoop | | 3
SeqScan | SeqScan on pg_attribute a | | 4
Materialize | Materialize | | 4
SeqScan | SeqScan on pg_type t | | 5
Select query | Select query | | 2
Planner | Planner | | 3
ExecutorRun | ExecutorRun | | 3
Result | Result | | 4
span_type | span_operation | parameters | lvl
--------------+---------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----
Select query | SELECT information_schema._pg_truetypid(a, t) FROM pg_attribute a, pg_type t limit $1 | {1} | 0
Planner | Planner | | 1
ExecutorRun | ExecutorRun | | 1
Limit | Limit | | 2
NestedLoop | NestedLoop | | 3
SeqScan | SeqScan on pg_attribute a | | 4
Materialize | Materialize | | 4
SeqScan | SeqScan on pg_type t | | 5
Select query | Select query | {"(1255,oid,26,4,1,-1,0,t,i,p,\"\",t,f,f,\"\",\"\",f,t,0,0,,,,,)","(16,bool,11,10,1,t,b,B,t,t,\",\",0,-,0,1000,boolin,boolout,boolrecv,boolsend,-,-,-,c,p,f,0,-1,0,0,,,)"} | 2
Planner | Planner | | 3
ExecutorRun | ExecutorRun | | 3
Result | Result | | 4
(12 rows)

CALL clean_spans();
Expand Down
Loading