Added comments [skip ci]

Updated comment [skip ci]
Updated variable name [skip ci]
2026-07-22 03:57:34 +08:00 · 2024-09-22 10:45:09 -07:00 · 2024-09-22 10:35:51 -07:00 · 2024-09-22 10:33:44 -07:00 · 2024-09-22 10:24:36 -07:00 · 2024-09-22 10:10:55 -07:00
49 changed files with 880 additions and 2222 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+/.git/
+/dist/
+/results/
+/tmp_check/
+/sql/vector--?.?.?.sql
+regression.*
+*.o
+*.so
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,29 +8,27 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - postgres: 19
-            os: ubuntu-24.04
-          - postgres: 18
-            os: ubuntu-24.04
+          # - postgres: 18
+          #   os: ubuntu-24.04
          - postgres: 17
            os: ubuntu-24.04
          - postgres: 16
-            os: ubuntu-24.04-arm
+            os: ubuntu-22.04
          - postgres: 15
            os: ubuntu-22.04
          - postgres: 14
-            os: ubuntu-22.04-arm
+            os: ubuntu-20.04
          - postgres: 13
-            os: ubuntu-22.04
+            os: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: ankane/setup-postgres@v1
        with:
          postgres-version: ${{ matrix.postgres }}
          dev-files: true
      - run: make
        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
      - run: |
          export PG_CONFIG=`which pg_config`
          sudo --preserve-env=PG_CONFIG make install
@@ -48,18 +46,18 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - postgres: 18
-            os: macos-26
+          - postgres: 16
+            os: macos-14
          - postgres: 14
-            os: macos-15-intel
+            os: macos-12
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: ankane/setup-postgres@v1
        with:
          postgres-version: ${{ matrix.postgres }}
      - run: make
        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
      - run: make install
      - run: make installcheck
      - if: ${{ failure() }}
@@ -72,35 +70,26 @@ jobs:
          tar xf $TAG.tar.gz
          mv postgres-$TAG postgres
        env:
-          TAG: ${{ matrix.postgres == 18 && 'REL_18_0' || 'REL_14_19' }}
+          TAG: ${{ matrix.postgres == 16 && 'REL_16_2' || 'REL_14_11' }}
      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres/src/test/perl -I ./test/perl"
        env:
          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@15)/bin/scan-build --status-bugs make
        env:
-          LLVM_VERSION: ${{ matrix.os == 'macos-26' && 20 || 18 }}
          PG_CFLAGS: -DUSE_ASSERT_CHECKING
  windows:
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
    if: ${{ !startsWith(github.ref_name, 'mac') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - postgres: 17
-            os: windows-2025
-          - postgres: 14
-            os: windows-2022
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: ankane/setup-postgres@v1
        with:
-          postgres-version: ${{ matrix.postgres }}
+          postgres-version: 14
      - run: |
          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && ^
          nmake /NOLOGO /F Makefile.win && ^
          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 && ^
          nmake /NOLOGO /F Makefile.win clean && ^
          nmake /NOLOGO /F Makefile.win uninstall
        shell: cmd
@@ -133,10 +122,10 @@ jobs:
    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - uses: ankane/setup-postgres-valgrind@v1
        with:
-          postgres-version: 18
+          postgres-version: 16
          check-ub: yes
      - run: make OPTFLAGS=""
      - run: sudo --preserve-env=PG_CONFIG make install
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,7 @@
-## 0.9.0 (unreleased)
+## 0.8.0 (unreleased)

- Added support for inline filtering with HNSW
-
-## 0.8.2 (unreleased)
-
- Improved `install` target on Windows
- Fixed `Index Searches` in `EXPLAIN` output for Postgres 18
-
-## 0.8.1 (2025-09-04)
-
- Added support for Postgres 18 rc1
- Improved performance of `binary_quantize` function
-
-## 0.8.0 (2024-10-30)
-
- Added support for iterative index scans
 - Added casts for arrays to `sparsevec`
- Improved cost estimation for better index selection when filtering
- Improved performance of HNSW index scans
- Improved performance of HNSW inserts and on-disk index builds
+- Reduced memory usage for HNSW index scans
 - Dropped support for Postgres 12

 ## 0.7.4 (2024-08-05)
--- a/9
+++ b/9
@@ -1,11 +1,8 @@
-# syntax=docker/dockerfile:1
-
-ARG PG_MAJOR=17
-ARG DEBIAN_CODENAME=bookworm
-FROM postgres:$PG_MAJOR-$DEBIAN_CODENAME
+ARG PG_MAJOR=16
+FROM postgres:$PG_MAJOR
 ARG PG_MAJOR

-ADD https://github.com/pgvector/pgvector.git#v0.8.1 /tmp/pgvector
+COPY . /tmp/pgvector

 RUN apt-get update && \
 		apt-mark hold locales && \
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2024, 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.8.1",
+	"version": "0.7.4",
 	"maintainer": [
 		"Andrew Kane <andrew@ankane.org>"
 	],
@@ -12,7 +12,7 @@
 	"prereqs": {
 		"runtime": {
 			"requires": {
-				"PostgreSQL": "13.0.0"
+				"PostgreSQL": "12.0.0"
 			}
 		}
 	},
@@ -20,7 +20,7 @@
 		"vector": {
 			"file": "sql/vector.sql",
 			"docfile": "README.md",
-			"version": "0.8.1",
+			"version": "0.7.4",
 			"abstract": "Open-source vector similarity search for Postgres"
 		}
 	},
--- a/11
+++ b/11
@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.8.1
+EXTVERSION = 0.7.4

 MODULE_big = vector
 DATA = $(wildcard sql/*--*--*.sql)
@@ -66,7 +66,7 @@ dist:
 	git archive --format zip --prefix=$(EXTENSION)-$(EXTVERSION)/ --output dist/$(EXTENSION)-$(EXTVERSION).zip master

 # for Docker
-PG_MAJOR ?= 17
+PG_MAJOR ?= 16

 .PHONY: docker

@@ -76,9 +76,4 @@ docker:
 .PHONY: docker-release

 docker-release:
-	docker buildx build --push --pull --no-cache --platform linux/amd64,linux/arm64 --build-arg PG_MAJOR=$(PG_MAJOR) --build-arg DEBIAN_CODENAME=bookworm -t pgvector/pgvector:pg$(PG_MAJOR) -t pgvector/pgvector:pg$(PG_MAJOR)-bookworm -t pgvector/pgvector:$(EXTVERSION)-pg$(PG_MAJOR) -t pgvector/pgvector:$(EXTVERSION)-pg$(PG_MAJOR)-bookworm .
-
-.PHONY: docker-release-trixie
-
-docker-release-trixie:
-	docker buildx build --push --pull --no-cache --platform linux/amd64,linux/arm64 --build-arg PG_MAJOR=$(PG_MAJOR) --build-arg DEBIAN_CODENAME=trixie -t pgvector/pgvector:pg$(PG_MAJOR)-trixie -t pgvector/pgvector:$(EXTVERSION)-pg$(PG_MAJOR)-trixie .
+	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) .
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.8.1
+EXTVERSION = 0.7.4

 DATA_built = sql\$(EXTENSION)--$(EXTVERSION).sql
 OBJS = src\bitutils.obj src\bitvec.obj src\halfutils.obj src\halfvec.obj 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\sparsevec.obj src\vector.obj
@@ -31,9 +31,6 @@ LIBDIR = $(PGROOT)\lib
 PKGLIBDIR = $(PGROOT)\lib
 SHAREDIR = $(PGROOT)\share

-# Use $(PGROOT)\bin\pg_regress for Postgres < 17
-PG_REGRESS = $(LIBDIR)\pgxs\src\test\regress\pg_regress
-
 CFLAGS = /nologo /I"$(INCLUDEDIR_SERVER)\port\win32_msvc" /I"$(INCLUDEDIR_SERVER)\port\win32" /I"$(INCLUDEDIR_SERVER)" /I"$(INCLUDEDIR)"

 CFLAGS = $(CFLAGS) $(PG_CFLAGS)
@@ -57,11 +54,11 @@ install: all
 	copy $(SHLIB) "$(PKGLIBDIR)"
 	copy $(EXTENSION).control "$(SHAREDIR)\extension"
 	copy sql\$(EXTENSION)--*.sql "$(SHAREDIR)\extension"
-	if not exist "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)" mkdir "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"
+	mkdir "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"
 	for %f in ($(HEADERS)) do copy %f "$(INCLUDEDIR_SERVER)\extension\$(EXTENSION)"

 installcheck:
-	"$(PG_REGRESS)" --bindir="$(BINDIR)" $(REGRESS_OPTS) $(REGRESS)
+	"$(BINDIR)\pg_regress" --bindir="$(BINDIR)" $(REGRESS_OPTS) $(REGRESS)

 uninstall:
 	del /f "$(PKGLIBDIR)\$(SHLIB)"
--- a/README.md
+++ b/README.md
@@ -17,11 +17,11 @@ Plus [ACID](https://en.wikipedia.org/wiki/ACID) compliance, point-in-time recove

 ### Linux and Mac

-Compile and install the extension (supports Postgres 13+)
+Compile and install the extension (supports Postgres 12+)

 ```sh
 cd /tmp
-git clone --branch v0.8.1 https://github.com/pgvector/pgvector.git
+git clone --branch v0.7.4 https://github.com/pgvector/pgvector.git
 cd pgvector
 make
 make install # may need sudo
@@ -29,16 +29,24 @@ make install # may need sudo

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

-You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), [APT](#apt), [Yum](#yum), [pkg](#pkg), [APK](#apk), 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).
+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 `x64 Native Tools Command Prompt for VS [version]` as administrator. Then use `nmake` to build:
+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
-set "PGROOT=C:\Program Files\PostgreSQL\18"
+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"
 cd %TEMP%
-git clone --branch v0.8.1 https://github.com/pgvector/pgvector.git
+git clone --branch v0.7.4 https://github.com/pgvector/pgvector.git
 cd pgvector
 nmake /F Makefile.win
 nmake /F Makefile.win install
@@ -74,7 +82,7 @@ Get the nearest neighbors by L2 distance
 SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
 ```

-Also supports inner product (`<#>`), cosine distance (`<=>`), and L1 distance (`<+>`)
+Also supports inner product (`<#>`), cosine distance (`<=>`), and L1 distance (`<+>`, added in 0.7.0)

 Note: `<#>` returns the negative inner product since Postgres only supports `ASC` order index scans on operators

@@ -92,8 +100,6 @@ Or add a vector column to an existing table
 ALTER TABLE items ADD COLUMN embedding vector(3);
 ```

-Also supports [half-precision](#half-precision-vectors), [binary](#binary-vectors), and [sparse](#sparse-vectors) vectors
-
 Insert vectors

 ```sql
@@ -138,9 +144,7 @@ Supported distance functions are:
 - `<->` - L2 distance
 - `<#>` - (negative) inner product
 - `<=>` - cosine distance
- `<+>` - L1 distance
- `<~>` - Hamming distance (binary vectors)
- `<%>` - Jaccard distance (binary vectors)
+- `<+>` - L1 distance (added in 0.7.0)

 Get the nearest neighbors to a row

@@ -227,19 +231,19 @@ Cosine distance
 CREATE INDEX ON items USING hnsw (embedding vector_cosine_ops);
 ```

-L1 distance
+L1 distance - added in 0.7.0

 ```sql
 CREATE INDEX ON items USING hnsw (embedding vector_l1_ops);
 ```

-Hamming distance
+Hamming distance - added in 0.7.0

 ```sql
 CREATE INDEX ON items USING hnsw (embedding bit_hamming_ops);
 ```

-Jaccard distance
+Jaccard distance - added in 0.7.0

 ```sql
 CREATE INDEX ON items USING hnsw (embedding bit_jaccard_ops);
@@ -248,9 +252,9 @@ CREATE INDEX ON items USING hnsw (embedding bit_jaccard_ops);
 Supported types are:

 - `vector` - up to 2,000 dimensions
- `halfvec` - up to 4,000 dimensions
- `bit` - up to 64,000 dimensions
- `sparsevec` - up to 1,000 non-zero elements
+- `halfvec` - up to 4,000 dimensions (added in 0.7.0)
+- `bit` - up to 64,000 dimensions (added in 0.7.0)
+- `sparsevec` - up to 1,000 non-zero elements (added in 0.7.0)

 ### Index Options

@@ -304,19 +308,17 @@ Note: Do not set `maintenance_work_mem` so high that it exhausts the memory on t

 Like other index types, it’s faster to create an index after loading your initial data

-You can also speed up index creation by increasing the number of parallel workers (2 by default)
+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 need to increase `max_parallel_workers` (8 by default)
-
-The [index options](#index-options) also have a significant impact on build time (use the defaults unless seeing low recall)
+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)
+Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+

 ```sql
 SELECT phase, round(100.0 * blocks_done / nullif(blocks_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
@@ -359,7 +361,7 @@ Cosine distance
 CREATE INDEX ON items USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
 ```

-Hamming distance
+Hamming distance - added in 0.7.0

 ```sql
 CREATE INDEX ON items USING ivfflat (embedding bit_hamming_ops) WITH (lists = 100);
@@ -368,8 +370,8 @@ CREATE INDEX ON items USING ivfflat (embedding bit_hamming_ops) WITH (lists = 10
 Supported types are:

 - `vector` - up to 2,000 dimensions
- `halfvec` - up to 4,000 dimensions
- `bit` - up to 64,000 dimensions
+- `halfvec` - up to 4,000 dimensions (added in 0.7.0)
+- `bit` - up to 64,000 dimensions (added in 0.7.0)

 ### Query Options

@@ -402,7 +404,7 @@ For a large number of workers, you may also need to increase `max_parallel_worke

 ### Indexing Progress

-Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING)
+Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+

 ```sql
 SELECT phase, round(100.0 * tuples_done / nullif(tuples_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
@@ -419,134 +421,34 @@ Note: `%` is only populated during the `loading tuples` phase

 ## Filtering

-There are a few ways to index nearest neighbor queries with a `WHERE` clause.
+There are a few ways to index nearest neighbor queries with a `WHERE` clause

 ```sql
 SELECT * FROM items WHERE category_id = 123 ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
 ```

-A good place to start is creating an index on the filter column. This can provide fast, exact nearest neighbor search in many cases. Postgres has a number of [index types](https://www.postgresql.org/docs/current/indexes-types.html) for this: B-tree (default), hash, GiST, SP-GiST, GIN, and BRIN.
+Create an index on one [or more](https://www.postgresql.org/docs/current/indexes-multicolumn.html) of the `WHERE` columns for exact search

 ```sql
 CREATE INDEX ON items (category_id);
 ```

-For multiple columns, consider a [multicolumn index](https://www.postgresql.org/docs/current/indexes-multicolumn.html).
-
-```sql
-CREATE INDEX ON items (location_id, category_id);
-```
-
-Exact indexes work well for conditions that match a low percentage of rows. Otherwise, [approximate indexes](#indexing) can work better.
-
-```sql
-CREATE INDEX ON items USING hnsw (embedding vector_l2_ops);
-```
-
-With approximate indexes, filtering is applied *after* the index is scanned. If a condition matches 10% of rows, with HNSW and the default `hnsw.ef_search` of 40, only 4 rows will match on average. For more rows, increase `hnsw.ef_search`.
-
-```sql
-SET hnsw.ef_search = 200;
-```
-
-Starting with 0.8.0, you can enable [iterative index scans](#iterative-index-scans), which will automatically scan more of the index when needed.
-
-```sql
-SET hnsw.iterative_scan = strict_order;
-```
-
-If filtering by only a few distinct values, consider [partial indexing](https://www.postgresql.org/docs/current/indexes-partial.html).
+Or a [partial index](https://www.postgresql.org/docs/current/indexes-partial.html) on the vector column for approximate search

 ```sql
 CREATE INDEX ON items USING hnsw (embedding vector_l2_ops) WHERE (category_id = 123);
 ```

-If filtering by many different values, consider [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html).
+Use [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) for approximate search on many different values of the `WHERE` columns

 ```sql
 CREATE TABLE items (embedding vector(3), category_id int) PARTITION BY LIST(category_id);
 ```

-Or a composite HNSW index (added in 0.9.0)
-
-```sql
-CREATE INDEX ON items USING hnsw (embedding vector_l2_ops, category_id);
-```
-
-## Iterative Index Scans
-
-With approximate indexes, queries with filtering can return less results since filtering is applied *after* the index is scanned. Starting with 0.8.0, you can enable iterative index scans, which will automatically scan more of the index until enough results are found (or it reaches `hnsw.max_scan_tuples` or `ivfflat.max_probes`).
-
-Iterative scans can use strict or relaxed ordering.
-
-Strict ensures results are in the exact order by distance
-
-```sql
-SET hnsw.iterative_scan = strict_order;
-```
-
-Relaxed allows results to be slightly out of order by distance, but provides better recall
-
-```sql
-SET hnsw.iterative_scan = relaxed_order;
-# or
-SET ivfflat.iterative_scan = relaxed_order;
-```
-
-With relaxed ordering, you can use a [materialized CTE](https://www.postgresql.org/docs/current/queries-with.html#QUERIES-WITH-CTE-MATERIALIZATION) to get strict ordering
-
-```sql
-WITH relaxed_results AS MATERIALIZED (
-    SELECT id, embedding <-> '[1,2,3]' AS distance FROM items WHERE category_id = 123 ORDER BY distance LIMIT 5
-) SELECT * FROM relaxed_results ORDER BY distance + 0;
-```
-
-Note: `+ 0` is needed for Postgres 17+
-
-For queries that filter by distance, use a materialized CTE and place the distance filter outside of it for best performance (due to the [current behavior](https://www.postgresql.org/message-id/flat/CAOdR5yGUoMQ6j7M5hNUXrySzaqZVGf_Ne%2B8fwZMRKTFxU1nbJg%40mail.gmail.com) of the Postgres executor)
-
-```sql
-WITH nearest_results AS MATERIALIZED (
-    SELECT id, embedding <-> '[1,2,3]' AS distance FROM items ORDER BY distance LIMIT 5
-) SELECT * FROM nearest_results WHERE distance < 5 ORDER BY distance;
-```
-
-Note: Place any other filters inside the CTE
-
-### Iterative Scan Options
-
-Since scanning a large portion of an approximate index is expensive, there are options to control when a scan ends.
-
-#### HNSW
-
-Specify the max number of tuples to visit (20,000 by default)
-
-```sql
-SET hnsw.max_scan_tuples = 20000;
-```
-
-Note: This is approximate and does not affect the initial scan
-
-Specify the max amount of memory to use, as a multiple of `work_mem` (1 by default)
-
-```sql
-SET hnsw.scan_mem_multiplier = 2;
-```
-
-Note: Try increasing this if increasing `hnsw.max_scan_tuples` does not improve recall
-
-#### IVFFlat
-
-Specify the max number of probes
-
-```sql
-SET ivfflat.max_probes = 100;
-```
-
-Note: If this is lower than `ivfflat.probes`, `ivfflat.probes` will be used
-
 ## Half-Precision Vectors

+*Added in 0.7.0*
+
 Use the `halfvec` type to store half-precision vectors

 ```sql
@@ -555,6 +457,8 @@ CREATE TABLE items (id bigserial PRIMARY KEY, embedding halfvec(3));

 ## Half-Precision Indexing

+*Added in 0.7.0*
+
 Index vectors at half precision for smaller indexes

 ```sql
@@ -576,16 +480,24 @@ CREATE TABLE items (id bigserial PRIMARY KEY, embedding bit(3));
 INSERT INTO items (embedding) VALUES ('000'), ('111');
 ```

-Get the nearest neighbors by Hamming distance
+Get the nearest neighbors by Hamming distance (added in 0.7.0)

 ```sql
 SELECT * FROM items ORDER BY embedding <~> '101' LIMIT 5;
 ```

+Or (before 0.7.0)
+
+```sql
+SELECT * FROM items ORDER BY bit_count(embedding # '101') LIMIT 5;
+```
+
 Also supports Jaccard distance (`<%>`)

 ## Binary Quantization

+*Added in 0.7.0*
+
 Use expression indexing for binary quantization

 ```sql
@@ -608,6 +520,8 @@ SELECT * FROM (

 ## Sparse Vectors

+*Added in 0.7.0*
+
 Use the `sparsevec` type to store sparse vectors

 ```sql
@@ -641,6 +555,8 @@ You can use [Reciprocal Rank Fusion](https://github.com/pgvector/pgvector-python

 ## Indexing Subvectors

+*Added in 0.7.0*
+
 Use expression indexing to index subvectors

 ```sql
@@ -701,10 +617,10 @@ CREATE INDEX CONCURRENTLY ...

 ### Querying

-Use `EXPLAIN (ANALYZE, BUFFERS)` to debug performance.
+Use `EXPLAIN ANALYZE` to debug performance.

 ```sql
-EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
+EXPLAIN ANALYZE SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
 ```

 #### Exact Search
@@ -754,6 +670,8 @@ SELECT query, calls, ROUND((total_plan_time + total_exec_time) / calls) AS avg_t
    FROM pg_stat_statements ORDER BY total_plan_time + total_exec_time DESC LIMIT 20;
 ```

+Note: Replace `total_plan_time + total_exec_time` with `total_time` for Postgres < 13
+
 Monitor recall by comparing results from approximate search with exact search.

 ```sql
@@ -777,35 +695,25 @@ Use pgvector from any language with a Postgres client. You can even generate and

 Language | Libraries / Examples
 --- | ---
-Ada | [pgvector-ada](https://github.com/pgvector/pgvector-ada)
-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)
 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)
 Elixir | [pgvector-elixir](https://github.com/pgvector/pgvector-elixir)
-Erlang | [pgvector-erlang](https://github.com/pgvector/pgvector-erlang)
-Fortran | [pgvector-fortran](https://github.com/pgvector/pgvector-fortran)
-Gleam | [pgvector-gleam](https://github.com/pgvector/pgvector-gleam)
 Go | [pgvector-go](https://github.com/pgvector/pgvector-go)
 Haskell | [pgvector-haskell](https://github.com/pgvector/pgvector-haskell)
 Java, Kotlin, Groovy, Scala | [pgvector-java](https://github.com/pgvector/pgvector-java)
 JavaScript, TypeScript | [pgvector-node](https://github.com/pgvector/pgvector-node)
-Julia | [Pgvector.jl](https://github.com/pgvector/Pgvector.jl)
+Julia | [pgvector-julia](https://github.com/pgvector/pgvector-julia)
 Lisp | [pgvector-lisp](https://github.com/pgvector/pgvector-lisp)
 Lua | [pgvector-lua](https://github.com/pgvector/pgvector-lua)
 Nim | [pgvector-nim](https://github.com/pgvector/pgvector-nim)
 OCaml | [pgvector-ocaml](https://github.com/pgvector/pgvector-ocaml)
-Pascal | [pgvector-pascal](https://github.com/pgvector/pgvector-pascal)
 Perl | [pgvector-perl](https://github.com/pgvector/pgvector-perl)
 PHP | [pgvector-php](https://github.com/pgvector/pgvector-php)
-Prolog | [pgvector-prolog](https://github.com/pgvector/pgvector-prolog)
 Python | [pgvector-python](https://github.com/pgvector/pgvector-python)
 R | [pgvector-r](https://github.com/pgvector/pgvector-r)
-Racket | [pgvector-racket](https://github.com/pgvector/pgvector-racket)
-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)
@@ -823,11 +731,11 @@ Yes, pgvector uses the write-ahead log (WAL), which allows for replication and p

 #### What if I want to index vectors with more than 2,000 dimensions?

-You can use [half-precision vectors](#half-precision-vectors) or [half-precision indexing](#half-precision-indexing) to index up to 4,000 dimensions or [binary quantization](#binary-quantization) to index up to 64,000 dimensions. Other options are [indexing subvectors](#indexing-subvectors) (for models that support it) or [dimensionality reduction](https://en.wikipedia.org/wiki/Dimensionality_reduction).
+You can use [half-precision indexing](#half-precision-indexing) to index up to 4,000 dimensions or [binary quantization](#binary-quantization) to index up to 64,000 dimensions. Another option is [dimensionality reduction](https://en.wikipedia.org/wiki/Dimensionality_reduction).

 #### Can I store vectors with different dimensions in the same column?

-You can use `vector` as the type (instead of `vector(n)`).
+You can use `vector` as the type (instead of `vector(3)`).

 ```sql
 CREATE TABLE embeddings (model_id bigint, item_id bigint, embedding vector, PRIMARY KEY (model_id, item_id));
@@ -927,7 +835,7 @@ 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`), which is 40 by default. There may be even less results due to dead tuples or filtering conditions in the query. Enabling [iterative index scans](#iterative-index-scans) can help address this.
+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.

 Also, note that `NULL` vectors are not indexed (as well as zero vectors for cosine distance).

@@ -939,7 +847,7 @@ 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`). Enabling [iterative index scans](#iterative-index-scans) can address this.
+Results can also be limited by the number of probes (`ivfflat.probes`).

 Also, note that `NULL` vectors are not indexed (as well as zero vectors for cosine distance).

@@ -1075,7 +983,7 @@ l2_normalize(sparsevec) → sparsevec | Normalize with Euclidean norm | 0.7.0
 If your machine has multiple Postgres installations, specify the path to [pg_config](https://www.postgresql.org/docs/current/app-pgconfig.html) with:

 ```sh
-export PG_CONFIG=/Library/PostgreSQL/18/bin/pg_config
+export PG_CONFIG=/Library/PostgreSQL/16/bin/pg_config
 ```

 Then re-run the installation instructions (run `make clean` before `make` if needed). If `sudo` is needed for `make install`, use:
@@ -1086,11 +994,11 @@ sudo --preserve-env=PG_CONFIG make install

 A few common paths on Mac are:

- EDB installer - `/Library/PostgreSQL/18/bin/pg_config`
- Homebrew (arm64) - `/opt/homebrew/opt/postgresql@18/bin/pg_config`
- Homebrew (x86-64) - `/usr/local/opt/postgresql@18/bin/pg_config`
+- EDB installer - `/Library/PostgreSQL/16/bin/pg_config`
+- Homebrew (arm64) - `/opt/homebrew/opt/postgresql@16/bin/pg_config`
+- Homebrew (x86-64) - `/usr/local/opt/postgresql@16/bin/pg_config`

-Note: Replace `18` with your Postgres server version
+Note: Replace `16` with your Postgres server version

 ### Missing Header

@@ -1099,20 +1007,14 @@ If compilation fails with `fatal error: postgres.h: No such file or directory`,
 For Ubuntu and Debian, use:

 ```sh
-sudo apt install postgresql-server-dev-18
+sudo apt install postgresql-server-dev-16
 ```

-Note: Replace `18` with your Postgres server version
+Note: Replace `16` with your Postgres server version

 ### Missing SDK

-If compilation fails and the output includes `warning: no such sysroot directory` on Mac, your Postgres installation points to a path that no longer exists.
-
-```sh
-pg_config --cppflags
-```
-
-Reinstall Postgres to fix this.
+If compilation fails and the output includes `warning: no such sysroot directory` on Mac, reinstall Xcode Command Line Tools.

 ### Portability

@@ -1130,14 +1032,6 @@ make OPTFLAGS=""

 If compilation fails with `Cannot open include file: 'postgres.h': No such file or directory`, make sure `PGROOT` is correct.

-### Mismatched Architecture
-
-If compilation fails with `error C2196: case value '4' already used`, make sure you’re using the `x64 Native Tools Command Prompt`. Then run `nmake /F Makefile.win clean` and re-run the installation instructions.
-
-### Missing Symbol
-
-If linking fails with `unresolved external symbol float_to_shortest_decimal_bufn` with Postgres 17.0-17.2, upgrade to Postgres 17.3+.
-
 ### Permissions

 If installation fails with `Access is denied`, re-run the installation instructions as an administrator.
@@ -1149,38 +1043,17 @@ If installation fails with `Access is denied`, re-run the installation instructi
 Get the [Docker image](https://hub.docker.com/r/pgvector/pgvector) with:

 ```sh
-docker pull pgvector/pgvector:pg18-trixie
+docker pull pgvector/pgvector:pg16
 ```

-This adds pgvector to the [Postgres image](https://hub.docker.com/_/postgres) (replace `18` with your Postgres server version, and run it the same way).
-
-Supported tags are:
-
- `pg18-trixie`, `0.8.1-pg18-trixie`
- `pg18-bookworm`, `0.8.1-pg18-bookworm`, `pg18`, `0.8.1-pg18`
- `pg17-trixie`, `0.8.1-pg17-trixie`
- `pg17-bookworm`, `0.8.1-pg17-bookworm`, `pg17`, `0.8.1-pg17`
- `pg16-trixie`, `0.8.1-pg16-trixie`
- `pg16-bookworm`, `0.8.1-pg16-bookworm`, `pg16`, `0.8.1-pg16`
- `pg15-trixie`, `0.8.1-pg15-trixie`
- `pg15-bookworm`, `0.8.1-pg15-bookworm`, `pg15`, `0.8.1-pg15`
- `pg14-trixie`, `0.8.1-pg14-trixie`
- `pg14-bookworm`, `0.8.1-pg14-bookworm`, `pg14`, `0.8.1-pg14`
- `pg13-trixie`, `0.8.1-pg13-trixie`
- `pg13-bookworm`, `0.8.1-pg13-bookworm`, `pg13`, `0.8.1-pg13`
+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).

 You can also build the image manually:

 ```sh
-git clone --branch v0.8.1 https://github.com/pgvector/pgvector.git
+git clone --branch v0.7.4 https://github.com/pgvector/pgvector.git
 cd pgvector
-docker build --pull --build-arg PG_MAJOR=18 -t myuser/pgvector .
-```
-
-If you increase `maintenance_work_mem`, make sure `--shm-size` is at least that size to avoid an error with parallel HNSW index builds.
-
-```sh
-docker run --shm-size=1g ...
+docker build --pull --build-arg PG_MAJOR=16 -t myuser/pgvector .
 ```

 ### Homebrew
@@ -1191,7 +1064,7 @@ With Homebrew Postgres, you can use:
 brew install pgvector
 ```

-Note: This only adds it to the `postgresql@18` and `postgresql@17` formulas
+Note: This only adds it to the `postgresql@14` formula

 ### PGXN

@@ -1206,29 +1079,29 @@ pgxn install vector
 Debian and Ubuntu packages are available from the [PostgreSQL APT Repository](https://wiki.postgresql.org/wiki/Apt). Follow the [setup instructions](https://wiki.postgresql.org/wiki/Apt#Quickstart) and run:

 ```sh
-sudo apt install postgresql-18-pgvector
+sudo apt install postgresql-16-pgvector
 ```

-Note: Replace `18` with your Postgres server version
+Note: Replace `16` with your Postgres server version

 ### Yum

 RPM packages are available from the [PostgreSQL Yum Repository](https://yum.postgresql.org/). Follow the [setup instructions](https://www.postgresql.org/download/linux/redhat/) for your distribution and run:

 ```sh
-sudo yum install pgvector_18
+sudo yum install pgvector_16
 # or
-sudo dnf install pgvector_18
+sudo dnf install pgvector_16
 ```

-Note: Replace `18` with your Postgres server version
+Note: Replace `16` with your Postgres server version

 ### pkg

 Install the FreeBSD package with:

 ```sh
-pkg install postgresql17-pgvector
+pkg install postgresql15-pgvector
 ```

 or the port with:
@@ -1238,14 +1111,6 @@ cd /usr/ports/databases/pgvector
 make install
 ```

-### APK
-
-Install the Alpine package with:
-
-```sh
-apk add postgresql-pgvector
-```
-
 ### conda-forge

 With Conda Postgres, install from [conda-forge](https://anaconda.org/conda-forge/pgvector) with:
@@ -1278,6 +1143,36 @@ You can check the version in the current database with:
 SELECT extversion FROM pg_extension WHERE extname = 'vector';
 ```

+## Upgrade Notes
+
+### 0.6.0
+
+#### Postgres 12
+
+If upgrading with Postgres 12, remove this line from `sql/vector--0.5.1--0.6.0.sql`:
+
+```sql
+ALTER TYPE vector SET (STORAGE = external);
+```
+
+Then run `make install` and `ALTER EXTENSION vector UPDATE;`.
+
+#### Docker
+
+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).
+
+```sh
+docker pull pgvector/pgvector:pg16
+# or
+docker pull pgvector/pgvector:0.6.0-pg16
+```
+
+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.
+
+```sh
+docker run --shm-size=1g ...
+```
+
 ## Thanks

 Thanks to:
@@ -1288,7 +1183,6 @@ 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)
- [HQANN: Efficient and Robust Similarity Search for Hybrid Queries with Structured and Unstructured Constraints](https://arxiv.org/pdf/2207.07940.pdf)

 ## History

--- a/sql/vector--0.8.0--0.8.1.sql
+++ b/sql/vector--0.8.0--0.8.1.sql
@@ -1,2 +0,0 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.8.1'" to load this file. \quit
--- a/sql/vector--0.8.1--0.9.0.sql
+++ b/sql/vector--0.8.1--0.9.0.sql
@@ -1,10 +0,0 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.9.0'" to load this file. \quit
-
-CREATE FUNCTION hnsw_attribute_distance(integer, integer) RETURNS float8
-	AS 'MODULE_PATHNAME', 'hnsw_int4_attribute_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE OPERATOR CLASS vector_integer_ops
-	DEFAULT FOR TYPE integer USING hnsw AS
-	OPERATOR 2 = (integer, integer),
-	FUNCTION 4 hnsw_attribute_distance(integer, integer);
--- a/sql/vector.sql
+++ b/sql/vector.sql
@@ -916,13 +916,3 @@ CREATE OPERATOR CLASS sparsevec_l1_ops
 	OPERATOR 1 <+> (sparsevec, sparsevec) FOR ORDER BY float_ops,
 	FUNCTION 1 l1_distance(sparsevec, sparsevec),
 	FUNCTION 3 hnsw_sparsevec_support(internal);
-
-- hnsw attributes
-
-CREATE FUNCTION hnsw_attribute_distance(integer, integer) RETURNS float8
-	AS 'MODULE_PATHNAME', 'hnsw_int4_attribute_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE OPERATOR CLASS vector_integer_ops
-	DEFAULT FOR TYPE integer USING hnsw AS
-	OPERATOR 2 = (integer, integer),
-	FUNCTION 4 hnsw_attribute_distance(integer, integer);
--- a/src/halfvec.c
+++ b/src/halfvec.c
@@ -159,6 +159,24 @@ CheckStateArray(ArrayType *statearray, const char *caller)
 	return (float8 *) ARR_DATA_PTR(statearray);
 }

+#if PG_VERSION_NUM < 120003
+static pg_noinline void
+float_overflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: overflow")));
+}
+
+static pg_noinline void
+float_underflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: underflow")));
+}
+#endif
+
 /*
 * Convert textual representation to internal representation
 */
@@ -898,21 +916,8 @@ halfvec_binary_quantize(PG_FUNCTION_ARGS)
 	half	   *ax = a->x;
 	VarBit	   *result = InitBitVector(a->dim);
 	unsigned char *rx = VARBITS(result);
-	int			i = 0;
-	int			count = (a->dim / 8) * 8;

-	/* Auto-vectorized on aarch64 */
-	for (; i < count; i += 8)
-	{
-		unsigned char result_byte = 0;
-
-		for (int j = 0; j < 8; j++)
-			result_byte |= (HalfToFloat4(ax[i + j]) > 0) << (7 - j);
-
-		rx[i / 8] = result_byte;
-	}
-
-	for (; i < a->dim; i++)
+	for (int i = 0; i < a->dim; i++)
 		rx[i / 8] |= (HalfToFloat4(ax[i]) > 0) << (7 - (i % 8));

 	PG_RETURN_VARBIT_P(result);
--- a/src/hnsw.c
+++ b/src/hnsw.c
@@ -12,23 +12,13 @@
 #include "utils/float.h"
 #include "utils/guc.h"
 #include "utils/selfuncs.h"
-#include "utils/spccache.h"

 #if PG_VERSION_NUM < 150000
 #define MarkGUCPrefixReserved(x) EmitWarningsOnPlaceholders(x)
 #endif

-static const struct config_enum_entry hnsw_iterative_scan_options[] = {
-	{"off", HNSW_ITERATIVE_SCAN_OFF, false},
-	{"relaxed_order", HNSW_ITERATIVE_SCAN_RELAXED, false},
-	{"strict_order", HNSW_ITERATIVE_SCAN_STRICT, false},
-	{NULL, 0, false}
-};
-
 int			hnsw_ef_search;
-int			hnsw_iterative_scan;
-int			hnsw_max_scan_tuples;
-double		hnsw_scan_mem_multiplier;
+bool		hnsw_streaming;
 int			hnsw_lock_tranche_id;
 static relopt_kind hnsw_relopt_kind;

@@ -52,20 +42,12 @@ HnswInitLockTranche(void)
 								  sizeof(int) * 1,
 								  &found);
 	if (!found)
-	{
-#if PG_VERSION_NUM >= 190000
-		tranche_ids[0] = LWLockNewTrancheId("HnswBuild");
-#else
 		tranche_ids[0] = LWLockNewTrancheId();
-#endif
-	}
 	hnsw_lock_tranche_id = tranche_ids[0];
 	LWLockRelease(AddinShmemInitLock);

-#if PG_VERSION_NUM < 190000
 	/* Per-backend registration of the tranche ID */
 	LWLockRegisterTranche(hnsw_lock_tranche_id, "HnswBuild");
-#endif
 }

 /*
@@ -87,19 +69,12 @@ HnswInit(void)
 							"Valid range is 1..1000.", &hnsw_ef_search,
 							HNSW_DEFAULT_EF_SEARCH, HNSW_MIN_EF_SEARCH, HNSW_MAX_EF_SEARCH, PGC_USERSET, 0, NULL, NULL, NULL);

-	DefineCustomEnumVariable("hnsw.iterative_scan", "Sets the mode for iterative scans",
-							 NULL, &hnsw_iterative_scan,
-							 HNSW_ITERATIVE_SCAN_OFF, hnsw_iterative_scan_options, PGC_USERSET, 0, NULL, NULL, NULL);
+	/* TODO Figure out name */
+	DefineCustomBoolVariable("hnsw.streaming", "Use streaming mode",
+							 NULL, &hnsw_streaming,
+							 HNSW_DEFAULT_STREAMING, PGC_USERSET, 0, NULL, NULL, NULL);

