Split amcheck into 4 reports: c1 (quick), c2 (heap), c3 (parent), c4 (full)

- c1: btree + GIN index check only. Actually fast. AccessShareLock.
- c2: c1 + verify_heapam. Still AccessShareLock but reads all data.
- c3: bt_index_parent_check — glibc/collation corruption. ShareLock.
- c4: heapallindexed + parent + heap. The full paranoia. ShareLock.

Tested on PG13, PG17, PG18 (GIN). 34 reports total.

Author: NikolayS

README.md

@@ -46,9 +46,10 @@ Then connect to any Postgres server via psql and type `:dba` to open the interac
 ### Corruption checks
 | ID | Report |
 |----|--------|
-| c1 | Quick: btree + GIN (PG18) + heap (PG14) check — safe for production (AccessShareLock) |
-| c2 | Parent: btree parent-child check — detects glibc/collation corruption (⚠️ ShareLock — use on clones) |
-| c3 | Full: heapallindexed + parent + heap — proves every tuple is indexed (⚠️⚠️ slow + ShareLock — use on clones) |
+| c1 | Quick index check: btree + GIN (PG18+). Fast, safe for production (AccessShareLock) |
+| c2 | Indexes + heap/TOAST (PG14+). Safe for production but reads all data (AccessShareLock) |
+| c3 | B-tree parent check — detects glibc/collation corruption (⚠️ ShareLock — use on clones) |
+| c4 | Full: heapallindexed + parent + heap — proves every tuple is indexed (⚠️⚠️ slow + ShareLock — use on clones) |
 
 ### Memory
 | ID | Report |

RELEASE_NOTES.md

@@ -1,6 +1,6 @@
 # postgres_dba 7.0
 
-**33 reports** | Tested on **PostgreSQL 13–18** | Works with `pg_monitor` role
+**34 reports** | Tested on **PostgreSQL 13–18** | Works with `pg_monitor` role
 
 ## New Reports
 
@@ -10,9 +10,10 @@ Three levels of integrity checking, all requiring `CREATE EXTENSION amcheck`:
 
 | Report | Lock | What it checks | When to use |
 |--------|------|----------------|-------------|
-| **c1** | AccessShareLock | B-tree pages, GIN indexes (PG18+), heap+TOAST (PG14+) | **Production primary** — safe, non-blocking |
-| **c2** | ShareLock ⚠️ | B-tree parent-child ordering, sibling pointers, rootdescend, checkunique (PG14+) | **Clones or standbys** — detects glibc/collation corruption |
-| **c3** | ShareLock ⚠️⚠️ | Everything in c2 + heapallindexed + verify_heapam with full TOAST | **Clones only** — proves every heap tuple is indexed, slow on large DBs |
+| **c1** | AccessShareLock | B-tree pages, GIN indexes (PG18+) | **Production** — fast, safe, non-blocking |
+| **c2** | AccessShareLock | c1 + heap/TOAST integrity (PG14+) | **Production** — safe but reads all data |
+| **c3** | ShareLock ⚠️ | B-tree parent-child ordering, sibling pointers, rootdescend, checkunique (PG14+) | **Clones or standbys** — detects glibc/collation corruption |
+| **c4** | ShareLock ⚠️⚠️ | Everything in c3 + heapallindexed + verify_heapam with full TOAST | **Clones only** — proves every heap tuple is indexed, slow on large DBs |
 
 All three check system catalog indexes (`pg_catalog`, `pg_toast`) — because catalog corruption is the scariest kind.
 
@@ -75,4 +76,4 @@ Categories reorganized for consistency:
 
 ## Compatibility
 
-Tested on PostgreSQL 13, 14, 15, 16, 17, and 18 — all 33 reports pass with both superuser and `pg_monitor` roles.
+Tested on PostgreSQL 13, 14, 15, 16, 17, and 18 — all 34 reports pass with both superuser and `pg_monitor` roles.

sql/c1_amcheck_indexes.sql

