add sudo package to build-tools image

.github/workflows/build_and_test.yml

@@ -963,7 +963,7 @@ jobs:
           fi
 
       - name: Verify docker-compose example and test extensions
-        timeout-minutes: 60
+        timeout-minutes: 20
         env:
           TAG: >-
             ${{

.github/workflows/cloud-regress.yml

@@ -14,6 +14,11 @@ defaults:
   run:
     shell: bash -euxo pipefail {0}
 
+concurrency:
+  # Allow only one workflow
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 permissions:
   id-token: write # aws-actions/configure-aws-credentials
   statuses: write
@@ -28,10 +33,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg-version: [17]
+        pg-version: [16, 17]
 
-    #runs-on: us-east-2
-    runs-on: small
+    runs-on: us-east-2
     container:
       image: ghcr.io/neondatabase/build-tools:pinned-bookworm
       credentials:
@@ -55,7 +59,6 @@ jobs:
         run: |
           cd "vendor/postgres-v${PG_VERSION}"
           patch -p1 < "../../compute/patches/cloud_regress_pg${PG_VERSION}.patch"
-          patch -p1 < "../../compute/patches/cloud_regress_pg17_495.patch"
 
       - name: Generate a random password
         id: pwgen

Cargo.lock

@@ -3794,16 +3794,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "neon-shmem"
-version = "0.1.0"
-dependencies = [
- "nix 0.30.1",
- "tempfile",
- "thiserror 1.0.69",
- "workspace_hack",
-]
-
 [[package]]
 name = "never-say-never"
 version = "6.6.666"
@@ -8492,7 +8482,6 @@ dependencies = [
  "log",
  "memchr",
  "nix 0.26.4",
- "nix 0.30.1",
  "nom",
  "num",
  "num-bigint",

Cargo.toml

@@ -23,7 +23,6 @@ members = [
     "libs/postgres_ffi",
     "libs/safekeeper_api",
     "libs/desim",
-    "libs/neon-shmem",
     "libs/utils",
     "libs/consumption_metrics",
     "libs/postgres_backend",
@@ -128,7 +127,7 @@ md5 = "0.7.0"
 measured = { version = "0.0.22", features=["lasso"] }
 measured-process = { version = "0.0.22" }
 memoffset = "0.9"
-nix = { version = "0.30.1", features = ["dir", "fs", "mman", "process", "socket", "signal", "poll"] }
+nix = { version = "0.30.1", features = ["dir", "fs", "process", "socket", "signal", "poll"] }
 # Do not update to >= 7.0.0, at least. The update will have a significant impact
 # on compute startup metrics (start_postgres_ms), >= 25% degradation.
 notify = "6.0.0"

build-tools.Dockerfile

@@ -144,6 +144,7 @@ RUN set -e \
         openssh-client \
         parallel \
         pkg-config \
+        sudo \
         unzip \
         wget \
         xz-utils \

compute/patches/cloud_regress_pg17_ha_plus.patch

@@ -1,129 +0,0 @@
-diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql
-index 249636c76c3..540c2b54dda 100644
---- a/src/test/regress/sql/box.sql
-+++ b/src/test/regress/sql/box.sql
-@@ -196,7 +196,7 @@ CREATE TABLE quad_box_tbl (id int, b box);
- 
- INSERT INTO quad_box_tbl
-   SELECT (x - 1) * 100 + y, box(point(x * 10, y * 10), point(x * 10 + 5, y * 10 + 5))
--  FROM generate_series(1, 95 * 100) x,
-+  FROM generate_series(1, 100) x,
-        generate_series(1, 95 * 100) y;
- 
- -- insert repeating data to test allTheSame
-diff --git a/src/test/regress/sql/partition_join.sql b/src/test/regress/sql/partition_join.sql
-index 3ca8a2d6090..a8e40f906c4 100644
---- a/src/test/regress/sql/partition_join.sql
-+++ b/src/test/regress/sql/partition_join.sql
-@@ -533,7 +533,7 @@ create temp table prtx2_3 partition of prtx2 for values from (21) to (31);
- insert into prtx1 select 1 + i%30, i, i
-   from generate_series(1, 95 * 1000) i;
- insert into prtx2 select 1 + i%30, i, i
--  from generate_series(1, 95 * 500) i, generate_series(1, 95 * 10) j;
-+  from generate_series(1, 500) i, generate_series(1, 95 * 10) j;
- create index on prtx2 (b);
- create index on prtx2 (c);
- analyze prtx1;
-diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
-index 82ac39d5dc8..bef0a891ade 100644
---- a/src/test/regress/sql/partition_prune.sql
-+++ b/src/test/regress/sql/partition_prune.sql
-@@ -1274,9 +1274,9 @@ select
-   case c when 0 then null else 3 end,
-   case d when 0 then null else 4 end
- from
--  generate_series(0, 95 * 1) a,
--  generate_series(0, 95 * 1) b,
--  generate_series(0, 95 * 1) c,
-+  generate_series(0, 1) a,
-+  generate_series(0, 1) b,
-+  generate_series(0, 1) c,
-   generate_series(0, 95 * 1) d;
- 
- -- Ensure partition pruning works correctly for each combination of IS NULL
-diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql
-index d39a2b4e8f8..2d862985510 100644
---- a/src/test/regress/sql/polygon.sql
-+++ b/src/test/regress/sql/polygon.sql
-@@ -42,7 +42,7 @@ CREATE TABLE quad_poly_tbl (id int, p polygon);
- 
- INSERT INTO quad_poly_tbl
- 	SELECT (x - 1) * 100 + y, polygon(circle(point(x * 10, y * 10), 1 + (x + y) % 10))
--	FROM generate_series(1, 95 * 100) x,
-+	FROM generate_series(1, 100) x,
- 		 generate_series(1, 95 * 100) y;
- 
- INSERT INTO quad_poly_tbl
-diff --git a/src/test/regress/sql/rangetypes.sql b/src/test/regress/sql/rangetypes.sql
-index b51d6c405c2..4138418c7a6 100644
---- a/src/test/regress/sql/rangetypes.sql
-+++ b/src/test/regress/sql/rangetypes.sql
-@@ -314,13 +314,13 @@ select count(*) from test_range_gist where ir -|- int4multirange(int4range(100,2
- create table test_range_spgist(ir int4range);
- create index test_range_spgist_idx on test_range_spgist using spgist (ir);
- 
--insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 95 * 2000) g;
--insert into test_range_spgist select 'empty'::int4range from generate_series(1, 95 * 500) g;
--insert into test_range_spgist select int4range(g, g+10000) from generate_series(1, 95 * 1000) g;
--insert into test_range_spgist select 'empty'::int4range from generate_series(1, 95 * 500) g;
--insert into test_range_spgist select int4range(NULL,g*10,'(]') from generate_series(1, 95 * 100) g;
--insert into test_range_spgist select int4range(g*10,NULL,'(]') from generate_series(1, 95 * 100) g;
--insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 95 * 2000) g;
-+insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 0.1 * 95 * 2000) g;
-+insert into test_range_spgist select 'empty'::int4range from generate_series(1, 0.1 * 95 * 500) g;
-+insert into test_range_spgist select int4range(g, g+10000) from generate_series(1, 0.1 * 95 * 1000) g;
-+insert into test_range_spgist select 'empty'::int4range from generate_series(1, 0.1 * 95 * 500) g;
-+insert into test_range_spgist select int4range(NULL,g*10,'(]') from generate_series(1, 0.1 * 95 * 100) g;
-+insert into test_range_spgist select int4range(g*10,NULL,'(]') from generate_series(1, 0.1 * 95 * 100) g;
-+insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 0.1 * 95 * 2000) g;
- 
- -- first, verify non-indexed results
- SET enable_seqscan    = t;
-diff --git a/src/test/regress/sql/spgist.sql b/src/test/regress/sql/spgist.sql
-index 0c4f24e1d49..61e53375539 100644
---- a/src/test/regress/sql/spgist.sql
-+++ b/src/test/regress/sql/spgist.sql
-@@ -16,9 +16,9 @@ vacuum spgist_point_tbl;
- 
- -- Insert more data, to make the index a few levels deep.
- insert into spgist_point_tbl (id, p)
--select g,      point(g*10, g*10) from generate_series(1, 95 * 10000) g;
-+select g,      point(g*10, g*10) from generate_series(1, 0.1 * 95 * 10000) g;
- insert into spgist_point_tbl (id, p)
--select g+100000, point(g*10+1, g*10+1) from generate_series(1, 95 * 10000) g;
-+select g+100000, point(g*10+1, g*10+1) from generate_series(1, 0.1 * 95 * 10000) g;
- 
- -- To test vacuum, delete some entries from all over the index.
- delete from spgist_point_tbl where id % 2 = 1;
-@@ -37,8 +37,8 @@ vacuum spgist_point_tbl;
- create table spgist_box_tbl(id serial, b box);
- insert into spgist_box_tbl(b)
- select box(point(i,j),point(i+s,j+s))
--  from generate_series(1, 95 * 100,5) i,
--       generate_series(1, 95 * 100,5) j,
-+  from generate_series(1,100,5) i,
-+       generate_series(1,100,5) j,
-        generate_series(1, 95 * 10) s;
- create index spgist_box_idx on spgist_box_tbl using spgist (b);
- 
-@@ -86,6 +86,6 @@ create unlogged table spgist_unlogged_tbl(id serial, b box);
- create index spgist_unlogged_idx on spgist_unlogged_tbl using spgist (b);
- insert into spgist_unlogged_tbl(b)
- select box(point(i,j))
--  from generate_series(1, 95 * 100,5) i,
-+  from generate_series(1,100,5) i,
-        generate_series(1, 95 * 10,5) j;
- -- leave this table around, to help in testing dump/restore
-diff --git a/src/test/regress/sql/tuplesort.sql b/src/test/regress/sql/tuplesort.sql
-index fa762f26ac7..7a1fd619eba 100644
---- a/src/test/regress/sql/tuplesort.sql
-+++ b/src/test/regress/sql/tuplesort.sql
-@@ -276,7 +276,7 @@ ROLLBACK;
- CREATE TEMP TABLE test_mark_restore(col1 int, col2 int, col12 int);
- -- need a few duplicates for mark/restore to matter
- INSERT INTO test_mark_restore(col1, col2, col12)
--   SELECT a.i, b.i, a.i * b.i FROM generate_series(1, 95 * 500) a(i), generate_series(1, 95 * 5) b(i);
-+   SELECT a.i, b.i, a.i * b.i FROM generate_series(1, 500) a(i), generate_series(1, 95 * 5) b(i);
- 
- BEGIN;
- 

compute/patches/cloud_regress_pg17_ha_plus2.patch

@@ -1,593 +0,0 @@
-diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql
-index 249636c76c3..540c2b54dda 100644
---- a/src/test/regress/sql/box.sql
-+++ b/src/test/regress/sql/box.sql
-@@ -196,7 +196,7 @@ CREATE TABLE quad_box_tbl (id int, b box);
- 
- INSERT INTO quad_box_tbl
-   SELECT (x - 1) * 100 + y, box(point(x * 10, y * 10), point(x * 10 + 5, y * 10 + 5))
--  FROM generate_series(1, 95 * 100) x,
-+  FROM generate_series(1, 100) x,
-        generate_series(1, 95 * 100) y;
- 
- -- insert repeating data to test allTheSame
-diff --git a/src/test/regress/sql/brin.sql b/src/test/regress/sql/brin.sql
-index 39d3cd7821a..86efbb72609 100644
---- a/src/test/regress/sql/brin.sql
-+++ b/src/test/regress/sql/brin.sql
-@@ -476,7 +476,7 @@ CREATE TABLE brintest_3 (a text, b text, c text, d text);
- 
- -- long random strings (~2000 chars each, so ~6kB for min/max on two
- -- columns) to trigger toasting
--WITH rand_value AS (SELECT string_agg(fipshash(i::text),'') AS val FROM generate_series(1, 95 * 60) s(i))
-+WITH rand_value AS (SELECT string_agg(fipshash(i::text),'') AS val FROM generate_series(1,60) s(i))
- INSERT INTO brintest_3
- SELECT val, val, val, val FROM rand_value;
- 
-@@ -495,7 +495,7 @@ VACUUM brintest_3;
- -- retry insert with a different random-looking (but deterministic) value
- -- the value is different, and so should replace either min or max in the
- -- brin summary
--WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1, 95 * 60) s(i))
-+WITH rand_value AS (SELECT string_agg(fipshash((-i)::text),'') AS val FROM generate_series(1,60) s(i))
- INSERT INTO brintest_3
- SELECT val, val, val, val FROM rand_value;
- 
-diff --git a/src/test/regress/sql/brin_multi.sql b/src/test/regress/sql/brin_multi.sql
-index b7f7a9e8803..b1a109fe07f 100644
---- a/src/test/regress/sql/brin_multi.sql
-+++ b/src/test/regress/sql/brin_multi.sql
-@@ -612,7 +612,7 @@ CREATE TABLE brin_date_test(a DATE);
- INSERT INTO brin_date_test SELECT '4713-01-01 BC'::date + i FROM generate_series(1, 95 * 30) s(i);
- 
- -- insert values close to date minimum
--INSERT INTO brin_date_test SELECT '5874897-12-01'::date + i FROM generate_series(1, 95 * 30) s(i);
-+INSERT INTO brin_date_test SELECT '5874897-12-01'::date + i FROM generate_series(1, 30) s(i);
- 
- CREATE INDEX ON brin_date_test USING brin (a date_minmax_multi_ops) WITH (pages_per_range=1);
- 
-diff --git a/src/test/regress/sql/btree_index.sql b/src/test/regress/sql/btree_index.sql
-index d0d86db1667..88a752264a0 100644
---- a/src/test/regress/sql/btree_index.sql
-+++ b/src/test/regress/sql/btree_index.sql
-@@ -267,7 +267,7 @@ VACUUM delete_test_table;
- --
- -- The vacuum above should've turned the leaf page into a fast root. We just
- -- need to insert some rows to cause the fast root page to split.
--INSERT INTO delete_test_table SELECT i, 1, 2, 3 FROM generate_series(1, 95 * 1000) i;
-+INSERT INTO delete_test_table SELECT i, 1, 2, 3 FROM generate_series(1,1000) i;
- 
- -- Test unsupported btree opclass parameters
- create index on btree_tall_tbl (id int4_ops(foo=1));
-diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
-index 13006372064..1fd4cbfa7ef 100644
---- a/src/test/regress/sql/create_table.sql
-+++ b/src/test/regress/sql/create_table.sql
-@@ -47,7 +47,7 @@ DEALLOCATE select1;
- -- (temporarily hide query, to avoid the long CREATE TABLE stmt)
- \set ECHO none
- SELECT 'CREATE TABLE extra_wide_table(firstc text, '|| array_to_string(array_agg('c'||i||' bool'),',')||', lastc text);'
--FROM generate_series(1, 95 * 1100) g(i)
-+FROM generate_series(1, 1100) g(i)
- \gexec
- \set ECHO all
- INSERT INTO extra_wide_table(firstc, lastc) VALUES('first col', 'last col');
-@@ -74,7 +74,7 @@ CREATE TABLE default_expr_agg (a int DEFAULT (avg(1)));
- -- invalid use of subquery
- CREATE TABLE default_expr_agg (a int DEFAULT (select 1));
- -- invalid use of set-returning function
--CREATE TABLE default_expr_agg (a int DEFAULT (generate_series(1, 95 * 3)));
-+CREATE TABLE default_expr_agg (a int DEFAULT (generate_series(1,3)));
- 
- -- Verify that subtransaction rollback restores rd_createSubid.
- BEGIN;
-@@ -359,7 +359,7 @@ CREATE TABLE part_bogus_expr_fail PARTITION OF range_parted
- CREATE TABLE part_bogus_expr_fail PARTITION OF range_parted
-   FOR VALUES FROM ((select 1)) TO ('2019-01-01');
- CREATE TABLE part_bogus_expr_fail PARTITION OF range_parted
--  FOR VALUES FROM (generate_series(1, 95 * 3)) TO ('2019-01-01');
-+  FOR VALUES FROM (generate_series(1, 3)) TO ('2019-01-01');
- 
- -- trying to specify list for range partitioned table
- CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES IN ('a');
-diff --git a/src/test/regress/sql/fast_default.sql b/src/test/regress/sql/fast_default.sql
-index 28fefad6fe6..7d7060820e4 100644
---- a/src/test/regress/sql/fast_default.sql
-+++ b/src/test/regress/sql/fast_default.sql
-@@ -318,7 +318,7 @@ CREATE TABLE T (pk INT NOT NULL PRIMARY KEY);
- 
- SELECT set('t');
- 
--INSERT INTO T SELECT * FROM generate_series(1, 95 * 10) a;
-+INSERT INTO T SELECT * FROM generate_series(1, 10) a;
- 
- ALTER TABLE T ADD COLUMN c_bigint BIGINT NOT NULL DEFAULT -1;
- 
-@@ -326,7 +326,7 @@ INSERT INTO T SELECT b, b - 10 FROM generate_series(11, 20) a(b);
- 
- ALTER TABLE T ADD COLUMN c_text TEXT DEFAULT 'hello';
- 
--INSERT INTO T SELECT b, b - 10, (b + 10)::text FROM generate_series(21, 30) a(b);
-+INSERT INTO T SELECT b, b - 10, (b + 10)::text FROM generate_series(21, 95 * 30) a(b);
- 
- -- WHERE clause
- SELECT c_bigint, c_text FROM T WHERE c_bigint = -1 LIMIT 1;
-diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql
-index fcd5f91a39f..6ac90c57730 100644
---- a/src/test/regress/sql/hash_index.sql
-+++ b/src/test/regress/sql/hash_index.sql
-@@ -220,7 +220,7 @@ SELECT h.seqno AS f20000
- CREATE TABLE hash_split_heap (keycol INT);
- INSERT INTO hash_split_heap SELECT 1 FROM generate_series(1, 95 * 500) a;
- CREATE INDEX hash_split_index on hash_split_heap USING HASH (keycol);
--INSERT INTO hash_split_heap SELECT 1 FROM generate_series(1, 95 * 5000) a;
-+INSERT INTO hash_split_heap SELECT 1 FROM generate_series(1, POW(95, 0.5) * 5000) a;
- 
- -- Let's do a backward scan.
- BEGIN;
-@@ -236,7 +236,7 @@ END;
- 
- -- DELETE, INSERT, VACUUM.
- DELETE FROM hash_split_heap WHERE keycol = 1;
--INSERT INTO hash_split_heap SELECT a/2 FROM generate_series(1, 95 * 25000) a;
-+INSERT INTO hash_split_heap SELECT a/2 FROM generate_series(1, POW(95, 0.5) * 25000) a;
- 
- VACUUM hash_split_heap;
- 
-diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
-index 3920a9528ae..d6ce372d799 100644
---- a/src/test/regress/sql/horology.sql
-+++ b/src/test/regress/sql/horology.sql
-@@ -551,14 +551,14 @@ SELECT to_timestamp('2011-12-18 11:38 +01:xyz', 'YYYY-MM-DD HH12:MI OF');  -- er
- SELECT to_timestamp('2018-11-02 12:34:56.025', 'YYYY-MM-DD HH24:MI:SS.MS');
- 
- SELECT i, to_timestamp('2018-11-02 12:34:56', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('2018-11-02 12:34:56.1', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('2018-11-02 12:34:56.12', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('2018-11-02 12:34:56.123', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('2018-11-02 12:34:56.1234', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('2018-11-02 12:34:56.12345', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
-+SELECT i, to_timestamp('2018-11-02 12:34:56.1', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
-+SELECT i, to_timestamp('2018-11-02 12:34:56.12', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
-+SELECT i, to_timestamp('2018-11-02 12:34:56.123', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
-+SELECT i, to_timestamp('2018-11-02 12:34:56.1234', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
-+SELECT i, to_timestamp('2018-11-02 12:34:56.12345', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
- SELECT i, to_timestamp('2018-11-02 12:34:56.123456', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
- SELECT i, to_timestamp('2018-11-02 12:34:56.123456789', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 95 * 6) i;
--SELECT i, to_timestamp('20181102123456123456', 'YYYYMMDDHH24MISSFF' || i) FROM generate_series(1, 95 * 6) i;
-+SELECT i, to_timestamp('20181102123456123456', 'YYYYMMDDHH24MISSFF' || i) FROM generate_series(1, 6) i;
- 
- SELECT to_date('1 4 1902', 'Q MM YYYY');  -- Q is ignored
- SELECT to_date('3 4 21 01', 'W MM CC YY');
-diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
-index 96c19fa5297..276f6d25c67 100644
---- a/src/test/regress/sql/inherit.sql
-+++ b/src/test/regress/sql/inherit.sql
-@@ -742,7 +742,7 @@ create table inhcld1(f2 name, f1 int primary key);
- create table inhcld2(f1 int primary key, f2 name);
- alter table inhpar attach partition inhcld1 for values from (1) to (5);
- alter table inhpar attach partition inhcld2 for values from (5) to (100);
--insert into inhpar select x, x::text from generate_series(1, 95 * 10) x;
-+insert into inhpar select x, x::text from generate_series(1,10) x;
- 
- explain (verbose, costs off)
- update inhpar i set (f1, f2) = (select i.f1, i.f2 || '-' from int4_tbl limit 1);
-diff --git a/src/test/regress/sql/insert.sql b/src/test/regress/sql/insert.sql
-index c9fdd126d15..bbbda3d6237 100644
---- a/src/test/regress/sql/insert.sql
-+++ b/src/test/regress/sql/insert.sql
-@@ -320,8 +320,8 @@ create table part_ee_ff3_2 partition of part_ee_ff3 for values from (25) to (30)
- 
- truncate list_parted;
- insert into list_parted values ('aa'), ('cc');
--insert into list_parted select 'Ff', s.a from generate_series(1, 95 * 29) s(a);
--insert into list_parted select 'gg', s.a from generate_series(1, 95 * 9) s(a);
-+insert into list_parted select 'Ff', s.a from generate_series(1, 29) s(a);
-+insert into list_parted select 'gg', s.a from generate_series(1, 9) s(a);
- insert into list_parted (b) values (1);
- select tableoid::regclass::text, a, min(b) as min_b, max(b) as max_b from list_parted group by 1, 2 order by 1;
- 
-diff --git a/src/test/regress/sql/join_hash.sql b/src/test/regress/sql/join_hash.sql
-index 47abc031c0f..34c4d8c1312 100644
---- a/src/test/regress/sql/join_hash.sql
-+++ b/src/test/regress/sql/join_hash.sql
-@@ -310,9 +310,9 @@ rollback to settings;
- -- Exercise rescans.  We'll turn off parallel_leader_participation so
- -- that we can check that instrumentation comes back correctly.
- 
--create table join_foo as select generate_series(1, 95 * 3) as id, 'xxxxx'::text as t;
-+create table join_foo as select generate_series(1, POW(95, 0.5) * 3) as id, 'xxxxx'::text as t;
- alter table join_foo set (parallel_workers = 0);
--create table join_bar as select generate_series(1, 95 * 10000) as id, 'xxxxx'::text as t;
-+create table join_bar as select generate_series(1, POW(95, 0.5) * 10000) as id, 'xxxxx'::text as t;
- alter table join_bar set (parallel_workers = 2);
- 
- -- multi-batch with rescan, parallel-oblivious
-diff --git a/src/test/regress/sql/merge.sql b/src/test/regress/sql/merge.sql
-index b60271d9400..7d89c85179f 100644
---- a/src/test/regress/sql/merge.sql
-+++ b/src/test/regress/sql/merge.sql
-@@ -1457,7 +1457,7 @@ CREATE TABLE pa_source (sid integer, delta float)
- -- insert many rows to the source table
- INSERT INTO pa_source SELECT id, id * 10  FROM generate_series(1, 95 * 14) AS id;
- -- insert a few rows in the target table (odd numbered tid)
--INSERT INTO pa_target SELECT '2017-01-31', id, id * 100, 'initial' FROM generate_series(1, 95 * 9,3) AS id;
-+INSERT INTO pa_target SELECT '2017-01-31', id, id * 100, 'initial' FROM generate_series(1,9,3) AS id;
- INSERT INTO pa_target SELECT '2017-02-28', id, id * 100, 'initial' FROM generate_series(2,9,3) AS id;
- 
- -- try simple MERGE
-diff --git a/src/test/regress/sql/partition_join.sql b/src/test/regress/sql/partition_join.sql
-index 53a9b26d4c4..0c48dd2be78 100644
---- a/src/test/regress/sql/partition_join.sql
-+++ b/src/test/regress/sql/partition_join.sql
-@@ -13,7 +13,7 @@ CREATE TABLE prt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
- CREATE TABLE prt1_p1 PARTITION OF prt1 FOR VALUES FROM (0) TO (250);
- CREATE TABLE prt1_p3 PARTITION OF prt1 FOR VALUES FROM (500) TO (600);
- CREATE TABLE prt1_p2 PARTITION OF prt1 FOR VALUES FROM (250) TO (500);
--INSERT INTO prt1 SELECT i, i % 25, to_char(i, 'FM0000') FROM generate_series(0, 95 * 599) i WHERE i % 2 = 0;
-+INSERT INTO prt1 SELECT i, i % 25, to_char(i, 'FM0000') FROM generate_series(0,599) i WHERE i % 2 = 0;
- CREATE INDEX iprt1_p1_a on prt1_p1(a);
- CREATE INDEX iprt1_p2_a on prt1_p2(a);
- CREATE INDEX iprt1_p3_a on prt1_p3(a);
-@@ -23,7 +23,7 @@ CREATE TABLE prt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
- CREATE TABLE prt2_p1 PARTITION OF prt2 FOR VALUES FROM (0) TO (250);
- CREATE TABLE prt2_p2 PARTITION OF prt2 FOR VALUES FROM (250) TO (500);
- CREATE TABLE prt2_p3 PARTITION OF prt2 FOR VALUES FROM (500) TO (600);
--INSERT INTO prt2 SELECT i % 25, i, to_char(i, 'FM0000') FROM generate_series(0, 95 * 599) i WHERE i % 3 = 0;
-+INSERT INTO prt2 SELECT i % 25, i, to_char(i, 'FM0000') FROM generate_series(0,599) i WHERE i % 3 = 0;
- CREATE INDEX iprt2_p1_b on prt2_p1(b);
- CREATE INDEX iprt2_p2_b on prt2_p2(b);
- CREATE INDEX iprt2_p3_b on prt2_p3(b);
-@@ -149,7 +149,7 @@ CREATE TABLE prt1_e (a int, b int, c int) PARTITION BY RANGE(((a + b)/2));
- CREATE TABLE prt1_e_p1 PARTITION OF prt1_e FOR VALUES FROM (0) TO (250);
- CREATE TABLE prt1_e_p2 PARTITION OF prt1_e FOR VALUES FROM (250) TO (500);
- CREATE TABLE prt1_e_p3 PARTITION OF prt1_e FOR VALUES FROM (500) TO (600);
--INSERT INTO prt1_e SELECT i, i, i % 25 FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt1_e SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
- CREATE INDEX iprt1_e_p1_ab2 on prt1_e_p1(((a+b)/2));
- CREATE INDEX iprt1_e_p2_ab2 on prt1_e_p2(((a+b)/2));
- CREATE INDEX iprt1_e_p3_ab2 on prt1_e_p3(((a+b)/2));
-@@ -159,7 +159,7 @@ CREATE TABLE prt2_e (a int, b int, c int) PARTITION BY RANGE(((b + a)/2));
- CREATE TABLE prt2_e_p1 PARTITION OF prt2_e FOR VALUES FROM (0) TO (250);
- CREATE TABLE prt2_e_p2 PARTITION OF prt2_e FOR VALUES FROM (250) TO (500);
- CREATE TABLE prt2_e_p3 PARTITION OF prt2_e FOR VALUES FROM (500) TO (600);
--INSERT INTO prt2_e SELECT i, i, i % 25 FROM generate_series(0, 95 * 599, 3) i;
-+INSERT INTO prt2_e SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
- ANALYZE prt2_e;
- 
- EXPLAIN (COSTS OFF)
-@@ -248,14 +248,14 @@ CREATE TABLE prt1_m (a int, b int, c int) PARTITION BY RANGE(a, ((a + b)/2));
- CREATE TABLE prt1_m_p1 PARTITION OF prt1_m FOR VALUES FROM (0, 0) TO (250, 250);
- CREATE TABLE prt1_m_p2 PARTITION OF prt1_m FOR VALUES FROM (250, 250) TO (500, 500);
- CREATE TABLE prt1_m_p3 PARTITION OF prt1_m FOR VALUES FROM (500, 500) TO (600, 600);
--INSERT INTO prt1_m SELECT i, i, i % 25 FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt1_m SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
- ANALYZE prt1_m;
- 
- CREATE TABLE prt2_m (a int, b int, c int) PARTITION BY RANGE(((b + a)/2), b);
- CREATE TABLE prt2_m_p1 PARTITION OF prt2_m FOR VALUES FROM (0, 0) TO (250, 250);
- CREATE TABLE prt2_m_p2 PARTITION OF prt2_m FOR VALUES FROM (250, 250) TO (500, 500);
- CREATE TABLE prt2_m_p3 PARTITION OF prt2_m FOR VALUES FROM (500, 500) TO (600, 600);
--INSERT INTO prt2_m SELECT i, i, i % 25 FROM generate_series(0, 95 * 599, 3) i;
-+INSERT INTO prt2_m SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
- ANALYZE prt2_m;
- 
- EXPLAIN (COSTS OFF)
-@@ -269,14 +269,14 @@ CREATE TABLE plt1 (a int, b int, c text) PARTITION BY LIST(c);
- CREATE TABLE plt1_p1 PARTITION OF plt1 FOR VALUES IN ('0000', '0003', '0004', '0010');
- CREATE TABLE plt1_p2 PARTITION OF plt1 FOR VALUES IN ('0001', '0005', '0002', '0009');
- CREATE TABLE plt1_p3 PARTITION OF plt1 FOR VALUES IN ('0006', '0007', '0008', '0011');
--INSERT INTO plt1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO plt1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE plt1;
- 
- CREATE TABLE plt2 (a int, b int, c text) PARTITION BY LIST(c);
- CREATE TABLE plt2_p1 PARTITION OF plt2 FOR VALUES IN ('0000', '0003', '0004', '0010');
- CREATE TABLE plt2_p2 PARTITION OF plt2 FOR VALUES IN ('0001', '0005', '0002', '0009');
- CREATE TABLE plt2_p3 PARTITION OF plt2 FOR VALUES IN ('0006', '0007', '0008', '0011');
--INSERT INTO plt2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 95 * 599, 3) i;
-+INSERT INTO plt2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 3) i;
- ANALYZE plt2;
- 
- --
-@@ -286,7 +286,7 @@ CREATE TABLE plt1_e (a int, b int, c text) PARTITION BY LIST(ltrim(c, 'A'));
- CREATE TABLE plt1_e_p1 PARTITION OF plt1_e FOR VALUES IN ('0000', '0003', '0004', '0010');
- CREATE TABLE plt1_e_p2 PARTITION OF plt1_e FOR VALUES IN ('0001', '0005', '0002', '0009');
- CREATE TABLE plt1_e_p3 PARTITION OF plt1_e FOR VALUES IN ('0006', '0007', '0008', '0011');
--INSERT INTO plt1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO plt1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE plt1_e;
- 
- -- test partition matching with N-way join
-@@ -371,7 +371,7 @@ CREATE TABLE prt1_l_p2_p2 PARTITION OF prt1_l_p2 FOR VALUES IN ('0002', '0003');
- CREATE TABLE prt1_l_p3 PARTITION OF prt1_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (b);
- CREATE TABLE prt1_l_p3_p1 PARTITION OF prt1_l_p3 FOR VALUES FROM (0) TO (13);
- CREATE TABLE prt1_l_p3_p2 PARTITION OF prt1_l_p3 FOR VALUES FROM (13) TO (25);
--INSERT INTO prt1_l SELECT i, i % 25, to_char(i % 4, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt1_l SELECT i, i % 25, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE prt1_l;
- 
- CREATE TABLE prt2_l (a int, b int, c varchar) PARTITION BY RANGE(b);
-@@ -382,7 +382,7 @@ CREATE TABLE prt2_l_p2_p2 PARTITION OF prt2_l_p2 FOR VALUES IN ('0002', '0003');
- CREATE TABLE prt2_l_p3 PARTITION OF prt2_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (a);
- CREATE TABLE prt2_l_p3_p1 PARTITION OF prt2_l_p3 FOR VALUES FROM (0) TO (13);
- CREATE TABLE prt2_l_p3_p2 PARTITION OF prt2_l_p3 FOR VALUES FROM (13) TO (25);
--INSERT INTO prt2_l SELECT i % 25, i, to_char(i % 4, 'FM0000') FROM generate_series(0, 95 * 599, 3) i;
-+INSERT INTO prt2_l SELECT i % 25, i, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 3) i;
- ANALYZE prt2_l;
- 
- -- inner join, qual covering only top-level partitions
-@@ -453,27 +453,27 @@ WHERE EXISTS (
- CREATE TABLE prt1_n (a int, b int, c varchar) PARTITION BY RANGE(c);
- CREATE TABLE prt1_n_p1 PARTITION OF prt1_n FOR VALUES FROM ('0000') TO ('0250');
- CREATE TABLE prt1_n_p2 PARTITION OF prt1_n FOR VALUES FROM ('0250') TO ('0500');
--INSERT INTO prt1_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 95 * 499, 2) i;
-+INSERT INTO prt1_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 499, 2) i;
- ANALYZE prt1_n;
- 
- CREATE TABLE prt2_n (a int, b int, c text) PARTITION BY LIST(c);
- CREATE TABLE prt2_n_p1 PARTITION OF prt2_n FOR VALUES IN ('0000', '0003', '0004', '0010', '0006', '0007');
- CREATE TABLE prt2_n_p2 PARTITION OF prt2_n FOR VALUES IN ('0001', '0005', '0002', '0009', '0008', '0011');
--INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE prt2_n;
- 
- CREATE TABLE prt3_n (a int, b int, c text) PARTITION BY LIST(c);
- CREATE TABLE prt3_n_p1 PARTITION OF prt3_n FOR VALUES IN ('0000', '0004', '0006', '0007');
- CREATE TABLE prt3_n_p2 PARTITION OF prt3_n FOR VALUES IN ('0001', '0002', '0008', '0010');
- CREATE TABLE prt3_n_p3 PARTITION OF prt3_n FOR VALUES IN ('0003', '0005', '0009', '0011');
--INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE prt3_n;
- 
- CREATE TABLE prt4_n (a int, b int, c text) PARTITION BY RANGE(a);
- CREATE TABLE prt4_n_p1 PARTITION OF prt4_n FOR VALUES FROM (0) TO (300);
- CREATE TABLE prt4_n_p2 PARTITION OF prt4_n FOR VALUES FROM (300) TO (500);
- CREATE TABLE prt4_n_p3 PARTITION OF prt4_n FOR VALUES FROM (500) TO (600);
--INSERT INTO prt4_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 95 * 599, 2) i;
-+INSERT INTO prt4_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 599, 2) i;
- ANALYZE prt4_n;
- 
- -- partitionwise join can not be applied if the partition ranges differ
-@@ -533,7 +533,7 @@ create temp table prtx2_3 partition of prtx2 for values from (21) to (31);
- insert into prtx1 select 1 + i%30, i, i
-   from generate_series(1, 95 * 1000) i;
- insert into prtx2 select 1 + i%30, i, i
--  from generate_series(1, 95 * 500) i, generate_series(1, 95 * 10) j;
-+  from generate_series(1, 500) i, generate_series(1, 95 * 10) j;
- create index on prtx2 (b);
- create index on prtx2 (c);
- analyze prtx1;
-@@ -1202,7 +1202,7 @@ CREATE TABLE fract_t0 PARTITION OF fract_t FOR VALUES FROM ('0') TO ('1000');
- CREATE TABLE fract_t1 PARTITION OF fract_t FOR VALUES FROM ('1000') TO ('2000');
- 
- -- insert data
--INSERT INTO fract_t (id) (SELECT generate_series(0, 95 * 1999));
-+INSERT INTO fract_t (id) (SELECT generate_series(0, 1999));
- ANALYZE fract_t;
- 
- -- verify plan; nested index only scans
-diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
-index 82ac39d5dc8..6a0c7a3666d 100644
---- a/src/test/regress/sql/partition_prune.sql
-+++ b/src/test/regress/sql/partition_prune.sql
-@@ -512,7 +512,7 @@ create table list_part2 partition of list_part for values in (2);
- create table list_part3 partition of list_part for values in (3);
- create table list_part4 partition of list_part for values in (4);
- 
--insert into list_part select generate_series(1, 95 * 4);
-+insert into list_part select generate_series(1, 4);
- 
- begin;
- 
-@@ -940,7 +940,7 @@ create table ma_test (a int, b int) partition by range (a);
- create table ma_test_p1 partition of ma_test for values from (0) to (10);
- create table ma_test_p2 partition of ma_test for values from (10) to (20);
- create table ma_test_p3 partition of ma_test for values from (20) to (30);
--insert into ma_test select x,x from generate_series(0, 95 * 29) t(x);
-+insert into ma_test select x,x from generate_series(0,29) t(x);
- create index on ma_test (b);
- 
- analyze ma_test;
-@@ -1263,7 +1263,7 @@ create table hp_prefix_test (a int, b int, c int, d int)
- 
- -- create 8 partitions
- select 'create table hp_prefix_test_p' || x::text || ' partition of hp_prefix_test for values with (modulus 8, remainder ' || x::text || ');'
--from generate_series(0, 95 * 7) x;
-+from generate_series(0, 7) x;
- \gexec
- 
- -- insert 16 rows, one row for each test to perform.
-@@ -1274,9 +1274,9 @@ select
-   case c when 0 then null else 3 end,
-   case d when 0 then null else 4 end
- from
--  generate_series(0, 95 * 1) a,
--  generate_series(0, 95 * 1) b,
--  generate_series(0, 95 * 1) c,
-+  generate_series(0, 1) a,
-+  generate_series(0, 1) b,
-+  generate_series(0, 1) c,
-   generate_series(0, 95 * 1) d;
- 
- -- Ensure partition pruning works correctly for each combination of IS NULL
-diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
-index d18cc331561..435d3d718e1 100644
---- a/src/test/regress/sql/plpgsql.sql
-+++ b/src/test/regress/sql/plpgsql.sql
-@@ -4581,12 +4581,12 @@ CREATE TRIGGER transition_table_level2_ri_child_upd_trigger
- 
- -- create initial test data
- INSERT INTO transition_table_level1 (level1_no)
--  SELECT generate_series(1, 95 * 200);
-+  SELECT generate_series(1,200);
- ANALYZE transition_table_level1;
- 
- INSERT INTO transition_table_level2 (level2_no, parent_no)
-   SELECT level2_no, level2_no / 50 + 1 AS parent_no
--    FROM generate_series(1, 95 * 9999) level2_no;
-+    FROM generate_series(1,9999) level2_no;
- ANALYZE transition_table_level2;
- 
- INSERT INTO transition_table_status (level, node_no, status)
-diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql
-index d39a2b4e8f8..2d862985510 100644
---- a/src/test/regress/sql/polygon.sql
-+++ b/src/test/regress/sql/polygon.sql
-@@ -42,7 +42,7 @@ CREATE TABLE quad_poly_tbl (id int, p polygon);
- 
- INSERT INTO quad_poly_tbl
- 	SELECT (x - 1) * 100 + y, polygon(circle(point(x * 10, y * 10), 1 + (x + y) % 10))
--	FROM generate_series(1, 95 * 100) x,
-+	FROM generate_series(1, 100) x,
- 		 generate_series(1, 95 * 100) y;
- 
- INSERT INTO quad_poly_tbl
-diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
-index 12c40039b18..e08b0aee00e 100644
---- a/src/test/regress/sql/psql.sql
-+++ b/src/test/regress/sql/psql.sql
-@@ -187,7 +187,7 @@ select 'drop table gexec_test', 'select ''2000-01-01''::date as party_over'
- prepare q as select array_to_string(array_agg(repeat('x',2*n)),E'\n') as "ab
- 
- c", array_to_string(array_agg(repeat('y',20-2*n)),E'\n') as "a
--bc" from generate_series(1, 95 * 10) as n(n) group by n>1 order by n>1;
-+bc" from generate_series(1,10) as n(n) group by n>1 order by n>1;
- 
- \pset linestyle ascii
- 
-@@ -304,7 +304,7 @@ execute q;
- deallocate q;
- 
- -- test single-line header and data
--prepare q as select repeat('x',2*n) as "0123456789abcdef", repeat('y',20-2*n) as "0123456789" from generate_series(1, 95 * 10) as n;
-+prepare q as select repeat('x',2*n) as "0123456789abcdef", repeat('y',20-2*n) as "0123456789" from generate_series(1,10) as n;
- 
- \pset linestyle ascii
- 
-@@ -1220,7 +1220,7 @@ create table child_10_20 partition of parent_tab
-   for values from (10) to (20);
- create table child_20_30 partition of parent_tab
-   for values from (20) to (30);
--insert into parent_tab values (generate_series(0, 95 * 29));
-+insert into parent_tab values (generate_series(0,29));
- create table child_30_40 partition of parent_tab
- for values from (30) to (40)
-   partition by range(id);
-diff --git a/src/test/regress/sql/rangetypes.sql b/src/test/regress/sql/rangetypes.sql
-index b51d6c405c2..a2d50d7bb43 100644
---- a/src/test/regress/sql/rangetypes.sql
-+++ b/src/test/regress/sql/rangetypes.sql
-@@ -314,13 +314,13 @@ select count(*) from test_range_gist where ir -|- int4multirange(int4range(100,2
- create table test_range_spgist(ir int4range);
- create index test_range_spgist_idx on test_range_spgist using spgist (ir);
- 
--insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 95 * 2000) g;
--insert into test_range_spgist select 'empty'::int4range from generate_series(1, 95 * 500) g;
--insert into test_range_spgist select int4range(g, g+10000) from generate_series(1, 95 * 1000) g;
--insert into test_range_spgist select 'empty'::int4range from generate_series(1, 95 * 500) g;
--insert into test_range_spgist select int4range(NULL,g*10,'(]') from generate_series(1, 95 * 100) g;
--insert into test_range_spgist select int4range(g*10,NULL,'(]') from generate_series(1, 95 * 100) g;
--insert into test_range_spgist select int4range(g, g+10) from generate_series(1, 95 * 2000) g;
-+insert into test_range_spgist select int4range(g, g+10) from generate_series(1, POW(95, 0.5)::int * 2000) g;
-+insert into test_range_spgist select 'empty'::int4range from generate_series(1, POW(95, 0.5)::int * 500) g;
-+insert into test_range_spgist select int4range(g, g+10000) from generate_series(1, POW(95, 0.5)::int * 1000) g;
-+insert into test_range_spgist select 'empty'::int4range from generate_series(1, POW(95, 0.5)::int * 500) g;
-+insert into test_range_spgist select int4range(NULL,g*10,'(]') from generate_series(1, POW(95, 0.5)::int * 100) g;
-+insert into test_range_spgist select int4range(g*10,NULL,'(]') from generate_series(1, POW(95, 0.5)::int * 100) g;
-+insert into test_range_spgist select int4range(g, g+10) from generate_series(1, POW(95, 0.5)::int * 2000) g;
- 
- -- first, verify non-indexed results
- SET enable_seqscan    = t;
-diff --git a/src/test/regress/sql/spgist.sql b/src/test/regress/sql/spgist.sql
-index 0c4f24e1d49..ed9f7c45411 100644
---- a/src/test/regress/sql/spgist.sql
-+++ b/src/test/regress/sql/spgist.sql
-@@ -16,9 +16,9 @@ vacuum spgist_point_tbl;
- 
- -- Insert more data, to make the index a few levels deep.
- insert into spgist_point_tbl (id, p)
--select g,      point(g*10, g*10) from generate_series(1, 95 * 10000) g;
-+select g,      point(g*10, g*10) from generate_series(1, POW(95, 0.5) * 10000) g;
- insert into spgist_point_tbl (id, p)
--select g+100000, point(g*10+1, g*10+1) from generate_series(1, 95 * 10000) g;
-+select g+100000, point(g*10+1, g*10+1) from generate_series(1, POW(95, 0.5) * 10000) g;
- 
- -- To test vacuum, delete some entries from all over the index.
- delete from spgist_point_tbl where id % 2 = 1;
-@@ -37,8 +37,8 @@ vacuum spgist_point_tbl;
- create table spgist_box_tbl(id serial, b box);
- insert into spgist_box_tbl(b)
- select box(point(i,j),point(i+s,j+s))
--  from generate_series(1, 95 * 100,5) i,
--       generate_series(1, 95 * 100,5) j,
-+  from generate_series(1,100,5) i,
-+       generate_series(1,100,5) j,
-        generate_series(1, 95 * 10) s;
- create index spgist_box_idx on spgist_box_tbl using spgist (b);
- 
-@@ -86,6 +86,6 @@ create unlogged table spgist_unlogged_tbl(id serial, b box);
- create index spgist_unlogged_idx on spgist_unlogged_tbl using spgist (b);
- insert into spgist_unlogged_tbl(b)
- select box(point(i,j))
--  from generate_series(1, 95 * 100,5) i,
-+  from generate_series(1,100,5) i,
-        generate_series(1, 95 * 10,5) j;
- -- leave this table around, to help in testing dump/restore
-diff --git a/src/test/regress/sql/tuplesort.sql b/src/test/regress/sql/tuplesort.sql
-index 133491a0d70..0642902ad53 100644
---- a/src/test/regress/sql/tuplesort.sql
-+++ b/src/test/regress/sql/tuplesort.sql
-@@ -19,7 +19,7 @@ INSERT INTO abbrev_abort_uuids (abort_increasing, abort_decreasing, noabort_incr
-         ('00000000-0000-0000-0000-'||to_char(20000 - g.i, '000000000000FM'))::uuid abort_decreasing,
-         (to_char(g.i % 10009, '00000000FM')||'-0000-0000-0000-'||to_char(g.i, '000000000000FM'))::uuid noabort_increasing,
-         (to_char(((20000 - g.i) % 10009), '00000000FM')||'-0000-0000-0000-'||to_char(20000 - g.i, '000000000000FM'))::uuid noabort_decreasing
--    FROM generate_series(0, 95 * 20000, 1) g(i);
-+    FROM generate_series(0, 20000, 1) g(i);
- 
- -- and a few NULLs
- INSERT INTO abbrev_abort_uuids(id) VALUES(0);
-@@ -276,7 +276,7 @@ ROLLBACK;
- CREATE TEMP TABLE test_mark_restore(col1 int, col2 int, col12 int);
- -- need a few duplicates for mark/restore to matter
- INSERT INTO test_mark_restore(col1, col2, col12)
--   SELECT a.i, b.i, a.i * b.i FROM generate_series(1, 95 * 500) a(i), generate_series(1, 95 * 5) b(i);
-+   SELECT a.i, b.i, a.i * b.i FROM generate_series(1, 500) a(i), generate_series(1, 95 * 5) b(i);
- 
- BEGIN;
- 
-diff --git a/src/test/regress/sql/updatable_views.sql b/src/test/regress/sql/updatable_views.sql
-index e4ad5c274fe..e1894d2d9cc 100644
---- a/src/test/regress/sql/updatable_views.sql
-+++ b/src/test/regress/sql/updatable_views.sql
-@@ -494,7 +494,7 @@ MERGE INTO rw_view2 t
- SELECT * FROM base_tbl ORDER BY a;
- 
- MERGE INTO rw_view2 t
--  USING (SELECT x, 'r'||x FROM generate_series(0, 95 * 2) x) AS s(a,b) ON t.a = s.a
-+  USING (SELECT x, 'r'||x FROM generate_series(0,2) x) AS s(a,b) ON t.a = s.a
-   WHEN MATCHED THEN UPDATE SET b = s.b
-   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b)
-   WHEN NOT MATCHED BY SOURCE THEN UPDATE SET b = 'Not matched by source'
-@@ -519,7 +519,7 @@ MERGE INTO rw_view2 t
-   WHEN MATCHED THEN UPDATE SET b = s.b
-   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b); -- should fail
- MERGE INTO rw_view2 t
--  USING (SELECT x, 'R'||x FROM generate_series(0, 95 * 3) x) AS s(a,b) ON t.a = s.a
-+  USING (SELECT x, 'R'||x FROM generate_series(0,3) x) AS s(a,b) ON t.a = s.a
-   WHEN MATCHED THEN UPDATE SET b = s.b
-   WHEN NOT MATCHED AND s.a > 0 THEN INSERT VALUES (s.a, s.b); -- ok
- 
-diff --git a/src/test/regress/sql/vacuum.sql b/src/test/regress/sql/vacuum.sql
-index 6a2f5815ab2..a63cf5cd12c 100644
---- a/src/test/regress/sql/vacuum.sql
-+++ b/src/test/regress/sql/vacuum.sql
-@@ -156,7 +156,7 @@ CREATE TABLE no_index_cleanup (i INT PRIMARY KEY, t TEXT);
- -- Use uncompressed data stored in toast.
- CREATE INDEX no_index_cleanup_idx ON no_index_cleanup(t);
- ALTER TABLE no_index_cleanup ALTER COLUMN t SET STORAGE EXTERNAL;
--INSERT INTO no_index_cleanup(i, t) VALUES (generate_series(1, 95 * 30),
-+INSERT INTO no_index_cleanup(i, t) VALUES (generate_series(1,30),
-     repeat('1234567890',269));
- -- index cleanup option is ignored if VACUUM FULL
- VACUUM (INDEX_CLEANUP TRUE, FULL TRUE) no_index_cleanup;

compute/patches/rum.patch

@@ -7,7 +7,7 @@ index 255e616..1c6edb7 100644
  			 RelationGetRelationName(index));
  
 +#ifdef NEON_SMGR
-+	smgr_start_unlogged_build(RelationGetSmgr(index));
++	smgr_start_unlogged_build(index->rd_smgr);
 +#endif
 +
  	initRumState(&buildstate.rumstate, index);
@@ -18,7 +18,7 @@ index 255e616..1c6edb7 100644
  	rumUpdateStats(index, &buildstate.buildStats, buildstate.rumstate.isBuild);
  
 +#ifdef NEON_SMGR
-+	smgr_finish_unlogged_build_phase_1(RelationGetSmgr(index));
++	smgr_finish_unlogged_build_phase_1(index->rd_smgr);
 +#endif
 +
  	/*
@@ -29,7 +29,7 @@ index 255e616..1c6edb7 100644
  	}
  
 +#ifdef NEON_SMGR
-+	smgr_end_unlogged_build(RelationGetSmgr(index));
++	smgr_end_unlogged_build(index->rd_smgr);
 +#endif
 +
  	/*

libs/neon-shmem/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "neon-shmem"
-version = "0.1.0"
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-thiserror.workspace = true
-nix.workspace=true
-workspace_hack = { version = "0.1", path = "../../workspace_hack" }
-
-[target.'cfg(target_os = "macos")'.dependencies]
-tempfile = "3.14.0"

libs/neon-shmem/src/lib.rs

@@ -1,418 +0,0 @@
-//! Shared memory utilities for neon communicator
-
-use std::num::NonZeroUsize;
-use std::os::fd::{AsFd, BorrowedFd, OwnedFd};
-use std::ptr::NonNull;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use nix::errno::Errno;
-use nix::sys::mman::MapFlags;
-use nix::sys::mman::ProtFlags;
-use nix::sys::mman::mmap as nix_mmap;
-use nix::sys::mman::munmap as nix_munmap;
-use nix::unistd::ftruncate as nix_ftruncate;
-
-/// ShmemHandle represents a shared memory area that can be shared by processes over fork().
-/// Unlike shared memory allocated by Postgres, this area is resizable, up to 'max_size' that's
-/// specified at creation.
-///
-/// The area is backed by an anonymous file created with memfd_create(). The full address space for
-/// 'max_size' is reserved up-front with mmap(), but whenever you call [`ShmemHandle::set_size`],
-/// the underlying file is resized. Do not access the area beyond the current size. Currently, that
-/// will cause the file to be expanded, but we might use mprotect() etc. to enforce that in the
-/// future.
-pub struct ShmemHandle {
-    /// memfd file descriptor
-    fd: OwnedFd,
-
-    max_size: usize,
-
-    // Pointer to the beginning of the shared memory area. The header is stored there.
-    shared_ptr: NonNull<SharedStruct>,
-
-    // Pointer to the beginning of the user data
-    pub data_ptr: NonNull<u8>,
-}
-
-/// This is stored at the beginning in the shared memory area.
-struct SharedStruct {
-    max_size: usize,
-
-    /// Current size of the backing file. The high-order bit is used for the RESIZE_IN_PROGRESS flag
-    current_size: AtomicUsize,
-}
-
-const RESIZE_IN_PROGRESS: usize = 1 << 63;
-
-const HEADER_SIZE: usize = std::mem::size_of::<SharedStruct>();
-
-/// Error type returned by the ShmemHandle functions.
-#[derive(thiserror::Error, Debug)]
-#[error("{msg}: {errno}")]
-pub struct Error {
-    pub msg: String,
-    pub errno: Errno,
-}
-
-impl Error {
-    fn new(msg: &str, errno: Errno) -> Error {
-        Error {
-            msg: msg.to_string(),
-            errno,
-        }
-    }
-}
-
-impl ShmemHandle {
-    /// Create a new shared memory area. To communicate between processes, the processes need to be
-    /// fork()'d after calling this, so that the ShmemHandle is inherited by all processes.
-    ///
-    /// If the ShmemHandle is dropped, the memory is unmapped from the current process. Other
-    /// processes can continue using it, however.
-    pub fn new(name: &str, initial_size: usize, max_size: usize) -> Result<ShmemHandle, Error> {
-        // create the backing anonymous file.
-        let fd = create_backing_file(name)?;
-
-        Self::new_with_fd(fd, initial_size, max_size)
-    }
-
-    fn new_with_fd(
-        fd: OwnedFd,
-        initial_size: usize,
-        max_size: usize,
-    ) -> Result<ShmemHandle, Error> {
-        // We reserve the high-order bit for the RESIZE_IN_PROGRESS flag, and the actual size
-        // is a little larger than this because of the SharedStruct header. Make the upper limit
-        // somewhat smaller than that, because with anything close to that, you'll run out of
-        // memory anyway.
-        if max_size >= 1 << 48 {
-            panic!("max size {} too large", max_size);
-        }
-        if initial_size > max_size {
-            panic!("initial size {initial_size} larger than max size {max_size}");
-        }
-
-        // The actual initial / max size is the one given by the caller, plus the size of
-        // 'SharedStruct'.
-        let initial_size = HEADER_SIZE + initial_size;
-        let max_size = NonZeroUsize::new(HEADER_SIZE + max_size).unwrap();
-
-        // Reserve address space for it with mmap
-        //
-        // TODO: Use MAP_HUGETLB if possible
-        let start_ptr = unsafe {
-            nix_mmap(
-                None,
-                max_size,
-                ProtFlags::PROT_READ | ProtFlags::PROT_WRITE,
-                MapFlags::MAP_SHARED,
-                &fd,
-                0,
-            )
-        }
-        .map_err(|e| Error::new("mmap failed: {e}", e))?;
-
-        // Reserve space for the initial size
-        enlarge_file(fd.as_fd(), initial_size as u64)?;
-
-        // Initialize the header
-        let shared: NonNull<SharedStruct> = start_ptr.cast();
-        unsafe {
-            shared.write(SharedStruct {
-                max_size: max_size.into(),
-                current_size: AtomicUsize::new(initial_size),
-            })
-        };
-
-        // The user data begins after the header
-        let data_ptr = unsafe { start_ptr.cast().add(HEADER_SIZE) };
-
-        Ok(ShmemHandle {
-            fd,
-            max_size: max_size.into(),
-            shared_ptr: shared,
-            data_ptr,
-        })
-    }
-
-    // return reference to the header
-    fn shared(&self) -> &SharedStruct {
-        unsafe { self.shared_ptr.as_ref() }
-    }
-
-    /// Resize the shared memory area. 'new_size' must not be larger than the 'max_size' specified
-    /// when creating the area.
-    ///
-    /// This may only be called from one process/thread concurrently. We detect that case
-    /// and return an Error.
-    pub fn set_size(&self, new_size: usize) -> Result<(), Error> {
-        let new_size = new_size + HEADER_SIZE;
-        let shared = self.shared();
-
-        if new_size > self.max_size {
-            panic!(
-                "new size ({} is greater than max size ({})",
-                new_size, self.max_size
-            );
-        }
-        assert_eq!(self.max_size, shared.max_size);
-
-        // Lock the area by setting the bit in 'current_size'
-        //
-        // Ordering::Relaxed would probably be sufficient here, as we don't access any other memory
-        // and the posix_fallocate/ftruncate call is surely a synchronization point anyway. But
-        // since this is not performance-critical, better safe than sorry .
-        let mut old_size = shared.current_size.load(Ordering::Acquire);
-        loop {
-            if (old_size & RESIZE_IN_PROGRESS) != 0 {
-                return Err(Error::new(
-                    "concurrent resize detected",
-                    Errno::UnknownErrno,
-                ));
-            }
-            match shared.current_size.compare_exchange(
-                old_size,
-                new_size,
-                Ordering::Acquire,
-                Ordering::Relaxed,
-            ) {
-                Ok(_) => break,
-                Err(x) => old_size = x,
-            }
-        }
-
-        // Ok, we got the lock.
-        //
-        // NB: If anything goes wrong, we *must* clear the bit!
-        let result = {
-            use std::cmp::Ordering::{Equal, Greater, Less};
-            match new_size.cmp(&old_size) {
-                Less => nix_ftruncate(&self.fd, new_size as i64).map_err(|e| {
-                    Error::new("could not shrink shmem segment, ftruncate failed: {e}", e)
-                }),
-                Equal => Ok(()),
-                Greater => enlarge_file(self.fd.as_fd(), new_size as u64),
-            }
-        };
-
-        // Unlock
-        shared.current_size.store(
-            if result.is_ok() { new_size } else { old_size },
-            Ordering::Release,
-        );
-
-        result
-    }
-
-    /// Returns the current user-visible size of the shared memory segment.
-    ///
-    /// NOTE: a concurrent set_size() call can change the size at any time. It is the caller's
-    /// responsibility not to access the area beyond the current size.
-    pub fn current_size(&self) -> usize {
-        let total_current_size =
-            self.shared().current_size.load(Ordering::Relaxed) & !RESIZE_IN_PROGRESS;
-        total_current_size - HEADER_SIZE
-    }
-}
-
-impl Drop for ShmemHandle {
-    fn drop(&mut self) {
-        // SAFETY: The pointer was obtained from mmap() with the given size.
-        // We unmap the entire region.
-        let _ = unsafe { nix_munmap(self.shared_ptr.cast(), self.max_size) };
-        // The fd is dropped automatically by OwnedFd.
-    }
-}
-
-/// Create a "backing file" for the shared memory area. On Linux, use memfd_create(), to create an
-/// anonymous in-memory file. One macos, fall back to a regular file. That's good enough for
-/// development and testing, but in production we want the file to stay in memory.
-///
-/// disable 'unused_variables' warnings, because in the macos path, 'name' is unused.
-#[allow(unused_variables)]
-fn create_backing_file(name: &str) -> Result<OwnedFd, Error> {
-    #[cfg(not(target_os = "macos"))]
-    {
-        nix::sys::memfd::memfd_create(name, nix::sys::memfd::MFdFlags::empty())
-            .map_err(|e| Error::new("memfd_create failed: {e}", e))
-    }
-    #[cfg(target_os = "macos")]
-    {
-        let file = tempfile::tempfile().map_err(|e| {
-            Error::new(
-                "could not create temporary file to back shmem area: {e}",
-                nix::errno::Errno::from_raw(e.raw_os_error().unwrap_or(0)),
-            )
-        })?;
-        Ok(OwnedFd::from(file))
-    }
-}
-
-fn enlarge_file(fd: BorrowedFd, size: u64) -> Result<(), Error> {
-    // Use posix_fallocate() to enlarge the file. It reserves the space correctly, so that
-    // we don't get a segfault later when trying to actually use it.
-    #[cfg(not(target_os = "macos"))]
-    {
-        nix::fcntl::posix_fallocate(fd, 0, size as i64).map_err(|e| {
-            Error::new(
-                "could not grow shmem segment, posix_fallocate failed: {e}",
-                e,
-            )
-        })
-    }
-    // As a fallback on macos, which doesn't have posix_fallocate, use plain 'fallocate'
-    #[cfg(target_os = "macos")]
-    {
-        nix::unistd::ftruncate(fd, size as i64)
-            .map_err(|e| Error::new("could not grow shmem segment, ftruncate failed: {e}", e))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use nix::unistd::ForkResult;
-    use std::ops::Range;
-
-    /// check that all bytes in given range have the expected value.
-    fn assert_range(ptr: *const u8, expected: u8, range: Range<usize>) {
-        for i in range {
-            let b = unsafe { *(ptr.add(i)) };
-            assert_eq!(expected, b, "unexpected byte at offset {}", i);
-        }
-    }
-
-    /// Write 'b' to all bytes in the given range
-    fn write_range(ptr: *mut u8, b: u8, range: Range<usize>) {
-        unsafe { std::ptr::write_bytes(ptr.add(range.start), b, range.end - range.start) };
-    }
-
-    // simple single-process test of growing and shrinking
-    #[test]
-    fn test_shmem_resize() -> Result<(), Error> {
-        let max_size = 1024 * 1024;
-        let init_struct = ShmemHandle::new("test_shmem_resize", 0, max_size)?;
-
-        assert_eq!(init_struct.current_size(), 0);
-
-        // Initial grow
-        let size1 = 10000;
-        init_struct.set_size(size1).unwrap();
-        assert_eq!(init_struct.current_size(), size1);
-
-        // Write some data
-        let data_ptr = init_struct.data_ptr.as_ptr();
-        write_range(data_ptr, 0xAA, 0..size1);
-        assert_range(data_ptr, 0xAA, 0..size1);
-
-        // Shrink
-        let size2 = 5000;
-        init_struct.set_size(size2).unwrap();
-        assert_eq!(init_struct.current_size(), size2);
-
-        // Grow again
-        let size3 = 20000;
-        init_struct.set_size(size3).unwrap();
-        assert_eq!(init_struct.current_size(), size3);
-
-        // Try to read it. The area that was shrunk and grown again should read as all zeros now
-        assert_range(data_ptr, 0xAA, 0..5000);
-        assert_range(data_ptr, 0, 5000..size1);
-
-        // Try to grow beyond max_size
-        //let size4 = max_size + 1;
-        //assert!(init_struct.set_size(size4).is_err());
-
-        // Dropping init_struct should unmap the memory
-        drop(init_struct);
-
-        Ok(())
-    }
-
-    /// This is used in tests to coordinate between test processes. It's like std::sync::Barrier,
-    /// but is stored in the shared memory area and works across processes. It's implemented by
-    /// polling, because e.g. standard rust mutexes are not guaranteed to work across processes.
-    struct SimpleBarrier {
-        num_procs: usize,
-        count: AtomicUsize,
-    }
-
-    impl SimpleBarrier {
-        unsafe fn init(ptr: *mut SimpleBarrier, num_procs: usize) {
-            unsafe {
-                *ptr = SimpleBarrier {
-                    num_procs,
-                    count: AtomicUsize::new(0),
-                }
-            }
-        }
-
-        pub fn wait(&self) {
-            let old = self.count.fetch_add(1, Ordering::Relaxed);
-
-            let generation = old / self.num_procs;
-
-            let mut current = old + 1;
-            while current < (generation + 1) * self.num_procs {
-                std::thread::sleep(std::time::Duration::from_millis(10));
-                current = self.count.load(Ordering::Relaxed);
-            }
-        }
-    }
-
-    #[test]
-    fn test_multi_process() {
-        // Initialize
-        let max_size = 1_000_000_000_000;
-        let init_struct = ShmemHandle::new("test_multi_process", 0, max_size).unwrap();
-        let ptr = init_struct.data_ptr.as_ptr();
-
-        // Store the SimpleBarrier in the first 1k of the area.
-        init_struct.set_size(10000).unwrap();
-        let barrier_ptr: *mut SimpleBarrier = unsafe {
-            ptr.add(ptr.align_offset(std::mem::align_of::<SimpleBarrier>()))
-                .cast()
-        };
-        unsafe { SimpleBarrier::init(barrier_ptr, 2) };
-        let barrier = unsafe { barrier_ptr.as_ref().unwrap() };
-
-        // Fork another test process. The code after this runs in both processes concurrently.
-        let fork_result = unsafe { nix::unistd::fork().unwrap() };
-
-        // In the parent, fill bytes between 1000..2000. In the child, between 2000..3000
-        if fork_result.is_parent() {
-            write_range(ptr, 0xAA, 1000..2000);
-        } else {
-            write_range(ptr, 0xBB, 2000..3000);
-        }
-        barrier.wait();
-        // Verify the contents. (in both processes)
-        assert_range(ptr, 0xAA, 1000..2000);
-        assert_range(ptr, 0xBB, 2000..3000);
-
-        // Grow, from the child this time
-        let size = 10_000_000;
-        if !fork_result.is_parent() {
-            init_struct.set_size(size).unwrap();
-        }
-        barrier.wait();
-
-        // make some writes at the end
-        if fork_result.is_parent() {
-            write_range(ptr, 0xAA, (size - 10)..size);
-        } else {
-            write_range(ptr, 0xBB, (size - 20)..(size - 10));
-        }
-        barrier.wait();
-
-        // Verify the contents. (This runs in both processes)
-        assert_range(ptr, 0, (size - 1000)..(size - 20));
-        assert_range(ptr, 0xBB, (size - 20)..(size - 10));
-        assert_range(ptr, 0xAA, (size - 10)..size);
-
-        if let ForkResult::Parent { child } = fork_result {
-            nix::sys::wait::waitpid(child, None).unwrap();
-        }
-    }
-}

pageserver/src/page_service.rs

@@ -1278,7 +1278,7 @@ impl PageServerHandler {
     }
 
     #[instrument(level = tracing::Level::DEBUG, skip_all)]
-    async fn pagestream_handle_batched_message<IO>(
+    async fn pagesteam_handle_batched_message<IO>(
         &mut self,
         pgb_writer: &mut PostgresBackend<IO>,
         batch: BatchedFeMessage,
@@ -1733,7 +1733,7 @@ impl PageServerHandler {
             };
 
             let result = self
-                .pagestream_handle_batched_message(
+                .pagesteam_handle_batched_message(
                     pgb_writer,
                     msg,
                     io_concurrency.clone(),
@@ -1909,7 +1909,7 @@ impl PageServerHandler {
                             return Err(e);
                         }
                     };
-                    self.pagestream_handle_batched_message(
+                    self.pagesteam_handle_batched_message(
                         pgb_writer,
                         batch,
                         io_concurrency.clone(),

pgxn/neon/file_cache.c

@@ -936,44 +936,6 @@ lfc_prewarm_main(Datum main_arg)
 	lfc_ctl->prewarm_workers[worker_id].completed = GetCurrentTimestamp();
 }
 
-void
-lfc_invalidate(NRelFileInfo rinfo, ForkNumber forkNum, BlockNumber nblocks)
-{
-	BufferTag	tag;
-	FileCacheEntry *entry;
-	uint32		hash;
-
-	if (lfc_maybe_disabled())	/* fast exit if file cache is disabled */
-		return;
-
-	CopyNRelFileInfoToBufTag(tag, rinfo);
-	tag.forkNum = forkNum;
-
-	CriticalAssert(BufTagGetRelNumber(&tag) != InvalidRelFileNumber);
-
-	LWLockAcquire(lfc_lock, LW_EXCLUSIVE);
-	if (LFC_ENABLED())
-	{
-		for (BlockNumber blkno = 0; blkno < nblocks; blkno += lfc_blocks_per_chunk)
-		{
-			tag.blockNum = blkno;
-			hash = get_hash_value(lfc_hash, &tag);
-			entry = hash_search_with_hash_value(lfc_hash, &tag, hash, HASH_FIND, NULL);
-			if (entry != NULL)
-			{
-				for (int i = 0; i < lfc_blocks_per_chunk; i++)
-				{
-					if (GET_STATE(entry, i) == AVAILABLE)
-					{
-						lfc_ctl->used_pages -= 1;
-						SET_STATE(entry, i, UNAVAILABLE);
-					}
-				}
-			}
-		}
-	}
-	LWLockRelease(lfc_lock);
-}
 
 /*
  * Check if page is present in the cache.

pgxn/neon/file_cache.h

@@ -28,7 +28,6 @@ typedef struct FileCacheState
 extern bool lfc_store_prefetch_result;
 
 /* functions for local file cache */
-extern void lfc_invalidate(NRelFileInfo rinfo, ForkNumber forkNum, BlockNumber nblocks);
 extern void lfc_writev(NRelFileInfo rinfo, ForkNumber forkNum,
 					   BlockNumber blkno, const void *const *buffers,
 					   BlockNumber nblocks);

pgxn/neon/neon_pgversioncompat.h

@@ -86,7 +86,7 @@ InitBufferTag(BufferTag *tag, const RelFileNode *rnode,
 
 #define InvalidRelFileNumber InvalidOid
 
-#define SMgrRelGetRelInfo(reln)				\
+#define SMgrRelGetRelInfo(reln) \
 	(reln->smgr_rnode.node)
 
 #define DropRelationAllLocalBuffers DropRelFileNodeAllLocalBuffers
@@ -148,12 +148,6 @@ InitBufferTag(BufferTag *tag, const RelFileNode *rnode,
 #define DropRelationAllLocalBuffers DropRelationAllLocalBuffers
 #endif
 
-#define NRelFileInfoInvalidate(rinfo) do { \
-		NInfoGetSpcOid(rinfo) = InvalidOid; \
-		NInfoGetDbOid(rinfo) = InvalidOid; \
-		NInfoGetRelNumber(rinfo) = InvalidRelFileNumber; \
-	} while (0)
-
 #if PG_MAJORVERSION_NUM < 17
 #define ProcNumber BackendId
 #define INVALID_PROC_NUMBER InvalidBackendId

pgxn/neon/pagestore_smgr.c

@@ -108,7 +108,7 @@ typedef enum
 	UNLOGGED_BUILD_NOT_PERMANENT
 } UnloggedBuildPhase;
 
-static NRelFileInfo unlogged_build_rel_info;
+static SMgrRelation unlogged_build_rel = NULL;
 static UnloggedBuildPhase unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS;
 
 static bool neon_redo_read_buffer_filter(XLogReaderState *record, uint8 block_id);
@@ -912,19 +912,16 @@ neon_extend(SMgrRelation reln, ForkNumber forkNum, BlockNumber blkno,
 	{
 		case 0:
 			neon_log(ERROR, "cannot call smgrextend() on rel with unknown persistence");
-			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdextend(reln, forkNum, blkno, buffer, skipFsync);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
 		case RELPERSISTENCE_UNLOGGED:
 			mdextend(reln, forkNum, blkno, buffer, skipFsync);
+			/* Update LFC in case of unlogged index build */
+			if (reln == unlogged_build_rel && unlogged_build_phase == UNLOGGED_BUILD_PHASE_2)
+				lfc_write(InfoFromSMgrRel(reln), forkNum, blkno, buffer);
 			return;
 
 		default:
@@ -1006,19 +1003,21 @@ neon_zeroextend(SMgrRelation reln, ForkNumber forkNum, BlockNumber blocknum,
 	{
 		case 0:
 			neon_log(ERROR, "cannot call smgrextend() on rel with unknown persistence");
-			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdzeroextend(reln, forkNum, blocknum, nblocks, skipFsync);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
 		case RELPERSISTENCE_UNLOGGED:
 			mdzeroextend(reln, forkNum, blocknum, nblocks, skipFsync);
+			/* Update LFC in case of unlogged index build */
+			if (reln == unlogged_build_rel && unlogged_build_phase == UNLOGGED_BUILD_PHASE_2)
+			{
+				for (int i = 0; i < nblocks; i++)
+				{
+					lfc_write(InfoFromSMgrRel(reln), forkNum, blocknum + i, buffer.data);
+				}
+			}
 			return;
 
 		default:
@@ -1388,14 +1387,8 @@ neon_read(SMgrRelation reln, ForkNumber forkNum, BlockNumber blkno, void *buffer
 	{
 		case 0:
 			neon_log(ERROR, "cannot call smgrread() on rel with unknown persistence");
-			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdread(reln, forkNum, blkno, buffer);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
@@ -1481,14 +1474,8 @@ neon_readv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 	{
 		case 0:
 			neon_log(ERROR, "cannot call smgrread() on rel with unknown persistence");
-			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdreadv(reln, forknum, blocknum, buffers, nblocks);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
@@ -1621,15 +1608,6 @@ neon_write(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, const vo
 			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-#if PG_MAJORVERSION_NUM >= 17
-				mdwritev(reln, forknum, blocknum, &buffer, 1, skipFsync);
-#else
-				mdwrite(reln, forknum, blocknum, buffer, skipFsync);
-#endif
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
@@ -1639,6 +1617,9 @@ neon_write(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, const vo
 			#else
 			mdwrite(reln, forknum, blocknum, buffer, skipFsync);
 			#endif
+			/* Update LFC in case of unlogged index build */
+			if (reln == unlogged_build_rel && unlogged_build_phase == UNLOGGED_BUILD_PHASE_2)
+				lfc_write(InfoFromSMgrRel(reln), forknum, blocknum, buffer);
 			return;
 		default:
 			neon_log(ERROR, "unknown relpersistence '%c'", reln->smgr_relpersistence);
@@ -1699,16 +1680,14 @@ neon_writev(SMgrRelation reln, ForkNumber forknum, BlockNumber blkno,
 			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdwritev(reln, forknum, blkno, buffers, nblocks, skipFsync);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
 		case RELPERSISTENCE_UNLOGGED:
 			mdwritev(reln, forknum, blkno, buffers, nblocks, skipFsync);
+			/* Update LFC in case of unlogged index build */
+			if (reln == unlogged_build_rel && unlogged_build_phase == UNLOGGED_BUILD_PHASE_2)
+				lfc_writev(InfoFromSMgrRel(reln), forknum, blkno, buffers, nblocks);
 			return;
 		default:
 			neon_log(ERROR, "unknown relpersistence '%c'", reln->smgr_relpersistence);
@@ -1744,10 +1723,6 @@ neon_nblocks(SMgrRelation reln, ForkNumber forknum)
 			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				return mdnblocks(reln, forknum);
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
@@ -1817,11 +1792,6 @@ neon_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber old_blocks, Blo
 			break;
 
 		case RELPERSISTENCE_PERMANENT:
-			if (RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)))
-			{
-				mdtruncate(reln, forknum, old_blocks, nblocks);
-				return;
-			}
 			break;
 
 		case RELPERSISTENCE_TEMP:
@@ -1960,6 +1930,7 @@ neon_start_unlogged_build(SMgrRelation reln)
 	 */
 	if (unlogged_build_phase != UNLOGGED_BUILD_NOT_IN_PROGRESS)
 		neon_log(ERROR, "unlogged relation build is already in progress");
+	Assert(unlogged_build_rel == NULL);
 
 	ereport(SmgrTrace,
 			(errmsg(NEON_TAG "starting unlogged build of relation %u/%u/%u",
@@ -1976,7 +1947,7 @@ neon_start_unlogged_build(SMgrRelation reln)
 
 		case RELPERSISTENCE_TEMP:
 		case RELPERSISTENCE_UNLOGGED:
-			unlogged_build_rel_info = InfoFromSMgrRel(reln);
+			unlogged_build_rel = reln;
 			unlogged_build_phase = UNLOGGED_BUILD_NOT_PERMANENT;
 #ifdef DEBUG_COMPARE_LOCAL
 			if (!IsParallelWorker())
@@ -1997,9 +1968,12 @@ neon_start_unlogged_build(SMgrRelation reln)
 		neon_log(ERROR, "cannot perform unlogged index build, index is not empty ");
 #endif
 
-	unlogged_build_rel_info = InfoFromSMgrRel(reln);
+	unlogged_build_rel = reln;
 	unlogged_build_phase = UNLOGGED_BUILD_PHASE_1;
 
+	/* Make the relation look like it's unlogged */
+	reln->smgr_relpersistence = RELPERSISTENCE_UNLOGGED;
+
 	/*
 	 * Create the local file. In a parallel build, the leader is expected to
 	 * call this first and do it.
@@ -2026,16 +2000,17 @@ neon_start_unlogged_build(SMgrRelation reln)
 static void
 neon_finish_unlogged_build_phase_1(SMgrRelation reln)
 {
-	Assert(RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)));
+	Assert(unlogged_build_rel == reln);
 
 	ereport(SmgrTrace,
 			(errmsg(NEON_TAG "finishing phase 1 of unlogged build of relation %u/%u/%u",
-					RelFileInfoFmt((unlogged_build_rel_info)))));
+					RelFileInfoFmt(InfoFromSMgrRel(reln)))));
 
 	if (unlogged_build_phase == UNLOGGED_BUILD_NOT_PERMANENT)
 		return;
 
 	Assert(unlogged_build_phase == UNLOGGED_BUILD_PHASE_1);
+	Assert(reln->smgr_relpersistence == RELPERSISTENCE_UNLOGGED);
 
 	/*
 	 * In a parallel build, (only) the leader process performs the 2nd
@@ -2043,7 +2018,7 @@ neon_finish_unlogged_build_phase_1(SMgrRelation reln)
 	 */
 	if (IsParallelWorker())
 	{
-		NRelFileInfoInvalidate(unlogged_build_rel_info);
+		unlogged_build_rel = NULL;
 		unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS;
 	}
 	else
@@ -2064,11 +2039,11 @@ neon_end_unlogged_build(SMgrRelation reln)
 {
 	NRelFileInfoBackend rinfob = InfoBFromSMgrRel(reln);
 
-	Assert(RelFileInfoEquals(unlogged_build_rel_info, InfoFromSMgrRel(reln)));
+	Assert(unlogged_build_rel == reln);
 
 	ereport(SmgrTrace,
 			(errmsg(NEON_TAG "ending unlogged build of relation %u/%u/%u",
-					RelFileInfoFmt(unlogged_build_rel_info))));
+					RelFileInfoFmt(InfoFromNInfoB(rinfob)))));
 
 	if (unlogged_build_phase != UNLOGGED_BUILD_NOT_PERMANENT)
 	{
@@ -2076,6 +2051,7 @@ neon_end_unlogged_build(SMgrRelation reln)
 		BlockNumber nblocks;
 
 		Assert(unlogged_build_phase == UNLOGGED_BUILD_PHASE_2);
+		Assert(reln->smgr_relpersistence == RELPERSISTENCE_UNLOGGED);
 
 		/*
 		 * Update the last-written LSN cache.
@@ -2096,6 +2072,9 @@ neon_end_unlogged_build(SMgrRelation reln)
 								InfoFromNInfoB(rinfob),
 								MAIN_FORKNUM);
 
+		/* Make the relation look permanent again */
+		reln->smgr_relpersistence = RELPERSISTENCE_PERMANENT;
+
 		/* Remove local copy */
 		for (int forknum = 0; forknum <= MAX_FORKNUM; forknum++)
 		{
@@ -2104,8 +2083,6 @@ neon_end_unlogged_build(SMgrRelation reln)
 				 forknum);
 
 			forget_cached_relsize(InfoFromNInfoB(rinfob), forknum);
-			lfc_invalidate(InfoFromNInfoB(rinfob), forknum, nblocks);
-
 			mdclose(reln, forknum);
 #ifndef DEBUG_COMPARE_LOCAL
 			/* use isRedo == true, so that we drop it immediately */
@@ -2116,7 +2093,7 @@ neon_end_unlogged_build(SMgrRelation reln)
 		mdunlink(rinfob, INIT_FORKNUM, true);
 #endif
 	}
-	NRelFileInfoInvalidate(unlogged_build_rel_info);
+	unlogged_build_rel = NULL;
 	unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS;
 }
 
@@ -2189,7 +2166,7 @@ AtEOXact_neon(XactEvent event, void *arg)
 			 * Forget about any build we might have had in progress. The local
 			 * file will be unlinked by smgrDoPendingDeletes()
 			 */
-			NRelFileInfoInvalidate(unlogged_build_rel_info);
+			unlogged_build_rel = NULL;
 			unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS;
 			break;
 
@@ -2201,7 +2178,7 @@ AtEOXact_neon(XactEvent event, void *arg)
 		case XACT_EVENT_PRE_PREPARE:
 			if (unlogged_build_phase != UNLOGGED_BUILD_NOT_IN_PROGRESS)
 			{
-				NRelFileInfoInvalidate(unlogged_build_rel_info);
+				unlogged_build_rel = NULL;
 				unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS;
 				ereport(ERROR,
 						(errcode(ERRCODE_INTERNAL_ERROR),

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand.
 
 [[package]]
 name = "aiohappyeyeballs"
@@ -1145,19 +1145,18 @@ dotenv = ["python-dotenv"]
 
 [[package]]
 name = "flask-cors"
-version = "6.0.0"
-description = "A Flask extension simplifying CORS support"
+version = "5.0.0"
+description = "A Flask extension adding a decorator for CORS support"
 optional = false
-python-versions = "<4.0,>=3.9"
+python-versions = "*"
 groups = ["main"]
 files = [
-    {file = "flask_cors-6.0.0-py3-none-any.whl", hash = "sha256:6332073356452343a8ccddbfec7befdc3fdd040141fe776ec9b94c262f058657"},
-    {file = "flask_cors-6.0.0.tar.gz", hash = "sha256:4592c1570246bf7beee96b74bc0adbbfcb1b0318f6ba05c412e8909eceec3393"},
+    {file = "Flask_Cors-5.0.0-py2.py3-none-any.whl", hash = "sha256:b9e307d082a9261c100d8fb0ba909eec6a228ed1b60a8315fd85f783d61910bc"},
+    {file = "flask_cors-5.0.0.tar.gz", hash = "sha256:5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef"},
 ]
 
 [package.dependencies]
-flask = ">=0.9"
-Werkzeug = ">=0.7"
+Flask = ">=0.9"
 
 [[package]]
 name = "frozenlist"

test_runner/cloud_regress/test_cloud_regress.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from fixtures.pg_version import PgVersion
 
 
-@pytest.mark.timeout(4*3600)
+@pytest.mark.timeout(7200)
 @pytest.mark.remote_cluster
 def test_cloud_regress(
     remote_pg: RemotePostgres,

test_runner/fixtures/neon_cli.py

@@ -103,7 +103,7 @@ class AbstractNeonCli:
             else:
                 stdout = ""
 
-            log.warning(f"CLI timeout: stderr={stderr}, stdout={stdout}")
+            log.warn(f"CLI timeout: stderr={stderr}, stdout={stdout}")
             raise
 
         indent = "  "

test_runner/regress/test_pageserver_secondary.py

@@ -510,7 +510,7 @@ def list_elegible_layers(
         except KeyError:
             # Unexpected: tests should call this when pageservers are in a quiet state such that the layer map
             # matches what's on disk.
-            log.warning(f"Lookup {layer_file_name} from {list(visible_map.keys())}")
+            log.warn(f"Lookup {layer_file_name} from {list(visible_map.keys())}")
             raise
 
     return list(c for c in candidates if is_visible(c))
@@ -636,7 +636,7 @@ def test_secondary_downloads(neon_env_builder: NeonEnvBuilder):
     except:
         # On assertion failures, log some details to help with debugging
         heatmap = env.pageserver_remote_storage.heatmap_content(tenant_id)
-        log.warning(f"heatmap contents: {json.dumps(heatmap, indent=2)}")
+        log.warn(f"heatmap contents: {json.dumps(heatmap, indent=2)}")
         raise
 
     # Scrub the remote storage

vendor/revisions.json

@@ -1,18 +1,18 @@
 {
   "v17": [
     "17.5",
-    "8be779fd3ab9e87206da96a7e4842ef1abf04f44"
+    "e5374b72997b0afc8374137674e873f7a558120a"
   ],
   "v16": [
     "16.9",
-    "0bf96bd6d70301a0b43b0b3457bb3cf8fb43c198"
+    "15710a76b7d07912110fcbbaf0c8ad6d7e5a9fbc"
   ],
   "v15": [
     "15.13",
-    "de7640f55da07512834d5cc40c4b3fb376b5f04f"
+    "daa81cffcf063c54b29a9aabdb6604625f675ad0"
   ],
   "v14": [
     "14.18",
-    "55c0d45abe6467c02084c2192bca117eda6ce1e7"
+    "4cca6f8083483dda9e12eae292cf788d45bd561f"
   ]
 }

workspace_hack/Cargo.toml

@@ -60,8 +60,7 @@ lazy_static = { version = "1", default-features = false, features = ["spin_no_st
 libc = { version = "0.2", features = ["extra_traits", "use_std"] }
 log = { version = "0.4", default-features = false, features = ["std"] }
 memchr = { version = "2" }
-nix-2f80eeee3b1b6c7e = { package = "nix", version = "0.26" }
-nix-fa1f6196edfd7249 = { package = "nix", version = "0.30", features = ["dir", "ioctl", "mman", "poll", "signal", "socket"] }
+nix = { version = "0.26" }
 nom = { version = "7" }
 num = { version = "0.4" }
 num-bigint = { version = "0.4" }