Improved test [skip ci]

Improved types
Updated comment [skip ci]
2026-07-22 20:15:46 +08:00 · 2024-01-23 15:13:14 -08:00 · 2024-01-23 15:08:50 -08:00 · 2024-01-23 15:01:48 -08:00 · 2024-01-23 15:01:11 -08:00
24 changed files with 308 additions and 394 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
          dev-files: true
      - run: make
        env:
-          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
+          PG_CFLAGS: -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
      - run: |
          export PG_CONFIG=`which pg_config`
          sudo --preserve-env=PG_CONFIG make install
@@ -49,7 +49,7 @@ jobs:
          postgres-version: 14
      - run: make
        env:
-          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter
+          PG_CFLAGS: -Wall -Wextra -Werror -Wno-unused-parameter
      - run: make install
      - run: make installcheck
      - if: ${{ failure() }}
@@ -57,12 +57,10 @@ jobs:
      - run: |
          brew install cpanm
          cpanm --notest IPC::Run
-          wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_10.tar.gz
-          tar xf REL_14_10.tar.gz
-      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres-REL_14_10/src/test/perl" PERL5LIB="/Users/runner/perl5/lib/perl5"
-      - run: make clean && /usr/local/opt/llvm@15/bin/scan-build --status-bugs make
-        env:
-          PG_CFLAGS: -DUSE_ASSERT_CHECKING
+          wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_5.tar.gz
+          tar xf REL_14_5.tar.gz
+      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres-REL_14_5/src/test/perl" PERL5LIB="/Users/runner/perl5/lib/perl5"
+      - run: make clean && /usr/local/opt/llvm@15/bin/scan-build --status-bugs make PG_CFLAGS="-DUSE_ASSERT_CHECKING"
  windows:
    runs-on: windows-latest
    if: ${{ !startsWith(github.ref_name, 'mac') }}
@@ -99,15 +97,4 @@ jobs:
          sudo -u postgres make installcheck
          sudo -u postgres make prove_installcheck
        env:
-          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
-  valgrind:
-    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ankane/setup-postgres-valgrind@v1
-        with:
-          postgres-version: 16
-      - run: make
-      - run: sudo --preserve-env=PG_CONFIG make install
-      - run: make installcheck
+          PG_CFLAGS: -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,27 +1,16 @@
-## 0.6.2 (unreleased)
+## 0.6.0 (unreleased)

