Fix index_beginscan signature for PG18 compatibility

PG18 added an IndexScanInstrumentation parameter to index_beginscan.
Add compatibility macro that handles the signature difference between
PG versions and update all callers to use the new macro.

postgres/postgres@0fbceae8 Show index search count in EXPLAIN ANALYZE, take 2.

Author: svenklemm

src/chunk_adaptive.c

@@ -184,7 +184,7 @@ minmax_heapscan(Relation rel, Oid atttype, AttrNumber attnum, Datum minmax[2])
 static MinMaxResult
 minmax_indexscan(Relation rel, Relation idxrel, AttrNumber attnum, Datum minmax[2])
 {
-	IndexScanDesc scan = index_beginscan(rel, idxrel, GetTransactionSnapshot(), 0, 0);
+	IndexScanDesc scan = index_beginscan_compat(rel, idxrel, GetTransactionSnapshot(), NULL, 0, 0);
 	TupleTableSlot *slot = table_slot_create(rel, NULL);
 	bool nulls[2] = { true, true };
 	int i;

src/compat/compat.h

@@ -669,3 +669,25 @@ pg_cmp_u32(uint32 a, uint32 b)
 #define i64abs(i) llabs(i)
 #endif
 #endif
+
+/*
+ * PG18 adds IndexScanInstrumentation parameter to index_beginscan
+ * https://github.com/postgres/postgres/commit/0fbceae8
+ */
+#if PG18_LT
+#define index_beginscan_compat(heapRelation,                                                       \
+							   indexRelation,                                                      \
+							   snapshot,                                                           \
+							   instrument,                                                         \
+							   nkeys,                                                              \
+							   norderbys)                                                          \
+	index_beginscan(heapRelation, indexRelation, snapshot, nkeys, norderbys)
+#else
+#define index_beginscan_compat(heapRelation,                                                       \
+							   indexRelation,                                                      \
+							   snapshot,                                                           \
+							   instrument,                                                         \
+							   nkeys,                                                              \
+							   norderbys)                                                          \
+	index_beginscan(heapRelation, indexRelation, snapshot, instrument, nkeys, norderbys)
+#endif

src/scanner.c

@@ -97,8 +97,12 @@ index_scanner_beginscan(ScannerCtx *ctx)
 {
 	InternalScannerCtx *ictx = &ctx->internal;
 
-	ictx->scan.index_scan =
-		index_beginscan(ctx->tablerel, ctx->indexrel, ctx->snapshot, ctx->nkeys, ctx->norderbys);
+	ictx->scan.index_scan = index_beginscan_compat(ctx->tablerel,
+												   ctx->indexrel,
+												   ctx->snapshot,
+												   NULL,
+												   ctx->nkeys,
+												   ctx->norderbys);
 	ictx->scan.index_scan->xs_want_itup = ctx->want_itup;
 	index_rescan(ictx->scan.index_scan, ctx->scankey, ctx->nkeys, NULL, ctx->norderbys);
 	return ictx->scan;

tsl/src/compression/compression.c

@@ -475,7 +475,8 @@ compress_chunk(Oid in_table, Oid out_table, int insert_options)
 			 "using index \"%s\" to scan rows for converting to columnstore",
 			 get_rel_name(matched_index_rel->rd_id));
 
-		index_scan = index_beginscan(in_rel, matched_index_rel, GetTransactionSnapshot(), 0, 0);
+		index_scan =
+			index_beginscan_compat(in_rel, matched_index_rel, GetTransactionSnapshot(), NULL, 0, 0);
 		slot = table_slot_create(in_rel, NULL);
 		index_rescan(index_scan, NULL, 0, NULL, 0);
 		report_reltuples = calculate_reltuples_to_report(in_rel->rd_rel->reltuples);

tsl/src/compression/compression_dml.c

@@ -464,7 +464,8 @@ decompress_batch_beginscan(Relation in_rel, Relation index_rel, Snapshot snapsho
 
 	if (index_rel)
 	{
-		scan->index_scan = index_beginscan(in_rel, index_rel, snapshot, num_scankeys, 0);
+		scan->index_scan =
+			index_beginscan_compat(in_rel, index_rel, snapshot, NULL, num_scankeys, 0);
 		index_rescan(scan->index_scan, scankeys, num_scankeys, NULL, 0);
 		scan->scan = NULL;
 	}

tsl/src/compression/recompress.c

@@ -324,7 +324,7 @@ recompress_chunk_segmentwise_impl(Chunk *uncompressed_chunk)
 
 	HeapTuple compressed_tuple;
 	IndexScanDesc index_scan =
-		index_beginscan(compressed_chunk_rel, index_rel, snapshot, num_segmentby, 0);
+		index_beginscan_compat(compressed_chunk_rel, index_rel, snapshot, NULL, num_segmentby, 0);
 
 	bool found_tuple = fetch_uncompressed_chunk_into_tuplesort(input_tuplesortstate,
 															   uncompressed_chunk_rel,

tsl/src/continuous_aggs/utils.c

@@ -738,7 +738,7 @@ get_direct_view_oid(int32 mat_hypertable_id)
 
 	/* Prepare index scan */
 	IndexScanDesc indexscan =
-		index_beginscan(cagg_rel, cagg_idx_rel, GetTransactionSnapshot(), 1, 0);
+		index_beginscan_compat(cagg_rel, cagg_idx_rel, GetTransactionSnapshot(), NULL, 1, 0);
 	index_rescan(indexscan, scankeys, 1, NULL, 0);
 
 	/* Read tuple from relation */