Restore GetIndexAmRoutine signature for compatibility with other callers

Use GetIndexAmRoutineExtended instead for all Orioledb extensibility.

src/backend/access/index/amapi.c

@@ -47,7 +47,6 @@ GetIndexAmRoutineWithTableAM(Oid tamoid, Oid amhandler)
 	return routine;
 }
 
-
 /*
  * GetIndexAmRoutine - call the specified access method handler routine to get
  * its IndexAmRoutine struct, which will be palloc'd in the caller's context.
@@ -57,7 +56,13 @@ GetIndexAmRoutineWithTableAM(Oid tamoid, Oid amhandler)
  * indexes for the system catalogs.  relcache.c relies on that.
  */
 IndexAmRoutine *
-GetIndexAmRoutine(Oid indoid, Oid amhandler)
+GetIndexAmRoutine(Oid amhandler)
+{
+	return GetIndexAmRoutineExtended(InvalidOid, amhandler);
+}
+
+IndexAmRoutine *
+GetIndexAmRoutineExtended(Oid indoid, Oid amhandler)
 {
 	HeapTuple	ht_idx;
 	HeapTuple	ht_tblrel;
@@ -146,7 +151,7 @@ GetIndexAmRoutineByAmId(Oid indoid, Oid amoid, bool noerror)
 	ReleaseSysCache(tuple);
 
 	/* And finally, call the handler function to get the API struct. */
-	return GetIndexAmRoutine(indoid, amhandler);
+	return GetIndexAmRoutineExtended(indoid, amhandler);
 }
 
 

src/backend/commands/indexcmds.c

@@ -214,7 +214,7 @@ CheckIndexCompatible(Oid oldId,
 						accessMethodName)));
 	accessMethodForm = (Form_pg_am) GETSTRUCT(tuple);
 	accessMethodId = accessMethodForm->oid;
-	amRoutine = GetIndexAmRoutine(oldId, accessMethodForm->amhandler);
+	amRoutine = GetIndexAmRoutineExtended(oldId, accessMethodForm->amhandler);
 	ReleaseSysCache(tuple);
 
 	amcanorder = amRoutine->amcanorder;

src/backend/utils/adt/ruleutils.c

@@ -1313,7 +1313,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno,
 	amrec = (Form_pg_am) GETSTRUCT(ht_am);
 
 	/* Fetch the index AM's API struct */
-	amroutine = GetIndexAmRoutine(indexrelid, amrec->amhandler);
+	amroutine = GetIndexAmRoutineExtended(indexrelid, amrec->amhandler);
 
 	/*
 	 * Get the index expressions, if any.  (NOTE: we do not use the relcache

src/backend/utils/cache/relcache.c

@@ -1404,7 +1404,7 @@ InitIndexAmRoutine(Relation relation)
 	 * Call the amhandler in current, short-lived memory context, just in case
 	 * it leaks anything (it probably won't, but let's be paranoid).
 	 */
-	tmp = GetIndexAmRoutine(relation->rd_id, relation->rd_amhandler);
+	tmp = GetIndexAmRoutineExtended(relation->rd_id, relation->rd_amhandler);
 
 	/* OK, now transfer the data into relation's rd_indexcxt. */
 	cached = (IndexAmRoutine *) MemoryContextAlloc(relation->rd_indexcxt,

src/include/access/amapi.h

@@ -310,7 +310,8 @@ typedef struct IndexAmRoutine
 
 /* Functions in access/index/amapi.c */
 extern IndexAmRoutine *GetIndexAmRoutineWithTableAM(Oid tamoid, Oid amhandler);
-extern IndexAmRoutine *GetIndexAmRoutine(Oid indoid, Oid amhandler);
+extern IndexAmRoutine *GetIndexAmRoutine(Oid amhandler);
+extern IndexAmRoutine *GetIndexAmRoutineExtended(Oid indoid, Oid amhandler);
 extern IndexAmRoutine *GetIndexAmRoutineByAmId(Oid indoid, Oid amoid, bool noerror);
 
 typedef IndexAmRoutine *(*IndexAMRoutineHookType) (Oid tamoid, Oid amhandler);