- Reduced lock contention with parallel HNSW index builds
+If upgrading with Postgres < 13, see [this note](https://github.com/pgvector/pgvector#060).

-## 0.6.1 (2024-03-04)
-
- Fixed error with `ANALYZE` and vectors with different dimensions
- Fixed error with `shared_preload_libraries`
- Fixed vector subtraction being marked as commutative
-
-## 0.6.0 (2024-01-29)
-
-If upgrading with Postgres 12 or Docker, see [these notes](https://github.com/pgvector/pgvector#060).
-
- Added support for parallel index builds for HNSW
- Added validation for GUC parameters
 - Changed storage for vector from `extended` to `external`
 - Improved performance of HNSW
+- Added support for parallel index builds for HNSW
+- Added `hamming_distance` function
+- Added validation for GUC parameters
 - Reduced memory usage for HNSW index builds
 - Reduced WAL generation for HNSW index builds
 - Fixed error with logical replication
- Fixed `invalid memory alloc request size` error with HNSW index builds
- Moved Docker image to `pgvector` org
- Added Docker tags for each supported version of Postgres
+- Fixed `invalid memory alloc request size` error with HNSW index build
 - Dropped support for Postgres 11

 ## 0.5.1 (2023-10-10)
@@ -70,7 +59,7 @@ If upgrading with Postgres 12 or Docker, see [these notes](https://github.com/pg

 ## 0.4.0 (2023-01-11)

-If upgrading with Postgres < 13, see [this note](https://github.com/pgvector/pgvector/blob/v0.4.0/README.md#040).
+If upgrading with Postgres < 13, see [this note](https://github.com/pgvector/pgvector#040).

 - Changed text representation for vector elements to match `real`
 - Changed storage for vector from `plain` to `extended`
@@ -87,7 +76,7 @@ If upgrading with Postgres < 13, see [this note](https://github.com/pgvector/pgv

 ## 0.3.1 (2022-11-02)

-If upgrading from 0.2.7 or 0.3.0, [recreate](https://github.com/pgvector/pgvector/blob/v0.3.1/README.md#031) all `ivfflat` indexes after upgrading to ensure all data is indexed.
+If upgrading from 0.2.7 or 0.3.0, [recreate](https://github.com/pgvector/pgvector#031) all `ivfflat` indexes after upgrading to ensure all data is indexed.

 - Fixed issue with inserts silently corrupting `ivfflat` indexes (introduced in 0.2.7)
 - Fixed segmentation fault with index creation when lists > 6500
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-ARG PG_MAJOR=16
+ARG PG_MAJOR=15
 FROM postgres:$PG_MAJOR
 ARG PG_MAJOR

--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group

 Portions Copyright (c) 1994, The Regents of the University of California

--- a/META.json
+++ b/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.6.1",
+	"version": "0.5.1",
 	"maintainer": [
 		"Andrew Kane <andrew@ankane.org>"
 	],
@@ -20,7 +20,7 @@
 		"vector": {
 			"file": "sql/vector.sql",
 			"docfile": "README.md",
-			"version": "0.6.1",
+			"version": "0.5.1",
 			"abstract": "Open-source vector similarity search for Postgres"
 		}
 	},
--- a/10
+++ b/10
@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.6.1
+EXTVERSION = 0.5.1

 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)
@@ -65,15 +65,13 @@ dist:
 	mkdir -p dist
 	git archive --format zip --prefix=$(EXTENSION)-$(EXTVERSION)/ --output dist/$(EXTENSION)-$(EXTVERSION).zip master

-# for Docker
-PG_MAJOR ?= 16
-
 .PHONY: docker

 docker:
-	docker build --pull --no-cache --build-arg PG_MAJOR=$(PG_MAJOR) -t pgvector/pgvector:pg$(PG_MAJOR) -t pgvector/pgvector:$(EXTVERSION)-pg$(PG_MAJOR) .
+	docker build --pull --no-cache --platform linux/amd64 -t ankane/pgvector:latest .

 .PHONY: docker-release

 docker-release:
-	docker buildx build --push --pull --no-cache --platform linux/amd64,linux/arm64 --build-arg PG_MAJOR=$(PG_MAJOR) -t pgvector/pgvector:pg$(PG_MAJOR) -t pgvector/pgvector:$(EXTVERSION)-pg$(PG_MAJOR) .
+	docker buildx build --push --pull --no-cache --platform linux/amd64,linux/arm64 -t ankane/pgvector:latest .
+	docker buildx build --push --platform linux/amd64,linux/arm64 -t ankane/pgvector:v$(EXTVERSION) .
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.6.1
+EXTVERSION = 0.5.1

 OBJS = src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
 HEADERS = src\vector.h
--- a/README.md
+++ b/README.md
@@ -14,13 +14,11 @@ Plus [ACID](https://en.wikipedia.org/wiki/ACID) compliance, point-in-time recove

 ## Installation

-### Linux and Mac
-
-Compile and install the extension (supports Postgres 12+)
+Compile and install the extension (supports Postgres 11+)

 ```sh
 cd /tmp
-git clone --branch v0.6.1 https://github.com/pgvector/pgvector.git
+git clone --branch v0.5.1 https://github.com/pgvector/pgvector.git
 cd pgvector
 make
 make install # may need sudo
@@ -28,29 +26,7 @@ make install # may need sudo

 See the [installation notes](#installation-notes) if you run into issues

-You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), [APT](#apt), [Yum](#yum), [pkg](#pkg), or [conda-forge](#conda-forge), and it comes preinstalled with [Postgres.app](#postgresapp) and many [hosted providers](#hosted-postgres). There are also instructions for [GitHub Actions](https://github.com/pgvector/setup-pgvector).
-
-### Windows
-
-Ensure [C++ support in Visual Studio](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) is installed, and run:
-
-```cmd
-call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-```
-
-Note: The exact path will vary depending on your Visual Studio version and edition
-
-Then use `nmake` to build:
-
-```cmd
-set "PGROOT=C:\Program Files\PostgreSQL\16"
-git clone --branch v0.6.1 https://github.com/pgvector/pgvector.git
-cd pgvector
-nmake /F Makefile.win
-nmake /F Makefile.win install
-```
-
-You can also install it with [Docker](#docker) or [conda-forge](#conda-forge).
+You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), [APT](#apt), [Yum](#yum), or [conda-forge](#conda-forge), and it comes preinstalled with [Postgres.app](#postgresapp) and many [hosted providers](#hosted-postgres). There are also instructions for [GitHub Actions](https://github.com/pgvector/setup-pgvector).

 ## Getting Started

@@ -102,12 +78,6 @@ Insert vectors
 INSERT INTO items (embedding) VALUES ('[1,2,3]'), ('[4,5,6]');
 ```

-Or load vectors in bulk using `COPY` ([example](https://github.com/pgvector/pgvector-python/blob/master/examples/bulk_loading.py))
-
-```sql
-COPY items (embedding) FROM STDIN WITH (FORMAT BINARY);
-```
-
 Upsert vectors

 ```sql
@@ -270,16 +240,6 @@ HINT:  Increase maintenance_work_mem to speed up builds.

 Note: Do not set `maintenance_work_mem` so high that it exhausts the memory on the server

-Like other index types, it’s faster to create an index after loading your initial data
-
-Starting with 0.6.0, you can also speed up index creation by increasing the number of parallel workers (2 by default)
-
-```sql
-SET max_parallel_maintenance_workers = 7; -- plus leader
-```
-
-For a large number of workers, you may also need to increase `max_parallel_workers` (8 by default)
-
 ### Indexing Progress

 Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
@@ -438,15 +398,6 @@ To speed up queries with an IVFFlat index, increase the number of inverted lists
 CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 1000);
 ```

-## Vacuuming
-
-Vacuuming can take a while for HNSW indexes. Speed it up by reindexing first.
-
-```sql
-REINDEX INDEX CONCURRENTLY index_name;
-VACUUM table_name;
-```
-
 ## Languages

 Use pgvector from any language with a Postgres client. You can even generate and store vectors in one language and query them in another.
@@ -581,10 +532,6 @@ or choose to store vectors inline:
 ALTER TABLE items ALTER COLUMN embedding SET STORAGE PLAIN;
 ```

-#### Why are there less results for a query after adding an HNSW index?
-
-Results are limited by the size of the dynamic candidate list (`hnsw.ef_search`). There may be even less results due to dead tuples or filtering conditions in the query. We recommend setting `hnsw.ef_search` to at least twice the `LIMIT` of the query. If you need more than 500 results, use an IVFFlat index instead.
-
 #### Why are there less results for a query after adding an IVFFlat index?

 The index was likely created with too little data for the number of lists. Drop the index until the table has more data.
@@ -593,8 +540,6 @@ The index was likely created with too little data for the number of lists. Drop
 DROP INDEX index_name;
 ```

-Results can also be limited by the number of probes (`ivfflat.probes`).
-
 ## Reference

 ### Vector Type
@@ -670,32 +615,44 @@ Note: Replace `16` with your Postgres server version

 If compilation fails and the output includes `warning: no such sysroot directory` on Mac, reinstall Xcode Command Line Tools.

-### Portability
+### Windows

-To compile for portability, use:
+Support for Windows is currently experimental. Ensure [C++ support in Visual Studio](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) is installed, and run:

-```sh
-make OPTFLAGS=""
+```cmd
+call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+```
+
+Note: The exact path will vary depending on your Visual Studio version and edition
+
+Then use `nmake` to build:
+
+```cmd
+set "PGROOT=C:\Program Files\PostgreSQL\16"
+git clone --branch v0.5.1 https://github.com/pgvector/pgvector.git
+cd pgvector
+nmake /F Makefile.win
+nmake /F Makefile.win install
 ```

 ## Additional Installation Methods

 ### Docker

-Get the [Docker image](https://hub.docker.com/r/pgvector/pgvector) with:
+Get the [Docker image](https://hub.docker.com/r/ankane/pgvector) with:

 ```sh
-docker pull pgvector/pgvector:pg16
+docker pull ankane/pgvector
 ```

-This adds pgvector to the [Postgres image](https://hub.docker.com/_/postgres) (replace `16` with your Postgres server version, and run it the same way).
+This adds pgvector to the [Postgres image](https://hub.docker.com/_/postgres) (run it the same way).

 You can also build the image manually:

 ```sh
-git clone --branch v0.6.1 https://github.com/pgvector/pgvector.git
+git clone --branch v0.5.1 https://github.com/pgvector/pgvector.git
 cd pgvector
-docker build --build-arg PG_MAJOR=16 -t myuser/pgvector .
+docker build --build-arg PG_MAJOR=15 -t myuser/pgvector .
 ```

 ### Homebrew
@@ -738,21 +695,6 @@ sudo dnf install pgvector_16

 Note: Replace `16` with your Postgres server version

-### pkg
-
-Install the FreeBSD package with:
-
-```sh
-pkg install postgresql15-pg_vector
-```
-
-or the port with:
-
-```sh
-cd /usr/ports/databases/pgvector
-make install
-```
-
 ### conda-forge

 With Conda Postgres, install from [conda-forge](https://anaconda.org/conda-forge/pgvector) with:
@@ -787,11 +729,9 @@ SELECT extversion FROM pg_extension WHERE extname = 'vector';

 ## Upgrade Notes

-### 0.6.0
+### 0.6.0 [unreleased]

-#### Postgres 12
-
-If upgrading with Postgres 12, remove this line from `sql/vector--0.5.1--0.6.0.sql`:
+If upgrading with Postgres < 13, remove this line from `sql/vector--0.5.1--0.6.0.sql`:

 ```sql
 ALTER TYPE vector SET (STORAGE = external);
@@ -799,20 +739,28 @@ ALTER TYPE vector SET (STORAGE = external);

 Then run `make install` and `ALTER EXTENSION vector UPDATE;`.

-#### Docker
+### 0.4.0

-The Docker image is now published in the `pgvector` org, and there are tags for each supported version of Postgres (rather than a `latest` tag).
+If upgrading with Postgres < 13, remove this line from `sql/vector--0.3.2--0.4.0.sql`:

-```sh
-docker pull pgvector/pgvector:pg16
-# or
-docker pull pgvector/pgvector:0.6.0-pg16
+```sql
+ALTER TYPE vector SET (STORAGE = extended);
 ```

-Also, if you’ve increased `maintenance_work_mem`, make sure `--shm-size` is at least that size to avoid an error with parallel HNSW index builds.
+Then run `make install` and `ALTER EXTENSION vector UPDATE;`.

-```sh
-docker run --shm-size=1g ...
+### 0.3.1
+
+If upgrading from 0.2.7 or 0.3.0, recreate all `ivfflat` indexes after upgrading to ensure all data is indexed.
+
+```sql
+-- Postgres 12+
+REINDEX INDEX CONCURRENTLY index_name;
+
+-- Postgres < 12
+CREATE INDEX CONCURRENTLY temp_name ON table USING ivfflat (column opclass);
+DROP INDEX CONCURRENTLY index_name;
+ALTER INDEX temp_name RENAME TO index_name;
 ```

 ## Thanks
@@ -858,8 +806,8 @@ make prove_installcheck  # TAP tests
 To run single tests:

 ```sh
-make installcheck REGRESS=functions                            # regression test
-make prove_installcheck PROVE_TESTS=test/t/001_ivfflat_wal.pl  # TAP test
+make installcheck REGRESS=functions                    # regression test
+make prove_installcheck PROVE_TESTS=test/t/001_wal.pl  # TAP test
 ```

 To enable benchmarking:
--- a/sql/vector--0.5.1--0.6.0.sql
+++ b/sql/vector--0.5.1--0.6.0.sql
@@ -3,3 +3,6 @@

 -- remove this single line for Postgres < 13
 ALTER TYPE vector SET (STORAGE = external);
+
+CREATE FUNCTION hamming_distance(bytea, bytea) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
--- a/sql/vector--0.6.0--0.6.1.sql
+++ b/sql/vector--0.6.0--0.6.1.sql
@@ -1,16 +0,0 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.6.1'" to load this file. \quit
-
-DROP OPERATOR - (vector, vector);
-
-CREATE OPERATOR - (
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_sub
-);
-
-ALTER OPERATOR <= (vector, vector) SET (
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-ALTER OPERATOR >= (vector, vector) SET (
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
--- a/sql/vector.sql
+++ b/sql/vector.sql
@@ -180,7 +180,8 @@ CREATE OPERATOR + (
 );

 CREATE OPERATOR - (
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_sub
+	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_sub,
+	COMMUTATOR = -
 );

 CREATE OPERATOR * (
@@ -194,10 +195,11 @@ CREATE OPERATOR < (
 	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
 );

+-- should use scalarlesel and scalarlejoinsel, but not supported in Postgres < 11
 CREATE OPERATOR <= (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_le,
 	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
+	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
 );

 CREATE OPERATOR = (
@@ -212,10 +214,11 @@ CREATE OPERATOR <> (
 	RESTRICT = eqsel, JOIN = eqjoinsel
 );

+-- should use scalargesel and scalargejoinsel, but not supported in Postgres < 11
 CREATE OPERATOR >= (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_ge,
 	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
+	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
 );

 CREATE OPERATOR > (
@@ -287,3 +290,8 @@ CREATE OPERATOR CLASS vector_cosine_ops
 	OPERATOR 1 <=> (vector, vector) FOR ORDER BY float_ops,
 	FUNCTION 1 vector_negative_inner_product(vector, vector),
 	FUNCTION 2 vector_norm(vector);
+
+-- bytea functions
+
+CREATE FUNCTION hamming_distance(bytea, bytea) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
--- a/src/hnsw.c
+++ b/src/hnsw.c
@@ -8,7 +8,6 @@
 #include "commands/progress.h"
 #include "commands/vacuum.h"
 #include "hnsw.h"
-#include "miscadmin.h"
 #include "utils/guc.h"
 #include "utils/selfuncs.h"

@@ -29,7 +28,7 @@ static relopt_kind hnsw_relopt_kind;
 * this grows bigger, we should use a shmem_request_hook and
 * RequestAddinShmemSpace() to pre-reserve space for this.
 */
-void
+static void
 HnswInitLockTranche(void)
 {
 	int		   *tranche_ids;
@@ -54,8 +53,7 @@ HnswInitLockTranche(void)
 void
 HnswInit(void)
 {
-	if (!process_shared_preload_libraries_in_progress)
-		HnswInitLockTranche();
+	HnswInitLockTranche();

 	hnsw_relopt_kind = add_reloption_kind();
 	add_int_reloption(hnsw_relopt_kind, "m", "Max number of connections",
--- a/src/hnsw.h
+++ b/src/hnsw.h
@@ -60,13 +60,10 @@
 #define PROGRESS_HNSW_PHASE_LOAD		2

 #define HNSW_MAX_SIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(HnswPageOpaqueData)) - sizeof(ItemIdData))
-#define HNSW_TUPLE_ALLOC_SIZE BLCKSZ

 #define HNSW_ELEMENT_TUPLE_SIZE(size)	MAXALIGN(offsetof(HnswElementTupleData, data) + (size))
 #define HNSW_NEIGHBOR_TUPLE_SIZE(level, m)	MAXALIGN(offsetof(HnswNeighborTupleData, indextids) + ((level) + 2) * (m) * sizeof(ItemPointerData))

-#define HNSW_NEIGHBOR_ARRAY_SIZE(lm)	(offsetof(HnswNeighborArray, items) + sizeof(HnswCandidate) * (lm))
-
 #define HnswPageGetOpaque(page)	((HnswPageOpaque) PageGetSpecialPointer(page))
 #define HnswPageGetMeta(page)	((HnswMetaPageData *) PageGetContents(page))

@@ -80,7 +77,7 @@

 #if PG_VERSION_NUM < 130000
 #define list_delete_last(list) list_truncate(list, list_length(list) - 1)
-#define list_sort(list, cmp) ((list) = list_qsort(list, cmp))
+#define list_sort(list, cmp) list_qsort(list, cmp)
 #endif

 #define HnswIsElementTuple(tup) ((tup)->type == HNSW_ELEMENT_TUPLE_TYPE)
@@ -185,7 +182,6 @@ typedef struct HnswGraph

 	/* Entry state */
 	LWLock		entryLock;
-	LWLock		entryWaitLock;
 	HnswElementPtr entryPoint;

 	/* Allocations state */
@@ -383,14 +379,13 @@ void		HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint
 void		HnswSetNeighborTuple(char *base, HnswNeighborTuple ntup, HnswElement e, int m);
 void		HnswAddHeapTid(HnswElement element, ItemPointer heaptid);
 void		HnswInitNeighbors(char *base, HnswElement element, int m, HnswAllocator * alloc);
-bool		HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, bool building);
+bool		HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel, bool building);
 void		HnswUpdateNeighborsOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting, bool building);
 void		HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHeaptids, bool loadVec);
 void		HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index, FmgrInfo *procinfo, Oid collation, bool loadVec);
 void		HnswSetElementTuple(char *base, HnswElementTuple etup, HnswElement element);
 void		HnswUpdateConnection(char *base, HnswElement element, HnswCandidate * hc, int lm, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation);
 void		HnswLoadNeighbors(HnswElement element, Relation index, int m);
-void		HnswInitLockTranche(void);
 PGDLLEXPORT void HnswParallelBuildMain(dsm_segment *seg, shm_toc *toc);

 /* Index access methods */
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -65,6 +65,8 @@
 #define CALLBACK_ITEM_POINTER HeapTuple hup
 #endif

+#define UpdateProgress(index, val) pgstat_progress_update_param(index, val)
+
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_status.h"
 #include "utils/wait_event.h"
@@ -141,13 +143,14 @@ HnswBuildAppendPage(Relation index, Buffer *buf, Page *page, ForkNumber forkNum)
 }

 /*
- * Create graph pages
+ * Create element pages
 */
 static void
-CreateGraphPages(HnswBuildState * buildstate)
+CreateElementPages(HnswBuildState * buildstate)
 {
 	Relation	index = buildstate->index;
 	ForkNumber	forkNum = buildstate->forkNum;
+	Size		etupAllocSize;
 	Size		maxSize;
 	HnswElementTuple etup;
 	HnswNeighborTuple ntup;
@@ -159,11 +162,12 @@ CreateGraphPages(HnswBuildState * buildstate)
 	char	   *base = buildstate->hnswarea;

 	/* Calculate sizes */
+	etupAllocSize = BLCKSZ;
 	maxSize = HNSW_MAX_SIZE;

 	/* Allocate once */
-	etup = palloc0(HNSW_TUPLE_ALLOC_SIZE);
-	ntup = palloc0(HNSW_TUPLE_ALLOC_SIZE);
+	etup = palloc0(etupAllocSize);
+	ntup = palloc0(BLCKSZ);

 	/* Prepare first page */
 	buf = HnswNewBuffer(index, forkNum);
@@ -176,13 +180,13 @@ CreateGraphPages(HnswBuildState * buildstate)
 		Size		etupSize;
 		Size		ntupSize;
 		Size		combinedSize;
-		Pointer		valuePtr = HnswPtrAccess(base, element->value);
+		void	   *valuePtr = HnswPtrAccess(base, element->value);

 		/* Update iterator */
 		iter = element->next;

 		/* Zero memory for each element */
-		MemSet(etup, 0, HNSW_TUPLE_ALLOC_SIZE);
+		MemSet(etup, 0, etupAllocSize);

 		/* Calculate sizes */
 		etupSize = HNSW_ELEMENT_TUPLE_SIZE(VARSIZE_ANY(valuePtr));
@@ -190,7 +194,7 @@ CreateGraphPages(HnswBuildState * buildstate)
 		combinedSize = etupSize + ntupSize + sizeof(ItemIdData);

 		/* Initial size check */
-		if (etupSize > HNSW_TUPLE_ALLOC_SIZE)
+		if (etupSize > etupAllocSize)
 			elog(ERROR, "index tuple too large");

 		HnswSetElementTuple(base, etup, element);
@@ -242,10 +246,10 @@ CreateGraphPages(HnswBuildState * buildstate)
 }

 /*
- * Write neighbor tuples
+ * Create neighbor pages
 */
 static void
-WriteNeighborTuples(HnswBuildState * buildstate)
+CreateNeighborPages(HnswBuildState * buildstate)
 {
 	Relation	index = buildstate->index;
 	ForkNumber	forkNum = buildstate->forkNum;
@@ -255,32 +259,29 @@ WriteNeighborTuples(HnswBuildState * buildstate)
 	HnswNeighborTuple ntup;

 	/* Allocate once */
-	ntup = palloc0(HNSW_TUPLE_ALLOC_SIZE);
+	ntup = palloc0(BLCKSZ);

 	while (!HnswPtrIsNull(base, iter))
 	{
-		HnswElement element = HnswPtrAccess(base, iter);
+		HnswElement e = HnswPtrAccess(base, iter);
 		Buffer		buf;
 		Page		page;
-		Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, m);
+		Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);

 		/* Update iterator */
-		iter = element->next;
-
-		/* Zero memory for each element */
-		MemSet(ntup, 0, HNSW_TUPLE_ALLOC_SIZE);
+		iter = e->next;

 		/* Can take a while, so ensure we can interrupt */
 		/* Needs to be called when no buffer locks are held */
 		CHECK_FOR_INTERRUPTS();

-		buf = ReadBufferExtended(index, forkNum, element->neighborPage, RBM_NORMAL, NULL);
+		buf = ReadBufferExtended(index, forkNum, e->neighborPage, RBM_NORMAL, NULL);
 		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
 		page = BufferGetPage(buf);

-		HnswSetNeighborTuple(base, ntup, element, m);
+		HnswSetNeighborTuple(base, ntup, e, m);

-		if (!PageIndexTupleOverwrite(page, element->neighborOffno, (Item) ntup, ntupSize))
+		if (!PageIndexTupleOverwrite(page, e->neighborOffno, (Item) ntup, ntupSize))
 			elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));

 		/* Commit */
@@ -302,8 +303,8 @@ FlushPages(HnswBuildState * buildstate)
 #endif

 	CreateMetaPage(buildstate);
-	CreateGraphPages(buildstate);
-	WriteNeighborTuples(buildstate);
+	CreateElementPages(buildstate);
+	CreateNeighborPages(buildstate);

 	buildstate->graph->flushed = true;
 	MemoryContextReset(buildstate->graphCtx);
@@ -431,15 +432,10 @@ InsertTupleInMemory(HnswBuildState * buildstate, HnswElement element)
 	HnswGraph  *graph = buildstate->graph;
 	HnswElement entryPoint;
 	LWLock	   *entryLock = &graph->entryLock;
-	LWLock	   *entryWaitLock = &graph->entryWaitLock;
 	int			efConstruction = buildstate->efConstruction;
 	int			m = buildstate->m;
 	char	   *base = buildstate->hnswarea;

-	/* Wait if another process needs exclusive lock */
-	LWLockAcquire(entryWaitLock, LW_EXCLUSIVE);
-	LWLockRelease(entryWaitLock);
-
 	/* Get entry point */
 	LWLockAcquire(entryLock, LW_SHARED);
 	entryPoint = HnswPtrAccess(base, graph->entryPoint);
@@ -451,9 +447,7 @@ InsertTupleInMemory(HnswBuildState * buildstate, HnswElement element)
 		LWLockRelease(entryLock);

 		/* Get exclusive lock */
-		LWLockAcquire(entryWaitLock, LW_EXCLUSIVE);
 		LWLockAcquire(entryLock, LW_EXCLUSIVE);
-		LWLockRelease(entryWaitLock);

 		/* Get latest entry point after lock is acquired */
 		entryPoint = HnswPtrAccess(base, graph->entryPoint);
@@ -504,7 +498,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
 	{
 		LWLockRelease(flushLock);

-		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, true);
+		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, buildstate->heap, true);
 	}

 	/*
@@ -536,7 +530,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn

 		LWLockRelease(flushLock);

-		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, true);
+		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, buildstate->heap, true);
 	}

 	/* Ok, we can proceed to allocate the element */
@@ -593,7 +587,7 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 	{
 		/* Update progress */
 		SpinLockAcquire(&graph->lock);
-		pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE, ++graph->indtuples);
+		UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++graph->indtuples);
 		SpinLockRelease(&graph->lock);
 	}

@@ -608,9 +602,6 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 static void
 InitGraph(HnswGraph * graph, char *base, long memoryTotal)
 {
-	/* Initialize the lock tranche if needed */
-	HnswInitLockTranche();
-
 	HnswPtrStore(base, graph->head, (HnswElement) NULL);
 	HnswPtrStore(base, graph->entryPoint, (HnswElement) NULL);
 	graph->memoryUsed = 0;
@@ -619,7 +610,6 @@ InitGraph(HnswGraph * graph, char *base, long memoryTotal)
 	graph->indtuples = 0;
 	SpinLockInit(&graph->lock);
 	LWLockInitialize(&graph->entryLock, hnsw_lock_tranche_id);
-	LWLockInitialize(&graph->entryWaitLock, hnsw_lock_tranche_id);
 	LWLockInitialize(&graph->allocatorLock, hnsw_lock_tranche_id);
 	LWLockInitialize(&graph->flushLock, hnsw_lock_tranche_id);
 }
@@ -985,14 +975,6 @@ HnswBeginParallel(HnswBuildState * buildstate, bool isconcurrent, int request)
 	/* Report less than allocated so never fails */
 	InitGraph(&hnswshared->graphData, hnswarea, esthnswarea - 1024 * 1024);

-	/*
-	 * Avoid base address for relptr for Postgres < 14.5
-	 * https://github.com/postgres/postgres/commit/7201cd18627afc64850537806da7f22150d1a83b
-	 */
-#if PG_VERSION_NUM < 140005
-	hnswshared->graphData.memoryUsed += MAXALIGN(1);
-#endif
-
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_HNSW_SHARED, hnswshared);
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_HNSW_AREA, hnswarea);

@@ -1066,7 +1048,7 @@ BuildGraph(HnswBuildState * buildstate, ForkNumber forkNum)
 {
 	int			parallel_workers = 0;

-	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_HNSW_PHASE_LOAD);
+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_HNSW_PHASE_LOAD);

 	/* Calculate parallel workers */
 	if (buildstate->heap != NULL)
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -355,7 +355,9 @@ HnswUpdateNeighborsOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, Hns
 			Buffer		buf;
 			Page		page;
 			GenericXLogState *state;
+			ItemId		itemid;
 			HnswNeighborTuple ntup;
+			Size		ntupSize;
 			int			idx = -1;
 			int			startIdx;
 			HnswElement neighborElement = HnswPtrAccess(base, hc->element);
@@ -394,7 +396,9 @@ HnswUpdateNeighborsOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, Hns
 			}

 			/* Get tuple */
-			ntup = (HnswNeighborTuple) PageGetItem(page, PageGetItemId(page, offno));
+			itemid = PageGetItemId(page, offno);
+			ntup = (HnswNeighborTuple) PageGetItem(page, itemid);
+			ntupSize = ItemIdGetLength(itemid);

 			/* Calculate index for update */
 			startIdx = (neighborElement->level - lc) * m;
@@ -423,9 +427,13 @@ HnswUpdateNeighborsOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, Hns
 			{
 				ItemPointer indextid = &ntup->indextids[idx];

-				/* Update neighbor on the buffer */
+				/* Update neighbor */
 				ItemPointerSet(indextid, e->blkno, e->offno);

+				/* Overwrite tuple */
+				if (!PageIndexTupleOverwrite(page, offno, (Item) ntup, ntupSize))
+					elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
+
 				/* Commit */
 				if (building)
 					MarkBufferDirty(buf);
@@ -449,7 +457,9 @@ AddDuplicateOnDisk(Relation index, HnswElement element, HnswElement dup, bool bu
 	Buffer		buf;
 	Page		page;
 	GenericXLogState *state;
+	ItemId		itemid;
 	HnswElementTuple etup;
+	Size		etupSize;
 	int			i;

 	/* Read page */
@@ -467,7 +477,9 @@ AddDuplicateOnDisk(Relation index, HnswElement element, HnswElement dup, bool bu
 	}

 	/* Find space */
-	etup = (HnswElementTuple) PageGetItem(page, PageGetItemId(page, dup->offno));
+	itemid = PageGetItemId(page, dup->offno);
+	etup = (HnswElementTuple) PageGetItem(page, itemid);
+	etupSize = ItemIdGetLength(itemid);
 	for (i = 0; i < HNSW_HEAPTIDS; i++)
 	{
 		if (!ItemPointerIsValid(&etup->heaptids[i]))
@@ -483,9 +495,13 @@ AddDuplicateOnDisk(Relation index, HnswElement element, HnswElement dup, bool bu
 		return false;
 	}

-	/* Add heap TID, modifying the tuple on the page directly */
+	/* Add heap TID */
 	etup->heaptids[i] = element->heaptids[0];

+	/* Overwrite tuple */
+	if (!PageIndexTupleOverwrite(page, dup->offno, (Item) etup, etupSize))
+		elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
+
 	/* Commit */
 	if (building)
 		MarkBufferDirty(buf);
@@ -554,7 +570,7 @@ UpdateGraphOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement
 * Insert a tuple into the index
 */
 bool
-HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, bool building)
+HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel, bool building)
 {
 	HnswElement entryPoint;
 	HnswElement element;
@@ -609,7 +625,7 @@ HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull,
 * Insert a tuple into the index
 */
 static void
-HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid)
+HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel)
 {
 	Datum		value;
 	FmgrInfo   *normprocinfo;
@@ -626,7 +642,7 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
 			return;
 	}

-	HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, false);
+	HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, heapRel, false);
 }

 /*
@@ -655,7 +671,7 @@ hnswinsert(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid,
 	oldCtx = MemoryContextSwitchTo(insertCtx);

 	/* Insert tuple */
