Version bump to 0.2.7 [skip ci]

This reverts commit 94eeb83abe.

.github/workflows/build.yml

@@ -33,6 +33,6 @@ jobs:
     - if: ${{ startsWith(matrix.os, 'macos') }}
       run: |
         brew install cpanm && cpanm IPC::Run
-        wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_1.tar.gz
-        tar xf REL_14_1.tar.gz
-        make prove_installcheck PROVE=prove PERL5LIB=postgres-REL_14_1/src/test/perl
+        wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_4.tar.gz
+        tar xf REL_14_4.tar.gz
+        make prove_installcheck PROVE=prove PERL5LIB="postgres-REL_14_4/src/test/perl:/Users/runner/perl5/lib/perl5"

CHANGELOG.md

@@ -1,6 +1,9 @@
-## 0.2.6 (unreleased)
+## 0.2.7 (2022-07-31)
+
+- Fixed `unexpected data beyond EOF` error
+
+## 0.2.6 (2022-05-22)
 
-- Significantly improved index query performance
 - Improved performance of index creation for Postgres < 12
 
 ## 0.2.5 (2022-02-11)

META.json

@@ -2,7 +2,7 @@
 	"name": "vector",
 	"abstract": "Open-source vector similarity search for Postgres",
 	"description": "Supports L2 distance, inner product, and cosine distance",
-	"version": "0.2.5",
+	"version": "0.2.7",
 	"maintainer": [
 		"Andrew Kane <andrew@ankane.org>"
 	],
@@ -20,7 +20,7 @@
 		"vector": {
 			"file": "sql/vector.sql",
 			"docfile": "README.md",
-			"version": "0.2.5",
+			"version": "0.2.7",
 			"abstract": "Open-source vector similarity search for Postgres"
 		}
 	},

Makefile

@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.2.5
+EXTVERSION = 0.2.7
 
 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)

README.md

@@ -17,7 +17,7 @@ Supports L2 distance, inner product, and cosine distance
 Compile and install the extension (supports Postgres 9.6+)
 
 ```sh
-git clone --branch v0.2.5 https://github.com/pgvector/pgvector.git
+git clone --branch v0.2.7 https://github.com/pgvector/pgvector.git
 cd pgvector
 make
 make install # may need sudo
@@ -220,14 +220,14 @@ This adds pgvector to the [Postgres image](https://hub.docker.com/_/postgres).
 You can also build the image manually
 
 ```sh
-git clone --branch v0.2.5 https://github.com/pgvector/pgvector.git
+git clone --branch v0.2.7 https://github.com/pgvector/pgvector.git
 cd pgvector
 docker build -t pgvector .
 ```
 
 ### Homebrew
 
-On Mac with Homebrew Postgres, you can use:
+With Homebrew Postgres, you can use:
 
 ```sh
 brew install pgvector/brew/pgvector

sql/vector--0.2.5--0.2.6.sql

@@ -0,0 +1,2 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION vector UPDATE TO '0.2.6'" to load this file. \quit

sql/vector--0.2.6--0.2.7.sql

@@ -0,0 +1,2 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION vector UPDATE TO '0.2.7'" to load this file. \quit

src/ivfflat.h

@@ -167,28 +167,12 @@ typedef struct IvfflatScanList
 	double		distance;
 }			IvfflatScanList;
 
-typedef struct IvfflatScanItem
-{
-	pairingheap_node ph_node;
-	BlockNumber searchPage;
-	double		distance;
-	ItemPointerData tid;
-}			IvfflatScanItem;
-
 typedef struct IvfflatScanOpaqueData
 {
 	int			probes;
-	int			stage;
+	bool		first;
 	Buffer		buf;
 
-	/* Items */
-	int			maxItems;
-	int			itemCount;
-	pairingheap *itemQueue;
-	IvfflatScanItem *items;
-	IvfflatScanItem **sortedItems;
-	bool		heapFull;
-
 	/* Sorting */
 	Tuplesortstate *sortstate;
 	TupleDesc	tupdesc;
@@ -202,7 +186,6 @@ typedef struct IvfflatScanOpaqueData
 
 	/* Lists */
 	pairingheap *listQueue;
-	IvfflatScanList **sortedLists;
 	IvfflatScanList lists[FLEXIBLE_ARRAY_MEMBER];	/* must come last */
 }			IvfflatScanOpaqueData;
 