@@ -0,0 +1,116 @@
+-- Corruption: quick index check — btree + GIN (PG18+). Safe for production, fast.
+-- Requires: CREATE EXTENSION amcheck
+-- All checks use AccessShareLock only — no write blocking.
+-- Checks page-level consistency of btree indexes (bt_index_check).
+-- On PG18+, also checks GIN indexes (gin_index_check).
+
+do $$
+declare
+  rec record;
+  idx_count int := 0;
+  err_count int := 0;
+  skip_count int := 0;
+  gin_count int := 0;
+  gin_err_count int := 0;
+  gin_skip_count int := 0;
+  pg_version int;
+begin
+  if not exists (select 1 from pg_extension where extname = 'amcheck') then
+    raise notice '❌ amcheck extension is not installed. Run: CREATE EXTENSION amcheck;';
+    return;
+  end if;
+
+  select current_setting('server_version_num')::int into pg_version;
+
+  -- === B-tree indexes ===
+  raise notice '';
+  raise notice '=== B-tree index check (bt_index_check, AccessShareLock) ===';
+  raise notice '';
+
+  for rec in
+    select
+      n.nspname as schema_name,
+      c.relname as index_name,
+      t.relname as table_name,
+      c.oid as index_oid
+    from pg_index i
+    join pg_class c on c.oid = i.indexrelid
+    join pg_class t on t.oid = i.indrelid
+    join pg_namespace n on n.oid = c.relnamespace
+    join pg_am a on a.oid = c.relam
+    where a.amname = 'btree'
+      and c.relpersistence != 't'
+      and i.indisvalid
+    order by n.nspname, t.relname, c.relname
+  loop
+    begin
+      perform bt_index_check(rec.index_oid);
+      idx_count := idx_count + 1;
+    exception
+      when insufficient_privilege then
+        skip_count := skip_count + 1;
+      when others then
+        raise warning '❌ CORRUPTION in %.%: %',
+          rec.schema_name, rec.index_name, sqlerrm;
+        err_count := err_count + 1;
+    end;
+  end loop;
+
+  if err_count = 0 and skip_count = 0 then
+    raise notice '✅ All % btree indexes OK.', idx_count;
+  elsif err_count = 0 then
+    raise notice '✅ % btree indexes OK, % skipped (insufficient privileges).', idx_count, skip_count;
+  else
+    raise warning '❌ % of % btree indexes have corruption!', err_count, idx_count + err_count + skip_count;
+  end if;
+
+  -- === GIN indexes (PG18+) ===
+  if pg_version >= 180000 then
+    raise notice '';
+    raise notice '=== GIN index check (gin_index_check, AccessShareLock) ===';
+    raise notice '';
+
+    for rec in
+      select
+        n.nspname as schema_name,
+        c.relname as index_name,
+        t.relname as table_name,
+        c.oid as index_oid
+      from pg_index i
+      join pg_class c on c.oid = i.indexrelid
+      join pg_class t on t.oid = i.indrelid
+      join pg_namespace n on n.oid = c.relnamespace
+      join pg_am a on a.oid = c.relam
+      where a.amname = 'gin'
+        and c.relpersistence != 't'
+        and i.indisvalid
+      order by n.nspname, t.relname, c.relname
+    loop
+      begin
+        perform gin_index_check(rec.index_oid);
+        gin_count := gin_count + 1;
+      exception
+        when insufficient_privilege then
+          gin_skip_count := gin_skip_count + 1;
+        when others then
+          raise warning '❌ CORRUPTION in %.%: %',
+            rec.schema_name, rec.index_name, sqlerrm;
+          gin_err_count := gin_err_count + 1;
+      end;
+    end loop;
+
+    if gin_count + gin_err_count + gin_skip_count = 0 then
+      raise notice 'No GIN indexes found.';
+    elsif gin_err_count = 0 and gin_skip_count = 0 then
+      raise notice '✅ All % GIN indexes OK.', gin_count;
+    elsif gin_err_count = 0 then
+      raise notice '✅ % GIN indexes OK, % skipped (insufficient privileges).', gin_count, gin_skip_count;
+    else
+      raise warning '❌ % of % GIN indexes have corruption!', gin_err_count, gin_count + gin_err_count + gin_skip_count;
+    end if;
+  else
+    raise notice '';
+    raise notice 'ℹ️  GIN index checking requires PostgreSQL 18+. Skipped.';
+  end if;
+end;
+$$;

sql/c1_amcheck_quick.sql sql/c2_amcheck_heap.sqlsql/c1_amcheck_quick.sql renamed to sql/c2_amcheck_heap.sql

@@ -1,9 +1,8 @@
--- Corruption: quick check — btree, GIN (PG18+), heap (PG14+). Safe for production.
+-- Corruption: indexes + heap/TOAST check. Safe for production but reads all data.
 -- Requires: CREATE EXTENSION amcheck
--- All checks use AccessShareLock only (same as SELECT) — no write blocking.
--- Checks page-level consistency of btree indexes (bt_index_check).
--- On PG18+, also checks GIN indexes (gin_index_check).
--- On PG14+, also checks heap and TOAST integrity (verify_heapam).
+-- All checks use AccessShareLock only — no write blocking.
+-- Same index checks as c1, plus verify_heapam (PG14+) which reads every heap page.
+-- ℹ️  On large databases this can take a while — it's a full sequential read.
 
 do $$
 declare
@@ -21,7 +20,6 @@ declare
   has_errors boolean;
   pg_version int;
 begin
-  -- Check extension
   if not exists (select 1 from pg_extension where extname = 'amcheck') then
     raise notice '❌ amcheck extension is not installed. Run: CREATE EXTENSION amcheck;';
     return;
@@ -123,7 +121,8 @@ begin
   -- === Heap verification (PG14+) ===
   if pg_version >= 140000 then
     raise notice '';