-	HnswInsertTuple(index, values, isnull, heap_tid);
+	HnswInsertTuple(index, values, isnull, heap_tid, heap);

 	/* Delete memory context */
 	MemoryContextSwitchTo(oldCtx);
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -202,7 +202,6 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		MemoryContextSwitchTo(oldCtx);

 		scan->xs_heaptid = *heaptid;
-		scan->xs_recheck = false;
 		scan->xs_recheckorderby = false;
 		return true;
 	}
--- a/src/hnswutils.c
+++ b/src/hnswutils.c
@@ -7,7 +7,6 @@
 #include "lib/pairingheap.h"
 #include "storage/bufmgr.h"
 #include "utils/datum.h"
-#include "utils/memdebug.h"
 #include "utils/rel.h"
 #include "vector.h"

@@ -203,19 +202,6 @@ HnswInitPage(Buffer buf, Page page)
 	HnswPageGetOpaque(page)->page_id = HNSW_PAGE_ID;
 }

-/*
- * Allocate a neighbor array
- */
-static HnswNeighborArray *
-HnswInitNeighborArray(int lm, HnswAllocator * allocator)
-{
-	HnswNeighborArray *a = HnswAlloc(allocator, HNSW_NEIGHBOR_ARRAY_SIZE(lm));
-
-	a->length = 0;
-	a->closerSet = false;
-	return a;
-}
-
 /*
 * Allocate neighbors
 */