-	/* This is approximate and does not affect the initial scan */
-	DefineCustomIntVariable("hnsw.max_scan_tuples", "Sets the max number of tuples to visit for iterative scans",
-							NULL, &hnsw_max_scan_tuples,
-							20000, 1, INT_MAX, PGC_USERSET, 0, NULL, NULL, NULL);
-
-	/* Same range as hash_mem_multiplier */
-	DefineCustomRealVariable("hnsw.scan_mem_multiplier", "Sets the multiple of work_mem to use for iterative scans",
-							 NULL, &hnsw_scan_mem_multiplier,
-							 1, 1, 1000, PGC_USERSET, 0, NULL, NULL, NULL);
+	/* TODO Add option for limiting iterative search */

 	MarkGUCPrefixReserved("hnsw");
 }
@@ -132,93 +107,39 @@ hnswcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 {
 	GenericCosts costs;
 	int			m;
-	double		ratio;
-	double		startupPages;
-	double		spc_seq_page_cost;
+	int			entryLevel;
 	Relation	index;

 	/* Never use index without order */
-	if (path->indexorderbys == NIL)
+	if (path->indexorderbys == NULL)
 	{
 		*indexStartupCost = get_float8_infinity();
 		*indexTotalCost = get_float8_infinity();
 		*indexSelectivity = 0;
 		*indexCorrelation = 0;
 		*indexPages = 0;
-#if PG_VERSION_NUM >= 180000
-		/* See "On disable_cost" thread on pgsql-hackers */
-		path->path.disabled_nodes = 2;
-#endif
 		return;
 	}

 	MemSet(&costs, 0, sizeof(costs));

-	genericcostestimate(root, path, loop_count, &costs);
-
 	index = index_open(path->indexinfo->indexoid, NoLock);
 	HnswGetMetaPageInfo(index, &m, NULL);
 	index_close(index, NoLock);

-	/*
-	 * HNSW cost estimation follows a formula that accounts for the total
-	 * number of tuples indexed combined with the parameters that most
-	 * influence the duration of the index scan, namely: m - the number of
-	 * tuples that are scanned in each step of the HNSW graph traversal
-	 * ef_search - which influences the total number of steps taken at layer 0
-	 *
-	 * The source of the vector data can impact how many steps it takes to
-	 * converge on the set of vectors to return to the executor. Currently, we
-	 * use a hardcoded scaling factor (HNSWScanScalingFactor) to help
-	 * influence that, but this could later become a configurable parameter
-	 * based on the cost estimations.
-	 *
-	 * The tuple estimator formula is below:
-	 *
-	 * numIndexTuples = entryLevel * m + layer0TuplesMax * layer0Selectivity
-	 *
-	 * "entryLevel * m" represents the floor of tuples we need to scan to get
-	 * to layer 0 (L0).
-	 *
-	 * "layer0TuplesMax" is the estimated total number of tuples we'd scan at
-	 * L0 if we weren't discarding already visited tuples as part of the scan.
-	 *
-	 * "layer0Selectivity" estimates the percentage of tuples that are scanned
-	 * at L0, accounting for previously visited tuples, multiplied by the
-	 * "scalingFactor" (currently hardcoded).
-	 */
-	if (path->indexinfo->tuples > 0)
-	{
-		double		scalingFactor = 0.55;
-		int			entryLevel = (int) (log(path->indexinfo->tuples) * HnswGetMl(m));
-		int			layer0TuplesMax = HnswGetLayerM(m, 0) * hnsw_ef_search;
-		double		layer0Selectivity = scalingFactor * log(path->indexinfo->tuples) / (log(m) * (1 + log(hnsw_ef_search)));
+	/* Approximate entry level */
+	entryLevel = (int) -log(1.0 / path->indexinfo->tuples) * HnswGetMl(m);

-		ratio = (entryLevel * m + layer0TuplesMax * layer0Selectivity) / path->indexinfo->tuples;
+	/* TODO Improve estimate of visited tuples (currently underestimates) */
+	/* Account for number of tuples (or entry level), m, and ef_search */
+	costs.numIndexTuples = (entryLevel + 2) * m;

-		if (ratio > 1)
-			ratio = 1;
-	}
-	else
-		ratio = 1;
+	/* TODO Adjust for selectivity for iterative scans */

-	get_tablespace_page_costs(path->indexinfo->reltablespace, NULL, &spc_seq_page_cost);
+	genericcostestimate(root, path, loop_count, &costs);

-	/* Startup cost is cost before returning the first row */
-	costs.indexStartupCost = costs.indexTotalCost * ratio;
-
-	/* Adjust cost if needed since TOAST not included in seq scan cost */
-	startupPages = costs.numIndexPages * ratio;
-	if (startupPages > path->indexinfo->rel->pages && ratio < 0.5)
-	{
-		/* Change all page cost from random to sequential */
-		costs.indexStartupCost -= startupPages * (costs.spc_random_page_cost - spc_seq_page_cost);
-
-		/* Remove cost of extra pages */
-		costs.indexStartupCost -= (startupPages - path->indexinfo->rel->pages) * spc_seq_page_cost;
-	}
-
-	*indexStartupCost = costs.indexStartupCost;
+	/* Use total cost since most work happens before first tuple is returned */
+	*indexStartupCost = costs.indexTotalCost;
 	*indexTotalCost = costs.indexTotalCost;
 	*indexSelectivity = costs.indexSelectivity;
 	*indexCorrelation = costs.indexCorrelation;
@@ -263,18 +184,13 @@ hnswhandler(PG_FUNCTION_ARGS)
 	IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);

 	amroutine->amstrategies = 0;
