Skip to content

[PGPRO-11679] Prepare for Ent optimizer changes #287

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
artfadeev-pgpro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[PGPRO-11679] Prepare for Ent optimizer changes #287

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
356c305
[PGPRO-11679] Prepare for Ent optimizer changes
artfadeev-pgpro Jan 14, 2026
75478fc
[PGPRO-11679] Fix CI on Postgres 14+
artfadeev-pgpro Jan 19, 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
7 changes: 5 additions & 2 deletions Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ RUN apk add --no-cache \
coreutils linux-headers \
make musl-dev gcc bison flex \
zlib-dev libedit-dev \
pkgconf icu-dev clang clang15 clang-analyzer;
pkgconf icu-dev clang clang-analyzer;

# Need this for Travis CI to pass
RUN if [ "${PG_VERSION}" == "13" ] ; then apk add --no-cache clang19; fi
RUN if [ "${PG_VERSION}" -ge "13" ] ; \
then apk add --no-cache clang19; \
else apk add --no-cache clang15; \
fi

# Install fresh valgrind
RUN apk add valgrind \
Expand Down
24 changes: 24 additions & 0 deletions expected/pathman_only.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA test_only;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

/* Test special case: ONLY statement with not-ONLY for partitioned table */
CREATE TABLE test_only.from_only_test(val INT NOT NULL);
INSERT INTO test_only.from_only_test SELECT generate_series(1, 20);
Expand Down Expand Up @@ -294,3 +307,14 @@ DROP TABLE test_only.from_only_test CASCADE;
NOTICE: drop cascades to 11 other objects
DROP SCHEMA test_only;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_only_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA test_only;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

/* Test special case: ONLY statement with not-ONLY for partitioned table */
CREATE TABLE test_only.from_only_test(val INT NOT NULL);
INSERT INTO test_only.from_only_test SELECT generate_series(1, 20);
Expand Down Expand Up @@ -297,3 +310,14 @@ DROP TABLE test_only.from_only_test CASCADE;
NOTICE: drop cascades to 11 other objects
DROP SCHEMA test_only;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_only_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA test_only;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

/* Test special case: ONLY statement with not-ONLY for partitioned table */
CREATE TABLE test_only.from_only_test(val INT NOT NULL);
INSERT INTO test_only.from_only_test SELECT generate_series(1, 20);
Expand Down Expand Up @@ -297,3 +310,14 @@ DROP TABLE test_only.from_only_test CASCADE;
NOTICE: drop cascades to 11 other objects
DROP SCHEMA test_only;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_only_3.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA test_only;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

/* Test special case: ONLY statement with not-ONLY for partitioned table */
CREATE TABLE test_only.from_only_test(val INT NOT NULL);
INSERT INTO test_only.from_only_test SELECT generate_series(1, 20);
Expand Down Expand Up @@ -297,3 +310,14 @@ DROP TABLE test_only.from_only_test CASCADE;
NOTICE: drop cascades to 11 other objects
DROP SCHEMA test_only;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_only_4.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA test_only;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

/* Test special case: ONLY statement with not-ONLY for partitioned table */
CREATE TABLE test_only.from_only_test(val INT NOT NULL);
INSERT INTO test_only.from_only_test SELECT generate_series(1, 20);
Expand Down Expand Up @@ -297,3 +310,14 @@ DROP TABLE test_only.from_only_test CASCADE;
NOTICE: drop cascades to 11 other objects
DROP SCHEMA test_only;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_rowmarks.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA rowmarks;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

CREATE TABLE rowmarks.first(id int NOT NULL);
CREATE TABLE rowmarks.second(id int NOT NULL);
INSERT INTO rowmarks.first SELECT generate_series(1, 10);
Expand Down Expand Up @@ -408,3 +421,14 @@ drop cascades to table rowmarks.first_4
DROP TABLE rowmarks.second CASCADE;
DROP SCHEMA rowmarks;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_rowmarks_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA rowmarks;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

CREATE TABLE rowmarks.first(id int NOT NULL);
CREATE TABLE rowmarks.second(id int NOT NULL);
INSERT INTO rowmarks.first SELECT generate_series(1, 10);
Expand Down Expand Up @@ -463,3 +476,14 @@ drop cascades to table rowmarks.first_4
DROP TABLE rowmarks.second CASCADE;
DROP SCHEMA rowmarks;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_rowmarks_2.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA rowmarks;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

CREATE TABLE rowmarks.first(id int NOT NULL);
CREATE TABLE rowmarks.second(id int NOT NULL);
INSERT INTO rowmarks.first SELECT generate_series(1, 10);
Expand Down Expand Up @@ -405,3 +418,14 @@ drop cascades to table rowmarks.first_4
DROP TABLE rowmarks.second CASCADE;
DROP SCHEMA rowmarks;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_rowmarks_3.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA rowmarks;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

CREATE TABLE rowmarks.first(id int NOT NULL);
CREATE TABLE rowmarks.second(id int NOT NULL);
INSERT INTO rowmarks.first SELECT generate_series(1, 10);
Expand Down Expand Up @@ -405,3 +418,14 @@ drop cascades to table rowmarks.first_4
DROP TABLE rowmarks.second CASCADE;
DROP SCHEMA rowmarks;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

24 changes: 24 additions & 0 deletions expected/pathman_rowmarks_4.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA rowmarks;
-- Prevent Ent-specific changes in query plans. Equivalent to
-- "SET enable_extra_transformations = off" but output is
-- edition-independent.
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, 'off', false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

CREATE TABLE rowmarks.first(id int NOT NULL);
CREATE TABLE rowmarks.second(id int NOT NULL);
INSERT INTO rowmarks.first SELECT generate_series(1, 10);
Expand Down Expand Up @@ -405,3 +418,14 @@ drop cascades to table rowmarks.first_4
DROP TABLE rowmarks.second CASCADE;
DROP SCHEMA rowmarks;
DROP EXTENSION pg_pathman;
-- RESET enable_extra_transformations
SELECT count(*) >= 0 AS success
FROM (
SELECT set_config(name, NULL, false) FROM pg_settings
WHERE name = 'enable_extra_transformations'
) tmp;
success
---------
t
(1 row)

Loading