src/ivfinsert.c

@@ -53,18 +53,6 @@ FindInsertPage(Relation rel, Datum *values, BlockNumber *insertPage, ListInfo *
 	}
 }
 
-/*
- * Prepare to insert an index tuple
- */
-static void
-LoadInsertPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, BlockNumber insertPage)
-{
-	*buf = ReadBuffer(index, insertPage);
-	LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE);
-	*state = GenericXLogStart(index);
-	*page = GenericXLogRegisterBuffer(*state, *buf, 0);
-}
-
 /*
  * Insert a tuple into the index
  */
@@ -87,11 +75,18 @@ InsertTuple(Relation rel, IndexTuple itup, Relation heapRel, Datum *values)
 	itemsz = MAXALIGN(IndexTupleSize(itup));
 	Assert(itemsz <= BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(IvfflatPageOpaqueData)));
 
-	LoadInsertPage(rel, &buf, &page, &state, insertPage);
-
 	/* Find a page to insert the item */
-	while (PageGetFreeSpace(page) < itemsz)
+	for (;;)
 	{
+		buf = ReadBuffer(rel, insertPage);
+		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
+
+		state = GenericXLogStart(rel);
+		page = GenericXLogRegisterBuffer(state, buf, 0);
+
+		if (PageGetFreeSpace(page) >= itemsz)
+			break;
+
 		insertPage = IvfflatPageGetOpaque(page)->nextblkno;
 
 		if (BlockNumberIsValid(insertPage))
@@ -99,15 +94,31 @@ InsertTuple(Relation rel, IndexTuple itup, Relation heapRel, Datum *values)
 			/* Move to next page */
 			GenericXLogAbort(state);
 			UnlockReleaseBuffer(buf);
-
-			LoadInsertPage(rel, &buf, &page, &state, insertPage);
 		}
 		else
 		{
 			/* Add a new page */
-			IvfflatAppendPage(rel, &buf, &page, &state, MAIN_FORKNUM);
+			Buffer		newbuf = IvfflatNewBuffer(rel, MAIN_FORKNUM);
+			Page		newpage = GenericXLogRegisterBuffer(state, buf, GENERIC_XLOG_FULL_IMAGE);
 
-			insertPage = BufferGetBlockNumber(buf);
+			insertPage = BufferGetBlockNumber(newbuf);
+
+			/* Update previous buffer */
+			IvfflatPageGetOpaque(page)->nextblkno = insertPage;
+
+			/* Init page */
+			PageInit(newpage, BufferGetPageSize(newbuf), sizeof(IvfflatPageOpaqueData));
+			IvfflatPageGetOpaque(newpage)->nextblkno = InvalidBlockNumber;
+			IvfflatPageGetOpaque(newpage)->page_id = IVFFLAT_PAGE_ID;
+
+			/* Commit */
+			MarkBufferDirty(buf);
+			MarkBufferDirty(newbuf);
+			GenericXLogFinish(state);
+
+			/* Unlock */
+			UnlockReleaseBuffer(buf);
+			UnlockReleaseBuffer(newbuf);
 		}
 	}
 

src/ivfscan.c

@@ -30,21 +30,6 @@ CompareLists(const pairingheap_node *a, const pairingheap_node *b, void *arg)
 	return 0;
 }
 
-/*
- * Compare item distances
- */
-static int
-CompareItems(const pairingheap_node *a, const pairingheap_node *b, void *arg)
-{
-	if (((const IvfflatScanItem *) a)->distance > ((const IvfflatScanItem *) b)->distance)
-		return 1;
-
-	if (((const IvfflatScanItem *) a)->distance < ((const IvfflatScanItem *) b)->distance)
-		return -1;
-
-	return ItemPointerCompare(&((IvfflatScanItem *) a)->tid, &((IvfflatScanItem *) b)->tid);
-}
-
 /*
  * Get lists and sort by distance
  */