-	amroutine->amsupport = 4;
+	amroutine->amsupport = 3;
 	amroutine->amoptsprocnum = 0;
 	amroutine->amcanorder = false;
 	amroutine->amcanorderbyop = true;
-#if PG_VERSION_NUM >= 180000
-	amroutine->amcanhash = false;
-	amroutine->amconsistentequality = false;
-	amroutine->amconsistentordering = false;
-#endif
 	amroutine->amcanbackward = false;	/* can change direction mid-scan */
 	amroutine->amcanunique = false;
-	amroutine->amcanmulticol = true;
+	amroutine->amcanmulticol = false;
 	amroutine->amoptionalkey = true;
 	amroutine->amsearcharray = false;
 	amroutine->amsearchnulls = false;
@@ -304,9 +220,6 @@ hnswhandler(PG_FUNCTION_ARGS)
 	amroutine->amvacuumcleanup = hnswvacuumcleanup;
 	amroutine->amcanreturn = NULL;
 	amroutine->amcostestimate = hnswcostestimate;
-#if PG_VERSION_NUM >= 180000
-	amroutine->amgettreeheight = NULL;
-#endif
 	amroutine->amoptions = hnswoptions;
 	amroutine->amproperty = NULL;	/* TODO AMPROP_DISTANCE_ORDERABLE */
 	amroutine->ambuildphasename = hnswbuildphasename;
@@ -327,24 +240,5 @@ hnswhandler(PG_FUNCTION_ARGS)
 	amroutine->aminitparallelscan = NULL;
 	amroutine->amparallelrescan = NULL;

-#if PG_VERSION_NUM >= 180000
-	amroutine->amtranslatestrategy = NULL;
-	amroutine->amtranslatecmptype = NULL;
-#endif
-
 	PG_RETURN_POINTER(amroutine);
 }
-
-/*
- * Get the distance between two int4 attributes
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(hnsw_int4_attribute_distance);
-Datum
-hnsw_int4_attribute_distance(PG_FUNCTION_ARGS)
-{
-	int32		a = PG_GETARG_INT32(0);
-	int32		b = PG_GETARG_INT32(1);
-	double		distance = ((double) a) - ((double) b);
-
-	PG_RETURN_FLOAT8(distance);
-}
--- a/src/hnsw.h
+++ b/src/hnsw.h
@@ -12,6 +12,10 @@
 #include "utils/sampling.h"
 #include "vector.h"

+#ifdef HNSW_BENCH
+#include "portability/instr_time.h"
+#endif
+
 #define HNSW_MAX_DIM 2000
 #define HNSW_MAX_NNZ 1000

@@ -19,7 +23,6 @@
 #define HNSW_DISTANCE_PROC 1
 #define HNSW_NORM_PROC 2
 #define HNSW_TYPE_INFO_PROC 3
-#define HNSW_ATTRIBUTE_DISTANCE_PROC 4

 #define HNSW_VERSION	1
 #define HNSW_MAGIC_NUMBER 0xA953A953
@@ -43,6 +46,7 @@
 #define HNSW_DEFAULT_EF_SEARCH	40
 #define HNSW_MIN_EF_SEARCH		1
 #define HNSW_MAX_EF_SEARCH		1000
+#define HNSW_DEFAULT_STREAMING	false

 /* Tuple types */
 #define HNSW_ELEMENT_TUPLE_TYPE  1
@@ -69,6 +73,21 @@
 #define HnswPageGetOpaque(page)	((HnswPageOpaque) PageGetSpecialPointer(page))
 #define HnswPageGetMeta(page)	((HnswMetaPageData *) PageGetContents(page))

+#ifdef HNSW_BENCH
+#define HnswBench(name, code) \
+	do { \
+		instr_time	start; \
+		instr_time	duration; \
+		INSTR_TIME_SET_CURRENT(start); \
+		(code); \
+		INSTR_TIME_SET_CURRENT(duration); \
+		INSTR_TIME_SUBTRACT(duration, start); \
+		elog(INFO, "%s: %.3f ms", name, INSTR_TIME_GET_MILLISEC(duration)); \
+	} while (0)
+#else
+#define HnswBench(name, code) (code)
+#endif
+
 #if PG_VERSION_NUM >= 150000
 #define RandomDouble() pg_prng_double(&pg_global_prng_state)
 #define SeedRandom(seed) pg_prng_seed(&pg_global_prng_state, seed)
@@ -89,9 +108,6 @@
 /* Ensure fits on page and in uint8 */
 #define HnswGetMaxLevel(m) Min(((BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(HnswPageOpaqueData)) - offsetof(HnswNeighborTupleData, indextids) - sizeof(ItemIdData)) / (sizeof(ItemPointerData)) / (m)) - 2, 255)

-#define HnswGetSearchCandidate(membername, ptr) pairingheap_container(HnswSearchCandidate, membername, ptr)
-#define HnswGetSearchCandidateConst(membername, ptr) pairingheap_const_container(HnswSearchCandidate, membername, ptr)
-
 #define HnswGetValue(base, element) PointerGetDatum(HnswPtrAccess(base, (element)->value))

 #if PG_VERSION_NUM < 140005
@@ -108,28 +124,17 @@
 #define HnswPtrPointer(hp) (hp).ptr
 #define HnswPtrOffset(hp) relptr_offset((hp).relptr)

-#define HnswUseIndexTuple(index) (IndexRelationGetNumberOfAttributes(index) > 1)
-
 /* Variables */
 extern int	hnsw_ef_search;
-extern int	hnsw_iterative_scan;
-extern int	hnsw_max_scan_tuples;
-extern double hnsw_scan_mem_multiplier;
+extern bool hnsw_streaming;
 extern int	hnsw_lock_tranche_id;

-typedef enum HnswIterativeScanMode
-{
-	HNSW_ITERATIVE_SCAN_OFF,
-	HNSW_ITERATIVE_SCAN_RELAXED,
-	HNSW_ITERATIVE_SCAN_STRICT
-}			HnswIterativeScanMode;
-
 typedef struct HnswElementData HnswElementData;
 typedef struct HnswNeighborArray HnswNeighborArray;

 #define HnswPtrDeclare(type, relptrtype, ptrtype) \
 	relptr_declare(type, relptrtype); \
-	typedef union { type *ptr; relptrtype relptr; } ptrtype
+	typedef union { type *ptr; relptrtype relptr; } ptrtype;

 /* Pointers that can be absolute or relative */
 /* Use char for DatumPtr so works with Pointer */
@@ -137,7 +142,6 @@ HnswPtrDeclare(HnswElementData, HnswElementRelptr, HnswElementPtr);
 HnswPtrDeclare(HnswNeighborArray, HnswNeighborArrayRelptr, HnswNeighborArrayPtr);
 HnswPtrDeclare(HnswNeighborArrayPtr, HnswNeighborsRelptr, HnswNeighborsPtr);
 HnswPtrDeclare(char, DatumRelptr, DatumPtr);
-HnswPtrDeclare(IndexTupleData, IndexTupleRelptr, IndexTuplePtr);

 struct HnswElementData
 {
@@ -154,7 +158,6 @@ struct HnswElementData
 	OffsetNumber neighborOffno;
 	BlockNumber neighborPage;
 	DatumPtr	value;
-	IndexTuplePtr itup;
 	LWLock		lock;
 };

@@ -179,10 +182,12 @@ typedef struct HnswSearchCandidate
 	pairingheap_node c_node;
 	pairingheap_node w_node;
 	HnswElementPtr element;
-	double		distance;
-	bool		matches;
+	float		distance;
 }			HnswSearchCandidate;

+#define HnswGetSearchCandidate(membername, ptr) pairingheap_container(HnswSearchCandidate, membername, ptr)
+#define HnswGetSearchCandidateConst(membername, ptr) pairingheap_const_container(HnswSearchCandidate, membername, ptr)
+
 /* HNSW index options */
 typedef struct HnswOptions
 {
@@ -205,8 +210,8 @@ typedef struct HnswGraph

 	/* Allocations state */
 	LWLock		allocatorLock;
-	Size		memoryUsed;
-	Size		memoryTotal;
+	long		memoryUsed;
+	long		memoryTotal;

 	/* Flushed state */
 	LWLock		flushLock;
@@ -257,20 +262,6 @@ typedef struct HnswTypeInfo
 	void		(*checkValue) (Pointer v);
 }			HnswTypeInfo;

-typedef struct HnswSupport
-{
-	FmgrInfo   *procinfo[2];
-	FmgrInfo   *normprocinfo;
-	Oid		   *collation;
-}			HnswSupport;
-
-typedef struct HnswQuery
-{
-	Datum		value;
-	IndexTuple	itup;
-	ScanKeyData *keyData;
-}			HnswQuery;
-
 typedef struct HnswBuildState
 {
 	/* Info */
@@ -290,15 +281,15 @@ typedef struct HnswBuildState
 	double		reltuples;

 	/* Support functions */
-	HnswSupport support;
+	FmgrInfo   *procinfo;
+	FmgrInfo   *normprocinfo;
+	Oid			collation;

 	/* Variables */
 	HnswGraph	graphData;
 	HnswGraph  *graph;
 	double		ml;
 	int			maxLevel;
-	bool		useIndexTuple;
-	TupleDesc	tupdesc;

 	/* Memory */
 	MemoryContext graphCtx;
@@ -366,12 +357,6 @@ typedef union
 	struct tidhash_hash *tids;
 }			visited_hash;

-typedef union
-{
-	HnswElement element;
-	ItemPointerData indextid;
-}			HnswUnvisited;
-
 typedef struct HnswScanOpaqueData
 {
 	const		HnswTypeInfo *typeInfo;
@@ -379,15 +364,15 @@ typedef struct HnswScanOpaqueData
 	List	   *w;
 	visited_hash v;
 	pairingheap *discarded;
-	HnswQuery	q;
+	Datum		q;
 	int			m;
 	int64		tuples;
-	double		previousDistance;
-	Size		maxMemory;
 	MemoryContext tmpCtx;

 	/* Support functions */
-	HnswSupport support;
+	FmgrInfo   *procinfo;
+	FmgrInfo   *normprocinfo;
+	Oid			collation;
 }			HnswScanOpaqueData;

 typedef HnswScanOpaqueData * HnswScanOpaque;
@@ -405,7 +390,8 @@ typedef struct HnswVacuumState
 	int			efConstruction;

 	/* Support functions */
-	HnswSupport support;
+	FmgrInfo   *procinfo;
+	Oid			collation;

 	/* Variables */
 	struct tidhash_hash *deleted;
@@ -421,38 +407,33 @@ typedef struct HnswVacuumState
 int			HnswGetM(Relation index);
 int			HnswGetEfConstruction(Relation index);
 FmgrInfo   *HnswOptionalProcInfo(Relation index, uint16 procnum);
-void		HnswInitSupport(HnswSupport * support, Relation index);
 Datum		HnswNormValue(const HnswTypeInfo * typeInfo, Oid collation, Datum value);
-bool		HnswCheckNorm(HnswSupport * support, Datum value);
+bool		HnswCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value);
 Buffer		HnswNewBuffer(Relation index, ForkNumber forkNum);
 void		HnswInitPage(Buffer buf, Page page);
 void		HnswInit(void);
-List	   *HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation index, HnswSupport * support, int m, bool inserting, HnswElement skipElement, bool inMemory, visited_hash * v, pairingheap **discarded, bool initVisited, int64 *tuples);
+List	   *HnswSearchLayer(char *base, Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *procinfo, Oid collation, int m, bool inserting, HnswElement skipElement, visited_hash * v, pairingheap **discarded, bool initVisited);
 HnswElement HnswGetEntryPoint(Relation index);
 void		HnswGetMetaPageInfo(Relation index, int *m, HnswElement * entryPoint);
 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, bool inMemory);
-HnswSearchCandidate *HnswEntryCandidate(char *base, HnswElement em, HnswQuery * q, Relation rel, HnswSupport * support, bool loadVec, bool inMemory);
+void		HnswFindElementNeighbors(char *base, HnswElement element, HnswElement entryPoint, Relation index, FmgrInfo *procinfo, Oid collation, int m, int efConstruction, bool existing);
+HnswSearchCandidate *HnswEntryCandidate(char *base, HnswElement em, Datum q, Relation rel, FmgrInfo *procinfo, Oid collation, 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);
-HnswNeighborArray *HnswInitNeighborArray(int lm, HnswAllocator * allocator);
 void		HnswInitNeighbors(char *base, HnswElement element, int m, HnswAllocator * alloc);
-bool		HnswInsertTupleOnDisk(Relation index, HnswSupport * support, IndexTuple itup, ItemPointer heaptid, bool building, TupleDesc tupdesc);
-void		HnswUpdateNeighborsOnDisk(Relation index, HnswSupport * support, HnswElement e, int m, bool checkExisting, bool building);
-void		HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHeaptids, bool loadVec, Relation index);
-void		HnswLoadElement(HnswElement element, double *distance, bool *matches, HnswQuery * q, Relation index, HnswSupport * support, bool loadVec, double *maxDistance);
-void		HnswSetElementTuple(char *base, HnswElementTuple etup, HnswElement element, bool useIndexTuple);
-void		HnswUpdateConnection(char *base, HnswNeighborArray * neighbors, HnswElement newElement, float distance, int lm, int *updateIdx, Relation index, HnswSupport * support);
-bool		HnswFormIndexTuple(IndexTuple *out, Datum *values, bool *isnull, const HnswTypeInfo * typeInfo, HnswSupport * support, TupleDesc tupdesc);
-bool		HnswLoadNeighborTids(HnswElement element, ItemPointerData *indextids, Relation index, int m, int lm, int lc);
+bool		HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, 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, float *maxDistance);
+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);
 const		HnswTypeInfo *HnswGetTypeInfo(Relation index);
 PGDLLEXPORT void HnswParallelBuildMain(dsm_segment *seg, shm_toc *toc);
-Size		HnswGetElementTupleSize(char *base, HnswElement element, bool useIndexTuple);
-bool		HnswIndexTupleIsEqual(IndexTuple a, IndexTuple b, TupleDesc tupdesc);

 /* Index access methods */
 IndexBuildResult *hnswbuild(Relation heap, Relation index, IndexInfo *indexInfo);
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -54,10 +54,6 @@
 #include "utils/datum.h"
 #include "utils/memutils.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_progress.h"
 #else
@@ -152,7 +148,6 @@ CreateGraphPages(HnswBuildState * buildstate)
 	Page		page;
 	HnswElementPtr iter = buildstate->graph->head;
 	char	   *base = buildstate->hnswarea;
-	bool		useIndexTuple = buildstate->useIndexTuple;

 	/* Calculate sizes */
 	maxSize = HNSW_MAX_SIZE;
@@ -172,6 +167,7 @@ CreateGraphPages(HnswBuildState * buildstate)
 		Size		etupSize;
 		Size		ntupSize;
 		Size		combinedSize;
+		Pointer		valuePtr = HnswPtrAccess(base, element->value);

 		/* Update iterator */
 		iter = element->next;
@@ -180,7 +176,7 @@ CreateGraphPages(HnswBuildState * buildstate)
 		MemSet(etup, 0, HNSW_TUPLE_ALLOC_SIZE);

 		/* Calculate sizes */
-		etupSize = HnswGetElementTupleSize(base, element, useIndexTuple);
+		etupSize = HNSW_ELEMENT_TUPLE_SIZE(VARSIZE_ANY(valuePtr));
 		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, buildstate->m);
 		combinedSize = etupSize + ntupSize + sizeof(ItemIdData);

@@ -190,7 +186,7 @@ CreateGraphPages(HnswBuildState * buildstate)
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 					 errmsg("index tuple too large")));

-		HnswSetElementTuple(base, etup, element, useIndexTuple);
+		HnswSetElementTuple(base, etup, element);

 		/* Keep element and neighbors on the same page if possible */
 		if (PageGetFreeSpace(page) < etupSize || (combinedSize <= maxSize && PageGetFreeSpace(page) < combinedSize))
@@ -331,18 +327,19 @@ AddDuplicateInMemory(HnswElement element, HnswElement dup)
 * Find duplicate element
 */
 static bool
