feat: test pgrouting with orioledb-17

Test pgrouting upgrade path on orioledb-17

Author: jfroche

nix/ext/pgrouting.nix

@@ -55,9 +55,7 @@ let
       ) "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types";
 
       cmakeFlags =
-        [
-          "-DPOSTGRESQL_VERSION=${postgresql.version}"
-        ]
+        [ "-DPOSTGRESQL_VERSION=${postgresql.version}" ]
         ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast postgresql.version "16") [
           "-DCMAKE_MACOSX_RPATH=ON"
           "-DCMAKE_SHARED_MODULE_SUFFIX=.dylib"

nix/ext/tests/pgrouting.nix

@@ -11,12 +11,15 @@ let
       majorVersion = lib.versions.major postgresql.version;
       pkg = pkgs.buildEnv {
         name = "postgresql-${majorVersion}-${pname}";
-        paths = [
-          postgresql
-          postgresql.lib
-          (installedExtension majorVersion)
-          self.packages.${pkgs.system}."psql_${majorVersion}/exts/postgis"
-        ];
+        paths =
+          [
+            postgresql
+            postgresql.lib
+            (installedExtension majorVersion)
+            self.packages.${pkgs.system}."psql_${majorVersion}/exts/postgis"
+          ]
+          ++ lib.optional (postgresql.isOrioleDB
+          ) self.packages.${pkgs.system}."psql_orioledb-17/exts/orioledb";
         passthru = {
           inherit (postgresql) version psqlSchema;
           lib = pkg;
@@ -106,16 +109,62 @@ self.inputs.nixpkgs.lib.nixos.runTest {
         };
       };
 
+      specialisation.orioledb17.configuration = {
+        services.postgresql = {
+          package = lib.mkForce (postgresqlWithExtension self.packages.${pkgs.system}.postgresql_orioledb-17);
+          settings = {
+            shared_preload_libraries = "orioledb";
+            default_table_access_method = "orioledb";
+          };
+          initdbArgs = [
+            "--allow-group-access"
+            "--locale-provider=icu"
+            "--encoding=UTF-8"
+            "--icu-locale=en_US.UTF-8"
+          ];
+          initialScript = pkgs.writeText "init-postgres-with-orioledb" ''
+            CREATE EXTENSION orioledb CASCADE;
+          '';
+        };
+
+        systemd.services.postgresql-migrate = {
+          # we don't support migrating from postgresql 17 to orioledb-17 so we just reinit the datadir
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            User = "postgres";
+            Group = "postgres";
+            StateDirectory = "postgresql";
+            WorkingDirectory = "${builtins.dirOf config.services.postgresql.dataDir}";
+          };
+          script =
+            let
+              newPostgresql = postgresqlWithExtension self.packages.${pkgs.system}.postgresql_orioledb-17;
+            in
+            ''
+              set -x
+              systemctl cat postgresql.service
+              rm -rf ${builtins.dirOf config.services.postgresql.dataDir}/${newPostgresql.psqlSchema}
+            '';
+        };
+
+        systemd.services.postgresql = {
+          after = [ "postgresql-migrate.service" ];
+          requires = [ "postgresql-migrate.service" ];
+        };
+      };
     };
   testScript =
     { nodes, ... }:
     let
       pg17-configuration = "${nodes.server.system.build.toplevel}/specialisation/postgresql17";
+      orioledb17-configuration = "${nodes.server.system.build.toplevel}/specialisation/orioledb17";
     in
     ''
       versions = {
         "15": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "15"))}],
         "17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "17"))}],
+        "orioledb-17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "orioledb-17"))}],
       }
 
       def run_sql(query):
@@ -166,5 +215,14 @@ self.inputs.nixpkgs.lib.nixos.runTest {
         assert f"${pname},{latestVersion}" in installed_extensions
 
       check_upgrade_path("17")
+
+      with subtest("switch to orioledb 17"):
+        server.succeed(
+          "${orioledb17-configuration}/bin/switch-to-configuration test >&2"
+        )
+        installed_extensions=run_sql(r"""SELECT extname FROM pg_extension WHERE extname = 'orioledb';""")
+        assert "orioledb" in installed_extensions
+
+      check_upgrade_path("orioledb-17")
     '';
 }

nix/postgresql/default.nix

@@ -10,6 +10,7 @@ let
       namePrefix,
       jitSupport,
       supportedVersions,
+      isOrioleDB,
     }:
     pkgs.lib.mapAttrs' (
       version: config:
@@ -18,6 +19,7 @@ let
       in
       pkgs.lib.nameValuePair "${namePrefix}${versionSuffix}" (
         pkgs.callPackage ./generic.nix {
+          inherit isOrioleDB;
           inherit (config) version hash;
           jitSupport = jitSupport;
           self = pkgs;
@@ -30,10 +32,12 @@ let
     {
       namePrefix = "postgresql_";
       versions = supportedPostgresVersions.postgres;
+      isOrioleDB = false;
     }
     {
       namePrefix = "postgresql_orioledb-";
       versions = supportedPostgresVersions.orioledb;
+      isOrioleDB = true;
     }
   ];
 
@@ -44,7 +48,7 @@ let
       acc: flavor:
       acc
       // (mkPostgresqlPackages {
-        inherit (flavor) namePrefix;
+        inherit (flavor) namePrefix isOrioleDB;
         inherit jitSupport;
         supportedVersions = flavor.versions;
       })

nix/postgresql/generic.nix

@@ -64,6 +64,8 @@ let
       # detection of crypt fails when using llvm stdenv, so we add it manually
       # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
       libxcrypt,
+
+      isOrioleDB ? false,
     }@args:
     let
       atLeast = lib.versionAtLeast version;
@@ -288,6 +290,7 @@ let
           withoutJIT = if jitSupport then jitToggle else this;
 
           dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;
+          inherit isOrioleDB;
 
           pkgs =
             let
@@ -347,6 +350,7 @@ let
           "libpq"
         ];
         platforms = platforms.unix;
+        inherit isOrioleDB;
 
         # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode
         # (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for
@@ -399,8 +403,9 @@ let
         wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
       '';
 
-      passthru.version = postgresql.version;
-      passthru.psqlSchema = postgresql.psqlSchema;
+      passthru = {
+        inherit (postgresql) version psqlSchema isOrioleDB;
+      };
     };
 in
 generic