@@ -223,12 +209,22 @@ void
 HnswInitNeighbors(char *base, HnswElement element, int m, HnswAllocator * allocator)
 {
 	int			level = element->level;
+
 	HnswNeighborArrayPtr *neighborList = (HnswNeighborArrayPtr *) HnswAlloc(allocator, sizeof(HnswNeighborArrayPtr) * (level + 1));

 	HnswPtrStore(base, element->neighbors, neighborList);

 	for (int lc = 0; lc <= level; lc++)
-		HnswPtrStore(base, neighborList[lc], HnswInitNeighborArray(HnswGetLayerM(m, lc), allocator));
+	{
+		HnswNeighborArray *a;
+		int			lm = HnswGetLayerM(m, lc);
+
+		HnswPtrStore(base, neighborList[lc], (HnswNeighborArray *) HnswAlloc(allocator, offsetof(HnswNeighborArray, items) + sizeof(HnswCandidate) * lm));
+
+		a = HnswGetNeighbors(base, element, lc);
+		a->length = 0;
+		a->closerSet = false;
+	}
 }

 /*
@@ -316,10 +312,7 @@ HnswGetMetaPageInfo(Relation index, int *m, HnswElement * entryPoint)
 	if (entryPoint != NULL)
 	{
 		if (BlockNumberIsValid(metap->entryBlkno))
-		{
 			*entryPoint = HnswInitElementFromBlock(metap->entryBlkno, metap->entryOffno);
-			(*entryPoint)->level = metap->entryLevel;
-		}
 		else
 			*entryPoint = NULL;
 	}
@@ -738,7 +731,7 @@ HnswSearchLayer(char *base, Datum q, List *ep, int ef, int lc, Relation index, F
 	/* Create local memory for neighborhood if needed */
 	if (index == NULL)
 	{
-		neighborhoodSize = HNSW_NEIGHBOR_ARRAY_SIZE(HnswGetLayerM(m, lc));
+		neighborhoodSize = offsetof(HnswNeighborArray, items) + sizeof(HnswCandidate) * HnswGetLayerM(m, lc);
 		neighborhoodData = palloc(neighborhoodSize);
 	}