-FindDuplicateInMemory(char *base, HnswElement element, bool useIndexTuple, TupleDesc tupdesc)
+FindDuplicateInMemory(char *base, HnswElement element)
 {
 	HnswNeighborArray *neighbors = HnswGetNeighbors(base, element, 0);
-	IndexTuple	itup = HnswPtrAccess(base, element->itup);
+	Datum		value = HnswGetValue(base, element);

 	for (int i = 0; i < neighbors->length; i++)
 	{
 		HnswCandidate *neighbor = &neighbors->items[i];
 		HnswElement neighborElement = HnswPtrAccess(base, neighbor->element);
+		Datum		neighborValue = HnswGetValue(base, neighborElement);

 		/* Exit early since ordered by distance */
-		if (!HnswIndexTupleIsEqual(itup, HnswPtrAccess(base, neighborElement->itup), tupdesc))
+		if (!datumIsEqual(value, neighborValue, false, -1))
 			return false;

 		/* Check for space */
@@ -369,7 +366,7 @@ AddElementInMemory(char *base, HnswGraph * graph, HnswElement element)
 * Update neighbors
 */
 static void
-UpdateNeighborsInMemory(char *base, Relation index, HnswSupport * support, HnswElement e, int m)
+UpdateNeighborsInMemory(char *base, FmgrInfo *procinfo, Oid collation, HnswElement e, int m)
 {
 	for (int lc = e->level; lc >= 0; lc--)
 	{
@@ -391,7 +388,7 @@ UpdateNeighborsInMemory(char *base, Relation index, HnswSupport * support, HnswE
 			Assert(neighborElement);

 			LWLockAcquire(&neighborElement->lock, LW_EXCLUSIVE);
-			HnswUpdateConnection(base, HnswGetNeighbors(base, neighborElement, lc), e, hc->distance, lm, NULL, index, support);
+			HnswUpdateConnection(base, e, hc, lm, lc, NULL, NULL, procinfo, collation);
 			LWLockRelease(&neighborElement->lock);
 		}
 	}
@@ -401,20 +398,20 @@ UpdateNeighborsInMemory(char *base, Relation index, HnswSupport * support, HnswE
 * Update graph in memory
 */
 static void
-UpdateGraphInMemory(HnswSupport * support, HnswElement element, int m, HnswElement entryPoint, HnswBuildState * buildstate)
+UpdateGraphInMemory(FmgrInfo *procinfo, Oid collation, HnswElement element, int m, int efConstruction, HnswElement entryPoint, HnswBuildState * buildstate)
 {
 	HnswGraph  *graph = buildstate->graph;
 	char	   *base = buildstate->hnswarea;

 	/* Look for duplicate */
-	if (FindDuplicateInMemory(base, element, buildstate->useIndexTuple, buildstate->tupdesc))
+	if (FindDuplicateInMemory(base, element))
 		return;

 	/* Add element */
 	AddElementInMemory(base, graph, element);

 	/* Update neighbors */
-	UpdateNeighborsInMemory(base, buildstate->index, support, element, m);
+	UpdateNeighborsInMemory(base, procinfo, collation, element, m);

 	/* Update entry point if needed (already have lock) */
 	if (entryPoint == NULL || element->level > entryPoint->level)
@@ -427,9 +424,9 @@ UpdateGraphInMemory(HnswSupport * support, HnswElement element, int m, HnswEleme
 static void
 InsertTupleInMemory(HnswBuildState * buildstate, HnswElement element)
 {
-	Relation	index = buildstate->index;
+	FmgrInfo   *procinfo = buildstate->procinfo;
+	Oid			collation = buildstate->collation;
 	HnswGraph  *graph = buildstate->graph;
-	HnswSupport *support = &buildstate->support;
 	HnswElement entryPoint;
 	LWLock	   *entryLock = &graph->entryLock;
 	LWLock	   *entryWaitLock = &graph->entryWaitLock;
@@ -461,10 +458,10 @@ InsertTupleInMemory(HnswBuildState * buildstate, HnswElement element)
 	}

 	/* Find neighbors for element */
-	HnswFindElementNeighbors(base, element, entryPoint, index, support, m, efConstruction, false, true);
+	HnswFindElementNeighbors(base, element, entryPoint, NULL, procinfo, collation, m, efConstruction, false);

 	/* Update graph in memory */
-	UpdateGraphInMemory(support, element, m, entryPoint, buildstate);
+	UpdateGraphInMemory(procinfo, collation, element, m, efConstruction, entryPoint, buildstate);

 	/* Release entry lock */
 	LWLockRelease(entryLock);
@@ -476,24 +473,33 @@ InsertTupleInMemory(HnswBuildState * buildstate, HnswElement element)
 static bool
 InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, HnswBuildState * buildstate)
 {
+	const		HnswTypeInfo *typeInfo = buildstate->typeInfo;
 	HnswGraph  *graph = buildstate->graph;
 	HnswElement element;
 	HnswAllocator *allocator = &buildstate->allocator;
-	HnswSupport *support = &buildstate->support;
+	Size		valueSize;
+	Pointer		valuePtr;
 	LWLock	   *flushLock = &graph->flushLock;
 	char	   *base = buildstate->hnswarea;
-	TupleDesc	tupdesc = buildstate->tupdesc;
-	IndexTuple	itup;
-	Size		itupSize;
-	IndexTuple	itupShared;
-	bool		unused;

-	/* Form index tuple */
-	if (!HnswFormIndexTuple(&itup, values, isnull, buildstate->typeInfo, support, tupdesc))
-		return false;
+	/* Detoast once for all calls */
+	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));

-	/* Get tuple size */
-	itupSize = IndexTupleSize(itup);
+	/* Check value */
+	if (typeInfo->checkValue != NULL)
+		typeInfo->checkValue(DatumGetPointer(value));
+
+	/* Normalize if needed */
+	if (buildstate->normprocinfo != NULL)
+	{
+		if (!HnswCheckNorm(buildstate->normprocinfo, buildstate->collation, value))
+			return false;
+
+		value = HnswNormValue(typeInfo, buildstate->collation, value);
+	}
+
+	/* Get datum size */
+	valueSize = VARSIZE_ANY(DatumGetPointer(value));

 	/* Ensure graph not flushed when inserting */
 	LWLockAcquire(flushLock, LW_SHARED);
@@ -503,7 +509,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
 	{
 		LWLockRelease(flushLock);

-		return HnswInsertTupleOnDisk(index, support, itup, heaptid, true, tupdesc);
+		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, true);
 	}

 	/*
@@ -535,12 +541,12 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn

 		LWLockRelease(flushLock);

-		return HnswInsertTupleOnDisk(index, support, itup, heaptid, true, tupdesc);
+		return HnswInsertTupleOnDisk(index, value, values, isnull, heaptid, true);
 	}

 	/* Ok, we can proceed to allocate the element */
 	element = HnswInitElement(base, heaptid, buildstate->m, buildstate->ml, buildstate->maxLevel, allocator);
-	itupShared = HnswAlloc(allocator, itupSize);
+	valuePtr = HnswAlloc(allocator, valueSize);

 	/*
 	 * We have now allocated the space needed for the element, so we don't
@@ -549,10 +555,9 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
 	 */
 	LWLockRelease(&graph->allocatorLock);

-	/* Copy the tuple */
-	memcpy(itupShared, itup, itupSize);
-	HnswPtrStore(base, element->itup, itupShared);
-	HnswPtrStore(base, element->value, DatumGetPointer(index_getattr(itupShared, 1, tupdesc, &unused)));
+	/* Copy the datum */
+	memcpy(valuePtr, DatumGetPointer(value), valueSize);
+	HnswPtrStore(base, element->value, valuePtr);

 	/* Create a lock for the element */
 	LWLockInitialize(&element->lock, hnsw_lock_tranche_id);
@@ -602,7 +607,7 @@ BuildCallback(Relation index, ItemPointer tid, Datum *values,
 * Initialize the graph
 */
 static void
-InitGraph(HnswGraph * graph, char *base, Size memoryTotal)
+InitGraph(HnswGraph * graph, char *base, long memoryTotal)
 {
 	/* Initialize the lock tranche if needed */
 	HnswInitLockTranche();
@@ -679,19 +684,6 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("type not supported for hnsw index")));

-	/* TODO See if needed */
-	if (IndexRelationGetNumberOfKeyAttributes(index) > 2)
-		elog(ERROR, "index cannot have more than two columns");
-
-	if (!OidIsValid(index_getprocid(index, 1, HNSW_DISTANCE_PROC)))
-		elog(ERROR, "first column must be a vector");
-
-	for (int i = 1; i < IndexRelationGetNumberOfKeyAttributes(index); i++)
-	{
-		if (!OidIsValid(index_getprocid(index, i + 1, HNSW_ATTRIBUTE_DISTANCE_PROC)))
-			elog(ERROR, "column %d cannot be a vector", i + 1);
-	}
-
 	/* Require column to have dimensions to be indexed */
 	if (buildstate->dimensions < 0)
 		ereport(ERROR,
@@ -712,14 +704,14 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 	buildstate->indtuples = 0;

 	/* Get support functions */
-	HnswInitSupport(&buildstate->support, index);
+	buildstate->procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
+	buildstate->normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
+	buildstate->collation = index->rd_indcollation[0];

-	InitGraph(&buildstate->graphData, NULL, (Size) maintenance_work_mem * 1024L);
+	InitGraph(&buildstate->graphData, NULL, maintenance_work_mem * 1024L);
 	buildstate->graph = &buildstate->graphData;
 	buildstate->ml = HnswGetMl(buildstate->m);
 	buildstate->maxLevel = HnswGetMaxLevel(buildstate->m);
-	buildstate->useIndexTuple = HnswUseIndexTuple(index);
-	buildstate->tupdesc = RelationGetDescr(index);

 	buildstate->graphCtx = GenerationContextCreate(CurrentMemoryContext,
 												   "Hnsw build graph context",
@@ -1076,7 +1068,7 @@ ComputeParallelWorkers(Relation heap, Relation index)
 * Build graph
 */
 static void
-BuildGraph(HnswBuildState * buildstate)
+BuildGraph(HnswBuildState * buildstate, ForkNumber forkNum)
 {
 	int			parallel_workers = 0;

@@ -1124,7 +1116,7 @@ BuildIndex(Relation heap, Relation index, IndexInfo *indexInfo,

 	InitBuildState(buildstate, heap, index, indexInfo, forkNum);

-	BuildGraph(buildstate);
+	BuildGraph(buildstate, forkNum);

 	if (RelationNeedsWAL(index) || forkNum == INIT_FORKNUM)
 		log_newpage_range(index, forkNum, 0, RelationGetNumberOfBlocksInFork(index, forkNum), true);
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -9,10 +9,6 @@
 #include "utils/datum.h"
 #include "utils/memutils.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
 /*
 * Get the insert page
 */
@@ -160,10 +156,9 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B
 	BlockNumber newInsertPage = InvalidBlockNumber;
 	uint8		tupleVersion;
 	char	   *base = NULL;
-	bool		useIndexTuple = HnswUseIndexTuple(index);

 	/* Calculate sizes */
-	etupSize = HnswGetElementTupleSize(base, e, useIndexTuple);
+	etupSize = HNSW_ELEMENT_TUPLE_SIZE(VARSIZE_ANY(HnswPtrAccess(base, e->value)));
 	ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);
 	combinedSize = etupSize + ntupSize + sizeof(ItemIdData);
 	maxSize = HNSW_MAX_SIZE;
@@ -171,7 +166,7 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B

 	/* Prepare element tuple */
 	etup = palloc0(etupSize);
-	HnswSetElementTuple(base, etup, e, useIndexTuple);
+	HnswSetElementTuple(base, etup, e);

 	/* Prepare neighbor tuple */
 	ntup = palloc0(ntupSize);
@@ -345,110 +340,6 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B
 		*updatedInsertPage = newInsertPage;
 }

-/*
- * Load neighbors
- */
-static HnswNeighborArray *
-HnswLoadNeighbors(HnswElement element, Relation index, int m, int lm, int lc)
-{
-	char	   *base = NULL;
-	HnswNeighborArray *neighbors = HnswInitNeighborArray(lm, NULL);
-	ItemPointerData indextids[HNSW_MAX_M * 2];
-
-	if (!HnswLoadNeighborTids(element, indextids, index, m, lm, lc))
-		return neighbors;
-
-	for (int i = 0; i < lm; i++)
-	{
-		ItemPointer indextid = &indextids[i];
-		HnswElement e;
-		HnswCandidate *hc;
-
-		if (!ItemPointerIsValid(indextid))
-			break;
-
-		e = HnswInitElementFromBlock(ItemPointerGetBlockNumber(indextid), ItemPointerGetOffsetNumber(indextid));
-		hc = &neighbors->items[neighbors->length++];
-		HnswPtrStore(base, hc->element, e);
-	}
-
-	return neighbors;
-}
-
-/*
- * Load elements for insert
- */
-static void
-LoadElementsForInsert(HnswNeighborArray * neighbors, HnswQuery * q, int *idx, Relation index, HnswSupport * support)
-{
-	char	   *base = NULL;
-
-	for (int i = 0; i < neighbors->length; i++)
-	{
-		HnswCandidate *hc = &neighbors->items[i];
-		HnswElement element = HnswPtrAccess(base, hc->element);
-		double		distance;
-		bool		matches;
-
-		HnswLoadElement(element, &distance, &matches, q, index, support, true, NULL);
-		hc->distance = distance;
-
-		/* Prune element if being deleted */
-		if (element->heaptidsLength == 0)
-		{
-			*idx = i;
-			break;
-		}
-	}
-}
-
-/*
- * Get update index
- */
-static int
-GetUpdateIndex(HnswElement element, HnswElement newElement, float distance, int m, int lm, int lc, Relation index, HnswSupport * support, MemoryContext updateCtx)
-{
-	char	   *base = NULL;
-	int			idx = -1;
-	HnswNeighborArray *neighbors;
-	MemoryContext oldCtx = MemoryContextSwitchTo(updateCtx);
-
-	/*
-	 * Get latest neighbors since they may have changed. Do not lock yet since
-	 * selecting neighbors can take time. Could use optimistic locking to
-	 * retry if another update occurs before getting exclusive lock.
-	 */
-	neighbors = HnswLoadNeighbors(element, index, m, lm, lc);
-
-	/*
-	 * Could improve performance for vacuuming by checking neighbors against
-	 * list of elements being deleted to find index. It's important to exclude
-	 * already deleted elements for this since they can be replaced at any
-	 * time.
-	 */
-
-	if (neighbors->length < lm)
-		idx = -2;
-	else
-	{
-		HnswQuery	q;
-
-		q.value = HnswGetValue(base, element);
-		q.itup = HnswPtrAccess(base, element->itup);
-		q.keyData = NULL;
-
-		LoadElementsForInsert(neighbors, &q, &idx, index, support);
-
-		if (idx == -1)
-			HnswUpdateConnection(base, neighbors, newElement, distance, lm, &idx, index, support);
-	}
-
-	MemoryContextSwitchTo(oldCtx);
-	MemoryContextReset(updateCtx);
-
-	return idx;
-}
-
 /*
 * Check if connection already exists
 */
@@ -469,94 +360,14 @@ ConnectionExists(HnswElement e, HnswNeighborTuple ntup, int startIdx, int lm)
 	return false;
 }

-/*
- * Update neighbor
- */
-static void
-UpdateNeighborOnDisk(HnswElement element, HnswElement newElement, int idx, int m, int lm, int lc, Relation index, bool checkExisting, bool building)
-{
-	Buffer		buf;
-	Page		page;
-	GenericXLogState *state;
-	HnswNeighborTuple ntup;
-	int			startIdx;
-	OffsetNumber offno = element->neighborOffno;
-
-	/* Register page */
-	buf = ReadBuffer(index, element->neighborPage);
-	LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-	if (building)
-	{
-		state = NULL;
-		page = BufferGetPage(buf);
-	}
-	else
-	{
-		state = GenericXLogStart(index);
-		page = GenericXLogRegisterBuffer(state, buf, 0);
-	}
-
-	/* Get tuple */
-	ntup = (HnswNeighborTuple) PageGetItem(page, PageGetItemId(page, offno));
-
-	/* Calculate index for update */
-	startIdx = (element->level - lc) * m;
-
-	/* Check for existing connection */
-	if (checkExisting && ConnectionExists(newElement, ntup, startIdx, lm))
-		idx = -1;
-	else if (idx == -2)
-	{
-		/* Find free offset if still exists */
-		/* TODO Retry updating connections if not */
-		for (int j = 0; j < lm; j++)
-		{
-			if (!ItemPointerIsValid(&ntup->indextids[startIdx + j]))
-			{
-				idx = startIdx + j;
-				break;
-			}
-		}
-	}
-	else
-		idx += startIdx;
-
-	/* Make robust to issues */
-	if (idx >= 0 && idx < ntup->count)
-	{
-		ItemPointer indextid = &ntup->indextids[idx];
-
-		/* Update neighbor on the buffer */
-		ItemPointerSet(indextid, newElement->blkno, newElement->offno);
-
-		/* Commit */
-		if (building)
-			MarkBufferDirty(buf);
-		else
-			GenericXLogFinish(state);
-	}
-	else if (!building)
-		GenericXLogAbort(state);
-
-	UnlockReleaseBuffer(buf);
-}
-
 /*
 * Update neighbors
 */
 void
-HnswUpdateNeighborsOnDisk(Relation index, HnswSupport * support, HnswElement e, int m, bool checkExisting, bool building)
+HnswUpdateNeighborsOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting, bool building)
 {
 	char	   *base = NULL;

-	/* Use separate memory context to improve performance for larger vectors */
-	MemoryContext updateCtx = GenerationContextCreate(CurrentMemoryContext,
-													  "Hnsw insert update context",
-#if PG_VERSION_NUM >= 150000
-													  128 * 1024, 128 * 1024,
-#endif
-													  128 * 1024);
-
 	for (int lc = e->level; lc >= 0; lc--)
 	{
 		int			lm = HnswGetLayerM(m, lc);
@@ -565,20 +376,96 @@ HnswUpdateNeighborsOnDisk(Relation index, HnswSupport * support, HnswElement e,
 		for (int i = 0; i < neighbors->length; i++)
 		{
 			HnswCandidate *hc = &neighbors->items[i];
+			Buffer		buf;
+			Page		page;
+			GenericXLogState *state;
+			HnswNeighborTuple ntup;
+			int			idx = -1;
+			int			startIdx;
 			HnswElement neighborElement = HnswPtrAccess(base, hc->element);
-			int			idx;
+			OffsetNumber offno = neighborElement->neighborOffno;

-			idx = GetUpdateIndex(neighborElement, e, hc->distance, m, lm, lc, index, support, updateCtx);
+			/*
+			 * Get latest neighbors since they may have changed. Do not lock
+			 * yet since selecting neighbors can take time. Could use
+			 * optimistic locking to retry if another update occurs before
+			 * getting exclusive lock.
+			 */
+			HnswLoadNeighbors(neighborElement, index, m);
+
+			/*
+			 * Could improve performance for vacuuming by checking neighbors
+			 * against list of elements being deleted to find index. It's
+			 * important to exclude already deleted elements for this since
+			 * they can be replaced at any time.
+			 */
+
+			/* Select neighbors */
+			HnswUpdateConnection(NULL, e, hc, lm, lc, &idx, index, procinfo, collation);

 			/* New element was not selected as a neighbor */
 			if (idx == -1)
 				continue;

-			UpdateNeighborOnDisk(neighborElement, e, idx, m, lm, lc, index, checkExisting, building);
+			/* Register page */
+			buf = ReadBuffer(index, neighborElement->neighborPage);
+			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
+			if (building)
+			{
+				state = NULL;
+				page = BufferGetPage(buf);
+			}
+			else
+			{
+				state = GenericXLogStart(index);
+				page = GenericXLogRegisterBuffer(state, buf, 0);
+			}
+
+			/* Get tuple */
+			ntup = (HnswNeighborTuple) PageGetItem(page, PageGetItemId(page, offno));
+
+			/* Calculate index for update */
+			startIdx = (neighborElement->level - lc) * m;
+
+			/* Check for existing connection */
+			if (checkExisting && ConnectionExists(e, ntup, startIdx, lm))
+				idx = -1;
+			else if (idx == -2)
+			{
+				/* Find free offset if still exists */
+				/* TODO Retry updating connections if not */
+				for (int j = 0; j < lm; j++)
+				{
+					if (!ItemPointerIsValid(&ntup->indextids[startIdx + j]))
+					{
+						idx = startIdx + j;
+						break;
+					}
+				}
+			}
+			else
+				idx += startIdx;
+
+			/* Make robust to issues */
+			if (idx >= 0 && idx < ntup->count)
+			{
+				ItemPointer indextid = &ntup->indextids[idx];
+
+				/* Update neighbor on the buffer */
+				ItemPointerSet(indextid, e->blkno, e->offno);
+
+				/* Commit */
+				if (building)
+					MarkBufferDirty(buf);
+				else
+					GenericXLogFinish(state);
+			}
+			else if (!building)
+				GenericXLogAbort(state);
+
+			UnlockReleaseBuffer(buf);
 		}
 	}
-
-	MemoryContextDelete(updateCtx);
 }

 /*
@@ -641,30 +528,21 @@ AddDuplicateOnDisk(Relation index, HnswElement element, HnswElement dup, bool bu
 * Find duplicate element
 */
 static bool
-FindDuplicateOnDisk(Relation index, HnswElement element, bool building, TupleDesc tupdesc)
+FindDuplicateOnDisk(Relation index, HnswElement element, bool building)
 {
 	char	   *base = NULL;
 	HnswNeighborArray *neighbors = HnswGetNeighbors(base, element, 0);
 	Datum		value = HnswGetValue(base, element);
-	IndexTuple	itup = HnswPtrAccess(base, element->itup);

 	for (int i = 0; i < neighbors->length; i++)
 	{
 		HnswCandidate *neighbor = &neighbors->items[i];
 		HnswElement neighborElement = HnswPtrAccess(base, neighbor->element);
+		Datum		neighborValue = HnswGetValue(base, neighborElement);

-		if (HnswUseIndexTuple(index))
-		{
-			/* Exit early since ordered by distance */
-			if (!HnswIndexTupleIsEqual(itup, HnswPtrAccess(base, neighborElement->itup), tupdesc))
-				return false;
-		}
-		else
-		{
-			/* Exit early since ordered by distance */
-			if (!datumIsEqual(value, HnswGetValue(base, neighborElement), false, -1))
-				return false;
-		}
+		/* Exit early since ordered by distance */
+		if (!datumIsEqual(value, neighborValue, false, -1))
+			return false;

 		if (AddDuplicateOnDisk(index, element, neighborElement, building))
 			return true;
@@ -677,12 +555,12 @@ FindDuplicateOnDisk(Relation index, HnswElement element, bool building, TupleDes
 * Update graph on disk
 */
 static void
-UpdateGraphOnDisk(Relation index, HnswSupport * support, HnswElement element, int m, HnswElement entryPoint, bool building, TupleDesc tupdesc)
+UpdateGraphOnDisk(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement element, int m, int efConstruction, HnswElement entryPoint, bool building)
 {
 	BlockNumber newInsertPage = InvalidBlockNumber;

 	/* Look for duplicate */
-	if (FindDuplicateOnDisk(index, element, building, tupdesc))
+	if (FindDuplicateOnDisk(index, element, building))
 		return;

 	/* Add element */
@@ -693,7 +571,7 @@ UpdateGraphOnDisk(Relation index, HnswSupport * support, HnswElement element, in
 		HnswUpdateMetaPage(index, 0, NULL, newInsertPage, MAIN_FORKNUM, building);

 	/* Update neighbors */
-	HnswUpdateNeighborsOnDisk(index, support, element, m, false, building);
+	HnswUpdateNeighborsOnDisk(index, procinfo, collation, element, m, false, building);

 	/* Update entry point if needed */
 	if (entryPoint == NULL || element->level > entryPoint->level)
@@ -704,15 +582,16 @@ UpdateGraphOnDisk(Relation index, HnswSupport * support, HnswElement element, in
 * Insert a tuple into the index
 */
 bool
-HnswInsertTupleOnDisk(Relation index, HnswSupport * support, IndexTuple itup, ItemPointer heaptid, bool building, TupleDesc tupdesc)
+HnswInsertTupleOnDisk(Relation index, Datum value, Datum *values, bool *isnull, ItemPointer heap_tid, bool building)
 {
 	HnswElement entryPoint;
 	HnswElement element;
 	int			m;
 	int			efConstruction = HnswGetEfConstruction(index);
+	FmgrInfo   *procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
+	Oid			collation = index->rd_indcollation[0];
 	LOCKMODE	lockmode = ShareLock;
 	char	   *base = NULL;
-	bool		unused;

 	/*
 	 * Get a shared lock. This allows vacuum to ensure no in-flight inserts
@@ -725,9 +604,8 @@ HnswInsertTupleOnDisk(Relation index, HnswSupport * support, IndexTuple itup, It
 	HnswGetMetaPageInfo(index, &m, &entryPoint);

 	/* Create an element */
-	element = HnswInitElement(base, heaptid, m, HnswGetMl(m), HnswGetMaxLevel(m), NULL);
-	HnswPtrStore(base, element->itup, itup);
-	HnswPtrStore(base, element->value, DatumGetPointer(index_getattr(itup, 1, tupdesc, &unused)));
+	element = HnswInitElement(base, heap_tid, m, HnswGetMl(m), HnswGetMaxLevel(m), NULL);
+	HnswPtrStore(base, element->value, DatumGetPointer(value));

 	/* Prevent concurrent inserts when likely updating entry point */
 	if (entryPoint == NULL || element->level > entryPoint->level)
@@ -744,10 +622,10 @@ HnswInsertTupleOnDisk(Relation index, HnswSupport * support, IndexTuple itup, It
 	}

 	/* Find neighbors for element */
-	HnswFindElementNeighbors(base, element, entryPoint, index, support, m, efConstruction, false, false);
+	HnswFindElementNeighbors(base, element, entryPoint, index, procinfo, collation, m, efConstruction, false);

 	/* Update graph on disk */
-	UpdateGraphOnDisk(index, support, element, m, entryPoint, building, tupdesc);
+	UpdateGraphOnDisk(index, procinfo, collation, element, m, efConstruction, entryPoint, building);

 	/* Release lock */
 	UnlockPage(index, HNSW_UPDATE_LOCK, lockmode);
@@ -759,20 +637,31 @@ HnswInsertTupleOnDisk(Relation index, HnswSupport * support, IndexTuple itup, It
 * Insert a tuple into the index
 */
 static void
-HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid)
+HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid)
 {
-	IndexTuple	itup;
+	Datum		value;
 	const		HnswTypeInfo *typeInfo = HnswGetTypeInfo(index);
-	TupleDesc	tupdesc = RelationGetDescr(index);
-	HnswSupport support;
+	FmgrInfo   *normprocinfo;
+	Oid			collation = index->rd_indcollation[0];

-	HnswInitSupport(&support, index);
+	/* Detoast once for all calls */
+	value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));

-	/* Form index tuple */
-	if (!HnswFormIndexTuple(&itup, values, isnull, typeInfo, &support, tupdesc))
-		return;
+	/* Check value */
+	if (typeInfo->checkValue != NULL)
+		typeInfo->checkValue(DatumGetPointer(value));

-	HnswInsertTupleOnDisk(index, &support, itup, heaptid, false, tupdesc);
+	/* Normalize if needed */
+	normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
+	if (normprocinfo != NULL)
+	{
+		if (!HnswCheckNorm(normprocinfo, collation, value))
+			return;
+
+		value = HnswNormValue(typeInfo, collation, value);
+	}
+
+	HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, false);
 }

 /*
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -5,47 +5,42 @@
 #include "pgstat.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
-#include "utils/float.h"
 #include "utils/memutils.h"

 /*
 * Algorithm 5 from paper
 */
 static List *
-GetScanItems(IndexScanDesc scan, Datum value)
+GetScanItems(IndexScanDesc scan, Datum q)
 {
 	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
 	Relation	index = scan->indexRelation;
-	HnswSupport *support = &so->support;
+	FmgrInfo   *procinfo = so->procinfo;
+	Oid			collation = so->collation;
 	List	   *ep;
 	List	   *w;
 	int			m;
 	HnswElement entryPoint;
 	char	   *base = NULL;
-	bool		inMemory = false;
-	HnswQuery  *q = &so->q;
-
-	q->value = value;
-	q->itup = NULL;
-	q->keyData = scan->keyData;

 	/* Get m and entry point */
 	HnswGetMetaPageInfo(index, &m, &entryPoint);

+	so->q = q;
 	so->m = m;

 	if (entryPoint == NULL)
 		return NIL;

-	ep = list_make1(HnswEntryCandidate(base, entryPoint, q, index, support, false, inMemory));
+	ep = list_make1(HnswEntryCandidate(base, entryPoint, q, index, procinfo, collation, false));

 	for (int lc = entryPoint->level; lc >= 1; lc--)
 	{
-		w = HnswSearchLayer(base, q, ep, 1, lc, index, support, m, false, NULL, inMemory, NULL, NULL, true, NULL);
+		w = HnswSearchLayer(base, q, ep, 1, lc, index, procinfo, collation, m, false, NULL, NULL, NULL, true);
 		ep = w;
 	}

-	return HnswSearchLayer(base, q, ep, hnsw_ef_search, 0, index, support, m, false, NULL, inMemory, &so->v, hnsw_iterative_scan != HNSW_ITERATIVE_SCAN_OFF ? &so->discarded : NULL, true, &so->tuples);
+	return HnswSearchLayer(base, q, ep, hnsw_ef_search, 0, index, procinfo, collation, m, false, NULL, &so->v, &so->discarded, true);
 }

 /*
@@ -56,6 +51,8 @@ ResumeScanItems(IndexScanDesc scan)
 {
 	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
 	Relation	index = scan->indexRelation;
+	FmgrInfo   *procinfo = so->procinfo;
+	Oid			collation = so->collation;
 	List	   *ep = NIL;
 	char	   *base = NULL;
 	int			batch_size = hnsw_ef_search;
@@ -66,17 +63,17 @@ ResumeScanItems(IndexScanDesc scan)
 	/* Get next batch of candidates */
 	for (int i = 0; i < batch_size; i++)
 	{
-		HnswSearchCandidate *sc;
+		HnswSearchCandidate *hc;

 		if (pairingheap_is_empty(so->discarded))
 			break;

-		sc = HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded));
+		hc = HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded));

-		ep = lappend(ep, sc);
+		ep = lappend(ep, hc);
 	}

-	return HnswSearchLayer(base, &so->q, ep, batch_size, 0, index, &so->support, so->m, false, NULL, false, &so->v, &so->discarded, false, &so->tuples);
+	return HnswSearchLayer(base, so->q, ep, batch_size, 0, index, procinfo, collation, so->m, false, NULL, &so->v, &so->discarded, false);
 }

 /*
@@ -99,24 +96,13 @@ GetScanValue(IndexScanDesc scan)
 		Assert(!VARATT_IS_EXTENDED(DatumGetPointer(value)));

 		/* Normalize if needed */
-		if (so->support.normprocinfo != NULL)
-			value = HnswNormValue(so->typeInfo, so->support.collation[0], value);
+		if (so->normprocinfo != NULL)
+			value = HnswNormValue(so->typeInfo, so->collation, value);
 	}

 	return value;
 }

