Revert "Rename files and headers related to index AM"

This follows multiple complains from Peter Geoghegan, Andres Freund and
Alvaro Herrera that this issue ought to be dug more before actually
happening, if it happens.

Discussion: https://postgr.es/m/[email protected]

20 files changed, 20 insertions, 20 deletions

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 70ee89d52f5..71372ceb161 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include "access/detoast.h"
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index cc35811dc89..b8c349f245b 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -17,8 +17,8 @@
  */
 #include "postgres.h"
 
+#include "access/amapi.h"
 #include "access/heapam.h"
-#include "access/indexam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 7823dace9fa..1859fb628fd 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index 8a57a0ef99d..806962a686b 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/heapam.h"
-#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "catalog/index.h"
 #include "commands/trigger.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index da0e5d8b94c..a70e75a219e 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -23,9 +23,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index df04a82fe59..6eaa9cc4f3d 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -29,8 +29,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 4527aa15f71..94411b50082 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -32,8 +32,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index d38de78e1d7..a143998a7ff 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -15,9 +15,9 @@
 
 #include "postgres.h"
 
+#include "access/amapi.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/indexam.h"
 #include "access/reloptions.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 907c71dda0c..537d0e8ceff 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -14,9 +14,9 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index cccd95a97a2..cb7a6bd2d14 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -17,9 +17,9 @@
 
 #include <limits.h>
 
+#include "access/genam.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 72ba997e4c3..36093dcd956 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -12,9 +12,9 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 0182dc7202a..b51c373b93f 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 4252db4ec05..fbf11c86aad 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 94d28b24fc8..63219ad589f 100644
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index e19772aa903..5b882f80bf1 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -15,9 +15,9 @@
 #include "postgres.h"
 
 #include "access/attmap.h"
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
-#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/reloptions.h"
 #include "access/relscan.h"
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index b9fca3af3c7..36093a29a82 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index 714dff53048..5d6528f9cf8 100644
--- a/src/backend/commands/tsearchcmds.c
+++ b/src/backend/commands/tsearchcmds.c
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index d3df657fa0f..89887b8fd75 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -31,9 +31,9 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index f3572b1749a..aab5aa855d2 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 477b271aa39..da1da234000 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -24,9 +24,9 @@
 
 #include "access/clog.h"
 #include "access/commit_ts.h"
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
-#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/transam.h"