Added support for adaptive beam search [skip ci]

.github/workflows/build.yml

@@ -37,10 +37,10 @@ jobs:
       - run: make installcheck
       - if: ${{ failure() }}
         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:
     runs-on: ${{ matrix.os }}
     if: ${{ !startsWith(github.ref_name, 'windows') }}
@@ -65,21 +65,21 @@ jobs:
       - if: ${{ failure() }}
         run: cat regression.diffs
       # 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:
     runs-on: ${{ matrix.os }}
     if: ${{ !startsWith(github.ref_name, 'mac') }}
@@ -106,4 +106,38 @@ jobs:
         shell: cmd
       - if: ${{ failure() }}
         run: cat regression.diffs
-
+  i386:
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    runs-on: ubuntu-latest
+    container:
+      image: debian:12
+      options: --platform linux/386
+    steps:
+      - run: apt-get update && apt-get install -y build-essential git libipc-run-perl postgresql-15 postgresql-server-dev-15 sudo
+      - run: service postgresql start
+      - run: |
+          git clone https://github.com/${{ github.repository }}.git pgvector
+          cd pgvector
+          git fetch origin ${{ github.ref }}
+          git reset --hard FETCH_HEAD
+          make
+          make install
+          chown -R postgres .
+          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
+      - if: ${{ failure() }}
+        run: cat pgvector/regression.diffs
+  valgrind:
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ankane/setup-postgres-valgrind@v1
+        with:
+          postgres-version: 18
+          check-ub: yes
+      - run: make OPTFLAGS=""
+      - run: sudo --preserve-env=PG_CONFIG make install
+      - run: make installcheck

README.md

@@ -803,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
@@ -1283,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,16 +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
-
 #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
 #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
 

src/hnsw.c

@@ -1,28 +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/nodes.h"
-#include "nodes/pathnodes.h"
-#include "nodes/pg_list.h"
-#include "storage/lockdefs.h"
-#include "storage/shmem.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,47 +36,23 @@
  */
 #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"
 #include "catalog/pg_type_d.h"
 #include "commands/progress.h"
-#include "common/relpath.h"
 #include "hnsw.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
 #include "optimizer/optimizer.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/condition_variable.h"
-#include "storage/dsm.h"
-#include "storage/itemid.h"
-#include "storage/itemptr.h"
-#include "storage/lockdefs.h"
-#include "storage/lwlock.h"
-#include "storage/off.h"
-#include "storage/shm_toc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-#include "utils/snapmgr.h"
-#include "utils/snapshot.h"
-
-#if PG_VERSION_NUM < 190000
-#include "storage/item.h"
-#endif
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -90,11 +66,6 @@
 
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_status.h"
-#endif
-
-#if PG_VERSION_NUM >= 170000
-#include "utils/wait_event_types.h"
-#elif PG_VERSION_NUM >= 140000
 #include "utils/wait_event.h"
 #endif
 
@@ -578,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,27 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
+#include <math.h>
+
 #include "access/generic_xlog.h"
-#include "common/relpath.h"
 #include "hnsw.h"
-#include "nodes/execnodes.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemid.h"
-#include "storage/itemptr.h"
 #include "storage/lmgr.h"
-#include "storage/lockdefs.h"
-#include "storage/off.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-
-#if PG_VERSION_NUM < 190000
-#include "storage/item.h"
-#endif
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -726,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,25 +1,12 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/skey.h"
 #include "hnsw.h"
-#include "lib/pairingheap.h"
-#include "miscadmin.h"
-#include "nodes/pg_list.h"
 #include "pgstat.h"
-#include "storage/itemptr.h"
+#include "storage/bufmgr.h"
 #include "storage/lmgr.h"
-#include "storage/lockdefs.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,28 +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 "common/relpath.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/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemptr.h"
-#include "storage/lwlock.h"
-#include "storage/off.h"
 #include "utils/datum.h"
 #include "utils/memdebug.h"
 #include "utils/rel.h"
-#include "utils/relcache.h"
-#include "vector.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -270,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;
 }
@@ -296,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;
 }
 
@@ -522,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));
 	}
 }
 
@@ -839,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)
 	{
@@ -894,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);
@@ -914,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)
 			{
@@ -930,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,26 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
+#include <math.h>
+
 #include "access/generic_xlog.h"
 #include "commands/vacuum.h"
-#include "common/relpath.h"
 #include "hnsw.h"
-#include "nodes/pg_list.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemptr.h"
 #include "storage/lmgr.h"
-#include "storage/lockdefs.h"
-#include "storage/off.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-
-#if PG_VERSION_NUM < 190000
-#include "storage/item.h"
-#endif
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -191,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);
 
@@ -546,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,52 +2,23 @@
 
 #include <float.h>
 
-#include "access/attnum.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 "common/relpath.h"
+#include "halfvec.h"
-#include "executor/tuptable.h"
-#include "fmgr.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
-#include "nodes/execnodes.h"
 #include "optimizer/optimizer.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/condition_variable.h"
-#include "storage/dsm.h"
-#include "storage/itemptr.h"
-#include "storage/lockdefs.h"
-#include "storage/off.h"
-#include "storage/shm_toc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
+#include "vector.h"
-#include "utils/relcache.h"
-#include "utils/sampling.h"
-#include "utils/snapmgr.h"
-#include "utils/snapshot.h"
-#include "utils/tuplesort.h"
-
-#if PG_VERSION_NUM < 190000
-#include "storage/item.h"
-#endif
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
@@ -61,11 +32,6 @@
 
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_status.h"
-#endif
-
-#if PG_VERSION_NUM >= 170000
-#include "utils/wait_event_types.h"
-#elif PG_VERSION_NUM >= 140000
 #include "utils/wait_event.h"
 #endif
 

src/ivfflat.c

@@ -3,22 +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/nodes.h"
-#include "nodes/pathnodes.h"
-#include "nodes/pg_list.h"
-#include "storage/lockdefs.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,29 +2,11 @@
 
 #include <float.h>
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
-#include "access/itup.h"
-#include "common/relpath.h"
-#include "fmgr.h"
 #include "ivfflat.h"
-#include "nodes/execnodes.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemid.h"
-#include "storage/itemptr.h"
 #include "storage/lmgr.h"
-#include "storage/lockdefs.h"
-#include "storage/off.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-
-#if PG_VERSION_NUM < 190000
-#include "storage/item.h"
-#endif
 
 /*
  * 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,38 +2,15 @@
 
 #include <float.h>
 
-#include "access/attnum.h"
-#include "access/genam.h"
-#include "access/itup.h"
 #include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
-#include "common/relpath.h"
-#include "executor/tuptable.h"
-#include "fmgr.h"
 #include "lib/pairingheap.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "pgstat.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemid.h"
-#include "storage/itemptr.h"
-#include "storage/off.h"
 #include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.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,23 +1,13 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
-#include "common/relpath.h"
+#include "bitvec.h"
+#include "catalog/pg_type.h"
 #include "fmgr.h"
 #include "halfutils.h"
 #include "halfvec.h"
 #include "ivfflat.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.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,18 +1,9 @@
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
-#include "access/itup.h"
 #include "commands/vacuum.h"
-#include "common/relpath.h"
 #include "ivfflat.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/itemptr.h"
-#include "storage/off.h"
-#include "utils/relcache.h"
 
 #if PG_VERSION_NUM >= 180000
 #define vacuum_delay_point() vacuum_delay_point(false)

src/sparsevec.c

@@ -5,23 +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
-
 typedef struct SparseInputElement
 {
 	int32		index;

src/vector.c

@@ -16,10 +16,10 @@
 #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