-#if defined(HNSW_MEMORY)
-/*
- * Show memory usage
- */
-static void
-ShowMemoryUsage(HnswScanOpaque so)
-{
-	elog(INFO, "memory: %zu KB, tuples: " INT64_FORMAT, MemoryContextMemAllocated(so->tmpCtx, false) / 1024, so->tuples);
-}
-#endif
-
 /*
 * Prepare for an index scan
 */
@@ -125,28 +111,20 @@ hnswbeginscan(Relation index, int nkeys, int norderbys)
 {
 	IndexScanDesc scan;
 	HnswScanOpaque so;
-	double		maxMemory;

 	scan = RelationGetIndexScan(index, nkeys, norderbys);

 	so = (HnswScanOpaque) palloc(sizeof(HnswScanOpaqueData));
 	so->typeInfo = HnswGetTypeInfo(index);
-
-	/* Set support functions */
-	HnswInitSupport(&so->support, index);
-
-	/*
-	 * Use a lower max allocation size than default to allow scanning more
-	 * tuples for iterative search before exceeding work_mem
-	 */
+	so->first = true;
 	so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
 									   "Hnsw scan temporary context",
-									   0, 8 * 1024, 256 * 1024);
+									   ALLOCSET_DEFAULT_SIZES);

-	/* Calculate max memory */
-	/* Add 256 extra bytes to fill last block when close */
-	maxMemory = (double) work_mem * hnsw_scan_mem_multiplier * 1024.0 + 256;
-	so->maxMemory = Min(maxMemory, (double) SIZE_MAX);
+	/* Set support functions */
+	so->procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
+	so->normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
+	so->collation = index->rd_indcollation[0];

 	scan->opaque = so;

@@ -161,12 +139,13 @@ hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int no
 {
 	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;

+	if (!so->first)
+	{
+		pairingheap_reset(so->discarded);
+		tidhash_reset(so->v.tids);
+	}
 	so->first = true;
-	/* v and discarded are allocated in tmpCtx */
-	so->v.tids = NULL;
-	so->discarded = NULL;
 	so->tuples = 0;
-	so->previousDistance = -get_float8_infinity();
 	MemoryContextReset(so->tmpCtx);

 	if (keys && scan->numberOfKeys > 0)
@@ -197,10 +176,6 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)

 		/* Count index scan for stats */
 		pgstat_count_index_scan(scan->indexRelation);
-#if PG_VERSION_NUM >= 180000
-		if (scan->instrument)
-			scan->instrument->nsearches++;
-#endif

 		/* Safety check */
 		if (scan->orderByData == NULL)
@@ -220,7 +195,7 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		 */
 		LockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);

-		so->w = GetScanItems(scan, value);
+		HnswBench("scan iteration", so->w = GetScanItems(scan, value));

 		/* Release shared lock */
 		UnlockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);
@@ -228,31 +203,33 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		so->first = false;

 #if defined(HNSW_MEMORY)
-		ShowMemoryUsage(so);
+		elog(INFO, "memory: %zu KB", MemoryContextMemAllocated(so->tmpCtx, false) / 1024);
 #endif
 	}

 	for (;;)
 	{
 		char	   *base = NULL;
-		HnswSearchCandidate *sc;
+		HnswSearchCandidate *hc;
 		HnswElement element;
 		ItemPointer heaptid;

 		if (list_length(so->w) == 0)
 		{
-			if (hnsw_iterative_scan == HNSW_ITERATIVE_SCAN_OFF)
+			if (!hnsw_streaming)
 				break;

-			/* Empty index */
-			if (so->discarded == NULL)
-				break;
-
-			/* Reached max number of tuples or memory limit */
-			if (so->tuples >= hnsw_max_scan_tuples || MemoryContextMemAllocated(so->tmpCtx, false) > so->maxMemory)
+			/* Prevent scans from consuming too much memory */
+			if (MemoryContextMemAllocated(so->tmpCtx, false) > (Size) work_mem * 1024L)
 			{
 				if (pairingheap_is_empty(so->discarded))
+				{
+					ereport(NOTICE,
+							(errmsg("hnsw iterative search exceeded work_mem after " INT64_FORMAT " tuples", so->tuples),
+							 errhint("Increase work_mem to scan more tuples.")));
+
 					break;
+				}

 				/* Return remaining tuples */
 				so->w = lappend(so->w, HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded)));
@@ -270,12 +247,12 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 				 */
 				LockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);

-				so->w = ResumeScanItems(scan);
+				HnswBench("scan iteration", so->w = ResumeScanItems(scan));

 				UnlockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);

 #if defined(HNSW_MEMORY)
-				ShowMemoryUsage(so);
+				elog(INFO, "memory: %zu KB", MemoryContextMemAllocated(so->tmpCtx, false) / 1024);
 #endif
 			}

@@ -283,34 +260,28 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 				break;
 		}

-		sc = llast(so->w);
-		element = HnswPtrAccess(base, sc->element);
+		hc = llast(so->w);
+		element = HnswPtrAccess(base, hc->element);

 		/* Move to next element if no valid heap TIDs */
-		if (!sc->matches || element->heaptidsLength == 0)
+		if (element->heaptidsLength == 0)
 		{
 			so->w = list_delete_last(so->w);

 			/* Mark memory as free for next iteration */
-			if (hnsw_iterative_scan != HNSW_ITERATIVE_SCAN_OFF)
+			if (hnsw_streaming)
 			{
 				pfree(element);
-				pfree(sc);
+				pfree(hc);
 			}

 			continue;
 		}

+		so->tuples++;
+
 		heaptid = &element->heaptids[--element->heaptidsLength];

-		if (hnsw_iterative_scan == HNSW_ITERATIVE_SCAN_STRICT)
-		{
-			if (sc->distance < so->previousDistance)
-				continue;
-
-			so->previousDistance = sc->distance;
-		}
-
 		MemoryContextSwitchTo(oldCtx);

 		scan->xs_heaptid = *heaptid;
--- a/src/hnswutils.c
+++ b/src/hnswutils.c
--- a/src/hnswvacuum.c
+++ b/src/hnswvacuum.c
@@ -9,14 +9,6 @@
 #include "storage/lmgr.h"
 #include "utils/memutils.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
-#if PG_VERSION_NUM >= 180000
-#define vacuum_delay_point() vacuum_delay_point(false)
-#endif
-
 /*
 * Check if deleted list contains an index TID
 */
@@ -192,12 +184,13 @@ static void
 RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswElement entryPoint)
 {
 	Relation	index = vacuumstate->index;
-	HnswSupport *support = &vacuumstate->support;
 	Buffer		buf;
 	Page		page;
 	GenericXLogState *state;
 	int			m = vacuumstate->m;
 	int			efConstruction = vacuumstate->efConstruction;
+	FmgrInfo   *procinfo = vacuumstate->procinfo;
+	Oid			collation = vacuumstate->collation;
 	BufferAccessStrategy bas = vacuumstate->bas;
 	HnswNeighborTuple ntup = vacuumstate->ntup;
 	Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, m);
@@ -212,7 +205,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswEleme
 	element->heaptidsLength = 0;

 	/* Find neighbors for element, skipping itself */
-	HnswFindElementNeighbors(base, element, entryPoint, index, support, m, efConstruction, true, false);
+	HnswFindElementNeighbors(base, element, entryPoint, index, procinfo, collation, m, efConstruction, true);

 	/* Zero memory for each element */
 	MemSet(ntup, 0, HNSW_TUPLE_ALLOC_SIZE);
@@ -236,7 +229,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswEleme
 	UnlockReleaseBuffer(buf);

 	/* Update neighbors */
-	HnswUpdateNeighborsOnDisk(index, support, element, m, true, false);
+	HnswUpdateNeighborsOnDisk(index, procinfo, collation, element, m, true, false);
 }

 /*
@@ -246,7 +239,6 @@ static void
 RepairGraphEntryPoint(HnswVacuumState * vacuumstate)
 {
 	Relation	index = vacuumstate->index;
-	HnswSupport *support = &vacuumstate->support;
 	HnswElement highestPoint = &vacuumstate->highestPoint;
 	HnswElement entryPoint;
 	MemoryContext oldCtx = MemoryContextSwitchTo(vacuumstate->tmpCtx);
@@ -264,7 +256,7 @@ RepairGraphEntryPoint(HnswVacuumState * vacuumstate)
 		LockPage(index, HNSW_UPDATE_LOCK, ShareLock);

 		/* Load element */
-		HnswLoadElement(highestPoint, NULL, NULL, NULL, index, support, true, NULL);
+		HnswLoadElement(highestPoint, NULL, NULL, index, vacuumstate->procinfo, vacuumstate->collation, true, NULL);

 		/* Repair if needed */
 		if (NeedsUpdated(vacuumstate, highestPoint))
@@ -302,7 +294,7 @@ RepairGraphEntryPoint(HnswVacuumState * vacuumstate)
 			 * is outdated, this can remove connections at higher levels in
 			 * the graph until they are repaired, but this should be fine.
 			 */
-			HnswLoadElement(entryPoint, NULL, NULL, NULL, index, support, true, NULL);
+			HnswLoadElement(entryPoint, NULL, NULL, index, vacuumstate->procinfo, vacuumstate->collation, true, NULL);

 			if (NeedsUpdated(vacuumstate, entryPoint))
 			{
@@ -378,7 +370,7 @@ RepairGraph(HnswVacuumState * vacuumstate)

 			/* Create an element */
 			element = HnswInitElementFromBlock(blkno, offno);
-			HnswLoadElementFromTuple(element, etup, false, true, index);
+			HnswLoadElementFromTuple(element, etup, false, true);

 			elements = lappend(elements, element);
 		}
@@ -448,7 +440,6 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 	BlockNumber insertPage = InvalidBlockNumber;
 	Relation	index = vacuumstate->index;
 	BufferAccessStrategy bas = vacuumstate->bas;
-	bool		useIndexTuple = HnswUseIndexTuple(index);

 	/*
 	 * Wait for index scans to complete. Scans before this point may contain
@@ -530,14 +521,7 @@ MarkDeleted(HnswVacuumState * vacuumstate)

 			/* Overwrite element */
 			etup->deleted = 1;
-			if (useIndexTuple)
-			{
-				IndexTuple	itup = (IndexTuple) &etup->data;
-
-				MemSet(itup, 0, IndexTupleSize(itup));
-			}
-			else
-				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++)
@@ -597,13 +581,13 @@ InitVacuumState(HnswVacuumState * vacuumstate, IndexVacuumInfo *info, IndexBulkD
 	vacuumstate->callback_state = callback_state;
 	vacuumstate->efConstruction = HnswGetEfConstruction(index);
 	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->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
 												"Hnsw vacuum temporary context",
 												ALLOCSET_DEFAULT_SIZES);

-	HnswInitSupport(&vacuumstate->support, index);
-
 	/* Get m from metapage */
 	HnswGetMetaPageInfo(index, &vacuumstate->m, NULL);

--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -20,10 +20,6 @@
 #include "utils/memutils.h"
 #include "vector.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_progress.h"
 #else
@@ -142,7 +138,7 @@ SampleRows(IvfflatBuildState * buildstate)
 * Add tuple to sort
 */
 static void
-AddTupleToSort(ItemPointer tid, Datum *values, IvfflatBuildState * buildstate)
+AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState * buildstate)
 {
 	double		distance;
 	double		minDistance = DBL_MAX;
@@ -219,7 +215,7 @@ BuildCallback(Relation index, ItemPointer tid, Datum *values,
 	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);

 	/* Add tuple to sort */
-	AddTupleToSort(tid, values, buildstate);
+	AddTupleToSort(index, tid, values, buildstate);

 	/* Reset memory context */
 	MemoryContextSwitchTo(oldCtx);
@@ -232,11 +228,11 @@ BuildCallback(Relation index, ItemPointer tid, Datum *values,
 static inline void
 GetNextTuple(Tuplesortstate *sortstate, TupleDesc tupdesc, TupleTableSlot *slot, IndexTuple *itup, int *list)
 {
+	Datum		value;
+	bool		isnull;
+
 	if (tuplesort_gettupleslot(sortstate, true, false, slot, NULL))
 	{
-		Datum		value;
-		bool		isnull;
-
 		*list = DatumGetInt32(slot_getattr(slot, 1, &isnull));
 		value = slot_getattr(slot, 3, &isnull);

@@ -258,8 +254,8 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 	IndexTuple	itup = NULL;	/* silence compiler warning */
 	int64		inserted = 0;

-	TupleTableSlot *slot = MakeSingleTupleTableSlot(buildstate->sortdesc, &TTSOpsMinimalTuple);
-	TupleDesc	tupdesc = buildstate->tupdesc;
+	TupleTableSlot *slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsMinimalTuple);
+	TupleDesc	tupdesc = RelationGetDescr(index);

 	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD);

@@ -323,7 +319,6 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 	buildstate->index = index;
 	buildstate->indexInfo = indexInfo;
 	buildstate->typeInfo = IvfflatGetTypeInfo(index);
-	buildstate->tupdesc = RelationGetDescr(index);

 	buildstate->lists = IvfflatGetLists(index);
 	buildstate->dimensions = TupleDescAttr(index->rd_att, 0)->atttypmod;
@@ -361,12 +356,12 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 				 errmsg("dimensions must be greater than one for this opclass")));

 	/* Create tuple description for sorting */