@@ -59,7 +44,6 @@ GetScanLists(IndexScanDesc scan, Datum value)
 	BlockNumber nextblkno = IVFFLAT_HEAD_BLKNO;
 	int			listCount = 0;
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
-	int			i;
 	double		distance;
 	IvfflatScanList *scanlist;
 	double		maxDistance = DBL_MAX;
@@ -113,140 +97,6 @@ GetScanLists(IndexScanDesc scan, Datum value)
 
 		UnlockReleaseBuffer(cbuf);
 	}
-
-	for (i = 0; i < so->probes; i++)
-		so->sortedLists[i] = (IvfflatScanList *) pairingheap_remove_first(so->listQueue);
-
-	Assert(pairingheap_is_empty(so->listQueue));
-}
-
-/*
- * Get items
- */
-static void
-GetScanItemsQuick(IndexScanDesc scan, Datum value)
-{
-	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
-	Buffer		buf;
-	Page		page;
-	IndexTuple	itup;
-	BlockNumber searchPage;
-	OffsetNumber offno;
-	OffsetNumber maxoffno;
-	Datum		datum;
-	bool		isnull;
-	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
-	int			i;
-	double		distance;
-	IvfflatScanItem *scanitem;
-	double		maxDistance = DBL_MAX;
-
-	/*
-	 * Reuse same set of shared buffers for scan
-	 *
-	 * See postgres/src/backend/storage/buffer/README for description
-	 */
-	BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD);
-
-	/* Search closest probes lists */
-	for (i = 0; i < so->probes; i++)
-	{
-		/* Read closest lists first for performance */
-		searchPage = so->sortedLists[i]->startPage;
-
-		/* Search all entry pages for list */
-		while (BlockNumberIsValid(searchPage))
-		{
-			buf = ReadBufferExtended(scan->indexRelation, MAIN_FORKNUM, searchPage, RBM_NORMAL, bas);
-			LockBuffer(buf, BUFFER_LOCK_SHARE);
-			page = BufferGetPage(buf);
-			maxoffno = PageGetMaxOffsetNumber(page);
-
-			for (offno = FirstOffsetNumber; offno <= maxoffno; offno = OffsetNumberNext(offno))
-			{
-				itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offno));
-				datum = index_getattr(itup, 1, tupdesc, &isnull);
-				distance = DatumGetFloat8(FunctionCall2Coll(so->procinfo, so->collation, datum, value));
-
-				if (so->itemCount < so->maxItems)
-				{
-					scanitem = &so->items[so->itemCount];
-					scanitem->searchPage = searchPage;
-					scanitem->tid = itup->t_tid;
-					scanitem->distance = distance;
-					so->itemCount++;
-
-					/* Add to heap */
-					pairingheap_add(so->itemQueue, &scanitem->ph_node);
-
-					/* Calculate max distance */
-					if (so->itemCount == so->maxItems)
-					{
-						maxDistance = ((IvfflatScanItem *) pairingheap_first(so->itemQueue))->distance;
-						scanitem = &so->items[so->itemCount];
-					}
-				}
-				else if (distance <= maxDistance)
-				{
-					/* Reuse */
-					scanitem->searchPage = searchPage;
-					scanitem->tid = itup->t_tid;
-					scanitem->distance = distance;
-					pairingheap_add(so->itemQueue, &scanitem->ph_node);
-
-					/* Remove */
-					scanitem = (IvfflatScanItem *) pairingheap_remove_first(so->itemQueue);
-
-					/* Update max distance */
-					maxDistance = ((IvfflatScanItem *) pairingheap_first(so->itemQueue))->distance;
-				}
-			}
-
-			searchPage = IvfflatPageGetOpaque(page)->nextblkno;
-
-			UnlockReleaseBuffer(buf);
-		}
-	}
-
-	for (i = 0; i < so->itemCount; i++)
-		so->sortedItems[i] = (IvfflatScanItem *) pairingheap_remove_first(so->itemQueue);
-
-	Assert(pairingheap_is_empty(so->itemQueue));
-}
-
-/*
- * Initialize sort
- */
-static void
-InitSort(IvfflatScanOpaque so)
-{
-	AttrNumber	attNums[] = {1, 2};
-	Oid			sortOperators[] = {Float8LessOperator, TIDLessOperator};
-	Oid			sortCollations[] = {InvalidOid, InvalidOid};
-	bool		nullsFirstFlags[] = {false, false};
-
-	/* Create tuple description for sorting */
-#if PG_VERSION_NUM >= 120000
-	so->tupdesc = CreateTemplateTupleDesc(3);
-#else
-	so->tupdesc = CreateTemplateTupleDesc(3, false);
-#endif
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0);
-
-	/* Prep sort */
-#if PG_VERSION_NUM >= 110000
-	so->sortstate = tuplesort_begin_heap(so->tupdesc, sizeof(attNums) / sizeof(attNums[0]), attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, NULL, false);
-#else
-	so->sortstate = tuplesort_begin_heap(so->tupdesc, sizeof(attNums) / sizeof(attNums[0]), attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, false);
-#endif
-
-#if PG_VERSION_NUM >= 120000
-	so->slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);
-#else
-	so->slot = MakeSingleTupleTableSlot(so->tupdesc);
-#endif
 }
 
 /*
@@ -265,7 +115,6 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	Datum		datum;
 	bool		isnull;
 	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
-	int			i;
 
 #if PG_VERSION_NUM >= 120000
 	TupleTableSlot *slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsVirtual);
@@ -281,9 +130,9 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD);
 
 	/* Search closest probes lists */
