Added support for amgetbatch [skip ci]

src/hnsw.c

@@ -258,6 +258,11 @@ hnswvalidate(Oid opclassoid)
 	return true;
 }
 
+static void
+hnswunguardbatch(IndexScanDesc scan, IndexScanBatch batch)
+{
+}
+
 /*
  * Define index handler
  *
@@ -279,6 +284,7 @@ hnswhandler(PG_FUNCTION_ARGS)
 		.amconsistentequality = false,
 		.amconsistentordering = false,
 		.amcanbackward = false,
+		.amcanmarkpos = false,
 		.amcanunique = false,
 		.amcanmulticol = false,
 		.amoptionalkey = true,
@@ -311,11 +317,14 @@ hnswhandler(PG_FUNCTION_ARGS)
 		.amadjustmembers = NULL,
 		.ambeginscan = hnswbeginscan,
 		.amrescan = hnswrescan,
-		.amgettuple = hnswgettuple,
+		.amgettuple = NULL,
+		.amgetbatch = hnswgetbatch,
+		.amunguardbatch = hnswunguardbatch,
+		.amkillitemsbatch = NULL,
+		.amgettransform = NULL,
 		.amgetbitmap = NULL,
 		.amendscan = hnswendscan,
-		.ammarkpos = NULL,
+		.amposreset = NULL,
-		.amrestrpos = NULL,
 		.amestimateparallelscan = NULL,
 		.aminitparallelscan = NULL,
 		.amparallelrescan = NULL,

src/hnsw.h

@@ -465,7 +465,7 @@ IndexBulkDeleteResult *hnswbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResu
 IndexBulkDeleteResult *hnswvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats);
 IndexScanDesc hnswbeginscan(Relation index, int nkeys, int norderbys);
 void		hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int norderbys);
-bool		hnswgettuple(IndexScanDesc scan, ScanDirection dir);
+IndexScanBatch hnswgetbatch(IndexScanDesc scan, IndexScanBatch priorbatch, ScanDirection dir);
 void		hnswendscan(IndexScanDesc scan);
 
 static inline HnswNeighborArray *

src/hnswscan.c

@@ -3,6 +3,7 @@
 #include <limits.h>
 
 #include "access/genam.h"
+#include "access/indexbatch.h"
 #include "access/relscan.h"
 #include "hnsw.h"
 #include "lib/pairingheap.h"
@@ -135,6 +136,11 @@ hnswbeginscan(Relation index, int nkeys, int norderbys)
 	double		maxMemory;
 
 	scan = RelationGetIndexScan(index, nkeys, norderbys);
+	scan->maxitemsbatch = hnsw_ef_search * HNSW_HEAPTIDS;
+	/* unused but be > 0 */
+	scan->batch_index_opaque_static = MAXALIGN(1);
+	scan->batch_index_opaque_dyn = 0;
+	scan->batch_tuples_workspace = 0;
 
 	so = (HnswScanOpaque) palloc(sizeof(HnswScanOpaqueData));
 	so->typeInfo = HnswGetTypeInfo(index);
@@ -184,12 +190,13 @@ hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int no
 }
 
 /*
- * Fetch the next tuple in the given scan
+ * Fetch the next batch in the given scan
  */
-bool
+IndexScanBatch
-hnswgettuple(IndexScanDesc scan, ScanDirection dir)
+hnswgetbatch(IndexScanDesc scan, IndexScanBatch priorbatch, ScanDirection dir)
 {
 	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
+	IndexScanBatch batch = indexam_util_alloc_batch(scan);
 	MemoryContext oldCtx = MemoryContextSwitchTo(so->tmpCtx);
 
 	/*
@@ -242,9 +249,7 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 	for (;;)
 	{
 		char	   *base = NULL;
-		HnswSearchCandidate *sc;
+		int			nitems = 0;
-		HnswElement element;
-		ItemPointer heaptid;
 
 		if (list_length(so->w) == 0)
 		{
@@ -290,44 +295,57 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 				break;
 		}
 
-		sc = llast(so->w);
+		while (list_length(so->w) != 0)
-		element = HnswPtrAccess(base, sc->element);
-
-		/* Move to next element if no valid heap TIDs */
-		if (element->heaptidsLength == 0)
 		{
-			so->w = list_delete_last(so->w);
+			HnswSearchCandidate *sc = llast(so->w);
+			HnswElement element = HnswPtrAccess(base, sc->element);
+			ItemPointer heaptid;
 
-			/* Mark memory as free for next iteration */
+			/* Move to next element if no valid heap TIDs */
-			if (hnsw_iterative_scan != HNSW_ITERATIVE_SCAN_OFF)
+			if (element->heaptidsLength == 0)
 			{
-				pfree(element);
+				so->w = list_delete_last(so->w);
-				pfree(sc);
+
+				/* Mark memory as free for next iteration */
+				if (hnsw_iterative_scan != HNSW_ITERATIVE_SCAN_OFF)
+				{
+					pfree(element);
+					pfree(sc);
+				}
+
+				continue;
 			}
 
-			continue;
+			heaptid = &element->heaptids[--element->heaptidsLength];
+
+			if (hnsw_iterative_scan == HNSW_ITERATIVE_SCAN_STRICT)
+			{
+				if (sc->distance < so->previousDistance)
+					continue;
+
+				so->previousDistance = sc->distance;
+			}
+
+			batch->items[nitems].tableTid = *heaptid;
+			batch->items[nitems].indexOffset = -1;
+			batch->items[nitems].tupleOffset = 0;
+			nitems++;
 		}
 
-		heaptid = &element->heaptids[--element->heaptidsLength];
+		if (nitems == 0)
-
+			break;
-		if (hnsw_iterative_scan == HNSW_ITERATIVE_SCAN_STRICT)
-		{
-			if (sc->distance < so->previousDistance)
-				continue;
-
-			so->previousDistance = sc->distance;
-		}
 
 		MemoryContextSwitchTo(oldCtx);
 
-		scan->xs_heaptid = *heaptid;
+		batch->firstItem = 0;
-		scan->xs_recheck = false;
+		batch->lastItem = nitems - 1;
-		scan->xs_recheckorderby = false;
+		batch->dir = ForwardScanDirection;
-		return true;
+		return batch;
 	}
 
 	MemoryContextSwitchTo(oldCtx);
-	return false;
+	indexam_util_release_batch(scan, batch);
+	return NULL;
 }
 
 /*

src/ivfflat.c

@@ -196,6 +196,7 @@ ivfflathandler(PG_FUNCTION_ARGS)
 		.amconsistentequality = false,
 		.amconsistentordering = false,
 		.amcanbackward = false,
+		.amcanmarkpos = false,
 		.amcanunique = false,
 		.amcanmulticol = false,
 		.amoptionalkey = true,
@@ -229,10 +230,13 @@ ivfflathandler(PG_FUNCTION_ARGS)
 		.ambeginscan = ivfflatbeginscan,
 		.amrescan = ivfflatrescan,
 		.amgettuple = ivfflatgettuple,
+		.amgetbatch = NULL,
+		.amunguardbatch = NULL,
+		.amkillitemsbatch = NULL,
+		.amgettransform = NULL,
 		.amgetbitmap = NULL,
 		.amendscan = ivfflatendscan,
-		.ammarkpos = NULL,
+		.amposreset = NULL,
-		.amrestrpos = NULL,
 		.amestimateparallelscan = NULL,
 		.aminitparallelscan = NULL,
 		.amparallelrescan = NULL,