From 61352aee28236c64ae1225caf0ef10bce9d58c12 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 4 Feb 2025 13:54:03 +0100 Subject: [PATCH v19.3 2/2] Allow non-btree speculative insertion indexes Previously, only btrees were supported as the arbiter index for speculative insertion because there was no way to get the equality strategy number for other index methods. We have this now (commit c09e5a6a016), so we can support this. At the moment, only btree supports unique indexes, so this does not change anything in practice, but it would allow another index method that has amcanunique to be supported. --- src/backend/catalog/index.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 7377912b41e..cdabf780244 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -2677,9 +2677,6 @@ BuildSpeculativeIndexInfo(Relation index, IndexInfo *ii) */ Assert(ii->ii_Unique); - if (index->rd_rel->relam != BTREE_AM_OID) - elog(ERROR, "unexpected non-btree speculative unique index"); - ii->ii_UniqueOps = (Oid *) palloc(sizeof(Oid) * indnkeyatts); ii->ii_UniqueProcs = (Oid *) palloc(sizeof(Oid) * indnkeyatts); ii->ii_UniqueStrats = (uint16 *) palloc(sizeof(uint16) * indnkeyatts); @@ -2691,7 +2688,12 @@ BuildSpeculativeIndexInfo(Relation index, IndexInfo *ii) /* We need the func OIDs and strategy numbers too */ for (i = 0; i < indnkeyatts; i++) { - ii->ii_UniqueStrats[i] = BTEqualStrategyNumber; + ii->ii_UniqueStrats[i] = + IndexAmTranslateCompareType(COMPARE_EQ, + index->rd_rel->relam, + index->rd_opfamily[i], + index->rd_opcintype[i], + false); ii->ii_UniqueOps[i] = get_opfamily_member(index->rd_opfamily[i], index->rd_opcintype[i], -- 2.48.1