-	for (i = 0; i < so->probes; i++)
+	while (!pairingheap_is_empty(so->listQueue))
 	{
-		searchPage = so->sortedLists[i]->startPage;
+		searchPage = ((IvfflatScanList *) pairingheap_remove_first(so->listQueue))->startPage;
 
 		/* Search all entry pages for list */
 		while (BlockNumberIsValid(searchPage))
@@ -323,7 +172,6 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	}
 
 	tuplesort_performsort(so->sortstate);
-	tuplesort_skiptuples(so->sortstate, so->maxItems, true);
 }
 
 /*
@@ -332,17 +180,24 @@ GetScanItems(IndexScanDesc scan, Datum value)
 IndexScanDesc
 ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 {
-	IndexScanDesc scan = RelationGetIndexScan(index, nkeys, norderbys);
-	int			lists = IvfflatGetLists(scan->indexRelation);
-	int			probes = ivfflat_probes;
+	IndexScanDesc scan;
 	IvfflatScanOpaque so;
+	int			lists;
+	AttrNumber	attNums[] = {1};
+	Oid			sortOperators[] = {Float8LessOperator};
+	Oid			sortCollations[] = {InvalidOid};
+	bool		nullsFirstFlags[] = {false};
+	int			probes = ivfflat_probes;
+
+	scan = RelationGetIndexScan(index, nkeys, norderbys);
+	lists = IvfflatGetLists(scan->indexRelation);
 
 	if (probes > lists)
 		probes = lists;
 
 	so = (IvfflatScanOpaque) palloc(offsetof(IvfflatScanOpaqueData, lists) + probes * sizeof(IvfflatScanList));
 	so->buf = InvalidBuffer;
-	so->stage = 0;
+	so->first = true;
 	so->probes = probes;
 
 	/* Set support functions */
@@ -350,16 +205,30 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	so->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	so->collation = index->rd_indcollation[0];
 
+	/* Create tuple description for sorting */
+#if PG_VERSION_NUM >= 120000
+	so->tupdesc = CreateTemplateTupleDesc(3);
+#else
+	so->tupdesc = CreateTemplateTupleDesc(3, false);
+#endif
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0);
+
+	/* Prep sort */
+#if PG_VERSION_NUM >= 110000
+	so->sortstate = tuplesort_begin_heap(so->tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, NULL, false);
+#else
+	so->sortstate = tuplesort_begin_heap(so->tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, false);
+#endif
+
+#if PG_VERSION_NUM >= 120000
+	so->slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);
+#else
+	so->slot = MakeSingleTupleTableSlot(so->tupdesc);
+#endif
+
 	so->listQueue = pairingheap_allocate(CompareLists, scan);
