feat: wip refactor to pg 17 for orioledb

Author: samrose

.github/workflows/ami-release-nix.yml

@@ -5,7 +5,7 @@ on:
     branches:
       #- develop
       #- release/*
-      - sam/oriole16
+      - sam/oriole17
     paths:
       - '.github/workflows/ami-release-nix.yml'
       - 'common-nix.vars.pkr.hcl'

ansible/tasks/stage2-setup-postgres.yml

@@ -8,22 +8,22 @@
   block:
     - name: Check if psql_version is psql_orioledb-16
       set_fact:
-        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+        is_psql_oriole: "{{ psql_version in ['psql_orioledb-16', 'psql_orioledb-17'] }}"
 
     - name: Remove specified extensions from postgresql.conf if oriole-16 build
       ansible.builtin.command:
         cmd: >
           sed -i 's/ timescaledb,//g' 
           /etc/postgresql/postgresql.conf
-      when: is_psql_oriole_16 and stage2_nix
+      when: is_psql_oriole and stage2_nix
       become: yes
 
     - name: Remove specified extensions from supautils.conf if oriole-16 build
       ansible.builtin.command:
         cmd: >
           sed -i 's/ timescaledb,//g; s/ vector,//g; s/ plv8,//g; s/ postgis,//g; s/ pgrouting,//g' 
           /etc/postgresql-custom/supautils.conf
-      when: is_psql_oriole_16 and stage2_nix
+      when: is_psql_oriole and stage2_nix
       become: yes
 
 - name: Install Postgres from nix binary cache
@@ -224,15 +224,15 @@
   block:
     - name: Check if psql_version is psql_orioledb-16
       set_fact:
-        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+        is_psql_oriole: "{{ psql_version == 'psql_orioledb-16' }}"
 
     - name: Recursively create symbolic links and set permissions for the contrib/postgis-* dir
       shell: >
         sudo mkdir -p /usr/lib/postgresql/share/postgresql/contrib && \
         sudo find /var/lib/postgresql/.nix-profile/share/postgresql/contrib/ -mindepth 1 -type d -exec sh -c 'for dir do sudo ln -s "$dir" "/usr/lib/postgresql/share/postgresql/contrib/$(basename "$dir")"; done' sh {} + \
         && chown -R postgres:postgres "/usr/lib/postgresql/share/postgresql/contrib/"
       become: yes
-      when: stage2_nix and not is_psql_oriole_16
+      when: stage2_nix and not is_psql_oriole
 
 - name: Create symbolic links from /var/lib/postgresql/.nix-profile/share/postgresql/timezonesets to /usr/lib/postgresql/share/postgresql/timeszonesets
   file:

ansible/tasks/test-image.yml

@@ -67,13 +67,13 @@
   block:
     - name: Check if psql_version is psql_orioledb-16
       set_fact:
-        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+        is_psql_oriole: "{{ psql_version in ['psql_orioledb-16', 'psql_orioledb-17'] }}"
 
     - name: Remove specified extensions from SQL file
       ansible.builtin.command:
         cmd: >
           sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\|pgvector\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
-      when: is_psql_oriole_16
+      when: is_psql_oriole
       become: yes
 
     - name: Remove specified extension files from extensions directory
@@ -86,14 +86,14 @@
           - '*plv8*.sql'
           - '*pgvector*.sql'
       register: files_to_remove
-      when: is_psql_oriole_16
+      when: is_psql_oriole
 
     - name: Delete matched extension files
       ansible.builtin.file:
         path: "{{ item.path }}"
         state: absent
       loop: "{{ files_to_remove.files }}"
-      when: is_psql_oriole_16
+      when: is_psql_oriole
       become: yes
 
 

ansible/vars.yml

@@ -5,14 +5,15 @@ async_mode: true
 postgres_major:
   #- "15"
   #- "16"
-  - "orioledb-16"
+  - "orioledb-17"
 
 # Full version strings for each major version
 # TOD PR uncomment these lines
 postgres_release:
   #postgres15: "15.8.1.003-staging-5"
   #postgres16: "16.3.1.000-staging-5"
-  postgresorioledb-16: "orioledb-16.3.1.000-staging-12"
+  #postgresorioledb-16: "orioledb-16.3.1.000-staging-12"
+  postgresorioledb-17: "orioledb-17.0.1.000-staging-1"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

docker/nix/build_nix.sh

@@ -10,7 +10,8 @@ nix build .#checks.$(nix-instantiate --eval -E builtins.currentSystem | tr -d '"
 #no nix flake check on oriole yet
 nix build .#psql_15/bin -o psql_15
 nix build .#psql_16/bin -o psql_16
-nix build .#psql_orioledb-16/bin -o psql_orioledb_16
+#nix build .#psql_orioledb-16/bin -o psql_orioledb_16
+nix build .#psql_orioledb-17/bin -o psql_orioledb_17
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_15
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_16
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_16

flake.nix

@@ -160,9 +160,7 @@
         orioledbExtensions = orioleFilteredExtensions ++ [ ./nix/ext/orioledb.nix ];
 
         getPostgresqlPackage = version:
-          if version == "orioledb_16" 
-          then pkgs.postgresql."postgresql_orioledb-16"
-          else pkgs.postgresql."postgresql_${version}";
+          pkgs.postgresql."postgresql_${version}";
         # Create a 'receipt' file for a given postgresql package. This is a way
         # of adding a bit of metadata to the package, which can be used by other
         # tools to inspect what the contents of the install are: the PSQL