@@ -860,15 +853,12 @@ HnswSearchLayer(char *base, Datum q, List *ep, int ef, int lc, Relation index, F
 static int
 #if PG_VERSION_NUM >= 130000
 CompareCandidateDistances(const ListCell *a, const ListCell *b)
-{
-	HnswCandidate *hca = lfirst(a);
-	HnswCandidate *hcb = lfirst(b);
 #else
 CompareCandidateDistances(const void *a, const void *b)
-{
-	HnswCandidate *hca = lfirst(*(ListCell **) a);
-	HnswCandidate *hcb = lfirst(*(ListCell **) b);
 #endif
+{
+	HnswCandidate *hca = lfirst((ListCell *) a);
+	HnswCandidate *hcb = lfirst((ListCell *) b);

 	if (hca->distance < hcb->distance)
 		return 1;
@@ -891,15 +881,12 @@ CompareCandidateDistances(const void *a, const void *b)
 static int
 #if PG_VERSION_NUM >= 130000
 CompareCandidateDistancesOffset(const ListCell *a, const ListCell *b)
-{
-	HnswCandidate *hca = lfirst(a);
-	HnswCandidate *hcb = lfirst(b);
 #else
 CompareCandidateDistancesOffset(const void *a, const void *b)
-{
-	HnswCandidate *hca = lfirst(*(ListCell **) a);
-	HnswCandidate *hcb = lfirst(*(ListCell **) b);
 #endif
+{
+	HnswCandidate *hca = lfirst((ListCell *) a);
+	HnswCandidate *hcb = lfirst((ListCell *) b);

 	if (hca->distance < hcb->distance)
 		return 1;
@@ -920,10 +907,40 @@ CompareCandidateDistancesOffset(const void *a, const void *b)
 * Calculate the distance between elements
 */
 static float
-HnswGetDistance(char *base, HnswElement a, HnswElement b, FmgrInfo *procinfo, Oid collation)
+HnswGetDistance(char *base, HnswElement a, HnswElement b, int lc, FmgrInfo *procinfo, Oid collation)
 {
-	Datum		aValue = HnswGetValue(base, a);
-	Datum		bValue = HnswGetValue(base, b);
+	Datum		aValue;
+	Datum		bValue;
+
+	/* Look for cached distance */
+	if (!HnswPtrIsNull(base, a->neighbors))
+	{
+		HnswNeighborArray *neighbors = HnswGetNeighbors(base, a, lc);
+
+		for (int i = 0; i < neighbors->length; i++)
+		{
+			HnswElement element = HnswPtrAccess(base, neighbors->items[i].element);
+
+			if (element == b)
+				return neighbors->items[i].distance;
+		}
+	}
+
+	if (!HnswPtrIsNull(base, b->neighbors))
+	{
+		HnswNeighborArray *neighbors = HnswGetNeighbors(base, b, lc);
+
+		for (int i = 0; i < neighbors->length; i++)
+		{
+			HnswElement element = HnswPtrAccess(base, neighbors->items[i].element);
+
+			if (element == a)
+				return neighbors->items[i].distance;
+		}
+	}
+
+	aValue = HnswGetValue(base, a);
+	bValue = HnswGetValue(base, b);

 	return DatumGetFloat8(FunctionCall2Coll(procinfo, collation, aValue, bValue));
 }
@@ -932,7 +949,7 @@ HnswGetDistance(char *base, HnswElement a, HnswElement b, FmgrInfo *procinfo, Oi
 * Check if an element is closer to q than any element from R
 */
 static bool
-CheckElementCloser(char *base, HnswCandidate * e, List *r, FmgrInfo *procinfo, Oid collation)
+CheckElementCloser(char *base, HnswCandidate * e, List *r, int lc, FmgrInfo *procinfo, Oid collation)
 {
 	HnswElement eElement = HnswPtrAccess(base, e->element);
 	ListCell   *lc2;
@@ -941,7 +958,7 @@ CheckElementCloser(char *base, HnswCandidate * e, List *r, FmgrInfo *procinfo, O
 	{
 		HnswCandidate *ri = lfirst(lc2);
 		HnswElement riElement = HnswPtrAccess(base, ri->element);
-		float		distance = HnswGetDistance(base, eElement, riElement, procinfo, collation);
+		float		distance = HnswGetDistance(base, eElement, riElement, lc, procinfo, collation);

 		if (distance <= e->distance)
 			return false;
@@ -958,9 +975,7 @@ SelectNeighbors(char *base, List *c, int lm, int lc, FmgrInfo *procinfo, Oid col
 {
 	List	   *r = NIL;
 	List	   *w = list_copy(c);
-	HnswCandidate **wd;
-	int			wdlen = 0;
-	int			wdoff = 0;
+	pairingheap *wd;
 	HnswNeighborArray *neighbors = HnswGetNeighbors(base, e2, lc);
 	bool		mustCalculate = !neighbors->closerSet;
 	List	   *added = NIL;
@@ -969,7 +984,7 @@ SelectNeighbors(char *base, List *c, int lm, int lc, FmgrInfo *procinfo, Oid col
 	if (list_length(w) <= lm)
 		return w;

-	wd = palloc(sizeof(HnswCandidate *) * list_length(w));
+	wd = pairingheap_allocate(CompareNearestCandidates, NULL);

 	/* Ensure order of candidates is deterministic for closer caching */
 	if (sortCandidates)
@@ -989,20 +1004,16 @@ SelectNeighbors(char *base, List *c, int lm, int lc, FmgrInfo *procinfo, Oid col

 		/* Use previous state of r and wd to skip work when possible */
 		if (mustCalculate)
-			e->closer = CheckElementCloser(base, e, r, procinfo, collation);
+			e->closer = CheckElementCloser(base, e, r, lc, procinfo, collation);
 		else if (list_length(added) > 0)
 		{
-			/* Keep Valgrind happy for in-memory, parallel builds */
-			if (base != NULL)
-				VALGRIND_MAKE_MEM_DEFINED(&e->closer, 1);
-
 			/*
 			 * If the current candidate was closer, we only need to compare it
 			 * with the other candidates that we have added.
 			 */
 			if (e->closer)
 			{
-				e->closer = CheckElementCloser(base, e, added, procinfo, collation);
+				e->closer = CheckElementCloser(base, e, added, lc, procinfo, collation);

 				if (!e->closer)
 					removedAny = true;
@@ -1015,7 +1026,7 @@ SelectNeighbors(char *base, List *c, int lm, int lc, FmgrInfo *procinfo, Oid col
 				 */
 				if (removedAny)
 				{
-					e->closer = CheckElementCloser(base, e, r, procinfo, collation);
+					e->closer = CheckElementCloser(base, e, r, lc, procinfo, collation);
 					if (e->closer)
 						added = lappend(added, e);
 				}
@@ -1023,33 +1034,29 @@ SelectNeighbors(char *base, List *c, int lm, int lc, FmgrInfo *procinfo, Oid col
 		}
 		else if (e == newCandidate)
 		{
-			e->closer = CheckElementCloser(base, e, r, procinfo, collation);
+			e->closer = CheckElementCloser(base, e, r, lc, procinfo, collation);
 			if (e->closer)
 				added = lappend(added, e);
 		}

-		/* Keep Valgrind happy for in-memory, parallel builds */
-		if (base != NULL)
-			VALGRIND_MAKE_MEM_DEFINED(&e->closer, 1);
-
 		if (e->closer)
 			r = lappend(r, e);
 		else
-			wd[wdlen++] = e;
+			pairingheap_add(wd, &(CreatePairingHeapNode(e)->ph_node));
 	}

 	/* Cached value can only be used in future if sorted deterministically */
 	neighbors->closerSet = sortCandidates;

 	/* Keep pruned connections */
-	while (wdoff < wdlen && list_length(r) < lm)
-		r = lappend(r, wd[wdoff++]);
+	while (!pairingheap_is_empty(wd) && list_length(r) < lm)
+		r = lappend(r, ((HnswPairingHeapNode *) pairingheap_remove_first(wd))->inner);

 	/* Return pruned for update connections */
 	if (pruned != NULL)
 	{
-		if (wdoff < wdlen)
-			*pruned = wd[wdoff];
+		if (!pairingheap_is_empty(wd))
+			*pruned = ((HnswPairingHeapNode *) pairingheap_first(wd))->inner;
 		else
 			*pruned = linitial(w);
 	}
--- a/src/hnswvacuum.c
+++ b/src/hnswvacuum.c
@@ -60,7 +60,8 @@ RemoveHeapTids(HnswVacuumState * vacuumstate)
 		/* Iterate over nodes */
 		for (offno = FirstOffsetNumber; offno <= maxoffno; offno = OffsetNumberNext(offno))
 		{
-			HnswElementTuple etup = (HnswElementTuple) PageGetItem(page, PageGetItemId(page, offno));
+			ItemId		itemid = PageGetItemId(page, offno);
+			HnswElementTuple etup = (HnswElementTuple) PageGetItem(page, itemid);
 			int			idx = 0;
 			bool		itemUpdated = false;

@@ -91,10 +92,15 @@ RemoveHeapTids(HnswVacuumState * vacuumstate)

 				if (itemUpdated)
 				{
+					Size		etupSize = ItemIdGetLength(itemid);
+
 					/* Mark rest as invalid */
 					for (int i = idx; i < HNSW_HEAPTIDS; i++)
 						ItemPointerSetInvalid(&etup->heaptids[i]);

+					if (!PageIndexTupleOverwrite(page, offno, (Item) etup, etupSize))
+						elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
+
 					updated = true;
 				}
 			}
@@ -207,9 +213,6 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswEleme
 	/* Find neighbors for element, skipping itself */
 	HnswFindElementNeighbors(base, element, entryPoint, index, procinfo, collation, m, efConstruction, true);

-	/* Zero memory for each element */
-	MemSet(ntup, 0, HNSW_TUPLE_ALLOC_SIZE);
-
 	/* Update neighbor tuple */
 	/* Do this before getting page to minimize locking */
 	HnswSetNeighborTuple(base, ntup, element, m);
@@ -476,8 +479,11 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 		/* Update element and neighbors together */
 		for (offno = FirstOffsetNumber; offno <= maxoffno; offno = OffsetNumberNext(offno))
 		{
-			HnswElementTuple etup = (HnswElementTuple) PageGetItem(page, PageGetItemId(page, offno));
+			ItemId		itemid = PageGetItemId(page, offno);
+			HnswElementTuple etup = (HnswElementTuple) PageGetItem(page, itemid);
 			HnswNeighborTuple ntup;
+			Size		etupSize;
+			Size		ntupSize;
 			Buffer		nbuf;
 			Page		npage;
 			BlockNumber neighborPage;
@@ -501,6 +507,10 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			if (ItemPointerIsValid(&etup->heaptids[0]))
 				continue;

+			/* Calculate sizes */
+			etupSize = ItemIdGetLength(itemid);
+			ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(etup->level, vacuumstate->m);
+
 			/* Get neighbor page */
 			neighborPage = ItemPointerGetBlockNumber(&etup->neighbortid);
 			neighborOffno = ItemPointerGetOffsetNumber(&etup->neighbortid);
@@ -527,10 +537,13 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			for (int i = 0; i < ntup->count; i++)
 				ItemPointerSetInvalid(&ntup->indextids[i]);

-			/*
-			 * We modified the tuples in place, no need to call
-			 * PageIndexTupleOverwrite
-			 */
+			/* Overwrite element tuple */
+			if (!PageIndexTupleOverwrite(page, offno, (Item) etup, etupSize))
+				elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
+
+			/* Overwrite neighbor tuple */
+			if (!PageIndexTupleOverwrite(npage, neighborOffno, (Item) ntup, ntupSize))
+				elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));

 			/* Commit */
 			GenericXLogFinish(state);
@@ -575,7 +588,7 @@ InitVacuumState(HnswVacuumState * vacuumstate, IndexVacuumInfo *info, IndexBulkD
 	vacuumstate->bas = GetAccessStrategy(BAS_BULKREAD);
 	vacuumstate->procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
 	vacuumstate->collation = index->rd_indcollation[0];
-	vacuumstate->ntup = palloc0(HNSW_TUPLE_ALLOC_SIZE);
+	vacuumstate->ntup = palloc0(BLCKSZ);
 	vacuumstate->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
 												"Hnsw vacuum temporary context",
 												ALLOCSET_DEFAULT_SIZES);
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -29,6 +29,8 @@
 #define CALLBACK_ITEM_POINTER HeapTuple hup
 #endif

+#define UpdateProgress(index, val) pgstat_progress_update_param(index, val)
+
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_status.h"
 #include "utils/wait_event.h"
@@ -260,9 +262,9 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 	TupleTableSlot *slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsMinimalTuple);
 	TupleDesc	tupdesc = RelationGetDescr(index);

-	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD);
+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD);

-	pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_TOTAL, buildstate->indtuples);
+	UpdateProgress(PROGRESS_CREATEIDX_TUPLES_TOTAL, buildstate->indtuples);

 	GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list);

@@ -298,7 +300,7 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)

 			pfree(itup);

-			pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE, ++inserted);
+			UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++inserted);

 			GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list);
 		}
@@ -398,7 +400,7 @@ ComputeCenters(IvfflatBuildState * buildstate)
 {
 	int			numSamples;

-	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS);
+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS);

 	/* Target 50 samples per list, with at least 10000 samples */
 	/* The number of samples has a large effect on index build time */
@@ -473,7 +475,7 @@ CreateListPages(Relation index, VectorArray centers, int dimensions,
 	IvfflatList list;

 	listSize = MAXALIGN(IVFFLAT_LIST_SIZE(dimensions));
-	list = palloc0(listSize);
+	list = palloc(listSize);

 	buf = IvfflatNewBuffer(index, forkNum);
 	IvfflatInitRegisterPage(index, &buf, &page, &state);
@@ -919,7 +921,7 @@ AssignTuples(IvfflatBuildState * buildstate)
 	Oid			sortCollations[] = {InvalidOid};
 	bool		nullsFirstFlags[] = {false};

-	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_ASSIGN);
+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_ASSIGN);

 	/* Calculate parallel workers */
 	if (buildstate->heap != NULL)
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -310,7 +310,6 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		ItemPointer heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));

 		scan->xs_heaptid = *heaptid;
-		scan->xs_recheck = false;
 		scan->xs_recheckorderby = false;
 		return true;
 	}
--- a/src/vector.c
+++ b/src/vector.c
@@ -10,6 +10,7 @@
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "port.h"				/* for strtof() */
+#include "port/pg_bitutils.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/float.h"
@@ -866,10 +867,9 @@ vector_mul(PG_FUNCTION_ARGS)
 int
 vector_cmp_internal(Vector * a, Vector * b)
 {
-	int			dim = Min(a->dim, b->dim);
+	CheckDims(a, b);

-	/* Check values before dimensions to be consistent with Postgres arrays */
-	for (int i = 0; i < dim; i++)
+	for (int i = 0; i < a->dim; i++)
 	{
 		if (a->x[i] < b->x[i])
 			return -1;
@@ -877,13 +877,6 @@ vector_cmp_internal(Vector * a, Vector * b)
 		if (a->x[i] > b->x[i])
 			return 1;
 	}
-
-	if (a->dim < b->dim)
-		return -1;
-
-	if (a->dim > b->dim)
-		return 1;
-
 	return 0;
 }

@@ -897,9 +890,6 @@ vector_lt(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) < 0);
 }