-	so->sortedLists = palloc(sizeof(IvfflatScanItem *) * probes);
-
-	so->maxItems = 1024;
-	so->itemCount = 0;
-	so->itemQueue = pairingheap_allocate(CompareItems, scan);
-	so->items = palloc(sizeof(IvfflatScanItem) * (so->maxItems + 1));
-	so->sortedItems = palloc(sizeof(IvfflatScanItem *) * so->maxItems);
-
-	so->sortstate = NULL;
 
 	scan->opaque = so;
 
@@ -375,14 +244,12 @@ ivfflatrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
 
 #if PG_VERSION_NUM >= 130000
-	if (so->sortstate != NULL)
+	if (!so->first)
 		tuplesort_reset(so->sortstate);
 #endif
 
-	so->stage = 0;
+	so->first = true;
 	pairingheap_reset(so->listQueue);
-	pairingheap_reset(so->itemQueue);
-	so->itemCount = 0;
 
 	if (keys && scan->numberOfKeys > 0)
 		memmove(scan->keyData, keys, scan->numberOfKeys * sizeof(ScanKeyData));
@@ -405,7 +272,7 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 	 */
 	Assert(ScanDirectionIsForward(dir));
 
-	if (so->stage == 0)
+	if (so->first)
 	{
 		Datum		value;
 
@@ -427,101 +294,42 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		}
 
 		IvfflatBench("GetScanLists", GetScanLists(scan, value));
-		IvfflatBench("GetScanItemsQuick", GetScanItemsQuick(scan, value));
-		so->heapFull = so->itemCount == so->maxItems;
-		so->stage++;
+		IvfflatBench("GetScanItems", GetScanItems(scan, value));
+		so->first = false;
 
 		/* Clean up if we allocated a new value */
 		if (value != scan->orderByData->sk_argument)
 			pfree(DatumGetPointer(value));
 	}
 
-	if (so->stage == 1)
-	{
-		if (so->itemCount > 0)
-		{
-			IvfflatScanItem *scanitem;
-
-			so->itemCount--;
-
-			scanitem = so->sortedItems[so->itemCount];
-
-#if PG_VERSION_NUM >= 120000
-			scan->xs_heaptid = scanitem->tid;
-#else
-			scan->xs_ctup.t_sef = scanitem->tid;
-#endif
-
-			if (BufferIsValid(so->buf))
-				ReleaseBuffer(so->buf);
-
-			/*
-			 * An index scan must maintain a pin on the index page holding the
-			 * item last returned by amgettuple
-			 *
-			 * https://www.postgresql.org/docs/current/index-locking.html
-			 */
-			so->buf = ReadBuffer(scan->indexRelation, scanitem->searchPage);
-
-			scan->xs_recheckorderby = false;
-			return true;
-		}
-		else if (so->heapFull)
-		{
-			Datum value = scan->orderByData->sk_argument;
-
-			if (so->normprocinfo != NULL)
-			{
-				/* No items will match if normalization fails */
-				if (!IvfflatNormValue(so->normprocinfo, so->collation, &value, NULL))
-					return false;
-			}
-
-			if (so->sortstate == NULL)
-				InitSort(so);
-
-			IvfflatBench("GetScanItems", GetScanItems(scan, value));
-			so->stage++;
-
-			/* Clean up if we allocated a new value */
-			if (value != scan->orderByData->sk_argument)
-				pfree(DatumGetPointer(value));
-		}
-		else
-			so->stage = 3;
-	}
-
-	if (so->stage == 2)
-	{
 #if PG_VERSION_NUM >= 100000
-		if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
+	if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
 #else
-		if (tuplesort_gettupleslot(so->sortstate, true, so->slot, NULL))
+	if (tuplesort_gettupleslot(so->sortstate, true, so->slot, NULL))
 #endif
-		{
-			ItemPointer tid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));
-			BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull));
+	{
+		ItemPointer tid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));
+		BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull));
 
 #if PG_VERSION_NUM >= 120000
-			scan->xs_heaptid = *tid;
+		scan->xs_heaptid = *tid;
 #else
-			scan->xs_ctup.t_self = *tid;
+		scan->xs_ctup.t_self = *tid;
 #endif
 
-			if (BufferIsValid(so->buf))
-				ReleaseBuffer(so->buf);
+		if (BufferIsValid(so->buf))
+			ReleaseBuffer(so->buf);
 
-			/*
-			 * An index scan must maintain a pin on the index page holding the
-			 * item last returned by amgettuple
-			 *
-			 * https://www.postgresql.org/docs/current/index-locking.html
-			 */
-			so->buf = ReadBuffer(scan->indexRelation, indexblkno);
+		/*
+		 * An index scan must maintain a pin on the index page holding the
+		 * item last returned by amgettuple
+		 *
+		 * https://www.postgresql.org/docs/current/index-locking.html
+		 */
+		so->buf = ReadBuffer(scan->indexRelation, indexblkno);
 
-			scan->xs_recheckorderby = false;
-			return true;
-		}
+		scan->xs_recheckorderby = false;
+		return true;
 	}
 
 	return false;
@@ -540,14 +348,7 @@ ivfflatendscan(IndexScanDesc scan)
 		ReleaseBuffer(so->buf);
 
 	pairingheap_free(so->listQueue);
-	pfree(so->sortedLists);
-
-	if (so->sortstate != NULL)
-		tuplesort_end(so->sortstate);
-
-	pairingheap_free(so->itemQueue);
-	pfree(so->items);
-	pfree(so->sortedItems);
+	tuplesort_end(so->sortstate);
 
 	pfree(so);
 	scan->opaque = NULL;

src/ivfutils.c

@@ -135,17 +135,29 @@ IvfflatCommitBuffer(Buffer buf, GenericXLogState *state)
 void
 IvfflatAppendPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, ForkNumber forkNum)
 {
-	Buffer		prevbuf = *buf;
-
 	/* Get new buffer */
-	*buf = IvfflatNewBuffer(index, forkNum);
+	Buffer		newbuf = IvfflatNewBuffer(index, forkNum);
+	Page		newpage = GenericXLogRegisterBuffer(*state, newbuf, GENERIC_XLOG_FULL_IMAGE);
 
-	/* Update and commit previous buffer */
-	IvfflatPageGetOpaque(*page)->nextblkno = BufferGetBlockNumber(*buf);
-	IvfflatCommitBuffer(prevbuf, *state);
+	/* Update the previous buffer */
+	IvfflatPageGetOpaque(*page)->nextblkno = BufferGetBlockNumber(newbuf);
 
 	/* Init new page */
-	IvfflatInitPage(index, buf, page, state);
+	PageInit(newpage, BufferGetPageSize(newbuf), sizeof(IvfflatPageOpaqueData));
+	IvfflatPageGetOpaque(newpage)->nextblkno = InvalidBlockNumber;
+	IvfflatPageGetOpaque(newpage)->page_id = IVFFLAT_PAGE_ID;
+
+	/* Commit */
+	MarkBufferDirty(*buf);
+	MarkBufferDirty(newbuf);
+	GenericXLogFinish(*state);
+
+	/* Unlock */
+	UnlockReleaseBuffer(*buf);
+
+	*state = GenericXLogStart(index);
+	*page = GenericXLogRegisterBuffer(*state, newbuf, GENERIC_XLOG_FULL_IMAGE);
+	*buf = newbuf;
 }
 
 /*

test/t/001_wal.pl

@@ -7,6 +7,8 @@ use PostgresNode;
 use TestLib;
 use Test::More tests => 31;
 
+my $dim = 32;
+
 my $node_primary;
 my $node_replica;
 
@@ -30,13 +32,15 @@ sub test_index_replay
 	$node_primary->poll_query_until('postgres', $caughtup_query)
 	  or die "Timed out while waiting for replica 1 to catch up";
 
-	my $r1 = rand();
-	my $r2 = rand();
-	my $r3 = rand();
+	my @r = ();
+	for (1 .. $dim) {
+		push(@r, rand());
+	}
+	my $sql = join(",", @r);
 
 	my $queries = qq(
 		SET enable_seqscan = off;
-		SELECT * FROM tst ORDER BY v <-> '[$r1,$r2,$r3]' LIMIT 10;
+		SELECT * FROM tst ORDER BY v <-> '[$sql]' LIMIT 10;
 	);
 
 	# Run test queries and compare their result
@@ -50,6 +54,10 @@ sub test_index_replay
 # Initialize primary node
 $node_primary = get_new_node('primary');
 $node_primary->init(allows_streaming => 1);
+if ($dim > 32) {
+	# TODO use wal_keep_segments for Postgres < 13
+	$node_primary->append_conf('postgresql.conf', qq(wal_keep_size = 1GB));
+}
 $node_primary->start;
 my $backup_name = 'my_backup';
 
@@ -64,9 +72,9 @@ $node_replica->start;
 
 # Create ivfflat index on primary
 $node_primary->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node_primary->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
+$node_primary->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
 $node_primary->safe_psql("postgres",
-	"INSERT INTO tst SELECT i % 10, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i % 10, (SELECT array_agg(random()) FROM generate_series(1, $dim)) FROM generate_series(1, 100000) i;"
 );
 $node_primary->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v);");
 
@@ -82,7 +90,7 @@ for my $i (1 .. 10)
 	test_index_replay("vacuum $i");
 	my ($start, $end) = (100001 + ($i - 1) * 10000, 100000 + $i * 10000);
 	$node_primary->safe_psql("postgres",
-		"INSERT INTO tst SELECT i % 10, ARRAY[random(), random(), random()] FROM generate_series($start, $end) i;"
+		"INSERT INTO tst SELECT i % 10, (SELECT array_agg(random()) FROM generate_series(1, $dim)) FROM generate_series($start, $end) i;"
 	);
 	test_index_replay("insert $i");
 }

test/t/007_inserts.pl

@@ -0,0 +1,33 @@
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 3;
+
+# Initialize node
+my $node = get_new_node('node');
+$node->init;
+$node->start;
+
+# Create table and index
+$node->safe_psql("postgres", "CREATE EXTENSION vector;");
+$node->safe_psql("postgres", "CREATE TABLE tst (v vector(768));");
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT (SELECT array_agg(random()) FROM generate_series(1, 768)) FROM generate_series(1, 10000) i;"
+);
+$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v);");
+
+$node->pgbench(
+	"--no-vacuum --client=5 --transactions=100",
+	0,
+	[qr{actually processed}],
+	[qr{^$}],
+	"concurrent INSERTs",
+	{
+		"007_concurrent" => q(
+			BEGIN;
+			INSERT INTO tst SELECT (SELECT array_agg(random()) FROM generate_series(1, 768)) FROM generate_series(1, 10) i;
+			COMMIT;
+		),
+	}
+);

test/t/007_stages.pl

@@ -1,38 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More tests => 2;
-
-# Initialize node
-my $node = get_new_node('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[i % 1000, i % 1000, i % 1000] FROM generate_series(1, 10000) i;"
-);
-
-my @limits = (128, 2048);
-my @expected = ();
-
-foreach (@limits) {
-	my $res = $node->safe_psql("postgres", "SELECT i, v FROM tst ORDER BY v <-> '[0,0,0]', i LIMIT $_;");
-	push(@expected, $res);
-}
-
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v) WITH (lists = 5);");
-
-for my $i (0 .. $#limits) {
-	my $res = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		SET ivfflat.probes = 5;
-		WITH tmp AS (
-			SELECT *, v <-> '[0,0,0]' AS d FROM tst ORDER BY v <-> '[0,0,0]' LIMIT $limits[$i]
-		) SELECT i, v FROM tmp ORDER BY d, i;
-	));
-	is($res, $expected[$i]);
-}

vector.control

@@ -1,4 +1,4 @@
 comment = 'vector data type and ivfflat access method'
-default_version = '0.2.5'
+default_version = '0.2.7'
 module_pathname = '$libdir/vector'
 relocatable = true