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 78a15aabc..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.041-orioledb" - postgres17: "17.6.1.084" - postgres15: "15.14.1.084" + 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/config.nix b/nix/config.nix index ca8a841f5..e61683674 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -56,8 +56,8 @@ in }; orioledb = { "17" = { - version = "17_15"; - hash = "sha256-1v3FGIN0UW+E4ilLwbsV3nXvef3n9O8bVmgyjRFEJsU="; + version = "17_16"; + hash = "sha256-Xm9IUsvmlcayNQH8TCvHoIV23xkt/WQV0Oy4CiJkywc="; }; }; }; diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix index a9170a9d0..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 = "beta13"; - sha256 = "sha256-80RQHOgkEC7Hq3+N1VhsuKEUL+SNT/WfDN5vmXpaQG4="; + rev = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02"; + sha256 = "sha256-Vz3vfmTGRW+O9aXZxqixHC2CpqZJf/1UCQWoENbAak4="; }; - version = "beta13"; + version = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02"; 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=16 ''; installPhase = '' runHook preInstall 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/tests/expected/z_orioledb-17_ext_interface.out b/nix/tests/expected/z_orioledb-17_ext_interface.out index 916ddba00..050e81bd6 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 @@ -4987,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) /* 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"