Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions Dockerfile-orioledb-17
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 0 additions & 32 deletions ansible/tasks/stage2-setup-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nix/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ in
};
orioledb = {
"17" = {
version = "17_15";
hash = "sha256-1v3FGIN0UW+E4ilLwbsV3nXvef3n9O8bVmgyjRFEJsU=";
version = "17_16";
hash = "sha256-Xm9IUsvmlcayNQH8TCvHoIV23xkt/WQV0Oy4CiJkywc=";
};
};
};
Expand Down
8 changes: 4 additions & 4 deletions nix/ext/orioledb.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions nix/ext/tests/lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
""
Expand Down
3 changes: 2 additions & 1 deletion nix/tests/expected/z_orioledb-17_ext_interface.out

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions nix/tools/run-server.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading