feat: support multiple versions of the pgroonga extension (supabase#1677)

* feat: support multiple versions of the pgroonga extension Build multiple versions of the pgroonga extension on different PostgreSQL versions. Add test for the extensions and their upgrade on PostgreSQL 15 and 17. * refactor(nix): make sure ext contains only extensions Moved sfcgal and mecab-naist-jdic from nix/ext to nix/packages. * feat: resolve a few issues with tests and integration with tooling * fix: make sure that docker image has full/correct groonga/pgroonga handling * chore: bump version to release --------- Co-authored-by: Sam Rose <samuel@supabase.io>

Author: jfroche

Dockerfile-15

@@ -122,6 +122,20 @@ RUN nix profile install .#wal-g-3 && \
 
 RUN nix store gc
 
+WORKDIR /
+####################
+# setup-groonga
+####################
+FROM base as groonga
+
+WORKDIR /nixpg
+
+RUN nix profile install .#supabase-groonga && \
+ mkdir -p /tmp/groonga-plugins && \
+ cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/
+
+RUN nix store gc
+
 WORKDIR /
 # ####################
 # # Download gosu for easy step-down from root
@@ -153,6 +167,7 @@ FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
 COPY --from=walg /tmp/wal-g /usr/local/bin/
+COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
@@ -216,4 +231,7 @@ ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive
 RUN mkdir -p /usr/share/postgresql/extension/ && \
  ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \
  chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh
+
+ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins
+
 CMD ["postgres", "-D", "/etc/postgresql"]

Dockerfile-17

@@ -126,6 +126,20 @@ RUN nix profile install .#wal-g-3 && \
 
 RUN nix store gc
 
+WORKDIR /
+####################
+# setup-groonga
+####################
+FROM base as groonga
+
+WORKDIR /nixpg
+
+RUN nix profile install .#supabase-groonga && \
+ mkdir -p /tmp/groonga-plugins && \
+ cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/
+
+RUN nix store gc
+
 WORKDIR /
 # ####################
 # # Download gosu for easy step-down from root
@@ -157,6 +171,7 @@ FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
 COPY --from=walg /tmp/wal-g /usr/local/bin/
+COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
@@ -229,4 +244,7 @@ ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive
 RUN mkdir -p /usr/share/postgresql/extension/ && \
  ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \
  chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh
+
+ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins
+
 CMD ["postgres", "-D", "/etc/postgresql"]

Dockerfile-orioledb-17

@@ -126,6 +126,20 @@ RUN nix profile install .#wal-g-3 && \
 
 RUN nix store gc
 
+WORKDIR /
+####################
+# setup-groonga
+####################
+FROM base as groonga
+
+WORKDIR /nixpg
+
+RUN nix profile install .#supabase-groonga && \
+ mkdir -p /tmp/groonga-plugins && \
+ cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/
+
+RUN nix store gc
+
 WORKDIR /
 # ####################
 # # Download gosu for easy step-down from root
@@ -157,6 +171,7 @@ FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
 COPY --from=walg /tmp/wal-g /usr/local/bin/
+COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
 COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf
@@ -235,4 +250,6 @@ RUN mkdir -p /usr/share/postgresql/extension/ && \
  ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \
  chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh
 
+ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins
+
 CMD ["postgres", "-D", "/etc/postgresql"]

ansible/vars.yml

@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
- postgresorioledb-17: "17.5.1.049-orioledb"
- postgres17: "17.6.1.028"
- postgres15: "15.14.1.028"
+ postgresorioledb-17: "17.5.1.050-orioledb"
+ postgres17: "17.6.1.029"
+ postgres15: "15.14.1.029"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

flake.nix

@@ -30,7 +30,6 @@
  nix/checks.nix
  nix/config.nix
  nix/devShells.nix
- nix/ext
  nix/fmt.nix
  nix/hooks.nix
  nix/nixpkgs.nix

nix/checks.nix

@@ -13,7 +13,6 @@
  psql_15 = self'.packages."psql_15/bin";
  psql_17 = self'.packages."psql_17/bin";
  psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
- pgroonga = self'.packages."psql_15/exts/pgroonga";
  inherit (self.supabase) defaults;
  };
  in
@@ -68,9 +67,36 @@
  '';
  };
 
+ # Get the major version for filtering
+ majorVersion =
+ let
+ version = builtins.trace "pgpkg.version is: ${pgpkg.version}" pgpkg.version;
+ isOrioledbMatch = builtins.match "^17_[0-9]+$" version != null;
+ isSeventeenMatch = builtins.match "^17[.][0-9]+$" version != null;
+ result =
+ if isOrioledbMatch then
+ "orioledb-17"
+ else if isSeventeenMatch then
+ "17"
+ else
+ "15";
+ in
+ builtins.trace "Major version result: ${result}" result;
+
+ # Select the appropriate pgroonga package for this PostgreSQL version
+ pgroonga = self'.packages."psql_${majorVersion}/exts/pgroonga-all";
+
+ pgPort =
+ if (majorVersion == "17") then
+ "5535"
+ else if (majorVersion == "15") then
+ "5536"
+ else
+ "5537";
+
  # Use the shared setup but with a test-specific name
  start-postgres-server-bin = pkgs-lib.makePostgresDevSetup {
- inherit pkgs;
+ inherit pkgs pgroonga;
  name = "start-postgres-server-test";
  extraSubstitutions = {
  PGSODIUM_GETKEY = "${getkey-script}/bin/pgsodium-getkey";
@@ -116,33 +142,9 @@
  in
  pkgs.lib.filterAttrs (name: _: isValidFile name) files;
 
- # Get the major version for filtering
- majorVersion =
- let
- version = builtins.trace "pgpkg.version is: ${pgpkg.version}" pgpkg.version;
- isOrioledbMatch = builtins.match "^17_[0-9]+$" version != null;
- isSeventeenMatch = builtins.match "^17[.][0-9]+$" version != null;
- result =
- if isOrioledbMatch then
- "orioledb-17"
- else if isSeventeenMatch then
- "17"
- else
- "15";
- in
- builtins.trace "Major version result: ${result}" result; # Trace the result # For "15.8"
-
  # Filter SQL test files
  filteredSqlTests = filterTestFiles majorVersion ./tests/sql;
 
- pgPort =
- if (majorVersion == "17") then
- "5535"
- else if (majorVersion == "15") then
- "5536"
- else
- "5537";
-
  # Convert filtered tests to a sorted list of basenames (without extension)
  testList = pkgs.lib.mapAttrsToList (
  name: _: builtins.substring 0 (pkgs.lib.stringLength name - 4) name