@@ -913,9 +903,6 @@ vector_le(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) <= 0);
 }

@@ -929,9 +916,6 @@ vector_eq(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) == 0);
 }

@@ -945,9 +929,6 @@ vector_ne(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) != 0);
 }

@@ -961,9 +942,6 @@ vector_ge(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) >= 0);
 }

@@ -977,9 +955,6 @@ vector_gt(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);

-	/* TODO Remove in 0.7.0 */
-	CheckDims(a, b);
-
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) > 0);
 }

@@ -1160,3 +1135,43 @@ vector_avg(PG_FUNCTION_ARGS)

 	PG_RETURN_POINTER(result);
 }
+
+/*
+ * Ensure same number of bytes
+ */
+static inline void
+CheckByteLengths(uint32 aLen, uint32 bLen)
+{
+	if (aLen != bLen)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_EXCEPTION),
+				 errmsg("different byte lengths %u and %u", aLen, bLen)));
+}
+
+/*
+ * Get the Hamming distance between two binary strings
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(hamming_distance);
+Datum
+hamming_distance(PG_FUNCTION_ARGS)
+{
+	bytea	   *a = PG_GETARG_BYTEA_PP(0);
+	bytea	   *b = PG_GETARG_BYTEA_PP(1);
+	char	   *ax = VARDATA_ANY(a);
+	char	   *bx = VARDATA_ANY(b);
+	uint32		aLen = VARSIZE_ANY_EXHDR(a);
+	uint32		bLen = VARSIZE_ANY_EXHDR(b);
+	uint64		distance = 0;
+
+	CheckByteLengths(aLen, bLen);
+
+	for (uint32 i = 0; i < aLen; i++)
+	{
+		unsigned char diff = (unsigned char) (ax[i] ^ bx[i]);
+
+		distance += pg_number_of_ones[diff];
+	}
+
+	/* TODO Decide on return type */
+	PG_RETURN_FLOAT8((double) distance);
+}
--- a/test/expected/functions.out
+++ b/test/expected/functions.out
@@ -24,56 +24,6 @@ SELECT '[1e37]'::vector * '[1e37]';
 ERROR:  value out of range: overflow
 SELECT '[1e-37]'::vector * '[1e-37]';
 ERROR:  value out of range: underflow