-	buildstate->sortdesc = CreateTemplateTupleDesc(3);
-	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 1, "list", INT4OID, -1, 0);
-	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
-	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 3, "vector", TupleDescAttr(buildstate->tupdesc, 0)->atttypid, -1, 0);
+	buildstate->tupdesc = CreateTemplateTupleDesc(3);
+	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 1, "list", INT4OID, -1, 0);
+	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
+	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 3, "vector", RelationGetDescr(index)->attrs[0].atttypid, -1, 0);

-	buildstate->slot = MakeSingleTupleTableSlot(buildstate->sortdesc, &TTSOpsVirtual);
+	buildstate->slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsVirtual);

 	buildstate->centers = VectorArrayInit(buildstate->lists, buildstate->dimensions, buildstate->typeInfo->itemSize(buildstate->dimensions));
 	buildstate->listInfo = palloc(sizeof(ListInfo) * buildstate->lists);
@@ -474,8 +469,8 @@ CreateMetaPage(Relation index, int dimensions, int lists, ForkNumber forkNum)
 * Create list pages
 */
 static void
-CreateListPages(Relation index, VectorArray centers, int lists,
-				ForkNumber forkNum, ListInfo * *listInfo)
+CreateListPages(Relation index, VectorArray centers, int dimensions,
+				int lists, ForkNumber forkNum, ListInfo * *listInfo)
 {
 	Buffer		buf;
 	Page		page;
@@ -638,7 +633,7 @@ IvfflatParallelScanAndSort(IvfflatSpool * ivfspool, IvfflatShared * ivfshared, S
 	InitBuildState(&buildstate, ivfspool->heap, ivfspool->index, indexInfo);
 	memcpy(buildstate.centers->items, ivfcenters, buildstate.centers->itemsize * buildstate.centers->maxlen);
 	buildstate.centers->length = buildstate.centers->maxlen;
-	ivfspool->sortstate = InitBuildSortState(buildstate.sortdesc, sortmem, coordinate);
+	ivfspool->sortstate = InitBuildSortState(buildstate.tupdesc, sortmem, coordinate);
 	buildstate.sortstate = ivfspool->sortstate;
 	scan = table_beginscan_parallel(ivfspool->heap,
 									ParallelTableScanFromIvfflatShared(ivfshared));
@@ -955,7 +950,7 @@ AssignTuples(IvfflatBuildState * buildstate)
 	}

 	/* Begin serial/leader tuplesort */
-	buildstate->sortstate = InitBuildSortState(buildstate->sortdesc, maintenance_work_mem, coordinate);
+	buildstate->sortstate = InitBuildSortState(buildstate->tupdesc, maintenance_work_mem, coordinate);

 	/* Add tuples to sort */
 	if (buildstate->heap != NULL)
@@ -1008,7 +1003,7 @@ BuildIndex(Relation heap, Relation index, IndexInfo *indexInfo,

 	/* Create pages */
 	CreateMetaPage(index, buildstate->dimensions, buildstate->lists, forkNum);
-	CreateListPages(index, buildstate->centers, buildstate->lists, forkNum, &buildstate->listInfo);
+	CreateListPages(index, buildstate->centers, buildstate->dimensions, buildstate->lists, forkNum, &buildstate->listInfo);
 	CreateEntryPages(buildstate, forkNum);

 	/* Write WAL for initialization fork since GenericXLog functions do not */
@@ -1027,10 +1022,6 @@ ivfflatbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	IndexBuildResult *result;
 	IvfflatBuildState buildstate;

-#ifdef IVFFLAT_BENCH
-	SeedRandom(42);
-#endif
-
 	BuildIndex(heap, index, indexInfo, &buildstate, MAIN_FORKNUM);

 	result = (IndexBuildResult *) palloc(sizeof(IndexBuildResult));
--- a/src/ivfflat.c
+++ b/src/ivfflat.c
@@ -17,16 +17,8 @@
 #endif

 int			ivfflat_probes;
-int			ivfflat_iterative_scan;
-int			ivfflat_max_probes;
 static relopt_kind ivfflat_relopt_kind;

-static const struct config_enum_entry ivfflat_iterative_scan_options[] = {
-	{"off", IVFFLAT_ITERATIVE_SCAN_OFF, false},
-	{"relaxed_order", IVFFLAT_ITERATIVE_SCAN_RELAXED, false},
-	{NULL, 0, false}
-};
-
 /*
 * Initialize index options and variables
 */
@@ -41,15 +33,6 @@ IvfflatInit(void)
 							"Valid range is 1..lists.", &ivfflat_probes,
 							IVFFLAT_DEFAULT_PROBES, IVFFLAT_MIN_LISTS, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL);

-	DefineCustomEnumVariable("ivfflat.iterative_scan", "Sets the mode for iterative scans",
-							 NULL, &ivfflat_iterative_scan,
-							 IVFFLAT_ITERATIVE_SCAN_OFF, ivfflat_iterative_scan_options, PGC_USERSET, 0, NULL, NULL, NULL);
-
-	/* If this is less than probes, probes is used */
-	DefineCustomIntVariable("ivfflat.max_probes", "Sets the max number of probes for iterative scans",
-							NULL, &ivfflat_max_probes,
-							IVFFLAT_MAX_LISTS, IVFFLAT_MIN_LISTS, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL);
-
 	MarkGUCPrefixReserved("ivfflat");
 }

@@ -86,30 +69,22 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	GenericCosts costs;
 	int			lists;
 	double		ratio;
-	double		sequentialRatio = 0.5;
-	double		startupPages;
 	double		spc_seq_page_cost;
 	Relation	index;

 	/* Never use index without order */
-	if (path->indexorderbys == NIL)
+	if (path->indexorderbys == NULL)
 	{
 		*indexStartupCost = get_float8_infinity();
 		*indexTotalCost = get_float8_infinity();
 		*indexSelectivity = 0;
 		*indexCorrelation = 0;
 		*indexPages = 0;
-#if PG_VERSION_NUM >= 180000
-		/* See "On disable_cost" thread on pgsql-hackers */
-		path->path.disabled_nodes = 2;
-#endif
 		return;
 	}

 	MemSet(&costs, 0, sizeof(costs));

-	genericcostestimate(root, path, loop_count, &costs);
-
 	index = index_open(path->indexinfo->indexoid, NoLock);
 	IvfflatGetMetaPageInfo(index, &lists, NULL);
 	index_close(index, NoLock);
@@ -119,26 +94,41 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	if (ratio > 1.0)
 		ratio = 1.0;

+	/*
+	 * This gives us the subset of tuples to visit. This value is passed into
+	 * the generic cost estimator to determine the number of pages to visit
+	 * during the index scan.
+	 */
+	costs.numIndexTuples = path->indexinfo->tuples * ratio;
+
+	genericcostestimate(root, path, loop_count, &costs);
+
 	get_tablespace_page_costs(path->indexinfo->reltablespace, NULL, &spc_seq_page_cost);

-	/* Change some page cost from random to sequential */
-	costs.indexTotalCost -= sequentialRatio * costs.numIndexPages * (costs.spc_random_page_cost - spc_seq_page_cost);
-
-	/* Startup cost is cost before returning the first row */
-	costs.indexStartupCost = costs.indexTotalCost * ratio;
-
 	/* Adjust cost if needed since TOAST not included in seq scan cost */
-	startupPages = costs.numIndexPages * ratio;
-	if (startupPages > path->indexinfo->rel->pages && ratio < 0.5)
+	if (costs.numIndexPages > path->indexinfo->rel->pages && ratio < 0.5)
 	{
-		/* Change rest of page cost from random to sequential */
-		costs.indexStartupCost -= (1 - sequentialRatio) * startupPages * (costs.spc_random_page_cost - spc_seq_page_cost);
+		/* Change all page cost from random to sequential */
+		costs.indexTotalCost -= costs.numIndexPages * (costs.spc_random_page_cost - spc_seq_page_cost);

 		/* Remove cost of extra pages */
-		costs.indexStartupCost -= (startupPages - path->indexinfo->rel->pages) * spc_seq_page_cost;
+		costs.indexTotalCost -= (costs.numIndexPages - path->indexinfo->rel->pages) * spc_seq_page_cost;
+	}
+	else
+	{
+		/* Change some page cost from random to sequential */
+		costs.indexTotalCost -= 0.5 * costs.numIndexPages * (costs.spc_random_page_cost - spc_seq_page_cost);
 	}

-	*indexStartupCost = costs.indexStartupCost;
+	/*
+	 * If the list selectivity is lower than what is returned from the generic
+	 * cost estimator, use that.
+	 */
+	if (ratio < costs.indexSelectivity)
+		costs.indexSelectivity = ratio;
+
+	/* Use total cost since most work happens before first tuple is returned */
+	*indexStartupCost = costs.indexTotalCost;
 	*indexTotalCost = costs.indexTotalCost;
 	*indexSelectivity = costs.indexSelectivity;
 	*indexCorrelation = costs.indexCorrelation;
@@ -186,11 +176,6 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->amoptsprocnum = 0;
 	amroutine->amcanorder = false;
 	amroutine->amcanorderbyop = true;
-#if PG_VERSION_NUM >= 180000
-	amroutine->amcanhash = false;
-	amroutine->amconsistentequality = false;
-	amroutine->amconsistentordering = false;
-#endif
 	amroutine->amcanbackward = false;	/* can change direction mid-scan */
 	amroutine->amcanunique = false;
 	amroutine->amcanmulticol = false;
@@ -223,9 +208,6 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->amvacuumcleanup = ivfflatvacuumcleanup;
 	amroutine->amcanreturn = NULL;	/* tuple not included in heapsort */
 	amroutine->amcostestimate = ivfflatcostestimate;
-#if PG_VERSION_NUM >= 180000
-	amroutine->amgettreeheight = NULL;
-#endif
 	amroutine->amoptions = ivfflatoptions;
 	amroutine->amproperty = NULL;	/* TODO AMPROP_DISTANCE_ORDERABLE */
 	amroutine->ambuildphasename = ivfflatbuildphasename;
@@ -246,10 +228,5 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->aminitparallelscan = NULL;
 	amroutine->amparallelrescan = NULL;

-#if PG_VERSION_NUM >= 180000
-	amroutine->amtranslatestrategy = NULL;
-	amroutine->amtranslatecmptype = NULL;
-#endif
-
 	PG_RETURN_POINTER(amroutine);
 }
--- a/src/ivfflat.h
+++ b/src/ivfflat.h
@@ -13,10 +13,6 @@
 #include "utils/tuplesort.h"
 #include "vector.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
 #if PG_VERSION_NUM >= 150000
 #include "common/pg_prng.h"
 #endif
@@ -77,23 +73,13 @@
 #if PG_VERSION_NUM >= 150000
 #define RandomDouble() pg_prng_double(&pg_global_prng_state)
 #define RandomInt() pg_prng_uint32(&pg_global_prng_state)
-#define SeedRandom(seed) pg_prng_seed(&pg_global_prng_state, seed)
 #else
 #define RandomDouble() (((double) random()) / MAX_RANDOM_VALUE)
 #define RandomInt() random()
-#define SeedRandom(seed) srandom(seed)
 #endif

 /* Variables */
 extern int	ivfflat_probes;
-extern int	ivfflat_iterative_scan;
-extern int	ivfflat_max_probes;
-
-typedef enum IvfflatIterativeScanMode
-{
-	IVFFLAT_ITERATIVE_SCAN_OFF,
-	IVFFLAT_ITERATIVE_SCAN_RELAXED
-}			IvfflatIterativeScanMode;

 typedef struct VectorArrayData
 {
@@ -179,7 +165,6 @@ typedef struct IvfflatBuildState
 	Relation	index;
 	IndexInfo  *indexInfo;
 	const		IvfflatTypeInfo *typeInfo;
-	TupleDesc	tupdesc;

 	/* Settings */
 	int			dimensions;
@@ -213,7 +198,7 @@ typedef struct IvfflatBuildState

 	/* Sorting */
 	Tuplesortstate *sortstate;
-	TupleDesc	sortdesc;
+	TupleDesc	tupdesc;
 	TupleTableSlot *slot;

 	/* Memory */
@@ -262,18 +247,14 @@ typedef struct IvfflatScanOpaqueData
 {
 	const		IvfflatTypeInfo *typeInfo;
 	int			probes;
-	int			maxProbes;
 	int			dimensions;
 	bool		first;
-	Datum		value;
-	MemoryContext tmpCtx;

 	/* Sorting */
 	Tuplesortstate *sortstate;
 	TupleDesc	tupdesc;
-	TupleTableSlot *vslot;
-	TupleTableSlot *mslot;
-	BufferAccessStrategy bas;
+	TupleTableSlot *slot;
+	bool		isnull;

 	/* Support functions */
 	FmgrInfo   *procinfo;
@@ -283,9 +264,7 @@ typedef struct IvfflatScanOpaqueData

 	/* Lists */
 	pairingheap *listQueue;
-	BlockNumber *listPages;
-	int			listIndex;
-	IvfflatScanList *lists;
+	IvfflatScanList lists[FLEXIBLE_ARRAY_MEMBER];	/* must come last */
 }			IvfflatScanOpaqueData;

 typedef IvfflatScanOpaqueData * IvfflatScanOpaque;
--- a/src/ivfinsert.c
+++ b/src/ivfinsert.c
@@ -65,7 +65,7 @@ FindInsertPage(Relation index, Datum *values, BlockNumber *insertPage, ListInfo
 * Insert a tuple into the index
 */
 static void
-InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid)
+InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel)
 {
 	const		IvfflatTypeInfo *typeInfo = IvfflatGetTypeInfo(index);
 	IndexTuple	itup;
@@ -98,7 +98,7 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid)
 	IvfflatGetMetaPageInfo(index, NULL, NULL);

 	/* Find the insert page - sets the page and list info */
-	FindInsertPage(index, &value, &insertPage, &listInfo);
+	FindInsertPage(index, values, &insertPage, &listInfo);
 	Assert(BlockNumberIsValid(insertPage));
 	originalInsertPage = insertPage;

@@ -204,7 +204,7 @@ ivfflatinsert(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid,
 	oldCtx = MemoryContextSwitchTo(insertCtx);

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

 	/* Delete memory context */
 	MemoryContextSwitchTo(oldCtx);
--- a/src/ivfkmeans.c
+++ b/src/ivfkmeans.c
@@ -13,10 +13,6 @@
 #include "utils/memutils.h"
 #include "vector.h"

-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
 /*
 * Initialize with kmeans++
 *
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -10,10 +10,10 @@
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
-#include "utils/memutils.h"

-#define GetScanList(ptr) pairingheap_container(IvfflatScanList, ph_node, ptr)
-#define GetScanListConst(ptr) pairingheap_const_container(IvfflatScanList, ph_node, ptr)
+#ifdef IVFFLAT_MEMORY
+#include "utils/memutils.h"
+#endif

 /*
 * Compare list distances
@@ -21,10 +21,10 @@
 static int
 CompareLists(const pairingheap_node *a, const pairingheap_node *b, void *arg)
 {
-	if (GetScanListConst(a)->distance > GetScanListConst(b)->distance)
+	if (((const IvfflatScanList *) a)->distance > ((const IvfflatScanList *) b)->distance)
 		return 1;

-	if (GetScanListConst(a)->distance < GetScanListConst(b)->distance)
+	if (((const IvfflatScanList *) a)->distance < ((const IvfflatScanList *) b)->distance)
 		return -1;

 	return 0;
@@ -62,7 +62,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 			/* Use procinfo from the index instead of scan key for performance */
 			distance = DatumGetFloat8(so->distfunc(so->procinfo, so->collation, PointerGetDatum(&list->center), value));

-			if (listCount < so->maxProbes)
+			if (listCount < so->probes)
 			{
 				IvfflatScanList *scanlist;

@@ -75,15 +75,15 @@ GetScanLists(IndexScanDesc scan, Datum value)
 				pairingheap_add(so->listQueue, &scanlist->ph_node);

 				/* Calculate max distance */
-				if (listCount == so->maxProbes)
-					maxDistance = GetScanList(pairingheap_first(so->listQueue))->distance;
+				if (listCount == so->probes)
+					maxDistance = ((IvfflatScanList *) pairingheap_first(so->listQueue))->distance;
 			}
 			else if (distance < maxDistance)
 			{
 				IvfflatScanList *scanlist;

 				/* Remove */
-				scanlist = GetScanList(pairingheap_remove_first(so->listQueue));
+				scanlist = (IvfflatScanList *) pairingheap_remove_first(so->listQueue);

 				/* Reuse */
 				scanlist->startPage = list->startPage;
@@ -91,7 +91,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 				pairingheap_add(so->listQueue, &scanlist->ph_node);

 				/* Update max distance */
-				maxDistance = GetScanList(pairingheap_first(so->listQueue))->distance;
+				maxDistance = ((IvfflatScanList *) pairingheap_first(so->listQueue))->distance;
 			}
 		}

@@ -99,11 +99,6 @@ GetScanLists(IndexScanDesc scan, Datum value)

 		UnlockReleaseBuffer(cbuf);
 	}
-
-	for (int i = listCount - 1; i >= 0; i--)
-		so->listPages[i] = GetScanList(pairingheap_remove_first(so->listQueue))->startPage;
-
-	Assert(pairingheap_is_empty(so->listQueue));
 }

 /*
@@ -114,15 +109,20 @@ GetScanItems(IndexScanDesc scan, Datum value)
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
 	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
-	TupleTableSlot *slot = so->vslot;
-	int			batchProbes = 0;
+	double		tuples = 0;
+	TupleTableSlot *slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsVirtual);

-	tuplesort_reset(so->sortstate);
+	/*
+	 * Reuse same set of shared buffers for scan
+	 *
+	 * See postgres/src/backend/storage/buffer/README for description
+	 */
+	BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD);

 	/* Search closest probes lists */
-	while (so->listIndex < so->maxProbes && (++batchProbes) <= so->probes)
+	while (!pairingheap_is_empty(so->listQueue))
 	{
-		BlockNumber searchPage = so->listPages[so->listIndex++];
+		BlockNumber searchPage = ((IvfflatScanList *) pairingheap_remove_first(so->listQueue))->startPage;

 		/* Search all entry pages for list */
 		while (BlockNumberIsValid(searchPage))
@@ -131,7 +131,7 @@ GetScanItems(IndexScanDesc scan, Datum value)
 			Page		page;
 			OffsetNumber maxoffno;

-			buf = ReadBufferExtended(scan->indexRelation, MAIN_FORKNUM, searchPage, RBM_NORMAL, so->bas);
+			buf = ReadBufferExtended(scan->indexRelation, MAIN_FORKNUM, searchPage, RBM_NORMAL, bas);
 			LockBuffer(buf, BUFFER_LOCK_SHARE);
 			page = BufferGetPage(buf);
 			maxoffno = PageGetMaxOffsetNumber(page);
@@ -160,6 +160,8 @@ GetScanItems(IndexScanDesc scan, Datum value)
 				ExecStoreVirtualTuple(slot);

 				tuplesort_puttupleslot(so->sortstate, slot);
+
+				tuples++;
 			}

 			searchPage = IvfflatPageGetOpaque(page)->nextblkno;
@@ -168,11 +170,15 @@ GetScanItems(IndexScanDesc scan, Datum value)
 		}
 	}

-	tuplesort_performsort(so->sortstate);
+	FreeAccessStrategy(bas);

-#if defined(IVFFLAT_MEMORY)
-	elog(INFO, "memory: %zu MB", MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
-#endif
+	if (tuples < 100)
+		ereport(DEBUG1,
+				(errmsg("index scan found few tuples"),
+				 errdetail("Index may have been created with little data."),
+				 errhint("Recreate the index and possibly decrease lists.")));
+
+	tuplesort_performsort(so->sortstate);
 }

 /*
@@ -209,13 +215,7 @@ GetScanValue(IndexScanDesc scan)

 		/* Normalize if needed */
 		if (so->normprocinfo != NULL)
-		{
-			MemoryContext oldCtx = MemoryContextSwitchTo(so->tmpCtx);
-
 			value = IvfflatNormValue(so->typeInfo, so->collation, value);
-
-			MemoryContextSwitchTo(oldCtx);
-		}
 	}

 	return value;
@@ -246,30 +246,19 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	int			lists;
 	int			dimensions;
 	int			probes = ivfflat_probes;
-	int			maxProbes;
-	MemoryContext oldCtx;

 	scan = RelationGetIndexScan(index, nkeys, norderbys);

 	/* Get lists and dimensions from metapage */
 	IvfflatGetMetaPageInfo(index, &lists, &dimensions);