@@ -202,7 +200,7 @@
         makeOurPostgresPkgs = version:
           let 
             postgresql = getPostgresqlPackage version;
-            extensionsToUse = if version == "orioledb-16" 
+            extensionsToUse = if (builtins.elem version ["orioledb-16" "orioledb-17"])
               then orioledbExtensions
               else ourExtensions;
           in map (path: pkgs.callPackage path { inherit postgresql; }) extensionsToUse;
@@ -277,7 +275,8 @@
           postgresVersions = {
             psql_15 = makePostgres "15";
             psql_16 = makePostgres "16";
-            psql_orioledb-16 = makePostgres "orioledb-16" ;
+            #psql_orioledb-16 = makePostgres "orioledb-16" ;
+            psql_orioledb-17 = makePostgres "orioledb-17" ;
           };
 
           # Find the active PostgreSQL version
@@ -293,7 +292,8 @@
               };
           postgresql_15 = getPostgresqlPackage "15";
           postgresql_16 = getPostgresqlPackage "16";
-          postgresql_orioledb-16 = getPostgresqlPackage "orioledb-16";
+          #postgresql_orioledb-16 = getPostgresqlPackage "orioledb-16";
+          postgresql_orioledb-17 = getPostgresqlPackage "orioledb-17";
         in 
         postgresVersions //{
           supabase-groonga = supabase-groonga;
@@ -302,13 +302,14 @@
           # PostgreSQL versions.
           psql_15 = postgresVersions.psql_15;
           psql_16 = postgresVersions.psql_16;
-          psql_orioledb-16 = postgresVersions.psql_orioledb-16;
+          #psql_orioledb-16 = postgresVersions.psql_orioledb-16;
+          psql_orioledb-17 = postgresVersions.psql_orioledb-17;
           sfcgal = sfcgal;
           pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
-          inherit postgresql_15 postgresql_16 postgresql_orioledb-16;
+          inherit postgresql_15 postgresql_16 postgresql_orioledb-17;
           postgresql_15_debug = if pkgs.stdenv.isLinux then postgresql_15.debug else null;
           postgresql_16_debug = if pkgs.stdenv.isLinux then postgresql_16.debug else null;
-          postgresql_orioledb-16_debug = if pkgs.stdenv.isLinux then postgresql_orioledb-16.debug else null;
+          postgresql_orioledb-17_debug = if pkgs.stdenv.isLinux then postgresql_orioledb-17.debug else null;
           postgresql_15_src = pkgs.stdenv.mkDerivation {
             pname = "postgresql-15-src";
             version = postgresql_15.version;
@@ -353,11 +354,11 @@
               platforms = platforms.all;
             };
           };
-          postgresql_orioledb-16_src = pkgs.stdenv.mkDerivation {
-            pname = "postgresql-16-src";
-            version = postgresql_orioledb-16.version;
+          postgresql_orioledb-17_src = pkgs.stdenv.mkDerivation {
+            pname = "postgresql-17-src";
+            version = postgresql_orioledb-17.version;
 
-            src = postgresql_16.src;
+            src = postgresql_orioledb-17.src;
 
             nativeBuildInputs = [ pkgs.bzip2 ];
 
@@ -434,7 +435,7 @@
                 --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
                 --subst-var-by 'PSQL_CONF_FILE' $out/etc/postgresql/postgresql.conf \
                 --subst-var-by 'PSQL16_BINDIR' '${basePackages.psql_16.bin}' \
-                --subst-var-by 'PSQLORIOLEDB16_BINDIR' '${basePackages.psql_orioledb-16.bin}' \
+                --subst-var-by 'PSQLORIOLEDB17_BINDIR' '${basePackages.psql_orioledb-17.bin}' \
                 --subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}' \
                 --subst-var-by 'READREPL_CONF_FILE' "$out/etc/postgresql-custom/read-replica.conf" \
                 --subst-var-by 'LOGGING_CONF_FILE' "$out/etc/postgresql-custom/logging.conf" \

nix/ext/orioledb.nix

@@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orioledb";
     repo = "orioledb";
-    rev = "bd8e32d0ebaafd0ea3ec3074233b65167f3b6fb7";
-    sha256 = "sha256-bzH1SgPZ6q90HpqRsECY2XQPghEcd2Hg4X55G43unNo=";
+    rev = "2861cf9091a92bcabbbbf1f4d15f8edff480fea1";
+    sha256 = "";
   };
-  version = "patches16_31";
+  version = "patches17_3";
   buildInputs = [ curl libkrb5 postgresql python3 openssl ];
   buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=31";
   installPhase = ''

nix/postgresql/default.nix

@@ -4,6 +4,7 @@ let
     postgresql_15 = ./15.nix;
     postgresql_16 = ./16.nix;
     postgresql_orioledb-16 = ./orioledb-16.nix;
+    postgresql_orioledb-17 = ./orioledb-17.nix;
   };
   mkAttributes = jitSupport:
     self.lib.mapAttrs' (version: path:

nix/postgresql/generic.nix

@@ -51,7 +51,7 @@ let
     inherit version;
     pname = pname + lib.optionalString jitSupport "-jit";
 
-    src = if (builtins.match "16_.*" version != null) then
+    src = if (builtins.match "17_*" version != null) then
       fetchurl {
         url = "https://github.com/orioledb/postgres/archive/refs/tags/patches${version}.tar.gz";
         inherit hash;

nix/postgresql/orioledb-17.nix

@@ -0,0 +1,4 @@
+import ./generic.nix {
+  version = "17_3";
+  hash = "";
+}