-SELECT '[1,2,3]'::vector = '[1,2,3]';
- ?column? 
----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::vector = '[1,2]';
-ERROR:  different vector dimensions 3 and 2
-SELECT vector_cmp('[1,2,3]', '[1,2,3]');
- vector_cmp 
------------
-          0
-(1 row)
-
-SELECT vector_cmp('[1,2,3]', '[0,0,0]');
- vector_cmp 
------------
-          1
-(1 row)
-
-SELECT vector_cmp('[0,0,0]', '[1,2,3]');
- vector_cmp 
------------
-         -1
-(1 row)
-
-SELECT vector_cmp('[1,2]', '[1,2,3]');
- vector_cmp 
------------
-         -1
-(1 row)
-
-SELECT vector_cmp('[1,2,3]', '[1,2]');
- vector_cmp 
------------
-          1
-(1 row)
-
-SELECT vector_cmp('[1,2]', '[2,3,4]');
- vector_cmp 
------------
-         -1
-(1 row)
-
-SELECT vector_cmp('[2,3]', '[1,2,3]');
- vector_cmp 
------------
-          1
-(1 row)
-
 SELECT vector_dims('[1,2,3]');
 vector_dims 
 -------------
@@ -208,6 +158,32 @@ SELECT l1_distance('[3e38]', '[-3e38]');
    Infinity
 (1 row)