-    raise notice '=== Heap check (verify_heapam, AccessShareLock) ===';
+    raise notice '=== Heap + TOAST check (verify_heapam, AccessShareLock) ===';
+    raise notice 'ℹ️  Reads every heap page — may take a while on large databases.';
     raise notice '';
 
     for rec in

sql/c2_amcheck_parent.sql sql/c3_amcheck_parent.sqlsql/c2_amcheck_parent.sql renamed to sql/c3_amcheck_parent.sql

@@ -17,7 +17,6 @@ declare
   skip_count int := 0;
   pg_version int;
 begin
-  -- Check extension
   if not exists (select 1 from pg_extension where extname = 'amcheck') then
     raise notice '❌ amcheck extension is not installed. Run: CREATE EXTENSION amcheck;';
     return;
@@ -48,7 +47,7 @@ begin
     where a.amname = 'btree'
       and c.relpersistence != 't'
       and i.indisvalid
-    order by pg_relation_size(c.oid) asc  -- smallest first
+    order by pg_relation_size(c.oid) asc
   loop
     begin
       if pg_version >= 140000 then

sql/c3_amcheck_full.sql sql/c4_amcheck_full.sqlsql/c3_amcheck_full.sql renamed to sql/c4_amcheck_full.sql

@@ -21,7 +21,6 @@ declare
   has_errors boolean;
   pg_version int;
 begin
-  -- Check extension
   if not exists (select 1 from pg_extension where extname = 'amcheck') then
     raise notice '❌ amcheck extension is not installed. Run: CREATE EXTENSION amcheck;';
     return;
@@ -55,7 +54,7 @@ begin
     where a.amname = 'btree'
       and c.relpersistence != 't'
       and i.indisvalid
-    order by pg_relation_size(c.oid) asc  -- smallest first
+    order by pg_relation_size(c.oid) asc
   loop
     begin
       if pg_version >= 140000 then

start.psql

@@ -10,9 +10,10 @@
 \echo '  b3 – Table bloat (requires pgstattuple; expensive)'
 \echo '  b4 – B-tree indexes bloat (requires pgstattuple; expensive)'
 \echo '  b5 – Tables and columns without stats (so bloat cannot be estimated)'
-\echo '  c1 –  Corruption: quick check — btree, GIN (PG18+), heap (PG14+). Safe for production.'
-\echo '  c2 –  Corruption: B-tree parent check — detects glibc/collation corruption (⚠️ ShareLock, use on clones)'
-\echo '  c3 –  Corruption: FULL check — heapallindexed + parent + heap (⚠️⚠️ SLOW + ShareLock, use on clones)'
+\echo '  c1 –  Corruption: quick index check — btree + GIN (PG18+). Safe for production, fast.'
+\echo '  c2 –  Corruption: indexes + heap/TOAST check. Safe for production but reads all data.'
+\echo '  c3 –  Corruption: B-tree parent check — detects glibc/collation corruption (⚠️ ShareLock, use on clones)'
+\echo '  c4 –  Corruption: FULL check — heapallindexed + parent + heap (⚠️⚠️ SLOW + ShareLock, use on clones)'
 \echo '  e1 – Extensions installed in current database'
 \echo '  i1 – Unused and rarely used indexes'
 \echo '  i2 – Redundant indexes'
@@ -52,6 +53,7 @@ select
 :d_stp::text = 'c1' as d_step_is_c1,
 :d_stp::text = 'c2' as d_step_is_c2,
 :d_stp::text = 'c3' as d_step_is_c3,
+:d_stp::text = 'c4' as d_step_is_c4,
 :d_stp::text = 'e1' as d_step_is_e1,
 :d_stp::text = 'i1' as d_step_is_i1,
 :d_stp::text = 'i2' as d_step_is_i2,
@@ -117,15 +119,19 @@ select
   \prompt 'Press <Enter> to continue…' d_dummy
   \ir ./start.psql
 \elif :d_step_is_c1
-  \ir ./sql/c1_amcheck_quick.sql
+  \ir ./sql/c1_amcheck_indexes.sql
   \prompt 'Press <Enter> to continue…' d_dummy
   \ir ./start.psql
 \elif :d_step_is_c2
-  \ir ./sql/c2_amcheck_parent.sql
+  \ir ./sql/c2_amcheck_heap.sql
   \prompt 'Press <Enter> to continue…' d_dummy
   \ir ./start.psql
 \elif :d_step_is_c3
-  \ir ./sql/c3_amcheck_full.sql
+  \ir ./sql/c3_amcheck_parent.sql
+  \prompt 'Press <Enter> to continue…' d_dummy
+  \ir ./start.psql
+\elif :d_step_is_c4
+  \ir ./sql/c4_amcheck_full.sql
   \prompt 'Press <Enter> to continue…' d_dummy
   \ir ./start.psql
 \elif :d_step_is_e1