-	if (ivfflat_iterative_scan != IVFFLAT_ITERATIVE_SCAN_OFF)
-		maxProbes = Max(ivfflat_max_probes, probes);
-	else
-		maxProbes = probes;
-
 	if (probes > lists)
 		probes = lists;

-	if (maxProbes > lists)
-		maxProbes = lists;
-
-	so = (IvfflatScanOpaque) palloc(sizeof(IvfflatScanOpaqueData));
+	so = (IvfflatScanOpaque) palloc(offsetof(IvfflatScanOpaqueData, lists) + probes * sizeof(IvfflatScanList));
 	so->typeInfo = IvfflatGetTypeInfo(index);
 	so->first = true;
 	so->probes = probes;
-	so->maxProbes = maxProbes;
 	so->dimensions = dimensions;

 	/* Set support functions */
@@ -277,12 +266,6 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	so->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	so->collation = index->rd_indcollation[0];

-	so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
-									   "Ivfflat scan temporary context",
-									   ALLOCSET_DEFAULT_SIZES);
-
-	oldCtx = MemoryContextSwitchTo(so->tmpCtx);
-
 	/* Create tuple description for sorting */
 	so->tupdesc = CreateTemplateTupleDesc(2);
 	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
@@ -291,23 +274,9 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	/* Prep sort */
 	so->sortstate = InitScanSortState(so->tupdesc);

-	/* Need separate slots for puttuple and gettuple */
-	so->vslot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsVirtual);
-	so->mslot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);
-
-	/*
-	 * Reuse same set of shared buffers for scan
-	 *
-	 * See postgres/src/backend/storage/buffer/README for description
-	 */
-	so->bas = GetAccessStrategy(BAS_BULKREAD);
+	so->slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);

 	so->listQueue = pairingheap_allocate(CompareLists, scan);
-	so->listPages = palloc(maxProbes * sizeof(BlockNumber));
-	so->listIndex = 0;
-	so->lists = palloc(maxProbes * sizeof(IvfflatScanList));
-
-	MemoryContextSwitchTo(oldCtx);

 	scan->opaque = so;

@@ -322,9 +291,11 @@ ivfflatrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;

+	if (!so->first)
+		tuplesort_reset(so->sortstate);
+
 	so->first = true;
 	pairingheap_reset(so->listQueue);
-	so->listIndex = 0;

 	if (keys && scan->numberOfKeys > 0)
 		memmove(scan->keyData, keys, scan->numberOfKeys * sizeof(ScanKeyData));
@@ -340,8 +311,6 @@ bool
 ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
-	ItemPointer heaptid;
-	bool		isnull;

 	/*
 	 * Index can be used to scan backward, but Postgres doesn't support
@@ -355,10 +324,6 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)

 		/* Count index scan for stats */
 		pgstat_count_index_scan(scan->indexRelation);
-#if PG_VERSION_NUM >= 180000
-		if (scan->instrument)
-			scan->instrument->nsearches++;
-#endif

 		/* Safety check */
 		if (scan->orderByData == NULL)
@@ -373,23 +338,27 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		IvfflatBench("GetScanLists", GetScanLists(scan, value));
 		IvfflatBench("GetScanItems", GetScanItems(scan, value));
 		so->first = false;
-		so->value = value;
+
+#if defined(IVFFLAT_MEMORY)
+		elog(INFO, "memory: %zu MB", MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
+#endif
+
+		/* Clean up if we allocated a new value */
+		if (value != scan->orderByData->sk_argument)
+			pfree(DatumGetPointer(value));
 	}

-	while (!tuplesort_gettupleslot(so->sortstate, true, false, so->mslot, NULL))
+	if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
 	{
-		if (so->listIndex == so->maxProbes)
-			return false;
+		ItemPointer heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));

-		IvfflatBench("GetScanItems", GetScanItems(scan, so->value));
+		scan->xs_heaptid = *heaptid;
+		scan->xs_recheck = false;
+		scan->xs_recheckorderby = false;
+		return true;
 	}

-	heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->mslot, 2, &isnull));
-
-	scan->xs_heaptid = *heaptid;
-	scan->xs_recheck = false;
-	scan->xs_recheckorderby = false;
-	return true;
+	return false;
 }

 /*
@@ -400,11 +369,9 @@ ivfflatendscan(IndexScanDesc scan)
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;

-	/* Free any temporary files */
+	pairingheap_free(so->listQueue);
 	tuplesort_end(so->sortstate);

-	MemoryContextDelete(so->tmpCtx);
-
 	pfree(so);
 	scan->opaque = NULL;
 }
--- a/src/ivfutils.c
+++ b/src/ivfutils.c
@@ -259,8 +259,8 @@ VectorUpdateCenter(Pointer v, int dimensions, float *x)
 	SET_VARSIZE(vec, VECTOR_SIZE(dimensions));
 	vec->dim = dimensions;

-	for (int i = 0; i < dimensions; i++)
-		vec->x[i] = x[i];
+	for (int k = 0; k < dimensions; k++)
+		vec->x[k] = x[k];
 }

 static void
@@ -271,8 +271,8 @@ HalfvecUpdateCenter(Pointer v, int dimensions, float *x)
 	SET_VARSIZE(vec, HALFVEC_SIZE(dimensions));
 	vec->dim = dimensions;

-	for (int i = 0; i < dimensions; i++)
-		vec->x[i] = Float4ToHalfUnchecked(x[i]);
+	for (int k = 0; k < dimensions; k++)
+		vec->x[k] = Float4ToHalfUnchecked(x[k]);
 }

 static void
@@ -284,33 +284,29 @@ BitUpdateCenter(Pointer v, int dimensions, float *x)
 	SET_VARSIZE(vec, VARBITTOTALLEN(dimensions));
 	VARBITLEN(vec) = dimensions;

-	for (uint32 i = 0; i < VARBITBYTES(vec); i++)
-		nx[i] = 0;
+	for (uint32 k = 0; k < VARBITBYTES(vec); k++)
+		nx[k] = 0;

-	for (int i = 0; i < dimensions; i++)
-		nx[i / 8] |= (x[i] > 0.5 ? 1 : 0) << (7 - (i % 8));
+	for (int k = 0; k < dimensions; k++)
+		nx[k / 8] |= (x[k] > 0.5 ? 1 : 0) << (7 - (k % 8));
 }

 static void
 VectorSumCenter(Pointer v, float *x)
 {
 	Vector	   *vec = (Vector *) v;
-	int			dim = vec->dim;

-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		x[i] += vec->x[i];
+	for (int k = 0; k < vec->dim; k++)
+		x[k] += vec->x[k];
 }

 static void
 HalfvecSumCenter(Pointer v, float *x)
 {
 	HalfVector *vec = (HalfVector *) v;
-	int			dim = vec->dim;

-	/* Auto-vectorized on aarch64 */
-	for (int i = 0; i < dim; i++)
-		x[i] += HalfToFloat4(vec->x[i]);
+	for (int k = 0; k < vec->dim; k++)
+		x[k] += HalfToFloat4(vec->x[k]);
 }

 static void
@@ -318,8 +314,8 @@ BitSumCenter(Pointer v, float *x)
 {
 	VarBit	   *vec = (VarBit *) v;

-	for (int i = 0; i < VARBITLEN(vec); i++)
-		x[i] += (float) (((VARBITS(vec)[i / 8]) >> (7 - (i % 8))) & 0x01);
+	for (int k = 0; k < VARBITLEN(vec); k++)
+		x[k] += (float) (((VARBITS(vec)[k / 8]) >> (7 - (k % 8))) & 0x01);
 }

 /*
@@ -359,7 +355,7 @@ ivfflat_halfvec_support(PG_FUNCTION_ARGS)
 	};

 	PG_RETURN_POINTER(&typeInfo);
-}
+};

 FUNCTION_PREFIX PG_FUNCTION_INFO_V1(ivfflat_bit_support);
 Datum
@@ -374,4 +370,4 @@ ivfflat_bit_support(PG_FUNCTION_ARGS)
 	};

 	PG_RETURN_POINTER(&typeInfo);
-}
+};
--- a/src/ivfvacuum.c
+++ b/src/ivfvacuum.c
@@ -5,10 +5,6 @@
 #include "ivfflat.h"
 #include "storage/bufmgr.h"

-#if PG_VERSION_NUM >= 180000
-#define vacuum_delay_point() vacuum_delay_point(false)
-#endif
-
 /*
 * Bulk delete tuples from the index
 */
@@ -30,7 +26,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		Page		cpage;
 		OffsetNumber coffno;
 		OffsetNumber cmaxoffno;
-		BlockNumber listPages[MaxOffsetNumber];
+		BlockNumber startPages[MaxOffsetNumber];
 		ListInfo	listInfo;

 		cbuf = ReadBuffer(index, blkno);
@@ -44,7 +40,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		{
 			IvfflatList list = (IvfflatList) PageGetItem(cpage, PageGetItemId(cpage, coffno));

-			listPages[coffno - FirstOffsetNumber] = list->startPage;
+			startPages[coffno - FirstOffsetNumber] = list->startPage;
 		}

 		listInfo.blkno = blkno;
@@ -54,7 +50,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,

 		for (coffno = FirstOffsetNumber; coffno <= cmaxoffno; coffno = OffsetNumberNext(coffno))
 		{
-			BlockNumber searchPage = listPages[coffno - FirstOffsetNumber];
+			BlockNumber searchPage = startPages[coffno - FirstOffsetNumber];
 			BlockNumber insertPage = InvalidBlockNumber;

 			/* Iterate over entry pages */
--- a/src/sparsevec.c
+++ b/src/sparsevec.c
@@ -4,7 +4,6 @@
 #include <math.h>

 #include "catalog/pg_type.h"
-#include "common/shortest_dec.h"
 #include "common/string.h"
 #include "fmgr.h"
 #include "halfutils.h"
@@ -13,10 +12,17 @@
 #include "sparsevec.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
-#include "utils/float.h"
 #include "utils/lsyscache.h"
 #include "vector.h"

+#if PG_VERSION_NUM >= 120000
+#include "common/shortest_dec.h"
+#include "utils/float.h"
+#else
+#include <float.h>
+#include "utils/builtins.h"
+#endif
+
 typedef struct SparseInputElement
 {
 	int32		index;
--- a/src/vector.c
+++ b/src/vector.c
@@ -35,11 +35,7 @@
 #define VECTOR_TARGET_CLONES
 #endif

-#if PG_VERSION_NUM >= 180000
-PG_MODULE_MAGIC_EXT(.name = "vector",.version = "0.8.1");
-#else
 PG_MODULE_MAGIC;
-#endif

 /*
 * Initialize index options and variables
@@ -159,6 +155,24 @@ CheckStateArray(ArrayType *statearray, const char *caller)
 	return (float8 *) ARR_DATA_PTR(statearray);
 }

+#if PG_VERSION_NUM < 120003
+static pg_noinline void
+float_overflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: overflow")));
+}
+
+static pg_noinline void
+float_underflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: underflow")));
+}
+#endif
+
 /*
 * Convert textual representation to internal representation
 */
@@ -924,13 +938,11 @@ vector_concat(PG_FUNCTION_ARGS)
 	CheckDim(dim);
 	result = InitVector(dim);

-	/* Auto-vectorized */
-	for (int i = 0, imax = a->dim; i < imax; i++)
+	for (int i = 0; i < a->dim; i++)
 		result->x[i] = a->x[i];

-	/* Auto-vectorized */
-	for (int i = 0, imax = b->dim, start = a->dim; i < imax; i++)
-		result->x[i + start] = b->x[i];
+	for (int i = 0; i < b->dim; i++)
+		result->x[i + a->dim] = b->x[i];

 	PG_RETURN_POINTER(result);
 }
@@ -946,21 +958,8 @@ binary_quantize(PG_FUNCTION_ARGS)
 	float	   *ax = a->x;
 	VarBit	   *result = InitBitVector(a->dim);
 	unsigned char *rx = VARBITS(result);
-	int			i = 0;
-	int			count = (a->dim / 8) * 8;

-	/* Auto-vectorized */
-	for (; i < count; i += 8)
-	{
-		unsigned char result_byte = 0;
-
-		for (int j = 0; j < 8; j++)
-			result_byte |= (ax[i + j] > 0) << (7 - j);
-
-		rx[i / 8] = result_byte;
-	}
-
-	for (; i < a->dim; i++)
+	for (int i = 0; i < a->dim; i++)
 		rx[i / 8] |= (ax[i] > 0) << (7 - (i % 8));

 	PG_RETURN_VARBIT_P(result);
--- a/test/expected/halfvec.out
+++ b/test/expected/halfvec.out
@@ -540,12 +540,6 @@ SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::halfvec)
 01001110101
 (1 row)

-SELECT binary_quantize('[1,2,3,-4,5,6,-7,8,1,-2,-3,4,5,-6,7,8,-1,2,3]'::halfvec);
-   binary_quantize   
---------------------
- 1110110110011011011
-(1 row)
-
 SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 3);
 subvector 
 -----------
--- a/test/expected/hnsw_vector.out
+++ b/test/expected/hnsw_vector.out
@@ -99,38 +99,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::vector)) t2
     4
 (1 row)

-DROP TABLE t;
-- iterative
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_l2_ops);
-SET hnsw.iterative_scan = strict_order;
-SET hnsw.ef_search = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
---------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-SET hnsw.iterative_scan = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
---------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
- val 
-----
-(0 rows)
-
-RESET hnsw.iterative_scan;
-RESET hnsw.ef_search;
 DROP TABLE t;
 -- unlogged
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -171,31 +139,4 @@ SET hnsw.ef_search = 0;
 ERROR:  0 is outside the valid range for parameter "hnsw.ef_search" (1 .. 1000)
 SET hnsw.ef_search = 1001;
 ERROR:  1001 is outside the valid range for parameter "hnsw.ef_search" (1 .. 1000)
-SHOW hnsw.iterative_scan;
- hnsw.iterative_scan 
---------------------
- off
-(1 row)
-
-SET hnsw.iterative_scan = on;
-ERROR:  invalid value for parameter "hnsw.iterative_scan": "on"
-HINT:  Available values: off, relaxed_order, strict_order.
-SHOW hnsw.max_scan_tuples;
- hnsw.max_scan_tuples 
----------------------
- 20000
-(1 row)
-
-SET hnsw.max_scan_tuples = 0;
-ERROR:  0 is outside the valid range for parameter "hnsw.max_scan_tuples" (1 .. 2147483647)
-SHOW hnsw.scan_mem_multiplier;
- hnsw.scan_mem_multiplier 
--------------------------
- 1
-(1 row)
-
-SET hnsw.scan_mem_multiplier = 0;
-ERROR:  0 is outside the valid range for parameter "hnsw.scan_mem_multiplier" (1 .. 1000)
-SET hnsw.scan_mem_multiplier = 1001;
-ERROR:  1001 is outside the valid range for parameter "hnsw.scan_mem_multiplier" (1 .. 1000)
 DROP TABLE t;
--- a/test/expected/ivfflat_vector.out
+++ b/test/expected/ivfflat_vector.out
@@ -81,46 +81,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2
     3
 (1 row)

-DROP TABLE t;
-- iterative
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 3);
-SET ivfflat.iterative_scan = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
---------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-SET ivfflat.max_probes = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
---------
- [1,2,3]
-(1 row)
-
-SET ivfflat.max_probes = 2;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
---------
- [1,2,3]
- [1,1,1]
-(2 rows)
-
-TRUNCATE t;
-NOTICE:  ivfflat index created with little data
-DETAIL:  This will cause low recall.
-HINT:  Drop the index until the table has more data.
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
- val 
-----
-(0 rows)
-
-RESET ivfflat.iterative_scan;
-RESET ivfflat.max_probes;
 DROP TABLE t;
 -- unlogged
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -149,27 +109,4 @@ SHOW ivfflat.probes;
 1
 (1 row)

-SET ivfflat.probes = 0;
-ERROR:  0 is outside the valid range for parameter "ivfflat.probes" (1 .. 32768)
-SET ivfflat.probes = 32769;
-ERROR:  32769 is outside the valid range for parameter "ivfflat.probes" (1 .. 32768)
-SHOW ivfflat.iterative_scan;
- ivfflat.iterative_scan 
------------------------
- off
-(1 row)
-
-SET ivfflat.iterative_scan = on;
-ERROR:  invalid value for parameter "ivfflat.iterative_scan": "on"
-HINT:  Available values: off, relaxed_order.
-SHOW ivfflat.max_probes;
- ivfflat.max_probes 
--------------------
- 32768
-(1 row)
-
-SET ivfflat.max_probes = 0;
-ERROR:  0 is outside the valid range for parameter "ivfflat.max_probes" (1 .. 32768)
-SET ivfflat.max_probes = 32769;
-ERROR:  32769 is outside the valid range for parameter "ivfflat.max_probes" (1 .. 32768)
 DROP TABLE t;
--- a/test/expected/vector_type.out
+++ b/test/expected/vector_type.out
@@ -576,12 +576,6 @@ SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::vector);
 01001110101
 (1 row)

-SELECT binary_quantize('[1,2,3,-4,5,6,-7,8,1,-2,-3,4,5,-6,7,8,-1,2,3]'::vector);
-   binary_quantize   
---------------------
- 1110110110011011011
-(1 row)
-
 SELECT subvector('[1,2,3,4,5]'::vector, 1, 3);
 subvector 
 -----------
--- a/test/sql/halfvec.sql
+++ b/test/sql/halfvec.sql
@@ -121,7 +121,6 @@ SELECT l2_normalize('[65504]'::halfvec);

 SELECT binary_quantize('[1,0,-1]'::halfvec);
 SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::halfvec);
-SELECT binary_quantize('[1,2,3,-4,5,6,-7,8,1,-2,-3,4,5,-6,7,8,-1,2,3]'::halfvec);

 SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 3);
 SELECT subvector('[1,2,3,4,5]'::halfvec, 3, 2);
--- a/test/sql/hnsw_vector.sql
+++ b/test/sql/hnsw_vector.sql
@@ -57,26 +57,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::vector)) t2

 DROP TABLE t;

-- iterative
-
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_l2_ops);
-
-SET hnsw.iterative_scan = strict_order;
-SET hnsw.ef_search = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET hnsw.iterative_scan = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-RESET hnsw.iterative_scan;
-RESET hnsw.ef_search;
-DROP TABLE t;
-
 -- unlogged

 CREATE UNLOGGED TABLE t (val vector(3));
@@ -101,17 +81,4 @@ SHOW hnsw.ef_search;
 SET hnsw.ef_search = 0;
 SET hnsw.ef_search = 1001;

-SHOW hnsw.iterative_scan;
-
-SET hnsw.iterative_scan = on;
-
-SHOW hnsw.max_scan_tuples;
-
-SET hnsw.max_scan_tuples = 0;
-
-SHOW hnsw.scan_mem_multiplier;
-
-SET hnsw.scan_mem_multiplier = 0;
-SET hnsw.scan_mem_multiplier = 1001;
-
 DROP TABLE t;
--- a/test/sql/ivfflat_vector.sql
+++ b/test/sql/ivfflat_vector.sql
@@ -44,28 +44,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2

 DROP TABLE t;

-- iterative
-
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 3);
-
-SET ivfflat.iterative_scan = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET ivfflat.max_probes = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET ivfflat.max_probes = 2;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-RESET ivfflat.iterative_scan;
-RESET ivfflat.max_probes;
-DROP TABLE t;
-
 -- unlogged

 CREATE UNLOGGED TABLE t (val vector(3));
@@ -84,16 +62,4 @@ CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 32769);

 SHOW ivfflat.probes;

-SET ivfflat.probes = 0;
-SET ivfflat.probes = 32769;
-
-SHOW ivfflat.iterative_scan;
-
-SET ivfflat.iterative_scan = on;
-
-SHOW ivfflat.max_probes;
-
-SET ivfflat.max_probes = 0;
-SET ivfflat.max_probes = 32769;
-
 DROP TABLE t;
--- a/test/sql/vector_type.sql
+++ b/test/sql/vector_type.sql
@@ -128,7 +128,6 @@ SELECT l2_normalize('[3e38]'::vector);

 SELECT binary_quantize('[1,0,-1]'::vector);
 SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::vector);
-SELECT binary_quantize('[1,2,3,-4,5,6,-7,8,1,-2,-3,4,5,-6,7,8,-1,2,3]'::vector);

 SELECT subvector('[1,2,3,4,5]'::vector, 1, 3);
 SELECT subvector('[1,2,3,4,5]'::vector, 3, 2);
--- a/test/t/002_ivfflat_vacuum.pl
+++ b/test/t/002_ivfflat_vacuum.pl
@@ -6,7 +6,13 @@ use Test::More;

 my $dim = 3;