+SELECT hamming_distance('\xFFFF', '\xFFFF');
+ hamming_distance 
+------------------
+                0
+(1 row)
+
+SELECT hamming_distance('\xFFFF', '\xFFFE');
+ hamming_distance 
+------------------
+                1
+(1 row)
+
+SELECT hamming_distance('\xFFFF', '\xFFFC');
+ hamming_distance 
+------------------
+                2
+(1 row)
+
+SELECT hamming_distance('\xFFFF', '\x0000');
+ hamming_distance 
+------------------
+               16
+(1 row)
+
+SELECT hamming_distance('\xFFFF', '\x00');
+ERROR:  different byte lengths 2 and 1
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
    avg    
 -----------
--- a/test/sql/functions.sql
+++ b/test/sql/functions.sql
@@ -6,17 +6,6 @@ SELECT '[1,2,3]'::vector * '[4,5,6]';
 SELECT '[1e37]'::vector * '[1e37]';
 SELECT '[1e-37]'::vector * '[1e-37]';

-SELECT '[1,2,3]'::vector = '[1,2,3]';
-SELECT '[1,2,3]'::vector = '[1,2]';
-
-SELECT vector_cmp('[1,2,3]', '[1,2,3]');
-SELECT vector_cmp('[1,2,3]', '[0,0,0]');
-SELECT vector_cmp('[0,0,0]', '[1,2,3]');
-SELECT vector_cmp('[1,2]', '[1,2,3]');
-SELECT vector_cmp('[1,2,3]', '[1,2]');
-SELECT vector_cmp('[1,2]', '[2,3,4]');
-SELECT vector_cmp('[2,3]', '[1,2,3]');
-
 SELECT vector_dims('[1,2,3]');

 SELECT round(vector_norm('[1,1]')::numeric, 5);
@@ -48,6 +37,12 @@ SELECT l1_distance('[0,0]', '[0,1]');
 SELECT l1_distance('[1,2]', '[3]');
 SELECT l1_distance('[3e38]', '[-3e38]');

+SELECT hamming_distance('\xFFFF', '\xFFFF');
+SELECT hamming_distance('\xFFFF', '\xFFFE');
+SELECT hamming_distance('\xFFFF', '\xFFFC');
+SELECT hamming_distance('\xFFFF', '\x0000');
+SELECT hamming_distance('\xFFFF', '\x00');
+
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]', NULL]) v;
 SELECT avg(v) FROM unnest(ARRAY[]::vector[]) v;
--- a/vector.control
+++ b/vector.control
@@ -1,4 +1,4 @@
 comment = 'vector data type and ivfflat and hnsw access methods'
-default_version = '0.6.1'
+default_version = '0.5.1'
 module_pathname = '$libdir/vector'
 relocatable = true
Author	SHA1	Message	Date
Andrew Kane	76418fc093	Improved test [skip ci]	2024-01-23 15:13:14 -08:00
Andrew Kane	34d5a8cf3f	Improved types	2024-01-23 15:08:50 -08:00
Andrew Kane	f9ae736c57	Updated comment [skip ci]	2024-01-23 15:01:48 -08:00
Andrew Kane	76c6dbb0a0	Added hamming_distance function	2024-01-23 15:01:11 -08:00