Added support for adaptive beam search [skip ci]

.github/workflows/build.yml

@@ -1,120 +1,120 @@
 name: build
 on: [push, pull_request]
 jobs:
-  # ubuntu:
+  ubuntu:
-  #   runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
-  #   if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
-  #   strategy:
+    strategy:
-  #     fail-fast: false
+      fail-fast: false
-  #     matrix:
+      matrix:
-  #       include:
+        include:
-  #         - postgres: 19
+          - postgres: 19
-  #           os: ubuntu-24.04
+            os: ubuntu-24.04
-  #         - postgres: 18
+          - postgres: 18
-  #           os: ubuntu-24.04
+            os: ubuntu-24.04
-  #         - postgres: 17
+          - postgres: 17
-  #           os: ubuntu-24.04
+            os: ubuntu-24.04
-  #         - postgres: 16
+          - postgres: 16
-  #           os: ubuntu-24.04-arm
+            os: ubuntu-24.04-arm
-  #         - postgres: 15
+          - postgres: 15
-  #           os: ubuntu-22.04
+            os: ubuntu-22.04
-  #         - postgres: 14
+          - postgres: 14
-  #           os: ubuntu-22.04-arm
+            os: ubuntu-22.04-arm
-  #         - postgres: 13
+          - postgres: 13
-  #           os: ubuntu-22.04
+            os: ubuntu-22.04
-  #   steps:
+    steps:
-  #     - uses: actions/checkout@v5
+      - uses: actions/checkout@v5
-  #     - uses: ankane/setup-postgres@v1
+      - uses: ankane/setup-postgres@v1
-  #       with:
+        with:
-  #         postgres-version: ${{ matrix.postgres }}
+          postgres-version: ${{ matrix.postgres }}
-  #         dev-files: true
+          dev-files: true
-  #     - run: make
+      - run: make
-  #       env:
+        env:
-  #         PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare ${{ matrix.postgres >= 18 && '-Wno-missing-field-initializers' || '' }}
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare ${{ matrix.postgres >= 18 && '-Wno-missing-field-initializers' || '' }}
-  #     - run: |
+      - run: |
-  #         export PG_CONFIG=`which pg_config`
+          export PG_CONFIG=`which pg_config`
-  #         sudo --preserve-env=PG_CONFIG make install
+          sudo --preserve-env=PG_CONFIG make install
-  #     - run: make installcheck
+      - run: make installcheck
-  #     - if: ${{ failure() }}
+      - if: ${{ failure() }}
-  #       run: cat regression.diffs
+        run: cat regression.diffs
-  #     - run: |
+      - run: |
-  #         sudo apt-get update
+          sudo apt-get update
-  #         sudo apt-get install libipc-run-perl
+          sudo apt-get install libipc-run-perl
-  #     - run: make prove_installcheck
+      - run: make prove_installcheck
-  # mac:
+  mac:
-  #   runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
-  #   if: ${{ !startsWith(github.ref_name, 'windows') }}
+    if: ${{ !startsWith(github.ref_name, 'windows') }}
-  #   strategy:
+    strategy:
-  #     fail-fast: false
+      fail-fast: false
-  #     matrix:
+      matrix:
-  #       include:
+        include:
-  #         - postgres: 18
+          - postgres: 18
-  #           os: macos-26
+            os: macos-26
-  #         - postgres: 14
+          - postgres: 14
-  #           os: macos-15-intel
+            os: macos-15-intel
-  #   steps:
+    steps:
-  #     - uses: actions/checkout@v5
+      - uses: actions/checkout@v5
-  #     - uses: ankane/setup-postgres@v1
+      - uses: ankane/setup-postgres@v1
-  #       with:
+        with:
-  #         postgres-version: ${{ matrix.postgres }}
+          postgres-version: ${{ matrix.postgres }}
-  #     - run: make
+      - run: make
-  #       env:
+        env:
-  #         PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unknown-warning-option ${{ matrix.postgres >= 18 && '-Wno-missing-field-initializers' || '' }}
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unknown-warning-option ${{ matrix.postgres >= 18 && '-Wno-missing-field-initializers' || '' }}
-  #     - run: make install
+      - run: make install
-  #     - run: make installcheck
+      - run: make installcheck
-  #     - if: ${{ failure() }}
+      - if: ${{ failure() }}
-  #       run: cat regression.diffs
+        run: cat regression.diffs
-  #     # Homebrew Postgres does not enable TAP tests, so need to download
+      # Homebrew Postgres does not enable TAP tests, so need to download
-  #     - run: |
+      - run: |
-  #         brew install cpanm
+          brew install cpanm
-  #         cpanm --notest IPC::Run
+          cpanm --notest IPC::Run
-  #         wget -q https://github.com/postgres/postgres/archive/refs/tags/$TAG.tar.gz
+          wget -q https://github.com/postgres/postgres/archive/refs/tags/$TAG.tar.gz
-  #         tar xf $TAG.tar.gz
+          tar xf $TAG.tar.gz
-  #         mv postgres-$TAG postgres
+          mv postgres-$TAG postgres
-  #       env:
+        env:
-  #         TAG: ${{ matrix.postgres == 18 && 'REL_18_0' || 'REL_14_19' }}
+          TAG: ${{ matrix.postgres == 18 && 'REL_18_0' || 'REL_14_19' }}
-  #     - run: make prove_installcheck PROVE_FLAGS="-I ./postgres/src/test/perl -I ./test/perl"
+      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres/src/test/perl -I ./test/perl"
-  #       env:
+        env:
-  #         PERL5LIB: /Users/runner/perl5/lib/perl5
+          PERL5LIB: /Users/runner/perl5/lib/perl5
-  #     - run: make clean && $(brew --prefix llvm@$LLVM_VERSION)/bin/scan-build --status-bugs make
+      - run: make clean && $(brew --prefix llvm@$LLVM_VERSION)/bin/scan-build --status-bugs make
-  #       env:
+        env:
-  #         LLVM_VERSION: ${{ matrix.os == 'macos-26' && 20 || 18 }}
+          LLVM_VERSION: ${{ matrix.os == 'macos-26' && 20 || 18 }}
-  #         PG_CFLAGS: -DUSE_ASSERT_CHECKING
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING
-  # windows:
+  windows:
-  #   runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
-  #   if: ${{ !startsWith(github.ref_name, 'mac') }}
+    if: ${{ !startsWith(github.ref_name, 'mac') }}
-  #   strategy:
+    strategy:
-  #     fail-fast: false
+      fail-fast: false
-  #     matrix:
+      matrix:
-  #       include:
+        include:
-  #         - postgres: 17
+          - postgres: 17
-  #           os: windows-2025
+            os: windows-2025
-  #         - postgres: 14
+          - postgres: 14
-  #           os: windows-2022
+            os: windows-2022
-  #   steps:
+    steps:
-  #     - uses: actions/checkout@v5
+      - uses: actions/checkout@v5
-  #     - uses: ankane/setup-postgres@v1
+      - uses: ankane/setup-postgres@v1
-  #       with:
+        with:
-  #         postgres-version: ${{ matrix.postgres }}
+          postgres-version: ${{ matrix.postgres }}
-  #     - run: |
+      - run: |
-  #         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && ^
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && ^
-  #         nmake /NOLOGO /F Makefile.win && ^
+          nmake /NOLOGO /F Makefile.win && ^
-  #         nmake /NOLOGO /F Makefile.win install && ^
+          nmake /NOLOGO /F Makefile.win install && ^
-  #         nmake /NOLOGO /F Makefile.win installcheck ${{ matrix.postgres != 17 && 'PG_REGRESS=$(PGROOT)\bin\pg_regress' || '' }} && ^
+          nmake /NOLOGO /F Makefile.win installcheck ${{ matrix.postgres != 17 && 'PG_REGRESS=$(PGROOT)\bin\pg_regress' || '' }} && ^
-  #         nmake /NOLOGO /F Makefile.win clean && ^
+          nmake /NOLOGO /F Makefile.win clean && ^
-  #         nmake /NOLOGO /F Makefile.win uninstall
+          nmake /NOLOGO /F Makefile.win uninstall
-  #       shell: cmd
+        shell: cmd
-  #     - if: ${{ failure() }}
+      - if: ${{ failure() }}
-  #       run: cat regression.diffs
+        run: cat regression.diffs
   i386:
     if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
     runs-on: ubuntu-latest
     container:
-      image: alpine:3.23
+      image: debian:12
       options: --platform linux/386
     steps:
-      - run: apk add --update build-base git openrc perl perl-ipc-run perl-test-harness-utils postgresql18 postgresql18-dev
+      - run: apt-get update && apt-get install -y build-essential git libipc-run-perl postgresql-15 postgresql-server-dev-15 sudo
-      - run: mkdir /run/openrc && touch /run/openrc/softlevel && rc-update add postgresql && rc-service postgresql start
+      - run: service postgresql start
       - run: |
           git clone https://github.com/${{ github.repository }}.git pgvector
           cd pgvector
@@ -123,21 +123,21 @@ jobs:
           make
           make install
           chown -R postgres .
-          su postgres -c "make installcheck"
+          sudo -u postgres make installcheck
-          su postgres -c "make prove_installcheck"
+          sudo -u postgres make prove_installcheck
         env:
-          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
       - if: ${{ failure() }}
         run: cat pgvector/regression.diffs
-  # valgrind:
+  valgrind:
-  #   if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-  #   steps:
+    steps:
-  #     - uses: actions/checkout@v5
+      - uses: actions/checkout@v5
-  #     - uses: ankane/setup-postgres-valgrind@v1
+      - uses: ankane/setup-postgres-valgrind@v1
-  #       with:
+        with:
-  #         postgres-version: 18
+          postgres-version: 18
-  #         check-ub: yes
+          check-ub: yes
-  #     - run: make OPTFLAGS=""
+      - run: make OPTFLAGS=""
-  #     - run: sudo --preserve-env=PG_CONFIG make install
+      - run: sudo --preserve-env=PG_CONFIG make install
-  #     - run: make installcheck
+      - run: make installcheck

