Merge PG REL_16_STABLE

based on:
commit 9ddecd40664f7523b18f760aea0e04936e8a2302
Author: Peter Eisentraut <[email protected]>
Date:   Tue Sep 5 11:36:55 2023 +0200

Makefile

@@ -9,16 +9,16 @@ TAP_TESTS = 0
 
 OBJS = src/encryption/enc_tuple.o \
 src/encryption/enc_aes.o \
-src/access/pg_tde_io.o \
-src/access/pg_tdeam_visibility.o \
+src/access/heapam_visibility.o \
+src/access/heapam_handler.o \
+src/access/heapam.o \
+src/access/heaptoast.o \
+src/access/hio.o \
+src/access/pruneheap.o \
+src/access/rewriteheap.o \
+src/access/vacuumlazy.o \
+src/access/visibilitymap.o \
 src/access/pg_tde_tdemap.o \
-src/access/pg_tdeam.o \
-src/access/pg_tdetoast.o \
-src/access/pg_tde_prune.o \
-src/access/pg_tde_vacuumlazy.o \
-src/access/pg_tde_visibilitymap.o \
-src/access/pg_tde_rewrite.o \
-src/access/pg_tdeam_handler.o \
 src/transam/pg_tde_xact_handler.o \
 src/keyring/keyring_config.o \
 src/keyring/keyring_file.o \

meson.build

@@ -5,16 +5,18 @@ jsondep = dependency('json-c')
 pg_tde_sources = files(
         'src/pg_tde.c',
         'src/transam/pg_tde_xact_handler.c',
+
         'src/access/pg_tde_tdemap.c',
-        'src/access/pg_tdeam.c',
-        'src/access/pg_tdeam_handler.c',
-        'src/access/pg_tdeam_visibility.c',
-        'src/access/pg_tdetoast.c',
-        'src/access/pg_tde_io.c',
-        'src/access/pg_tde_prune.c',
-        'src/access/pg_tde_rewrite.c',
-        'src/access/pg_tde_vacuumlazy.c',
-        'src/access/pg_tde_visibilitymap.c',
+
+        'src/access/heapam_handler.c',
+        'src/access/heapam_visibility.c',
+        'src/access/heapam.c',
+        'src/access/heaptoast.c',
+        'src/access/hio.c',
+        'src/access/pruneheap.c',
+        'src/access/rewriteheap.c',
+        'src/access/vacuumlazy.c',
+        'src/access/visibilitymap.c',
 
         'src/encryption/enc_tuple.c',
         'src/encryption/enc_aes.c',