-my $array_sql = join(",", ('random()') x $dim);
+my @r = ();
+for (1 .. $dim)
+{
+	my $v = int(rand(1000)) + 1;
+	push(@r, "i % $v");
+}
+my $array_sql = join(", ", @r);

 # Initialize node
 my $node = PostgreSQL::Test::Cluster->new('node');
@@ -17,20 +23,19 @@ $node->start;
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 $node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i % 10, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
 );
 $node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops);");

 # Get size
 my $size = $node->safe_psql("postgres", "SELECT pg_total_relation_size('tst_v_idx');");

-# Store values
-$node->safe_psql("postgres", "CREATE TABLE tmp AS SELECT * FROM tst;");
-
 # Delete all, vacuum, and insert same data
 $node->safe_psql("postgres", "DELETE FROM tst;");
 $node->safe_psql("postgres", "VACUUM tst;");
-$node->safe_psql("postgres", "INSERT INTO tst SELECT * FROM tmp;");
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT i % 10, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
+);

 # Check size
 my $new_size = $node->safe_psql("postgres", "SELECT pg_total_relation_size('tst_v_idx');");
--- a/test/t/009_ivfflat_filtering.pl
+++ b/test/t/009_ivfflat_filtering.pl
@@ -94,7 +94,8 @@ like($explain, qr/Seq Scan/);
 $explain = $node->safe_psql("postgres", qq(
 	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query';
 ));
-like($explain, qr/Seq Scan/);
+# TODO Do not use index
+like($explain, qr/Index Scan using idx/);

 # Test attribute index
 $node->safe_psql("postgres", "CREATE INDEX attribute_idx ON tst (c);");
@@ -109,6 +110,7 @@ $node->safe_psql("postgres", "CREATE INDEX partial_idx ON tst USING ivfflat (v v
 $explain = $node->safe_psql("postgres", qq(
 	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
 ));
-like($explain, qr/Index Scan using partial_idx/);
+# TODO Use partial index
+like($explain, qr/Index Scan using idx/);

 done_testing();
--- a/test/t/017_hnsw_filtering.pl
+++ b/test/t/017_hnsw_filtering.pl
@@ -18,13 +18,9 @@ $node->start;
 # Create table and index
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 $node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim), c int4, t text);");
-$node->safe_psql("postgres", "CREATE TABLE cat (i int4 PRIMARY KEY, t text, b boolean);");
 $node->safe_psql("postgres",
 	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc, 'test ' || i FROM generate_series(1, 10000) i;"
 );
-$node->safe_psql("postgres",
-	"INSERT INTO cat SELECT i, 'cat ' || i, i % 5 = 0 FROM generate_series(1, $nc) i;"
-);
 $node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v vector_l2_ops);");
 $node->safe_psql("postgres", "ANALYZE tst;");

@@ -41,7 +37,8 @@ my $c = int(rand() * $nc);
 my $explain = $node->safe_psql("postgres", qq(
 	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
 ));
-like($explain, qr/Seq Scan/);
+# TODO Do not use index
+like($explain, qr/Index Scan using idx/);

 # Test attribute filtering with few rows removed
 $explain = $node->safe_psql("postgres", qq(
@@ -59,7 +56,8 @@ like($explain, qr/Index Scan using idx/);
 $explain = $node->safe_psql("postgres", qq(
 	EXPLAIN ANALYZE SELECT i FROM tst WHERE c < 1 ORDER BY v <-> '$query' LIMIT $limit;
 ));
-like($explain, qr/Seq Scan/);
+# TODO Do not use index
+like($explain, qr/Index Scan using idx/);

 # Test attribute filtering with few rows removed like
 $explain = $node->safe_psql("postgres", qq(
@@ -98,25 +96,13 @@ $explain = $node->safe_psql("postgres", qq(
 ));
 like($explain, qr/Seq Scan/);

-# Test join
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT cat.t FROM cat INNER JOIN tst ON cat.i = tst.c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test join with attribute filtering
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT cat.t FROM cat INNER JOIN tst ON cat.i = tst.c WHERE cat.b = 't' ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
 # Test attribute index
 $node->safe_psql("postgres", "CREATE INDEX attribute_idx ON tst (c);");
 $explain = $node->safe_psql("postgres", qq(
 	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
 ));
-# Use attribute index
-like($explain, qr/Bitmap Index Scan on attribute_idx/);
+# TODO Use attribute index
+like($explain, qr/Index Scan using idx/);

 # Test partial index
 $node->safe_psql("postgres", "CREATE INDEX partial_idx ON tst USING hnsw (v vector_l2_ops) WHERE (c = $c);");
--- a/test/t/039_hnsw_cost.pl
+++ b/test/t/039_hnsw_cost.pl
@@ -1,60 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my @dims = (384, 1536);
-my $limit = 10;
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-
-for my $dim (@dims)
-{
-	my $array_sql = join(",", ('random()') x $dim);
-
-	# Create table and index
-	$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
-	$node->safe_psql("postgres",
-		"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 2000) i;"
-	);
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v vector_l2_ops);");
-	$node->safe_psql("postgres", "ANALYZE tst;");
-
-	# Generate query
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, rand());
-	}
-	my $query = "[" . join(",", @r) . "]";
-
-	my $explain = $node->safe_psql("postgres", qq(
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v <-> '$query' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx/);
-
-	# 3x the rows are needed for distance filters
-	# since the planner uses DEFAULT_INEQ_SEL for the selectivity (should be 1)
-	# Recreate index for performance
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-	$node->safe_psql("postgres",
-		"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(2001, 6000) i;"
-	);
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v vector_l2_ops);");
-	$node->safe_psql("postgres", "ANALYZE tst;");
-
-	$explain = $node->safe_psql("postgres", qq(
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx/);
-
-	$node->safe_psql("postgres", "DROP TABLE tst;");
-}
-
-done_testing();
--- a/test/t/043_hnsw_iterative_scan.pl
+++ b/test/t/043_hnsw_iterative_scan.pl
@@ -14,7 +14,7 @@ $node->start;

 # Create table
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4 PRIMARY KEY, v vector($dim));");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
 $node->safe_psql("postgres",
 	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
 );
@@ -26,34 +26,18 @@ $node->safe_psql("postgres", qq(

 my $count = $node->safe_psql("postgres", qq(
 	SET enable_seqscan = off;
-	SET hnsw.iterative_scan = relaxed_order;
-	SET hnsw.max_scan_tuples = 100000;
-	SET hnsw.scan_mem_multiplier = 2;
+	SET hnsw.streaming = on;
+	SET work_mem = '8MB';
 	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
 ));
 is($count, 10);

-foreach ((30000, 50000, 70000))
-{
-	my $max_tuples = $_;
-	my $expected = $max_tuples / 10000;
-	my $sum = 0;
-
-	for my $i (1 .. 20)
-	{
-		$count = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET hnsw.iterative_scan = relaxed_order;
-			SET hnsw.max_scan_tuples = $max_tuples;
-			SET hnsw.scan_mem_multiplier = 2;
-			SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
-		));
-		$sum += $count;
-	}
-
-	my $avg = $sum / 20;
-	cmp_ok($avg, '>', $expected - 2);
-	cmp_ok($avg, '<', $expected + 2);
-}
+my ($ret, $stdout, $stderr) = $node->psql("postgres", qq(
+	SET enable_seqscan = off;
+	SET hnsw.streaming = on;
+	SET work_mem = '2MB';
+	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
+));
+like($stderr, qr/iterative search exceeded work_mem after \d+ tuples/);

 done_testing();
--- a/test/t/044_hnsw_iterative_scan_recall.pl
+++ b/test/t/044_hnsw_iterative_scan_recall.pl
@@ -10,18 +10,18 @@ my @expected;
 my $limit = 20;
 my $dim = 3;
 my $array_sql = join(",", ('random()') x $dim);
-my @cs = (50, 500);
+my @cs = (100, 1000);

 sub test_recall
 {
-	my ($c, $ef_search, $min, $operator, $mode) = @_;
+	my ($c, $ef_search, $min, $operator) = @_;
 	my $correct = 0;
 	my $total = 0;

 	my $explain = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
 		SET hnsw.ef_search = $ef_search;
-		SET hnsw.iterative_scan = $mode;
+		SET hnsw.streaming = on;
 		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
 	));
 	like($explain, qr/Index Scan using idx on tst/);
@@ -31,7 +31,7 @@ sub test_recall
 		my $actual = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
 			SET hnsw.ef_search = $ef_search;
-			SET hnsw.iterative_scan = $mode;
+			SET hnsw.streaming = on;
 			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
 		));
 		my @actual_ids = split("\n", $actual);
@@ -50,7 +50,7 @@ sub test_recall
 		$total += $limit;
 	}

-	cmp_ok($correct / $total, ">=", $min, "$operator $mode $c");
+	cmp_ok($correct / $total, ">=", $min, $operator);
 }

 # Initialize node
@@ -62,7 +62,7 @@ $node->start;
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 $node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 50000) i;"
+	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
 );

 # Generate queries
@@ -108,8 +108,21 @@ for my $i (0 .. $#operators)
 			push(@expected, $res);
 		}

-		test_recall($c, 40, 0.99, $operator, "strict_order");
-		test_recall($c, 40, 0.99, $operator, "relaxed_order");
+		if ($c == 100)
+		{
+			test_recall($c, 40, 0.99, $operator);
+		}
+		else
+		{
+			if ($operator eq "<->")
+			{
+				test_recall($c, 40, 0.99, $operator);
+			}
+			else
+			{
+				test_recall($c, 40, 0.99, $operator);
+			}
+		}
 	}

 	$node->safe_psql("postgres", "DROP INDEX idx;");
--- a/test/t/040_ivfflat_cost.pl
+++ b/test/t/040_ivfflat_cost.pl
@@ -1,50 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my @dims = (384, 1536);
-my $limit = 10;
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-
-for my $dim (@dims)
-{
-	my $array_sql = join(",", ('random()') x $dim);
-
-	# Create table and index
-	$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
-	$node->safe_psql("postgres",
-		"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 5000) i;"
-	);
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING ivfflat (v vector_l2_ops) WITH (lists = 5);");
-	$node->safe_psql("postgres", "ANALYZE tst;");
-
-	# Generate query
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, rand());
-	}
-	my $query = "[" . join(",", @r) . "]";
-
-	my $explain = $node->safe_psql("postgres", qq(
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v <-> '$query' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx/);
-
-	$explain = $node->safe_psql("postgres", qq(
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx/);
-
-	$node->safe_psql("postgres", "DROP TABLE tst;");
-}
-
-done_testing();
--- a/test/t/041_ivfflat_iterative_scan.pl
+++ b/test/t/041_ivfflat_iterative_scan.pl
@@ -1,54 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $dim = 3;
-my $array_sql = join(",", ('random()') x $dim);
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4 PRIMARY KEY, v vector($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops);");
-
-my $count = $node->safe_psql("postgres", qq(
-	SET enable_seqscan = off;
-	SET ivfflat.probes = 10;
-	SET ivfflat.iterative_scan = relaxed_order;
-	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
-));
-is($count, 10);
-
-foreach ((30, 50, 70))
-{
-	my $max_probes = $_;
-	my $expected = $max_probes / 10;
-	my $sum = 0;
-
-	for my $i (1 .. 20)
-	{
-		$count = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET ivfflat.probes = 10;
-			SET ivfflat.iterative_scan = relaxed_order;
-			SET ivfflat.max_probes = $max_probes;
-			SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
-		));
-		$sum += $count;
-	}
-
-	my $avg = $sum / 20;
-	cmp_ok($avg, '>', $expected - 2);
-	cmp_ok($avg, '<', $expected + 2);
-}
-
-done_testing();
--- a/test/t/042_ivfflat_iterative_scan_recall.pl
+++ b/test/t/042_ivfflat_iterative_scan_recall.pl
@@ -1,125 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my @cs = (100, 1000);
-
-sub test_recall
-{
-	my ($c, $probes, $min, $operator) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		SET ivfflat.probes = $probes;
-		SET ivfflat.iterative_scan = relaxed_order;
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx on tst/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET ivfflat.probes = $probes;
-			SET ivfflat.iterative_scan = relaxed_order;
-			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-
-		my @expected_ids = split("\n", $expected[$i]);
-		my %expected_set = map { $_ => 1 } @expected_ids;
-
-		foreach (@actual_ids)
-		{
-			if (exists($expected_set{$_}))
-			{
-				$correct++;
-			}
-		}
-
-		$total += $limit;
-	}
-
-	cmp_ok($correct / $total, ">=", $min, "$operator $c");
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
-);
-
-# Generate queries
-for (1 .. 20)
-{
-	my $r1 = rand();
-	my $r2 = rand();
-	my $r3 = rand();
-	push(@queries, "[$r1,$r2,$r3]");
-}
-
-# Check each index type
-my @operators = ("<->", "<=>");
-my @opclasses = ("vector_l2_ops", "vector_cosine_ops");
-
-for my $i (0 .. $#operators)
-{
-	my $operator = $operators[$i];
-	my $opclass = $opclasses[$i];
-
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING ivfflat (v $opclass);");
-
-	foreach (@cs)
-	{
-		my $c = $_;
-
-		# Get exact results
-		@expected = ();
-		foreach (@queries)
-		{
-			my $res = $node->safe_psql("postgres", qq(
-				SET enable_indexscan = off;
-				WITH top AS (
-					SELECT v $operator '$_' AS distance FROM tst WHERE i % $c = 0 ORDER BY distance LIMIT $limit
-				)
-				SELECT i FROM tst WHERE (v $operator '$_') <= (SELECT MAX(distance) FROM top)
-			));
-			push(@expected, $res);
-		}
-
-		if ($c == 100)
-		{
-			test_recall($c, 1, 0.57, $operator);
-			test_recall($c, 10, 0.98, $operator);
-		}
-		else
-		{
-			if ($operator eq "<->")
-			{
-				test_recall($c, 1, 0.80, $operator);
-			}
-			else
-			{
-				test_recall($c, 1, 0.88, $operator);
-			}
-		}
-	}
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-}
-
-done_testing();
--- a/test/t/045_hnsw_hqann.pl
+++ b/test/t/045_hnsw_hqann.pl
@@ -1,113 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @cs = ();
-my @expected;
-my $limit = 20;
-my $dim = 3;
-my $array_sql = join(",", ('random()') x $dim);
-my $nc = 1000;
-
-sub test_recall
-{
-	my ($min, $operator) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $cs[0] ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Cond/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SELECT i FROM tst WHERE c = $cs[$i] ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-		my %actual_set = map { $_ => 1 } @actual_ids;
-
-		is(scalar(@actual_ids), $limit);
-
-		my @expected_ids = split("\n", $expected[$i]);
-
-		foreach (@expected_ids)
-		{
-			if (exists($actual_set{$_}))
-			{
-				$correct++;
-			}
-			$total++;
-		}
-	}
-
-	cmp_ok($correct / $total, ">=", $min, $operator);
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim), c int4);");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc FROM generate_series(1, 20000) i;"
-);
-
-# Generate queries
-for (1 .. 20)
-{
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, rand());
-	}
-	push(@queries, "[" . join(",", @r) . "]");
-	push(@cs, int(rand() * $nc));
-}
-
-# Get exact results
-@expected = ();
-for my $i (0 .. $#queries)
-{
-	my $res = $node->safe_psql("postgres", "SELECT i FROM tst WHERE c = $cs[$i] ORDER BY v <=> '$queries[$i]' LIMIT $limit;");
-	push(@expected, $res);
-}
-
-# Add index
-$node->safe_psql("postgres", qq(
-	SET maintenance_work_mem = '256MB';
-	SET max_parallel_maintenance_workers = 2;
-	CREATE INDEX ON tst USING hnsw (v vector_cosine_ops, c);
-));
-
-# Test recall
-test_recall(0.99, '<=>');
-
-# Test vacuum
-$node->safe_psql("postgres", "DELETE FROM tst WHERE c > 5;");
-$node->safe_psql("postgres", "VACUUM tst;");
-
-# Test columns
-my ($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING hnsw (c);");
-like($stderr, qr/first column must be a vector/);
-
-($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING hnsw (c, v vector_cosine_ops);");
-like($stderr, qr/first column must be a vector/);
-
-($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING hnsw (v vector_cosine_ops, c, c);");
-like($stderr, qr/index cannot have more than two columns/);
-
-($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING hnsw (v vector_cosine_ops, v vector_cosine_ops);");
-like($stderr, qr/column 2 cannot be a vector/);
-
-done_testing();
--- a/vector.control
+++ b/vector.control
@@ -1,4 +1,4 @@
 comment = 'vector data type and ivfflat and hnsw access methods'
-default_version = '0.8.1'
+default_version = '0.7.4'
 module_pathname = '$libdir/vector'
 relocatable = true
Author	SHA1	Message	Date
Andrew Kane	dd127da62a	Added comments [skip ci]	2024-09-22 10:45:09 -07:00
Andrew Kane	9c59d09a97	Updated comment [skip ci]	2024-09-22 10:35:51 -07:00
Andrew Kane	c5b6769bed	Updated variable name [skip ci]	2024-09-22 10:33:44 -07:00
Andrew Kane	d7152448f9	Improved code [skip ci]	2024-09-22 10:24:36 -07:00
Andrew Kane	08420b6404	Updated comment [skip ci]	2024-09-22 10:10:55 -07:00
Andrew Kane	3fba403f8f	Updated comment [skip ci]	2024-09-22 10:07:30 -07:00
Andrew Kane	f53e65fb6a	Updated comment [skip ci]	2024-09-22 09:31:16 -07:00
Andrew Kane	12015dbe53	Updated comment [skip ci]	2024-09-22 09:18:25 -07:00
Andrew Kane	794ce3a54c	Updated comment [skip ci]	2024-09-22 09:10:05 -07:00
Andrew Kane	be51204a45	Only use some bits [skip ci]	2024-09-22 08:53:41 -07:00
Andrew Kane	e78ce02dc9	Fixed CI [skip ci]	2024-09-22 01:52:14 -07:00
Andrew Kane	7412ee6cee	Use smaller batch size for better performance	2024-09-22 00:00:02 -07:00
Andrew Kane	ba0196ba10	Improved logging [skip ci]	2024-09-21 23:20:23 -07:00
Andrew Kane	64b0e6359b	Updated message [skip ci]	2024-09-21 23:06:30 -07:00
Andrew Kane	0e83213e88	Removed logging [skip ci]	2024-09-21 22:56:35 -07:00
Andrew Kane	f1c7494c35	Added sorting [skip ci]	2024-09-21 22:56:03 -07:00
Andrew Kane	e07d17fe38	Limit work_mem [skip ci]	2024-09-21 22:37:03 -07:00
Andrew Kane	96ff1b992f	Added comment [skip ci]	2024-09-21 16:21:02 -07:00
Andrew Kane	569bf93355	Updated comment [skip ci]	2024-09-21 16:18:56 -07:00
Andrew Kane	72aa53ef54	Only free if streaming [skip ci]	2024-09-21 16:15:00 -07:00
Andrew Kane	4773931b11	Improved code [skip ci]	2024-09-21 12:28:12 -07:00
Andrew Kane	b7564dfc19	Improved logging [skip ci]	2024-09-21 12:23:05 -07:00
Andrew Kane	7dc1b36adc	Merge branch 'master' into hnsw-streaming	2024-09-21 12:16:40 -07:00
Andrew Kane	5266c208a6	Reduced calls to AddToVisited [skip ci]	2024-09-21 00:32:31 -07:00
Andrew Kane	a0fddf2d1d	Added todo [skip ci]	2024-09-20 16:24:20 -07:00
Andrew Kane	63d5d121a3	Added HNSW_BENCH define [skip ci]	2024-09-20 16:20:27 -07:00
Andrew Kane	39d2ef624a	Merge branch 'master' into hnsw-streaming	2024-09-20 15:24:27 -07:00
Andrew Kane	aa0b7ddf70	Removed code for pg12 [skip ci]	2024-09-20 15:19:50 -07:00
Andrew Kane	d499ead3c6	Removed todo [skip ci]	2024-09-20 15:19:23 -07:00
Andrew Kane	f20f5e28b8	Added versioning to tuples	2024-09-20 15:12:39 -07:00
Andrew Kane	3dde18a883	Fixed CI	2024-09-20 14:13:33 -07:00
Andrew Kane	0af1c7dd55	Merge branch 'master' into hnsw-streaming	2024-09-20 13:57:23 -07:00
Andrew Kane	f6ebc5d708	Fixed warning [skip ci]	2024-09-20 13:56:27 -07:00
Andrew Kane	c6493415b2	Added test for streaming recall	2024-09-20 13:04:08 -07:00
Andrew Kane	aaff3de409	Free memory [skip ci]	2024-09-19 15:32:22 -07:00
Andrew Kane	4d1c6ff955	Merge branch 'master' into hnsw-streaming	2024-09-19 14:52:34 -07:00
Andrew Kane	af1727775d	Added streaming option for HNSW [skip ci]	2024-09-18 14:55:58 -07:00