Skip to content

pgChecks: Fix orioledb checks not running orioledb #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmlb merged 1 commit into from
Sep 24, 2026
+16 −19
Merged

pgChecks: Fix orioledb checks not running orioledb #2484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 16 additions & 19 deletions nix/checks.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
isSlim ? false,
}:
let
isOrioleDB = lib.strings.hasPrefix "orioledb-" pgpkg.version;
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
inherit (self'.packages) pg_regress pg_isolation_regress;
getkey-script = pkgs.stdenv.mkDerivation {
Expand Down Expand Up @@ -84,7 +85,7 @@
"5538"
else if (pgpkg.version == "15" && isSlim) then
"5539"
else if (pgpkg.version == "orioledb-17" && isSlim) then
else if (isOrioleDB && isSlim) then
"5540"
else if (pgpkg.version == "17" && isCliVariant) then
"5541"
Expand Down Expand Up @@ -144,7 +145,7 @@
};

# Tests to skip for OrioleDB (not compatible with OrioleDB storage)
orioledbSkipTests = [
orioleDBSkipTests = [
"index_advisor" # index_advisor doesn't support OrioleDB tables
];

Expand All @@ -153,33 +154,33 @@
version: dir:
let
files = builtins.readDir dir;
# Get list of OrioleDB-specific test basenames , then strip the orioledb prefix from them
orioledbVariants = pkgs.lib.pipe files [
# Get list of OrioleDB-specific test basenames, then strip the orioledb prefix from them
orioleDBVariants = pkgs.lib.pipe files [
builtins.attrNames
(builtins.filter (n: builtins.match "z_orioledb-17_.*\\.sql" n != null))
(map (n: builtins.substring 14 (pkgs.lib.stringLength n - 18) n)) # Remove "z_orioledb-17_" prefix (14 chars) and ".sql" suffix (4 chars)
];
hasOrioledbVariant = basename: builtins.elem basename orioledbVariants;
hasOrioleDBVariant = basename: builtins.elem basename orioleDBVariants;
isValidFile =
name:
let
isVersionSpecific = builtins.match "z_.*" name != null;
basename = builtins.substring 0 (pkgs.lib.stringLength name - 4) name; # Remove .sql
# Skip tests that don't work with OrioleDB
isSkippedForOrioledb = version == "orioledb-17" && builtins.elem basename orioledbSkipTests;
isSkippedForOrioleDB = isOrioleDB && builtins.elem basename orioleDBSkipTests;
matchesVersion =
if isSkippedForOrioledb then
if isSkippedForOrioleDB then
false
else if isVersionSpecific then
if version == "orioledb-17" then
if isOrioleDB then
builtins.match "z_orioledb-17_.*" name != null
else if version == "17" then
builtins.match "z_17_.*" name != null
else
builtins.match "z_15_.*" name != null
else
# For common tests: exclude if OrioleDB variant exists and we're running OrioleDB
if version == "orioledb-17" && hasOrioledbVariant basename then
if isOrioleDB && hasOrioleDBVariant basename then
false
else
true;
Expand Down Expand Up @@ -371,9 +372,9 @@
echo "host all all 127.0.0.1/32 trust" >> "$PGTAP_CLUSTER/pg_hba.conf"
log info "Checking shared_preload_libraries setting:"
log info "$(grep -rn "shared_preload_libraries" "$PGTAP_CLUSTER"/postgresql.conf)"

# Configure OrioleDB if running orioledb-17 check
#shellcheck disable=SC2193
if [[ "${pgpkg.version}" == *"_"* ]]; then
if ${lib.boolToString isOrioleDB}; then
log info "Configuring OrioleDB..."
# Add orioledb to shared_preload_libraries
perl -pi -e "s/(shared_preload_libraries = ')/\$1orioledb, /" "$PGTAP_CLUSTER/postgresql.conf"
Expand Down Expand Up @@ -406,8 +407,7 @@
log_cmd createdb -p ${pgPort} -h localhost --username=supabase_admin testing

# Create orioledb extension if running orioledb-17 check (before prime.sql)
#shellcheck disable=SC2193
if [[ "${pgpkg.version}" == *"_"* ]]; then
if ${lib.boolToString isOrioleDB}; then
log info "Creating orioledb extension..."
log_cmd psql -p ${pgPort} -h localhost --username=supabase_admin -d testing -c "CREATE EXTENSION IF NOT EXISTS orioledb;"
fi
Expand Down Expand Up @@ -472,8 +472,7 @@
check_postgres_ready

# Create orioledb extension if running orioledb-17 check (before prime.sql)
#shellcheck disable=SC2193
if [[ "${pgpkg.version}" == *"_"* ]]; then
if ${lib.boolToString isOrioleDB}; then
log info "Creating orioledb extension for pg_regress tests..."
log_cmd psql -p ${pgPort} -h localhost --no-password --username=supabase_admin -d postgres -c "CREATE EXTENSION IF NOT EXISTS orioledb;"
fi
Expand Down Expand Up @@ -538,12 +537,10 @@
# running server as pg_regress (--use-existing). These specs target
# core/heap + contrib concurrency behaviour. Skipped on:
# - CLI variants: portable build runs only a test subset.
# - orioledb ships its own isolation suite for its storage-engine
# concurrency semantics.
#shellcheck disable=SC2193
# - orioledb ships its own isolation suite for its storage-engine concurrency semantics.
if ${lib.boolToString isCliVariant}; then
log info "CLI variant detected - skipping isolation tests"
elif [[ "${pgpkg.version}" == *"_"* ]]; then
elif ${lib.boolToString isOrioleDB}; then
log info "orioledb variant detected - skipping isolation tests (orioledb has its own isolation suite)"
else
log info "Running pg_isolation_regress tests (${builtins.toString (builtins.length isolationSpecList)} specs)"
Expand Down
Loading