Rename GistTranslateStratnum() to GistTranslateCompareType()

petere · petere · commit a5709b5bb293 · 2025-02-01T10:18:46.000+01:00
Follow up to commit 630f9a4. The previous name had become confusing, because it doesn't actually translate a strategy number but a CompareType into a strategy number. We might add the inverse at some point, which would then probably be called something like GistTranslateStratnum. Reviewed-by: Mark Dilger <mark.dilger@enterprisedb.com> Discussion: https://www.postgresql.org/message-id/flat/E72EAA49-354D-4C2E-8EB9-255197F55330@enterprisedb.com
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
@@ -1095,7 +1095,7 @@ gist_stratnum_common(PG_FUNCTION_ARGS)
  * Returns InvalidStrategy if the function is not defined.
  */
 StrategyNumber
-GistTranslateStratnum(Oid opclass, CompareType cmptype)
+GistTranslateCompareType(Oid opclass, CompareType cmptype)
 {
 	Oid			opfamily;
 	Oid			opcintype;
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -2455,7 +2455,7 @@ GetOperatorFromCompareType(Oid opclass, Oid rhstype, CompareType cmptype,
 		 * For now we only need GiST support, but this could support other
 		 * indexams if we wanted.
 		 */
-		*strat = GistTranslateStratnum(opclass, cmptype);
+		*strat = GistTranslateCompareType(opclass, cmptype);
 		if (*strat == InvalidStrategy)
 		{
 			HeapTuple	tuple;
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -10016,7 +10016,7 @@ ATAddForeignKeyConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			 * ask the opclass what number it actually uses instead of our RT*
 			 * constants.
 			 */
-			eqstrategy = GistTranslateStratnum(opclasses[i], cmptype);
+			eqstrategy = GistTranslateCompareType(opclasses[i], cmptype);
 			if (eqstrategy == InvalidStrategy)
 			{
 				HeapTuple	tuple;
@@ -10041,7 +10041,7 @@ ATAddForeignKeyConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			 * other index AMs support unique indexes.  If we ever did have
 			 * other types of unique indexes, we'd need a way to determine
 			 * which operator strategy number is equality.  (We could use
-			 * something like GistTranslateStratnum.)
+			 * something like GistTranslateCompareType.)
 			 */
 			if (amid != BTREE_AM_OID)
 				elog(ERROR, "only b-tree indexes are supported for foreign keys");
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
@@ -57,7 +57,7 @@ get_equal_strategy_number(Oid opclass)
 			ret = HTEqualStrategyNumber;
 			break;
 		case GIST_AM_OID:
-			ret = GistTranslateStratnum(opclass, COMPARE_EQ);
+			ret = GistTranslateCompareType(opclass, COMPARE_EQ);
 			break;
 		default:
 			ret = InvalidStrategy;
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
@@ -248,6 +248,6 @@ typedef struct
 	do { (e).key = (k); (e).rel = (r); (e).page = (pg); \
 		 (e).offset = (o); (e).leafkey = (l); } while (0)
 
-extern StrategyNumber GistTranslateStratnum(Oid opclass, CompareType cmp);
+extern StrategyNumber GistTranslateCompareType(Oid opclass, CompareType cmptype);
 
 #endif							/* GIST_H */

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ gist_stratnum_common(PG_FUNCTION_ARGS)`
`1095`	`1095`	`* Returns InvalidStrategy if the function is not defined.`
`1096`	`1096`	`*/`
`1097`	`1097`	`StrategyNumber`
`1098`		`-GistTranslateStratnum(Oid opclass, CompareType cmptype)`
	`1098`	`+GistTranslateCompareType(Oid opclass, CompareType cmptype)`
`1099`	`1099`	`{`
`1100`	`1100`	`Oid opfamily;`
`1101`	`1101`	`Oid opcintype;`
Original file line number	Diff line number	Diff line change
`@@ -2455,7 +2455,7 @@ GetOperatorFromCompareType(Oid opclass, Oid rhstype, CompareType cmptype,`
`2455`	`2455`	`* For now we only need GiST support, but this could support other`
`2456`	`2456`	`* indexams if we wanted.`
`2457`	`2457`	`*/`
`2458`		`- *strat = GistTranslateStratnum(opclass, cmptype);`
	`2458`	`+ *strat = GistTranslateCompareType(opclass, cmptype);`
`2459`	`2459`	`if (*strat == InvalidStrategy)`
`2460`	`2460`	`{`
`2461`	`2461`	`HeapTuple tuple;`