LICENSE

@@ -1,4 +1,4 @@
-Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 

Makefile

@@ -27,11 +27,6 @@ ifneq ($(filter ppc64%, $(shell uname -m)), )
 	OPTFLAGS =
 endif
 
-# RISC-V64 doesn't support -march=native
-ifeq ($(shell uname -m), riscv64)
-	OPTFLAGS =
-endif
-
 # For auto-vectorization:
 # - GCC (needs -ftree-vectorize OR -O3) - https://gcc.gnu.org/projects/tree-ssa/vectorization.html
 # - Clang (could use pragma instead) - https://llvm.org/docs/Vectorizers.html

README.md

@@ -776,7 +776,6 @@ Algol | [pgvector-algol](https://github.com/pgvector/pgvector-algol)
 C | [pgvector-c](https://github.com/pgvector/pgvector-c)
 C++ | [pgvector-cpp](https://github.com/pgvector/pgvector-cpp)
 C#, F#, Visual Basic | [pgvector-dotnet](https://github.com/pgvector/pgvector-dotnet)
-COBOL | [pgvector-cobol](https://github.com/pgvector/pgvector-cobol)
 Crystal | [pgvector-crystal](https://github.com/pgvector/pgvector-crystal)
 D | [pgvector-d](https://github.com/pgvector/pgvector-d)
 Dart | [pgvector-dart](https://github.com/pgvector/pgvector-dart)
@@ -804,7 +803,6 @@ Raku | [pgvector-raku](https://github.com/pgvector/pgvector-raku)
 Ruby | [pgvector-ruby](https://github.com/pgvector/pgvector-ruby), [Neighbor](https://github.com/ankane/neighbor)
 Rust | [pgvector-rust](https://github.com/pgvector/pgvector-rust)
 Swift | [pgvector-swift](https://github.com/pgvector/pgvector-swift)
-Tcl | [pgvector-tcl](https://github.com/pgvector/pgvector-tcl)
 Zig | [pgvector-zig](https://github.com/pgvector/pgvector-zig)
 
 ## Frequently Asked Questions
@@ -1284,6 +1282,7 @@ Thanks to:
 - [k-means++: The Advantage of Careful Seeding](https://theory.stanford.edu/~sergei/papers/kMeansPP-soda.pdf)
 - [Concept Decompositions for Large Sparse Text Data using Clustering](https://www.cs.utexas.edu/users/inderjit/public_papers/concept_mlj.pdf)
 - [Efficient and Robust Approximate Nearest Neighbor Search using Hierarchical Navigable Small World Graphs](https://arxiv.org/ftp/arxiv/papers/1603/1603.09320.pdf)
+- [Distance Adaptive Beam Search for Provably Accurate Graph-Based Nearest Neighbor Search](https://arxiv.org/pdf/2505.15636)
 
 ## History
 

src/bitvec.c

@@ -2,7 +2,6 @@
 
 #include "bitutils.h"
 #include "bitvec.h"
-#include "fmgr.h"
 #include "utils/varbit.h"
 #include "vector.h"
 

src/halfutils.c

@@ -1,7 +1,5 @@
 #include "postgres.h"
 
-#include <math.h>
-
 #include "halfutils.h"
 #include "halfvec.h"
 

src/halfvec.c

@@ -13,20 +13,12 @@
 #include "port.h"				/* for strtof() */
 #include "sparsevec.h"
 #include "utils/array.h"
+#include "utils/builtins.h"
 #include "utils/float.h"
-#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/varbit.h"
+#include "utils/numeric.h"
 #include "vector.h"
 
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
-#if PG_VERSION_NUM >= 170000
-#include "parser/scansup.h"
-#endif
-
 #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
 #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
 
@@ -137,9 +129,9 @@ InitHalfVector(int dim)
 	return result;
 }
 
-#if PG_VERSION_NUM >= 170000
+/*
-#define halfvec_isspace(ch) scanner_isspace(ch)
+ * Check for whitespace, since array_isspace() is static
-#else
+ */
 static inline bool
 halfvec_isspace(char ch)
 {
@@ -152,7 +144,6 @@ halfvec_isspace(char ch)
 		return true;
 	return false;
 }
-#endif
 
 /*
  * Check state array

src/hnsw.c

@@ -1,24 +1,18 @@
 #include "postgres.h"
 
 #include <float.h>
-#include <limits.h>
 #include <math.h>
 
 #include "access/amapi.h"
-#include "access/genam.h"
 #include "access/reloptions.h"
 #include "commands/progress.h"
 #include "commands/vacuum.h"
-#include "fmgr.h"
 #include "hnsw.h"
 #include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "utils/float.h"
 #include "utils/guc.h"
-#include "utils/relcache.h"
 #include "utils/selfuncs.h"
 #include "utils/spccache.h"
-#include "vector.h"
 
 #if PG_VERSION_NUM < 150000
 #define MarkGUCPrefixReserved(x) EmitWarningsOnPlaceholders(x)

src/hnsw.h

@@ -3,8 +3,6 @@
 
 #include "postgres.h"
 
-#include <math.h>
-
 #include "access/genam.h"
 #include "access/parallel.h"
 #include "lib/pairingheap.h"
@@ -14,10 +12,6 @@
 #include "utils/sampling.h"
 #include "vector.h"
 
-#if PG_VERSION_NUM >= 190000
-typedef Pointer Item;
-#endif
-
 #define HNSW_MAX_DIM 2000
 #define HNSW_MAX_NNZ 1000
 
@@ -430,7 +424,7 @@ void	   *HnswAlloc(HnswAllocator * allocator, Size size);
 HnswElement HnswInitElement(char *base, ItemPointer tid, int m, double ml, int maxLevel, HnswAllocator * alloc);
 HnswElement HnswInitElementFromBlock(BlockNumber blkno, OffsetNumber offno);
 void		HnswFindElementNeighbors(char *base, HnswElement element, HnswElement entryPoint, Relation index, HnswSupport * support, int m, int efConstruction, bool existing);
-HnswSearchCandidate *HnswEntryCandidate(char *base, HnswElement entryPoint, HnswQuery * q, Relation index, HnswSupport * support, bool loadVec);
+HnswSearchCandidate *HnswEntryCandidate(char *base, HnswElement em, HnswQuery * q, Relation rel, HnswSupport * support, bool loadVec);
 void		HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, BlockNumber insertPage, ForkNumber forkNum, bool building);
 void		HnswSetNeighborTuple(char *base, HnswNeighborTuple ntup, HnswElement e, int m);
 void		HnswAddHeapTid(HnswElement element, ItemPointer heaptid);

src/hnswbuild.c

@@ -36,12 +36,11 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include <math.h>
+
 #include "access/parallel.h"
-#include "access/relscan.h"
 #include "access/table.h"
 #include "access/tableam.h"
-#include "access/tupdesc.h"
 #include "access/xact.h"
 #include "access/xloginsert.h"
 #include "catalog/index.h"
@@ -49,14 +48,11 @@
 #include "commands/progress.h"
 #include "hnsw.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
 #include "optimizer/optimizer.h"
 #include "storage/bufmgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/snapmgr.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -553,7 +549,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
 
 	/* Copy the datum */
 	memcpy(valuePtr, DatumGetPointer(value), valueSize);
-	HnswPtrStore(base, element->value, (char *) valuePtr);
+	HnswPtrStore(base, element->value, valuePtr);
 
 	/* Create a lock for the element */
 	LWLockInitialize(&element->lock, hnsw_lock_tranche_id);

src/hnswinsert.c

@@ -1,14 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
+#include <math.h>
+
 #include "access/generic_xlog.h"
 #include "hnsw.h"
-#include "nodes/execnodes.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -713,7 +712,7 @@ HnswInsertTupleOnDisk(Relation index, HnswSupport * support, Datum value, ItemPo
 
 	/* Create an element */
 	element = HnswInitElement(base, heaptid, m, HnswGetMl(m), HnswGetMaxLevel(m), NULL);
-	HnswPtrStore(base, element->value, (char *) DatumGetPointer(value));
+	HnswPtrStore(base, element->value, DatumGetPointer(value));
 
 	/* Prevent concurrent inserts when likely updating entry point */
 	if (entryPoint == NULL || element->level > entryPoint->level)

src/hnswscan.c

@@ -1,21 +1,12 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/relscan.h"
 #include "hnsw.h"
-#include "lib/pairingheap.h"
-#include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "pgstat.h"
+#include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/float.h"
 #include "utils/memutils.h"
-#include "utils/relcache.h"
-#include "utils/snapmgr.h"
-
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
 
 /*
  * Algorithm 5 from paper

src/hnswutils.c

@@ -2,20 +2,18 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_type_d.h"
 #include "common/hashfn.h"
 #include "fmgr.h"
 #include "hnsw.h"
 #include "lib/pairingheap.h"
-#include "nodes/pg_list.h"
-#include "port/atomics.h"
 #include "sparsevec.h"
 #include "storage/bufmgr.h"
 #include "utils/datum.h"
 #include "utils/memdebug.h"
 #include "utils/rel.h"
-#include "vector.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -262,7 +260,7 @@ HnswInitElement(char *base, ItemPointer heaptid, int m, double ml, int maxLevel,
 
 	HnswInitNeighbors(base, element, m, allocator);
 
-	HnswPtrStore(base, element->value, (char *) NULL);
+	HnswPtrStore(base, element->value, (Pointer) NULL);
 
 	return element;
 }
@@ -288,7 +286,7 @@ HnswInitElementFromBlock(BlockNumber blkno, OffsetNumber offno)
 	element->blkno = blkno;
 	element->offno = offno;
 	HnswPtrStore(base, element->neighbors, (HnswNeighborArrayPtr *) NULL);
-	HnswPtrStore(base, element->value, (char *) NULL);
+	HnswPtrStore(base, element->value, (Pointer) NULL);
 	return element;
 }
 
@@ -514,7 +512,7 @@ HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHe
 		char	   *base = NULL;
 		Datum		value = datumCopy(PointerGetDatum(&etup->data), false, -1);
 
-		HnswPtrStore(base, element->value, (char *) DatumGetPointer(value));
+		HnswPtrStore(base, element->value, DatumGetPointer(value));
 	}
 }
 
@@ -831,6 +829,7 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 	HnswUnvisited *unvisited = palloc(lm * sizeof(HnswUnvisited));
 	int			unvisitedLength;
 	bool		inMemory = index == NULL;
+	double		lambda = 0.12;
 
 	if (v == NULL)
 	{
@@ -886,7 +885,7 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 		HnswSearchCandidate *f = HnswGetSearchCandidate(w_node, pairingheap_first(W));
 		HnswElement cElement;
 
-		if (c->distance > f->distance)
+		if (c->distance > f->distance * (1 + lambda))
 			break;
 
 		cElement = HnswPtrAccess(base, c->element);
@@ -906,8 +905,10 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 			HnswSearchCandidate *e;
 			double		eDistance;
 			bool		alwaysAdd = wlen < ef;
+			double		fDistance;
 
 			f = HnswGetSearchCandidate(w_node, pairingheap_first(W));
+			fDistance = f->distance * (1 + lambda);
 
 			if (inMemory)
 			{
@@ -922,13 +923,13 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 
 				/* Avoid any allocations if not adding */
 				eElement = NULL;
-				HnswLoadElementImpl(blkno, offno, &eDistance, q, index, support, inserting, alwaysAdd || discarded != NULL ? NULL : &f->distance, &eElement);
+				HnswLoadElementImpl(blkno, offno, &eDistance, q, index, support, inserting, alwaysAdd || discarded != NULL ? NULL : &fDistance, &eElement);
 
 				if (eElement == NULL)
 					continue;
 			}
 
-			if (!(eDistance < f->distance || alwaysAdd))
+			if (eElement == NULL || !(eDistance < fDistance || alwaysAdd))
 			{
 				if (discarded != NULL)
 				{

src/hnswvacuum.c

@@ -1,14 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
+#include <math.h>
+
 #include "access/generic_xlog.h"
 #include "commands/vacuum.h"
 #include "hnsw.h"
-#include "nodes/pg_list.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -179,12 +178,7 @@ NeedsUpdated(HnswVacuumState * vacuumstate, HnswElement element)
 	/* Also update if layer 0 is not full */
 	/* This could indicate too many candidates being deleted during insert */
 	if (!needsUpdated)
-	{
-		/* Keep clang-tidy happy */
-		Assert(ntup->count > 0);
-
 		needsUpdated = !ItemPointerIsValid(&ntup->indextids[ntup->count - 1]);
-	}
 
 	UnlockReleaseBuffer(buf);
 
@@ -534,9 +528,8 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			ntup = (HnswNeighborTuple) PageGetItem(npage, PageGetItemId(npage, neighborOffno));
 
 			/* Overwrite element */
-			/* Use memset instead of MemSet to keep clang-tidy happy */
 			etup->deleted = 1;
-			memset(&etup->data, 0, VARSIZE_ANY(&etup->data));
+			MemSet(&etup->data, 0, VARSIZE_ANY(&etup->data));
 
 			/* Overwrite neighbors */
 			for (int i = 0; i < ntup->count; i++)

src/ivfbuild.c

@@ -2,32 +2,23 @@
 
 #include <float.h>
 
-#include "access/genam.h"
-#include "access/generic_xlog.h"
-#include "access/itup.h"
-#include "access/relscan.h"
 #include "access/table.h"
 #include "access/tableam.h"
-#include "access/tupdesc.h"
 #include "access/parallel.h"
 #include "access/xact.h"
-#include "access/xloginsert.h"
+#include "bitvec.h"
 #include "catalog/index.h"
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
 #include "commands/progress.h"
-#include "fmgr.h"
+#include "halfvec.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
 #include "optimizer/optimizer.h"
 #include "storage/bufmgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
+#include "vector.h"
-#include "utils/sampling.h"
-#include "utils/snapmgr.h"
-#include "utils/tuplesort.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"

src/ivfflat.c

@@ -3,19 +3,14 @@
 #include <float.h>
 
 #include "access/amapi.h"
-#include "access/genam.h"
 #include "access/reloptions.h"
 #include "commands/progress.h"
 #include "commands/vacuum.h"
-#include "fmgr.h"
 #include "ivfflat.h"
-#include "nodes/pg_list.h"
 #include "utils/float.h"
 #include "utils/guc.h"
-#include "utils/relcache.h"
 #include "utils/selfuncs.h"
 #include "utils/spccache.h"
-#include "vector.h"
 
 #if PG_VERSION_NUM < 150000
 #define MarkGUCPrefixReserved(x) EmitWarningsOnPlaceholders(x)

src/ivfflat.h

@@ -25,10 +25,6 @@
 #include "portability/instr_time.h"
 #endif
 
-#if PG_VERSION_NUM >= 190000
-typedef Pointer Item;
-#endif
-
 #define IVFFLAT_MAX_DIM 2000
 
 /* Support functions */

src/ivfinsert.c

@@ -2,16 +2,11 @@
 
 #include <float.h>
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
-#include "access/itup.h"
-#include "fmgr.h"
 #include "ivfflat.h"
-#include "nodes/execnodes.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
 
 /*
  * Find the list that minimizes the distance function

src/ivfkmeans.c

@@ -1,15 +1,17 @@
 #include "postgres.h"
 
 #include <float.h>
-#include <limits.h>
 #include <math.h>
 
-#include "access/genam.h"
+#include "bitvec.h"
-#include "fmgr.h"
+#include "halfutils.h"
+#include "halfvec.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
+#include "utils/builtins.h"
+#include "utils/datum.h"
 #include "utils/memutils.h"
-#include "utils/relcache.h"
+#include "vector.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"

src/ivfscan.c

@@ -2,26 +2,15 @@
 
 #include <float.h>
 
-#include "access/genam.h"
-#include "access/itup.h"
 #include "access/relscan.h"
-#include "access/tupdesc.h"
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
-#include "fmgr.h"
 #include "lib/pairingheap.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/snapmgr.h"
-#include "utils/tuplesort.h"
-
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
 
 #define GetScanList(ptr) pairingheap_container(IvfflatScanList, ph_node, ptr)
 #define GetScanListConst(ptr) pairingheap_const_container(IvfflatScanList, ph_node, ptr)

src/ivfutils.c

@@ -1,19 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
+#include "bitvec.h"
+#include "catalog/pg_type.h"
 #include "fmgr.h"
 #include "halfutils.h"
 #include "halfvec.h"
 #include "ivfflat.h"
 #include "storage/bufmgr.h"
-#include "utils/relcache.h"
-#include "utils/varbit.h"
-#include "vector.h"
-
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
 
 /*
  * Allocate a vector array

src/ivfvacuum.c

@@ -1,12 +1,9 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
-#include "access/itup.h"
 #include "commands/vacuum.h"
 #include "ivfflat.h"
 #include "storage/bufmgr.h"
-#include "utils/relcache.h"
 
 #if PG_VERSION_NUM >= 180000
 #define vacuum_delay_point() vacuum_delay_point(false)

src/sparsevec.c

@@ -5,27 +5,18 @@
 
 #include "catalog/pg_type.h"
 #include "common/shortest_dec.h"
+#include "common/string.h"
 #include "fmgr.h"
 #include "halfutils.h"
 #include "halfvec.h"
-#include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "sparsevec.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/float.h"
-#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
 #include "vector.h"
 
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
-#if PG_VERSION_NUM >= 170000
-#include "parser/scansup.h"
-#endif
-
 typedef struct SparseInputElement
 {
 	int32		index;
@@ -159,9 +150,9 @@ InitSparseVector(int dim, int nnz)
 	return result;
 }
 
-#if PG_VERSION_NUM >= 170000
+/*
-#define sparsevec_isspace(ch) scanner_isspace(ch)
+ * Check for whitespace, since array_isspace() is static
-#else
+ */
 static inline bool
 sparsevec_isspace(char ch)
 {
@@ -174,7 +165,6 @@ sparsevec_isspace(char ch)
 		return true;
 	return false;
 }
-#endif
 
 /*
  * Compare indices

src/vector.c

@@ -16,20 +16,16 @@
 #include "port.h"				/* for strtof() */
 #include "sparsevec.h"
 #include "utils/array.h"
+#include "utils/builtins.h"
 #include "utils/float.h"
-#include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
-#include "utils/varbit.h"
+#include "utils/numeric.h"
 #include "vector.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif
 
-#if PG_VERSION_NUM >= 170000
-#include "parser/scansup.h"
-#endif
-
 #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
 #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
 
@@ -133,9 +129,9 @@ InitVector(int dim)
 	return result;
 }
 
-#if PG_VERSION_NUM >= 170000
+/*
-#define vector_isspace(ch) scanner_isspace(ch)
+ * Check for whitespace, since array_isspace() is static
-#else
+ */
 static inline bool
 vector_isspace(char ch)
 {
@@ -148,7 +144,6 @@ vector_isspace(char ch)
 		return true;
 	return false;
 }
-#endif
 
 /*
  * Check state array

test/t/005_ivfflat_query_recall.pl

@@ -16,19 +16,29 @@ $node->safe_psql("postgres",
 	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
 );
 
-# Add index
+# Check each index type
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops);");
+my @operators = ("<->", "<#>", "<=>");
+my @opclasses = ("vector_l2_ops", "vector_ip_ops", "vector_cosine_ops");
 
-# Test 100% recall
+for my $i (0 .. $#operators)
-for (1 .. 20)
 {
-	my $id = int(rand() * 100000);
+	my $operator = $operators[$i];
-	my $query = $node->safe_psql("postgres", "SELECT v FROM tst WHERE i = $id;");
+	my $opclass = $opclasses[$i];
-	my $res = $node->safe_psql("postgres", qq(
+
-		SET enable_seqscan = off;
+	# Add index
-		SELECT v FROM tst ORDER BY v <-> '$query' LIMIT 1;
+	$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v $opclass);");
-	));
+
-	is($res, $query);
+	# Test 100% recall
+	for (1 .. 20)
+	{
+		my $id = int(rand() * 100000);
+		my $query = $node->safe_psql("postgres", "SELECT v FROM tst WHERE i = $id;");
+		my $res = $node->safe_psql("postgres", qq(
+			SET enable_seqscan = off;
+			SELECT v FROM tst ORDER BY v <-> '$query' LIMIT 1;
+		));
+		is($res, $query);
+	}
 }
 
 done_testing();