From ce0bb9c3e4da68f371ee2e2927ec8d2065a82858 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 30 Jan 2026 09:20:42 -0500 Subject: [PATCH 01/11] feat: bump oriole to latest --- nix/config.nix | 5 +++-- nix/ext/orioledb.nix | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nix/config.nix b/nix/config.nix index ca8a841f5..ccc5012da 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -56,8 +56,9 @@ in }; orioledb = { "17" = { - version = "17_15"; - hash = "sha256-1v3FGIN0UW+E4ilLwbsV3nXvef3n9O8bVmgyjRFEJsU="; + version = "17_29012026"; + revision = "07eed1c01c0b649922c822867f11c7a0ccd9e851"; + hash = "sha256-clsgUbaWlfZu8GRk0uCmVNVdeWEQLMiF9Z+3yjJJOzQ="; }; }; }; diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix index a9170a9d0..cb5727ac7 100644 --- a/nix/ext/orioledb.nix +++ b/nix/ext/orioledb.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orioledb"; repo = "orioledb"; - rev = "beta13"; - sha256 = "sha256-80RQHOgkEC7Hq3+N1VhsuKEUL+SNT/WfDN5vmXpaQG4="; + rev = "18a3029046ce70464d22bff6398885fa705aa54d"; + sha256 = "sha256-tIXg/jp6yNkfw9KHxFpR55LXaA2tvv1LY1/sOxhSqkA="; }; - version = "beta13"; + version = "18a3029046ce70464d22bff6398885fa705aa54d"; buildInputs = [ curl libkrb5 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { openssl ]; buildPhase = '' - make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=15 + make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=07eed1c01c0b649922c822867f11c7a0ccd9e851 ''; installPhase = '' runHook preInstall From fe030debf117d8c54a8cbc29479364ffa01f4edb Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 30 Jan 2026 15:23:23 -0500 Subject: [PATCH 02/11] fix: update func interface inclusion on oriole --- nix/tests/expected/z_orioledb-17_ext_interface.out | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/tests/expected/z_orioledb-17_ext_interface.out b/nix/tests/expected/z_orioledb-17_ext_interface.out index 916ddba00..322c362d2 100644 --- a/nix/tests/expected/z_orioledb-17_ext_interface.out +++ b/nix/tests/expected/z_orioledb-17_ext_interface.out @@ -1121,6 +1121,7 @@ order by orioledb | extensions | orioledb_version | | text orioledb | extensions | orioledb_write_pages | relid oid | void orioledb | extensions | pg_stopevent_reset | eventname text | boolean + orioledb | extensions | pg_stopevent_set | eventname text, condition jsonpath, flags text | void orioledb | extensions | pg_stopevent_set | eventname text, condition jsonpath | void orioledb | extensions | pg_stopevents | OUT stopevent text, OUT condition jsonpath, OUT waiter_pids integer[] | SETOF record pageinspect | public | brin_metapage_info | page bytea, OUT magic text, OUT version integer, OUT pagesperrange integer, OUT lastrevmappage bigint | record From 98b460c917d836f1d8a935be65d1713b08d535ae Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 30 Jan 2026 22:19:13 -0500 Subject: [PATCH 03/11] tests: rewind regres test --- nix/tests/expected/z_orioledb-17_rewind.out | 76 +++++++++++++++++++++ nix/tests/sql/z_orioledb-17_rewind.sql | 34 +++++++++ 2 files changed, 110 insertions(+) create mode 100644 nix/tests/expected/z_orioledb-17_rewind.out create mode 100644 nix/tests/sql/z_orioledb-17_rewind.sql diff --git a/nix/tests/expected/z_orioledb-17_rewind.out b/nix/tests/expected/z_orioledb-17_rewind.out new file mode 100644 index 000000000..1d5ccbd34 --- /dev/null +++ b/nix/tests/expected/z_orioledb-17_rewind.out @@ -0,0 +1,76 @@ +-- Test OrioleDB rewind functionality +-- These tests verify the rewind feature interface and configuration +-- Note: Actual rewind operations require a server restart, so we only test +-- configuration and function existence here +-- +-- Reference: https://github.com/orioledb/orioledb/blob/18a3029046ce70464d22bff6398885fa705aa54d/doc/usage/rewind.mdx +-- Verify rewind is enabled in configuration +SELECT name, setting FROM pg_settings +WHERE name LIKE 'orioledb.%rewind%' +ORDER BY name; + name | setting +----------------------------------+--------- + orioledb.enable_rewind | on + orioledb.rewind_buffers | 1280 + orioledb.rewind_max_time | 1200 + orioledb.rewind_max_transactions | 100000 +(4 rows) + +-- Verify rewind functions exist with correct signatures +SELECT + p.proname AS function_name, + pg_catalog.pg_get_function_result(p.oid) AS return_type, + pg_catalog.pg_get_function_identity_arguments(p.oid) AS argument_types +FROM + pg_catalog.pg_proc p + JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace +WHERE + p.proname LIKE 'orioledb_rewind%' + OR p.proname LIKE 'orioledb_get_complete%' + OR p.proname LIKE 'orioledb_get_current_oxid%' + OR p.proname LIKE 'orioledb_get_rewind%' +ORDER BY + p.proname; + function_name | return_type | argument_types +------------------------------------+-------------+------------------------------------------- + orioledb_get_complete_oxid | bigint | + orioledb_get_complete_xid | integer | + orioledb_get_current_oxid | bigint | + orioledb_get_rewind_evicted_length | bigint | + orioledb_get_rewind_queue_length | bigint | + orioledb_rewind_by_time | void | rewind_time integer + orioledb_rewind_to_timestamp | void | rewind_timestamp timestamp with time zone + orioledb_rewind_to_transaction | void | xid integer, oxid bigint +(8 rows) + +-- Test diagnostic functions (these are read-only and safe) +SELECT orioledb_get_current_oxid() IS NOT NULL AS has_current_oxid; + has_current_oxid +------------------ + t +(1 row) + +SELECT orioledb_get_complete_xid() IS NOT NULL AS has_complete_xid; + has_complete_xid +------------------ + t +(1 row) + +SELECT orioledb_get_complete_oxid() IS NOT NULL AS has_complete_oxid; + has_complete_oxid +------------------- + t +(1 row) + +SELECT orioledb_get_rewind_queue_length() >= 0 AS valid_queue_length; + valid_queue_length +-------------------- + t +(1 row) + +SELECT orioledb_get_rewind_evicted_length() >= 0 AS valid_evicted_length; + valid_evicted_length +---------------------- + t +(1 row) + diff --git a/nix/tests/sql/z_orioledb-17_rewind.sql b/nix/tests/sql/z_orioledb-17_rewind.sql new file mode 100644 index 000000000..87ad6d754 --- /dev/null +++ b/nix/tests/sql/z_orioledb-17_rewind.sql @@ -0,0 +1,34 @@ +-- Test OrioleDB rewind functionality +-- These tests verify the rewind feature interface and configuration +-- Note: Actual rewind operations require a server restart, so we only test +-- configuration and function existence here +-- +-- Reference: https://github.com/orioledb/orioledb/blob/18a3029046ce70464d22bff6398885fa705aa54d/doc/usage/rewind.mdx + +-- Verify rewind is enabled in configuration +SELECT name, setting FROM pg_settings +WHERE name LIKE 'orioledb.%rewind%' +ORDER BY name; + +-- Verify rewind functions exist with correct signatures +SELECT + p.proname AS function_name, + pg_catalog.pg_get_function_result(p.oid) AS return_type, + pg_catalog.pg_get_function_identity_arguments(p.oid) AS argument_types +FROM + pg_catalog.pg_proc p + JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace +WHERE + p.proname LIKE 'orioledb_rewind%' + OR p.proname LIKE 'orioledb_get_complete%' + OR p.proname LIKE 'orioledb_get_current_oxid%' + OR p.proname LIKE 'orioledb_get_rewind%' +ORDER BY + p.proname; + +-- Test diagnostic functions (these are read-only and safe) +SELECT orioledb_get_current_oxid() IS NOT NULL AS has_current_oxid; +SELECT orioledb_get_complete_xid() IS NOT NULL AS has_complete_xid; +SELECT orioledb_get_complete_oxid() IS NOT NULL AS has_complete_oxid; +SELECT orioledb_get_rewind_queue_length() >= 0 AS valid_queue_length; +SELECT orioledb_get_rewind_evicted_length() >= 0 AS valid_evicted_length; From 1730e8d470d80ef11aea4f3fda347f0be827b52b Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Sat, 7 Feb 2026 08:20:56 -0500 Subject: [PATCH 04/11] chore: bump version --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 78a15aabc..37fdacfd9 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.041-orioledb" - postgres17: "17.6.1.084" - postgres15: "15.14.1.084" + postgresorioledb-17: "17.6.0.032-orioledb-rel-2" + postgres17: "17.6.1.075-rel-3" + postgres15: "15.14.1.075-rel-3" # Non Postgres Extensions pgbouncer_release: 1.25.1 From d6c32e6a40e1d94ebf2d9fa3b1a3e2e4d808d252 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Sat, 7 Feb 2026 13:47:44 -0500 Subject: [PATCH 05/11] oriole regres fix --- nix/tests/expected/z_orioledb-17_ext_interface.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/tests/expected/z_orioledb-17_ext_interface.out b/nix/tests/expected/z_orioledb-17_ext_interface.out index 322c362d2..050e81bd6 100644 --- a/nix/tests/expected/z_orioledb-17_ext_interface.out +++ b/nix/tests/expected/z_orioledb-17_ext_interface.out @@ -4988,7 +4988,7 @@ order by xml2 | public | xpath_table | text, text, text, text, text | SETOF record xml2 | public | xslt_process | text, text | text xml2 | public | xslt_process | text, text, text | text -(4827 rows) +(4828 rows) /* From 205e947d1ed685e62a608eb8c681a791585e8191 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Sat, 7 Feb 2026 14:04:11 -0500 Subject: [PATCH 06/11] fix: rm rewind tests --- nix/tests/expected/z_orioledb-17_rewind.out | 76 --------------------- nix/tests/sql/z_orioledb-17_rewind.sql | 34 --------- 2 files changed, 110 deletions(-) delete mode 100644 nix/tests/expected/z_orioledb-17_rewind.out delete mode 100644 nix/tests/sql/z_orioledb-17_rewind.sql diff --git a/nix/tests/expected/z_orioledb-17_rewind.out b/nix/tests/expected/z_orioledb-17_rewind.out deleted file mode 100644 index 1d5ccbd34..000000000 --- a/nix/tests/expected/z_orioledb-17_rewind.out +++ /dev/null @@ -1,76 +0,0 @@ --- Test OrioleDB rewind functionality --- These tests verify the rewind feature interface and configuration --- Note: Actual rewind operations require a server restart, so we only test --- configuration and function existence here --- --- Reference: https://github.com/orioledb/orioledb/blob/18a3029046ce70464d22bff6398885fa705aa54d/doc/usage/rewind.mdx --- Verify rewind is enabled in configuration -SELECT name, setting FROM pg_settings -WHERE name LIKE 'orioledb.%rewind%' -ORDER BY name; - name | setting -----------------------------------+--------- - orioledb.enable_rewind | on - orioledb.rewind_buffers | 1280 - orioledb.rewind_max_time | 1200 - orioledb.rewind_max_transactions | 100000 -(4 rows) - --- Verify rewind functions exist with correct signatures -SELECT - p.proname AS function_name, - pg_catalog.pg_get_function_result(p.oid) AS return_type, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS argument_types -FROM - pg_catalog.pg_proc p - JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace -WHERE - p.proname LIKE 'orioledb_rewind%' - OR p.proname LIKE 'orioledb_get_complete%' - OR p.proname LIKE 'orioledb_get_current_oxid%' - OR p.proname LIKE 'orioledb_get_rewind%' -ORDER BY - p.proname; - function_name | return_type | argument_types -------------------------------------+-------------+------------------------------------------- - orioledb_get_complete_oxid | bigint | - orioledb_get_complete_xid | integer | - orioledb_get_current_oxid | bigint | - orioledb_get_rewind_evicted_length | bigint | - orioledb_get_rewind_queue_length | bigint | - orioledb_rewind_by_time | void | rewind_time integer - orioledb_rewind_to_timestamp | void | rewind_timestamp timestamp with time zone - orioledb_rewind_to_transaction | void | xid integer, oxid bigint -(8 rows) - --- Test diagnostic functions (these are read-only and safe) -SELECT orioledb_get_current_oxid() IS NOT NULL AS has_current_oxid; - has_current_oxid ------------------- - t -(1 row) - -SELECT orioledb_get_complete_xid() IS NOT NULL AS has_complete_xid; - has_complete_xid ------------------- - t -(1 row) - -SELECT orioledb_get_complete_oxid() IS NOT NULL AS has_complete_oxid; - has_complete_oxid -------------------- - t -(1 row) - -SELECT orioledb_get_rewind_queue_length() >= 0 AS valid_queue_length; - valid_queue_length --------------------- - t -(1 row) - -SELECT orioledb_get_rewind_evicted_length() >= 0 AS valid_evicted_length; - valid_evicted_length ----------------------- - t -(1 row) - diff --git a/nix/tests/sql/z_orioledb-17_rewind.sql b/nix/tests/sql/z_orioledb-17_rewind.sql deleted file mode 100644 index 87ad6d754..000000000 --- a/nix/tests/sql/z_orioledb-17_rewind.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Test OrioleDB rewind functionality --- These tests verify the rewind feature interface and configuration --- Note: Actual rewind operations require a server restart, so we only test --- configuration and function existence here --- --- Reference: https://github.com/orioledb/orioledb/blob/18a3029046ce70464d22bff6398885fa705aa54d/doc/usage/rewind.mdx - --- Verify rewind is enabled in configuration -SELECT name, setting FROM pg_settings -WHERE name LIKE 'orioledb.%rewind%' -ORDER BY name; - --- Verify rewind functions exist with correct signatures -SELECT - p.proname AS function_name, - pg_catalog.pg_get_function_result(p.oid) AS return_type, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS argument_types -FROM - pg_catalog.pg_proc p - JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace -WHERE - p.proname LIKE 'orioledb_rewind%' - OR p.proname LIKE 'orioledb_get_complete%' - OR p.proname LIKE 'orioledb_get_current_oxid%' - OR p.proname LIKE 'orioledb_get_rewind%' -ORDER BY - p.proname; - --- Test diagnostic functions (these are read-only and safe) -SELECT orioledb_get_current_oxid() IS NOT NULL AS has_current_oxid; -SELECT orioledb_get_complete_xid() IS NOT NULL AS has_complete_xid; -SELECT orioledb_get_complete_oxid() IS NOT NULL AS has_complete_oxid; -SELECT orioledb_get_rewind_queue_length() >= 0 AS valid_queue_length; -SELECT orioledb_get_rewind_evicted_length() >= 0 AS valid_evicted_length; From 4e7e7e3bba80396d2659a4c561c033400ed39e60 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 11 Feb 2026 09:30:43 -0500 Subject: [PATCH 07/11] feat: use beta14 and 17_16 patchset --- nix/config.nix | 5 ++--- nix/ext/orioledb.nix | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nix/config.nix b/nix/config.nix index ccc5012da..e61683674 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -56,9 +56,8 @@ in }; orioledb = { "17" = { - version = "17_29012026"; - revision = "07eed1c01c0b649922c822867f11c7a0ccd9e851"; - hash = "sha256-clsgUbaWlfZu8GRk0uCmVNVdeWEQLMiF9Z+3yjJJOzQ="; + version = "17_16"; + hash = "sha256-Xm9IUsvmlcayNQH8TCvHoIV23xkt/WQV0Oy4CiJkywc="; }; }; }; diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix index cb5727ac7..d87c78e59 100644 --- a/nix/ext/orioledb.nix +++ b/nix/ext/orioledb.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orioledb"; repo = "orioledb"; - rev = "18a3029046ce70464d22bff6398885fa705aa54d"; - sha256 = "sha256-tIXg/jp6yNkfw9KHxFpR55LXaA2tvv1LY1/sOxhSqkA="; + rev = "beta14"; + sha256 = "sha256-q9lukw4PZ4GRGFuvbk4bgGdoL0Dt1lPMTI0Y9ttaIS8="; }; - version = "18a3029046ce70464d22bff6398885fa705aa54d"; + version = "beta14"; buildInputs = [ curl libkrb5 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { openssl ]; buildPhase = '' - make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=07eed1c01c0b649922c822867f11c7a0ccd9e851 + make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=16 ''; installPhase = '' runHook preInstall From c8fdfe78ec89518a55a7f05f2dd1a77b5810d386 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Wed, 11 Feb 2026 23:24:35 -0500 Subject: [PATCH 08/11] fix: update oriole to 00043a2881d0d2a3dfe7914e2a67694889c686b5 to fix a bug with OrioleDB treating CREATE MATERIALIZED VIEW ... AS SELECT as if it were WITH NO DATA --- nix/ext/orioledb.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix index d87c78e59..42075e90a 100644 --- a/nix/ext/orioledb.nix +++ b/nix/ext/orioledb.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orioledb"; repo = "orioledb"; - rev = "beta14"; - sha256 = "sha256-q9lukw4PZ4GRGFuvbk4bgGdoL0Dt1lPMTI0Y9ttaIS8="; + rev = "00043a2881d0d2a3dfe7914e2a67694889c686b5"; + sha256 = "sha256-Vz3vfmTGRW+O9aXZxqixHC2CpqZJf/1UCQWoENbAak4="; }; - version = "beta14"; + version = "00043a2881d0d2a3dfe7914e2a67694889c686b5"; buildInputs = [ curl libkrb5 From ec61a305355b399409d6b9044af1331a4fe6dec3 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 12 Feb 2026 06:34:24 -0500 Subject: [PATCH 09/11] feat: using main commit --- nix/ext/orioledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix index 42075e90a..e338a3a27 100644 --- a/nix/ext/orioledb.nix +++ b/nix/ext/orioledb.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orioledb"; repo = "orioledb"; - rev = "00043a2881d0d2a3dfe7914e2a67694889c686b5"; + rev = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02"; sha256 = "sha256-Vz3vfmTGRW+O9aXZxqixHC2CpqZJf/1UCQWoENbAak4="; }; - version = "00043a2881d0d2a3dfe7914e2a67694889c686b5"; + version = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02"; buildInputs = [ curl libkrb5 From f9d203ef873f794b6cf7082a14340a06ee072994 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Mon, 16 Feb 2026 11:24:32 -0500 Subject: [PATCH 10/11] feat: bump to test --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 37fdacfd9..26bbc2e15 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.032-orioledb-rel-2" - postgres17: "17.6.1.075-rel-3" - postgres15: "15.14.1.075-rel-3" + postgresorioledb-17: "17.6.0.032-orioledb-rel-4" + postgres17: "17.6.1.075-rel-4" + postgres15: "15.14.1.075-rel-4" # Non Postgres Extensions pgbouncer_release: 1.25.1 From 8c674fe217660a1e4c1ec29c9c94db4decc79cf5 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Mon, 16 Feb 2026 14:57:41 -0500 Subject: [PATCH 11/11] feat: rewind off by default --- Dockerfile-orioledb-17 | 8 ------- ansible/tasks/stage2-setup-postgres.yml | 32 ------------------------- ansible/vars.yml | 6 ++--- nix/ext/tests/lib.nix | 4 ---- nix/tools/run-server.sh.in | 10 -------- 5 files changed, 3 insertions(+), 57 deletions(-) diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index b796e75b2..2b0f8e9fd 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -157,14 +157,6 @@ RUN sed -i 's/ timescaledb,//g;' "/etc/postgresql/postgresql.conf" && \ RUN sed -i 's/\(shared_preload_libraries.*\)'\''\(.*\)$/\1, orioledb'\''\2/' "/etc/postgresql/postgresql.conf" && \ echo "default_table_access_method = 'orioledb'" >> "/etc/postgresql/postgresql.conf" -# OrioleDB rewind configuration -# Enables time-based rewind capability for up to 20 minutes (1200 seconds) -# Buffer size: 1280 buffers * 8KB = 10MB for transaction retention -RUN echo "orioledb.enable_rewind = true" >> "/etc/postgresql/postgresql.conf" && \ - echo "orioledb.rewind_max_time = 1200" >> "/etc/postgresql/postgresql.conf" && \ - echo "orioledb.rewind_max_transactions = 100000" >> "/etc/postgresql/postgresql.conf" && \ - echo "orioledb.rewind_buffers = 1280" >> "/etc/postgresql/postgresql.conf" - # Include schema migrations COPY migrations/db /docker-entrypoint-initdb.d/ COPY ansible/files/pgbouncer_config/pgbouncer_auth_schema.sql /docker-entrypoint-initdb.d/init-scripts/00-schema.sql diff --git a/ansible/tasks/stage2-setup-postgres.yml b/ansible/tasks/stage2-setup-postgres.yml index 9adef6f68..d935d2447 100644 --- a/ansible/tasks/stage2-setup-postgres.yml +++ b/ansible/tasks/stage2-setup-postgres.yml @@ -52,38 +52,6 @@ path: '/etc/postgresql/postgresql.conf' state: 'present' - - name: Enable OrioleDB rewind feature - ansible.builtin.lineinfile: - path: /etc/postgresql/postgresql.conf - line: "orioledb.enable_rewind = true" - state: present - when: is_psql_oriole and stage2_nix - become: yes - - - name: Set OrioleDB rewind max time (20 minutes) - ansible.builtin.lineinfile: - path: /etc/postgresql/postgresql.conf - line: "orioledb.rewind_max_time = 1200" - state: present - when: is_psql_oriole and stage2_nix - become: yes - - - name: Set OrioleDB rewind max transactions - ansible.builtin.lineinfile: - path: /etc/postgresql/postgresql.conf - line: "orioledb.rewind_max_transactions = 100000" - state: present - when: is_psql_oriole and stage2_nix - become: yes - - - name: Set OrioleDB rewind buffers (1280 buffers = 10MB) - ansible.builtin.lineinfile: - path: /etc/postgresql/postgresql.conf - line: "orioledb.rewind_buffers = 1280" - state: present - when: is_psql_oriole and stage2_nix - become: yes - - name: Add ORIOLEDB_ENABLED environment variable ansible.builtin.lineinfile: line: 'ORIOLEDB_ENABLED=true' diff --git a/ansible/vars.yml b/ansible/vars.yml index 26bbc2e15..7a095834e 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.032-orioledb-rel-4" - postgres17: "17.6.1.075-rel-4" - postgres15: "15.14.1.075-rel-4" + postgresorioledb-17: "17.6.0.032-orioledb-rel-5" + postgres17: "17.6.1.075-rel-5" + postgres15: "15.14.1.075-rel-5" # Non Postgres Extensions pgbouncer_release: 1.25.1 diff --git a/nix/ext/tests/lib.nix b/nix/ext/tests/lib.nix index a07b838e5..f7bde9300 100644 --- a/nix/ext/tests/lib.nix +++ b/nix/ext/tests/lib.nix @@ -120,10 +120,6 @@ let # OrioleDB: append orioledb to shared_preload_libraries sed -i "s/\(shared_preload_libraries.*\)'\(.*\)$/\1, orioledb'\2/" $out/postgresql.conf echo "default_table_access_method = 'orioledb'" >> $out/postgresql.conf - echo "orioledb.enable_rewind = true" >> $out/postgresql.conf - echo "orioledb.rewind_max_time = 1200" >> $out/postgresql.conf - echo "orioledb.rewind_max_transactions = 100000" >> $out/postgresql.conf - echo "orioledb.rewind_buffers = 1280" >> $out/postgresql.conf '' else "" diff --git a/nix/tools/run-server.sh.in b/nix/tools/run-server.sh.in index ea66b6f29..333f062bc 100644 --- a/nix/tools/run-server.sh.in +++ b/nix/tools/run-server.sh.in @@ -256,11 +256,6 @@ orioledb_config_items() { sed -i 's/ timescaledb,//g; s/ plv8,//g; s/ pgjwt,//g;' "$DATDIR/supautils.conf" sed -i 's/\(shared_preload_libraries.*\)'\''\(.*\)$/\1, orioledb'\''\2/' "$DATDIR/postgresql.conf" echo "default_table_access_method = 'orioledb'" >> "$DATDIR/postgresql.conf" - # OrioleDB rewind configuration (20 minute window, 10MB buffer) - echo "orioledb.enable_rewind = true" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_max_time = 1200" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_max_transactions = 100000" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_buffers = 1280" >> "$DATDIR/postgresql.conf" elif [[ "$1" = "orioledb-17" && "$CURRENT_SYSTEM" = "aarch64-darwin" ]]; then # macOS specific configuration echo "macOS detected, applying macOS specific configuration" @@ -276,11 +271,6 @@ orioledb_config_items() { perl -pi -e 's/(shared_preload_libraries\s*=\s*'\''.*?)'\''/\1, orioledb'\''/' "$DATDIR/postgresql.conf" echo "default_table_access_method = 'orioledb'" >> "$DATDIR/postgresql.conf" - # OrioleDB rewind configuration (20 minute window, 10MB buffer) - echo "orioledb.enable_rewind = true" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_max_time = 1200" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_max_transactions = 100000" >> "$DATDIR/postgresql.conf" - echo "orioledb.rewind_buffers = 1280" >> "$DATDIR/postgresql.conf" elif [[ "$VERSION" == "17" && "$CURRENT_SYSTEM" != "aarch64-darwin" ]]; then echo "non-macos pg 17 conf" sed -i 's/ timescaledb,//g;' "$DATDIR/postgresql.conf"