Fixed alloc [skip ci]

Significantly improved index query performance [skip ci]
2026-07-22 20:15:46 +08:00 · 2022-03-12 12:58:35 -08:00 · 2022-02-15 20:21:29 -08:00
60 changed files with 684 additions and 1192 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
 root = true

-[*.{c,h,pl,pm,sql}]
+[*.{c,h,pl}]
 indent_style = tab
 indent_size = tab
 tab_width = 4
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,72 +1,38 @@
 name: build
 on: [push, pull_request]
 jobs:
-  ubuntu:
+  build:
    runs-on: ${{ matrix.os }}
-    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
    strategy:
      fail-fast: false
      matrix:
+        os: [ubuntu-latest]
+        postgres: [14, 13, 12, 11, 10, 9.6]
        include:
-          - postgres: 15
-            os: ubuntu-22.04
-          - postgres: 14
-            os: ubuntu-22.04
-          - postgres: 13
-            os: ubuntu-20.04
-          - postgres: 12
-            os: ubuntu-20.04
-          - postgres: 11
-            os: ubuntu-18.04
+        - os: macos-latest
+          postgres: 14
    steps:
-      - uses: actions/checkout@v3
-      - uses: ankane/setup-postgres@v1
-        with:
-          postgres-version: ${{ matrix.postgres }}
-          dev-files: true
-      - run: make
-      - run: |
-          export PG_CONFIG=`which pg_config`
-          sudo --preserve-env=PG_CONFIG make install
-      - run: make installcheck
-      - if: ${{ failure() }}
-        run: cat regression.diffs
-      - run: |
-          sudo apt-get update
-          sudo apt-get install libipc-run-perl
-      - run: make prove_installcheck
-  mac:
-    runs-on: macos-latest
-    if: ${{ !startsWith(github.ref_name, 'windows') }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ankane/setup-postgres@v1
-        with:
-          postgres-version: 14
-      - run: make
-      - run: make install
-      - run: make installcheck
-      - if: ${{ failure() }}
-        run: cat regression.diffs
-      - run: |
-          brew install cpanm
-          cpanm --notest IPC::Run
-          wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_5.tar.gz
-          tar xf REL_14_5.tar.gz
-      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres-REL_14_5/src/test/perl" PERL5LIB="/Users/runner/perl5/lib/perl5"
-  windows:
-    runs-on: windows-latest
-    if: ${{ !startsWith(github.ref_name, 'mac') }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ankane/setup-postgres@v1
-        with:
-          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 && ^
-          nmake /NOLOGO /F Makefile.win clean && ^
-          nmake /NOLOGO /F Makefile.win uninstall
-        shell: cmd
+    - uses: actions/checkout@v2
+    - uses: ankane/setup-postgres@v1
+      with:
+        postgres-version: ${{ matrix.postgres }}
+    - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+      run: sudo apt-get update && sudo apt-get install postgresql-server-dev-${{ matrix.postgres }} libipc-run-perl
+    - run: make
+    - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+      run: |
+        export PG_CONFIG=`which pg_config`
+        sudo --preserve-env=PG_CONFIG make install
+    - if: ${{ startsWith(matrix.os, 'macos') }}
+      run: make install
+    - run: make installcheck
+    - if: ${{ failure() }}
+      run: cat regression.diffs
+    - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+      run: make prove_installcheck
+    - if: ${{ startsWith(matrix.os, 'macos') }}
+      run: |
+        brew install cpanm && cpanm IPC::Run
+        wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_1.tar.gz
+        tar xf REL_14_1.tar.gz
+        make prove_installcheck PROVE=prove PERL5LIB=postgres-REL_14_1/src/test/perl
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,3 @@
 regression.*
 *.o
 *.so
-*.bc
-*.dll
-*.obj
-*.lib
-*.exp
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,42 +1,6 @@
-## 0.4.1 (unreleased)
-
- Added `random_vector` function
-
-## 0.4.0 (2023-01-11)
-
-If upgrading with Postgres < 13, see [this note](https://github.com/pgvector/pgvector#040).
-
- Changed text representation for vector elements to match `real`
- Changed storage for vector from `plain` to `extended`
- Increased max dimensions for vector from 1024 to 16000
- Increased max dimensions for index from 1024 to 2000
- Improved accuracy of text parsing for certain inputs
- Added `avg` aggregate for vector
- Added experimental support for Windows
- Dropped support for Postgres 10
-
-## 0.3.2 (2022-11-22)
-
- Fixed `invalid memory alloc request size` error
-
-## 0.3.1 (2022-11-02)
-
-If upgrading from 0.2.7 or 0.3.0, [recreate](https://github.com/pgvector/pgvector#031) all `ivfflat` indexes after upgrading to ensure all data is indexed.
-
- Fixed issue with inserts silently corrupting `ivfflat` indexes (introduced in 0.2.7)
- Fixed segmentation fault with index creation when lists > 6500
-
-## 0.3.0 (2022-10-15)
-
- Added support for Postgres 15
- Dropped support for Postgres 9.6
-
-## 0.2.7 (2022-07-31)
-
- Fixed `unexpected data beyond EOF` error
-
-## 0.2.6 (2022-05-22)
+## 0.2.6 (unreleased)

+- Significantly improved index query performance
 - Improved performance of index creation for Postgres < 12

 ## 0.2.5 (2022-02-11)
--- a/6
+++ b/6
@@ -1,9 +1,9 @@
-FROM postgres:15
+FROM postgres:14

 COPY . /tmp/pgvector

 RUN apt-get update && \
-		apt-get install -y --no-install-recommends build-essential postgresql-server-dev-15 && \
+		apt-get install -y --no-install-recommends build-essential postgresql-server-dev-14 && \
 		cd /tmp/pgvector && \
 		make clean && \
 		make OPTFLAGS="" && \
@@ -11,6 +11,6 @@ RUN apt-get update && \
 		mkdir /usr/share/doc/pgvector && \
 		cp LICENSE README.md /usr/share/doc/pgvector && \
 		rm -r /tmp/pgvector && \
-		apt-get remove -y build-essential postgresql-server-dev-15 && \
+		apt-get remove -y build-essential postgresql-server-dev-14 && \
 		apt-get autoremove -y && \
 		rm -rf /var/lib/apt/lists/*
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2021, 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.4.0",
+	"version": "0.2.5",
 	"maintainer": [
 		"Andrew Kane <andrew@ankane.org>"
 	],
@@ -12,7 +12,7 @@
 	"prereqs": {
 		"runtime": {
 			"requires": {
-				"PostgreSQL": "11.0.0"
+				"PostgreSQL": "9.6.0"
 			}
 		}
 	},
@@ -20,7 +20,7 @@
 		"vector": {
 			"file": "sql/vector.sql",
 			"docfile": "README.md",
-			"version": "0.4.0",
+			"version": "0.2.5",
 			"abstract": "Open-source vector similarity search for Postgres"
 		}
 	},
--- a/12
+++ b/12
@@ -1,5 +1,5 @@
 EXTENSION = vector
-EXTVERSION = 0.4.0
+EXTVERSION = 0.2.5

 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)
@@ -7,7 +7,7 @@ OBJS = src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.

 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
-REGRESS_OPTS = --inputdir=test --load-extension=vector
+REGRESS_OPTS = --inputdir=test

 OPTFLAGS = -march=native

@@ -40,14 +40,6 @@ PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

-# for Mac
-ifeq ($(PROVE),)
-	PROVE = prove
-endif
-
-# for Postgres 15
-PROVE_FLAGS += -I ./test/perl
-
 prove_installcheck:
 	rm -rf $(CURDIR)/tmp_check
 	cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),test/t/*.pl)
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,70 +0,0 @@
-EXTENSION = vector
-EXTVERSION = 0.4.0
-
-OBJS = src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
-
-REGRESS = btree cast copy functions input ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged
-REGRESS_OPTS = --inputdir=test --load-extension=vector
-
-# For /arch flags
-# https://learn.microsoft.com/en-us/cpp/build/reference/arch-minimum-cpu-architecture
-OPTFLAGS =
-
-# For auto-vectorization:
-# - MSVC (needs /O2 /fp:fast) - https://learn.microsoft.com/en-us/cpp/parallel/auto-parallelization-and-auto-vectorization?#auto-vectorizer
-PG_CFLAGS = $(PG_CFLAGS) $(OPTFLAGS) /O2 /fp:fast
-
-# Debug MSVC auto-vectorization
-# https://learn.microsoft.com/en-us/cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
-# PG_CFLAGS = $(PG_CFLAGS) /Qvec-report:2
-
-all: sql\$(EXTENSION)--$(EXTVERSION).sql
-
-sql\$(EXTENSION)--$(EXTVERSION).sql: sql\$(EXTENSION).sql
-	copy sql\$(EXTENSION).sql $@
-
-# TODO use pg_config
-!ifndef PGROOT
-!error PGROOT is not set
-!endif
-BINDIR = $(PGROOT)\bin
-INCLUDEDIR = $(PGROOT)\include
-INCLUDEDIR_SERVER = $(PGROOT)\include\server
-LIBDIR = $(PGROOT)\lib
-PKGLIBDIR = $(PGROOT)\lib
-SHAREDIR = $(PGROOT)\share
-
-CFLAGS = /nologo /I"$(INCLUDEDIR_SERVER)\port\win32_msvc" /I"$(INCLUDEDIR_SERVER)\port\win32" /I"$(INCLUDEDIR_SERVER)" /I"$(INCLUDEDIR)"
-
-CFLAGS = $(CFLAGS) $(PG_CFLAGS)
-
-SHLIB = $(EXTENSION).dll
-
-LIBS = "$(LIBDIR)\postgres.lib"
-
-.c.obj:
-	$(CC) $(CFLAGS) /c $< /Fo$@
-
-$(SHLIB): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) /link /DLL /OUT:$(SHLIB)
-
-all: $(SHLIB)
-
-install:
-	copy $(SHLIB) "$(PKGLIBDIR)"
-	copy $(EXTENSION).control "$(SHAREDIR)\extension"
-	copy sql\$(EXTENSION)--*.sql "$(SHAREDIR)\extension"
-
-installcheck:
-	"$(BINDIR)\pg_regress" --bindir="$(BINDIR)" $(REGRESS_OPTS) $(REGRESS)
-
-uninstall:
-	del /f "$(PKGLIBDIR)\$(SHLIB)"
-	del /f "$(SHAREDIR)\extension\$(EXTENSION).control"
-	del /f "$(SHAREDIR)\extension\vector--*.sql"
-
-clean:
-	del /f $(SHLIB) $(EXTENSION).lib $(EXTENSION).exp
-	del /f $(OBJS)
-	del /f sql\$(EXTENSION)--$(EXTVERSION).sql
-	del /f /s /q results regression.diffs regression.out tmp_check tmp_check_iso log output_iso
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
 Open-source vector similarity search for Postgres

 ```sql
-CREATE TABLE items (embedding vector(3));
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops);
-SELECT * FROM items ORDER BY embedding <-> '[1,2,3]' LIMIT 5;
+CREATE TABLE table (column vector(3));
+CREATE INDEX ON table USING ivfflat (column vector_l2_ops);
+SELECT * FROM table ORDER BY column <-> '[1,2,3]' LIMIT 5;
 ```

 Supports L2 distance, inner product, and cosine distance
@@ -14,10 +14,10 @@ Supports L2 distance, inner product, and cosine distance

 ## Installation

-Compile and install the extension (supports Postgres 11+)
+Compile and install the extension (supports Postgres 9.6+)

 ```sh
-git clone --branch v0.4.0 https://github.com/pgvector/pgvector.git
+git clone --branch v0.2.5 https://github.com/pgvector/pgvector.git
 cd pgvector
 make
 make install # may need sudo
@@ -29,26 +29,26 @@ Then load it in databases where you want to use it
 CREATE EXTENSION vector;
 ```

-You can also install it with [Docker](#docker), [Homebrew](#homebrew), [PGXN](#pgxn), or [conda-forge](#conda-forge)
+You can also install it with [Docker](#docker), [Homebrew](#homebrew), or [PGXN](#pgxn)

 ## Getting Started

-Create a vector column with 3 dimensions
+Create a vector column with 3 dimensions (replace `table` and `column` with non-reserved names)

 ```sql
-CREATE TABLE items (embedding vector(3));
+CREATE TABLE table (column vector(3));
 ```

 Insert values

 ```sql
-INSERT INTO items VALUES ('[1,2,3]'), ('[4,5,6]');
+INSERT INTO table VALUES ('[1,2,3]'), ('[4,5,6]');
 ```

 Get the nearest neighbor by L2 distance

 ```sql
-SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 1;
+SELECT * FROM table ORDER BY column <-> '[3,1,2]' LIMIT 1;
 ```

 Also supports inner product (`<#>`) and cosine distance (`<=>`)
@@ -62,29 +62,29 @@ Speed up queries with an approximate index. Add an index for each distance funct
 L2 distance

 ```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops);
+CREATE INDEX ON table USING ivfflat (column vector_l2_ops);
 ```

 Inner product

 ```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_ip_ops);
+CREATE INDEX ON table USING ivfflat (column vector_ip_ops);
 ```

 Cosine distance

 ```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_cosine_ops);
+CREATE INDEX ON table USING ivfflat (column vector_cosine_ops);
 ```

-Indexes should be created after the table has some data for optimal clustering. Also, unlike typical indexes which only affect performance, you may see different results for queries after adding an approximate index. Vectors with up to 2,000 dimensions can be indexed.
+Indexes should be created after the table has some data for optimal clustering. Also, unlike typical indexes which only affect performance, you may see different results for queries after adding an approximate index.

 ### Index Options

 Specify the number of inverted lists (100 by default)

 ```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100);
+CREATE INDEX ON table USING ivfflat (column opclass) WITH (lists = 100);
 ```

 A [good place to start](https://github.com/facebookresearch/faiss/issues/112) is `4 * sqrt(rows)`
@@ -119,9 +119,10 @@ SELECT phase, tuples_done, tuples_total FROM pg_stat_progress_create_index;
 The phases are:

 1. `initializing`
-2. `performing k-means`
-3. `sorting tuples`
-4. `loading tuples`
+2. `sampling table`
+3. `performing k-means`
+4. `sorting tuples`
+5. `loading tuples`

 Note: `tuples_done` and `tuples_total` are only populated during the `loading tuples` phase

@@ -130,20 +131,10 @@ Note: `tuples_done` and `tuples_total` are only populated during the `loading tu
 Consider [partial indexes](https://www.postgresql.org/docs/current/indexes-partial.html) for queries with a `WHERE` clause

 ```sql
-SELECT * FROM items WHERE category_id = 123 ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
+CREATE INDEX ON table USING ivfflat (column opclass) WHERE (other_column = 123);
 ```

-can be indexed with:
-
-```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WHERE (category_id = 123);
-```
-
-To index many different values of `category_id`, consider [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) on `category_id`.
-
-```sql
-CREATE TABLE items (embedding vector(3), category_id int) PARTITION BY LIST(category_id);
-```
+To index many different values of `other_column`, consider [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) on `other_column`.

 ## Performance

@@ -156,14 +147,14 @@ SET max_parallel_workers_per_gather = 4;
 To speed up queries with an index, increase the number of inverted lists (at the expense of recall).

 ```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 1000);
+CREATE INDEX ON table USING ivfflat (column opclass) WITH (lists = 1000);
 ```

 ## Reference

 ### Vector Type

-Each vector takes `4 * dimensions + 8` bytes of storage. Each element is a single precision floating-point number (like the `real` type in Postgres), and all elements must be finite (no `NaN`, `Infinity` or `-Infinity`). Vectors can have up to 16,000 dimensions.
+Each vector takes `4 * dimensions + 8` bytes of storage. Each element is a float, and all elements must be finite (no `NaN`, `Infinity` or `-Infinity`). Vectors can have up to 1024 dimensions.

 ### Vector Operators

@@ -179,31 +170,23 @@ Operator | Description

 Function | Description
 --- | ---
-cosine_distance(vector, vector) → double precision | cosine distance
-inner_product(vector, vector) → double precision | inner product
-l2_distance(vector, vector) → double precision | Euclidean distance
-vector_dims(vector) → integer | number of dimensions
-vector_norm(vector) → double precision | Euclidean norm
-random_vector(integer) → vector | random vector [unreleased]
-
-### Aggregate Functions
-
-Function | Description
--- | ---
-avg(vector) → vector | arithmetic mean
+cosine_distance(vector, vector) | cosine distance
+inner_product(vector, vector) | inner product
+l2_distance(vector, vector) | Euclidean distance
+vector_dims(vector) | number of dimensions
+vector_norm(vector) | Euclidean norm

 ## Libraries

-Language | Libraries
--- | ---
-Python | [pgvector-python](https://github.com/pgvector/pgvector-python)
-Ruby | [Neighbor](https://github.com/ankane/neighbor), [pgvector-ruby](https://github.com/pgvector/pgvector-ruby)
-Node | [pgvector-node](https://github.com/pgvector/pgvector-node)
-Go | [pgvector-go](https://github.com/pgvector/pgvector-go)
-PHP | [pgvector-php](https://github.com/pgvector/pgvector-php)
-Rust | [pgvector-rust](https://github.com/pgvector/pgvector-rust)
-C++ | [pgvector-cpp](https://github.com/pgvector/pgvector-cpp)
-Elixir | [pgvector-elixir](https://github.com/pgvector/pgvector-elixir)
+Libraries that use pgvector:
+
+- [pgvector-python](https://github.com/pgvector/pgvector-python) (Python)
+- [Neighbor](https://github.com/ankane/neighbor) (Ruby)
+- [pgvector-ruby](https://github.com/pgvector/pgvector-ruby) (Ruby)
+- [pgvector-node](https://github.com/pgvector/pgvector-node) (Node.js)
+- [pgvector-go](https://github.com/pgvector/pgvector-go) (Go)
+- [pgvector-rust](https://github.com/pgvector/pgvector-rust) (Rust)
+- [pgvector-cpp](https://github.com/pgvector/pgvector-cpp) (C++)

 ## Frequently Asked Questions

@@ -215,12 +198,12 @@ A non-partitioned table has a limit of 32 TB by default in Postgres. A partition

 Yes, pgvector uses the write-ahead log (WAL), which allows for replication and point-in-time recovery.

-#### What if I want to index vectors with more than 2,000 dimensions?
+#### What if my data has more than 1024 dimensions?

 Two things you can try are:

 1. use dimensionality reduction
-2. compile Postgres with a larger block size (`./configure --with-blocksize=32`) and edit the limit in `src/ivfflat.h`
+2. compile Postgres with a larger block size (`./configure --with-blocksize=32`) and edit the limit in `src/vector.h`

 ## Additional Installation Methods

@@ -237,14 +220,14 @@ This adds pgvector to the [Postgres image](https://hub.docker.com/_/postgres).
 You can also build the image manually

 ```sh
-git clone --branch v0.4.0 https://github.com/pgvector/pgvector.git
+git clone --branch v0.2.5 https://github.com/pgvector/pgvector.git
 cd pgvector
 docker build -t pgvector .
 ```

 ### Homebrew

-With Homebrew Postgres, you can use:
+On Mac with Homebrew Postgres, you can use:

 ```sh
 brew install pgvector/brew/pgvector
@@ -258,24 +241,14 @@ Install from the [PostgreSQL Extension Network](https://pgxn.org/dist/vector) wi
 pgxn install vector
 ```

-### conda-forge
-
-Install from [conda-forge](https://anaconda.org/conda-forge/pgvector) with:
-
-```sh
-conda install -c conda-forge pgvector
-```
-
-This method is [community-maintained](https://github.com/conda-forge/pgvector-feedstock) by [@mmcauliffe](https://github.com/mmcauliffe)
-
 ## Hosted Postgres

 Some Postgres providers only support specific extensions. To request a new extension:

 - Amazon RDS - follow the instructions on [this page](https://aws.amazon.com/rds/postgresql/faqs/)
- Google Cloud SQL - vote or comment on [this page](https://issuetracker.google.com/issues/265172065)
+- Google Cloud SQL - follow the instructions on [this page](https://cloud.google.com/sql/docs/postgres/extensions#requesting-support-for-a-new-extension)
 - DigitalOcean Managed Databases - vote or comment on [this page](https://ideas.digitalocean.com/app-framework-services/p/pgvector-extension-for-postgresql)
- Azure Database for PostgreSQL - vote or comment on [this page](https://feedback.azure.com/d365community/idea/7b423322-6189-ed11-a81b-000d3ae49307)
+- Azure Database for PostgreSQL - follow the instructions on [this page](https://docs.microsoft.com/en-us/azure/postgresql/concepts-extensions#next-steps)

 ## Upgrading

@@ -285,32 +258,6 @@ Install the latest version and run:
 ALTER EXTENSION vector UPDATE;
 ```

-## Upgrade Notes
-
-### 0.4.0
-
-If upgrading with Postgres < 13, remove this line from `sql/vector--0.3.2--0.4.0.sql`:
-
-```sql
-ALTER TYPE vector SET (STORAGE = extended);
-```
-
-Then run `make install` and `ALTER EXTENSION vector UPDATE;`.
-
-### 0.3.1
-
-If upgrading from 0.2.7 or 0.3.0, recreate all `ivfflat` indexes after upgrading to ensure all data is indexed.
-
-```sql
-- Postgres 12+
-REINDEX INDEX CONCURRENTLY index_name;
-
-- Postgres < 12
-CREATE INDEX CONCURRENTLY temp_name ON table USING ivfflat (column opclass);
-DROP INDEX CONCURRENTLY index_name;
-ALTER INDEX temp_name RENAME TO index_name;
-```
-
 ## Thanks

 Thanks to:
--- a/sql/vector--0.2.0--0.2.1.sql
+++ b/sql/vector--0.2.0--0.2.1.sql
@@ -7,13 +7,13 @@ DROP CAST (double precision[] AS vector);
 DROP CAST (numeric[] AS vector);

 CREATE CAST (integer[] AS vector)
-	WITH FUNCTION array_to_vector(integer[], integer, boolean) AS ASSIGNMENT;
+  WITH FUNCTION array_to_vector(integer[], integer, boolean) AS ASSIGNMENT;

 CREATE CAST (real[] AS vector)
-	WITH FUNCTION array_to_vector(real[], integer, boolean) AS ASSIGNMENT;
+  WITH FUNCTION array_to_vector(real[], integer, boolean) AS ASSIGNMENT;

 CREATE CAST (double precision[] AS vector)
-	WITH FUNCTION array_to_vector(double precision[], integer, boolean) AS ASSIGNMENT;
+  WITH FUNCTION array_to_vector(double precision[], integer, boolean) AS ASSIGNMENT;

 CREATE CAST (numeric[] AS vector)
-	WITH FUNCTION array_to_vector(numeric[], integer, boolean) AS ASSIGNMENT;
+  WITH FUNCTION array_to_vector(numeric[], integer, boolean) AS ASSIGNMENT;
--- a/sql/vector--0.2.5--0.2.6.sql
+++ b/sql/vector--0.2.5--0.2.6.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.2.6'" to load this file. \quit
--- a/sql/vector--0.2.6--0.2.7.sql
+++ b/sql/vector--0.2.6--0.2.7.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.2.7'" to load this file. \quit
--- a/sql/vector--0.2.7--0.3.0.sql
+++ b/sql/vector--0.2.7--0.3.0.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.3.0'" to load this file. \quit
--- a/sql/vector--0.3.0--0.3.1.sql
+++ b/sql/vector--0.3.0--0.3.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.3.1'" to load this file. \quit
--- a/sql/vector--0.3.1--0.3.2.sql
+++ b/sql/vector--0.3.1--0.3.2.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.3.2'" to load this file. \quit
--- a/sql/vector--0.3.2--0.4.0.sql
+++ b/sql/vector--0.3.2--0.4.0.sql
@@ -1,23 +0,0 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.4.0'" to load this file. \quit
-
-- remove this single line for Postgres < 13
-ALTER TYPE vector SET (STORAGE = extended);
-
-CREATE FUNCTION vector_accum(double precision[], vector) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_avg(double precision[]) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_combine(double precision[], double precision[]) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE AGGREGATE avg(vector) (
-	SFUNC = vector_accum,
-	STYPE = double precision[],
-	FINALFUNC = vector_avg,
-	COMBINEFUNC = vector_combine,
-	INITCOND = '{0}',
-	PARALLEL = SAFE
-);
--- a/sql/vector--0.4.0--0.4.1.sql
+++ b/sql/vector--0.4.0--0.4.1.sql
@@ -1,5 +0,0 @@
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "ALTER EXTENSION vector UPDATE TO '0.4.1'" to load this file. \quit
-
-CREATE FUNCTION random_vector(integer) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C VOLATILE STRICT PARALLEL SAFE;
--- a/sql/vector.sql
+++ b/sql/vector.sql
@@ -25,8 +25,7 @@ CREATE TYPE vector (
 	OUTPUT    = vector_out,
 	TYPMOD_IN = vector_typmod_in,
 	RECEIVE   = vector_recv,
-	SEND      = vector_send,
-	STORAGE   = extended
+	SEND      = vector_send
 );

 -- functions
@@ -52,9 +51,6 @@ CREATE FUNCTION vector_add(vector, vector) RETURNS vector
 CREATE FUNCTION vector_sub(vector, vector) RETURNS vector
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

-CREATE FUNCTION random_vector(integer) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C VOLATILE STRICT PARALLEL SAFE;
-
 -- private functions

 CREATE FUNCTION vector_lt(vector, vector) RETURNS bool
@@ -87,26 +83,6 @@ CREATE FUNCTION vector_negative_inner_product(vector, vector) RETURNS float8
 CREATE FUNCTION vector_spherical_distance(vector, vector) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

-CREATE FUNCTION vector_accum(double precision[], vector) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_avg(double precision[]) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_combine(double precision[], double precision[]) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-- aggregates
-
-CREATE AGGREGATE avg(vector) (
-	SFUNC = vector_accum,
-	STYPE = double precision[],
-	FINALFUNC = vector_avg,
-	COMBINEFUNC = vector_combine,
-	INITCOND = '{0}',
-	PARALLEL = SAFE
-);
-
 -- cast functions

 CREATE FUNCTION vector(vector, integer, boolean) RETURNS vector
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -6,7 +6,6 @@
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
-#include "utils/memutils.h"

 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_progress.h"
@@ -23,8 +22,13 @@
 #define PROGRESS_CREATEIDX_TUPLES_DONE 0
 #endif

+#if PG_VERSION_NUM >= 110000
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
+#else
+#include "catalog/pg_operator.h"
+#include "catalog/pg_type.h"
+#endif

 #if PG_VERSION_NUM >= 130000
 #define CALLBACK_ITEM_POINTER ItemPointer tid
@@ -39,16 +43,20 @@
 #endif

 /*
- * Add sample
+ * Callback for sampling
 */
 static void
-AddSample(Datum *values, IvfflatBuildState * buildstate)
+SampleCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
+			   bool *isnull, bool tupleIsAlive, void *state)
 {
+	IvfflatBuildState *buildstate = (IvfflatBuildState *) state;
 	VectorArray samples = buildstate->samples;
 	int			targsamples = samples->maxlen;
+	Datum		value = values[0];

-	/* Detoast once for all calls */
-	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
+	/* Skip nulls */
+	if (isnull[0])
+		return;

 	/*
 	 * Normalize with KMEANS_NORM_PROC since spherical distance function
@@ -72,11 +80,7 @@ AddSample(Datum *values, IvfflatBuildState * buildstate)

 		if (buildstate->rowstoskip <= 0)
 		{
-#if PG_VERSION_NUM >= 150000
-			int			k = (int) (targsamples * sampler_random_fract(&buildstate->rstate.randstate));
-#else
 			int			k = (int) (targsamples * sampler_random_fract(buildstate->rstate.randstate));
-#endif

 			Assert(k >= 0 && k < targsamples);
 			VectorArraySet(samples, k, DatumGetVector(value));
@@ -86,31 +90,6 @@ AddSample(Datum *values, IvfflatBuildState * buildstate)
 	}
 }

-/*
- * Callback for sampling
- */
-static void
-SampleCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
-			   bool *isnull, bool tupleIsAlive, void *state)
-{
-	IvfflatBuildState *buildstate = (IvfflatBuildState *) state;
-	MemoryContext oldCtx;
-
-	/* Skip nulls */
-	if (isnull[0])
-		return;
-
-	/* Use memory context since detoast can allocate */
-	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
-
-	/* Add sample */
-	AddSample(values, state);
-
-	/* Reset memory context */
-	MemoryContextSwitchTo(oldCtx);
-	MemoryContextReset(buildstate->tmpCtx);
-}
-
 /*
 * Sample rows with same logic as ANALYZE
 */
@@ -120,9 +99,11 @@ SampleRows(IvfflatBuildState * buildstate)
 	int			targsamples = buildstate->samples->maxlen;
 	BlockNumber totalblocks = RelationGetNumberOfBlocks(buildstate->heap);

+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_SAMPLE);
+
 	buildstate->rowstoskip = -1;

-	BlockSampler_Init(&buildstate->bs, totalblocks, targsamples, RandomInt());
+	BlockSampler_Init(&buildstate->bs, totalblocks, targsamples, random());

 	reservoir_init_selection_state(&buildstate->rstate, targsamples);
 	while (BlockSampler_HasMore(&buildstate->bs))
@@ -132,28 +113,38 @@ SampleRows(IvfflatBuildState * buildstate)
 #if PG_VERSION_NUM >= 120000
 		table_index_build_range_scan(buildstate->heap, buildstate->index, buildstate->indexInfo,
 									 false, true, false, targblock, 1, SampleCallback, (void *) buildstate, NULL);
-#else
+#elif PG_VERSION_NUM >= 110000
 		IndexBuildHeapRangeScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
 								false, true, targblock, 1, SampleCallback, (void *) buildstate, NULL);
+#else
+		IndexBuildHeapRangeScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
+								false, true, targblock, 1, SampleCallback, (void *) buildstate);
 #endif
 	}
 }

 /*
- * Add tuple to sort
+ * Callback for table_index_build_scan
 */
 static void
-AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState * buildstate)
+BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
+			  bool *isnull, bool tupleIsAlive, void *state)
 {
+	IvfflatBuildState *buildstate = (IvfflatBuildState *) state;
 	double		distance;
 	double		minDistance = DBL_MAX;
 	int			closestCenter = -1;
 	VectorArray centers = buildstate->centers;
 	TupleTableSlot *slot = buildstate->slot;
+	Datum		value = values[0];
 	int			i;

-	/* Detoast once for all calls */
-	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
+#if PG_VERSION_NUM < 130000
+	ItemPointer tid = &hup->t_self;
+#endif
+
+	if (isnull[0])
+		return;

 	/* Normalize if needed */
 	if (buildstate->normprocinfo != NULL)
@@ -201,35 +192,6 @@ AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState
 	buildstate->indtuples++;
 }

-/*
- * Callback for table_index_build_scan
- */
-static void
-BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
-			  bool *isnull, bool tupleIsAlive, void *state)
-{
-	IvfflatBuildState *buildstate = (IvfflatBuildState *) state;
-	MemoryContext oldCtx;
-
-#if PG_VERSION_NUM < 130000
-	ItemPointer tid = &hup->t_self;
-#endif
-
-	/* Skip nulls */
-	if (isnull[0])
-		return;
-
-	/* Use memory context since detoast can allocate */
-	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
-
-	/* Add tuple to sort */
-	AddTupleToSort(index, tid, values, buildstate);
-
-	/* Reset memory context */
-	MemoryContextSwitchTo(oldCtx);
-	MemoryContextReset(buildstate->tmpCtx);
-}
-
 /*
 * Get index tuple from sort state
 */
@@ -239,7 +201,11 @@ GetNextTuple(Tuplesortstate *sortstate, TupleDesc tupdesc, TupleTableSlot *slot,
 	Datum		value;
 	bool		isnull;

+#if PG_VERSION_NUM >= 100000
 	if (tuplesort_gettupleslot(sortstate, true, false, slot, NULL))
+#else
+	if (tuplesort_gettupleslot(sortstate, true, slot, NULL))
+#endif
 	{
 		*list = DatumGetInt32(slot_getattr(slot, 1, &isnull));
 		value = slot_getattr(slot, 3, &isnull);
@@ -263,8 +229,8 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 	GenericXLogState *state;
 	int			list;
 	IndexTuple	itup = NULL;	/* silence compiler warning */
-	BlockNumber startPage;
-	BlockNumber insertPage;
+	BlockNumber startPage = InvalidBlockNumber;
+	BlockNumber insertPage = InvalidBlockNumber;
 	Size		itemsz;
 	int			i;
 	int64		inserted = 0;
@@ -289,7 +255,7 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 		CHECK_FOR_INTERRUPTS();

 		buf = IvfflatNewBuffer(index, forkNum);
-		IvfflatInitRegisterPage(index, &buf, &page, &state);
+		IvfflatInitPage(index, &buf, &page, &state);

 		startPage = BufferGetBlockNumber(buf);

@@ -338,9 +304,6 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 	if (buildstate->dimensions < 0)
 		elog(ERROR, "column does not have dimensions");

-	if (buildstate->dimensions > IVFFLAT_MAX_DIM)
-		elog(ERROR, "column cannot have more than %d dimensions for ivfflat index", IVFFLAT_MAX_DIM);
-
 	buildstate->reltuples = 0;
 	buildstate->indtuples = 0;

@@ -364,7 +327,11 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 #endif
 	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 1, "list", INT4OID, -1, 0);
 	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
+#if PG_VERSION_NUM >= 110000
 	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 3, "vector", RelationGetDescr(index)->attrs[0].atttypid, -1, 0);
+#else
+	TupleDescInitEntry(buildstate->tupdesc, (AttrNumber) 3, "vector", RelationGetDescr(index)->attrs[0]->atttypid, -1, 0);
+#endif

 #if PG_VERSION_NUM >= 120000
 	buildstate->slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsVirtual);
@@ -378,10 +345,6 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 	/* Reuse for each tuple */
 	buildstate->normvec = InitVector(buildstate->dimensions);

-	buildstate->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
-											   "Ivfflat build temporary context",
-											   ALLOCSET_DEFAULT_SIZES);
-
 #ifdef IVFFLAT_KMEANS_DEBUG
 	buildstate->inertia = 0;
 	buildstate->listSums = palloc0(sizeof(double) * buildstate->lists);
@@ -395,7 +358,7 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 static void
 FreeBuildState(IvfflatBuildState * buildstate)
 {
-	VectorArrayFree(buildstate->centers);
+	pfree(buildstate->centers);
 	pfree(buildstate->listInfo);
 	pfree(buildstate->normvec);

@@ -403,8 +366,6 @@ FreeBuildState(IvfflatBuildState * buildstate)
 	pfree(buildstate->listSums);
 	pfree(buildstate->listCounts);
 #endif
-
-	MemoryContextDelete(buildstate->tmpCtx);
 }

 /*
@@ -415,8 +376,6 @@ ComputeCenters(IvfflatBuildState * buildstate)
 {
 	int			numSamples;

-	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS);
-
 	/* Target 50 samples per list, with at least 10000 samples */
 	/* The number of samples has a large effect on index build time */
 	numSamples = buildstate->lists * 50;
@@ -434,10 +393,11 @@ ComputeCenters(IvfflatBuildState * buildstate)
 		SampleRows(buildstate);

 	/* Calculate centers */
+	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_KMEANS);
 	IvfflatBench("k-means", IvfflatKmeans(buildstate->index, buildstate->samples, buildstate->centers));

 	/* Free samples before we allocate more memory */
-	VectorArrayFree(buildstate->samples);
+	pfree(buildstate->samples);
 }

 /*
@@ -452,7 +412,7 @@ CreateMetaPage(Relation index, int dimensions, int lists, ForkNumber forkNum)
 	IvfflatMetaPage metap;

 	buf = IvfflatNewBuffer(index, forkNum);
-	IvfflatInitRegisterPage(index, &buf, &page, &state);
+	IvfflatInitPage(index, &buf, &page, &state);

 	/* Set metapage data */
 	metap = IvfflatPageGetMeta(page);
@@ -485,7 +445,7 @@ CreateListPages(Relation index, VectorArray centers, int dimensions,
 	list = palloc(itemsz);

 	buf = IvfflatNewBuffer(index, forkNum);
-	IvfflatInitRegisterPage(index, &buf, &page, &state);
+	IvfflatInitPage(index, &buf, &page, &state);

 	for (i = 0; i < lists; i++)
 	{
@@ -571,7 +531,11 @@ CreateEntryPages(IvfflatBuildState * buildstate, ForkNumber forkNum)

 	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_SORT);

+#if PG_VERSION_NUM >= 110000
 	buildstate->sortstate = tuplesort_begin_heap(buildstate->tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, maintenance_work_mem, NULL, false);
+#else
+	buildstate->sortstate = tuplesort_begin_heap(buildstate->tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, maintenance_work_mem, false);
+#endif

 	/* Add tuples to sort */
 	if (buildstate->heap != NULL)
@@ -579,9 +543,12 @@ CreateEntryPages(IvfflatBuildState * buildstate, ForkNumber forkNum)
 #if PG_VERSION_NUM >= 120000
 		buildstate->reltuples = table_index_build_scan(buildstate->heap, buildstate->index, buildstate->indexInfo,
 													   true, true, BuildCallback, (void *) buildstate, NULL);
-#else
+#elif PG_VERSION_NUM >= 110000
 		buildstate->reltuples = IndexBuildHeapScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
 												   true, BuildCallback, (void *) buildstate, NULL);
+#else
+		buildstate->reltuples = IndexBuildHeapScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
+												   true, BuildCallback, (void *) buildstate);
 #endif
 	}

--- a/src/ivfflat.c
+++ b/src/ivfflat.c
@@ -45,6 +45,8 @@ ivfflatbuildphasename(int64 phasenum)
 	{
 		case PROGRESS_CREATEIDX_SUBPHASE_INITIALIZE:
 			return "initializing";
+		case PROGRESS_IVFFLAT_PHASE_SAMPLE:
+			return "sampling table";
 		case PROGRESS_IVFFLAT_PHASE_KMEANS:
 			return "performing k-means";
 		case PROGRESS_IVFFLAT_PHASE_SORT:
@@ -64,7 +66,9 @@ static void
 ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 					Cost *indexStartupCost, Cost *indexTotalCost,
 					Selectivity *indexSelectivity, double *indexCorrelation
+#if PG_VERSION_NUM >= 100000
 					,double *indexPages
+#endif
 )
 {
 	GenericCosts costs;
@@ -82,7 +86,9 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 		*indexTotalCost = DBL_MAX;
 		*indexSelectivity = 0;
 		*indexCorrelation = 0;
+#if PG_VERSION_NUM >= 100000
 		*indexPages = 0;
+#endif
 		return;
 	}

@@ -110,7 +116,9 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	*indexTotalCost = costs.indexTotalCost;
 	*indexSelectivity = costs.indexSelectivity;
 	*indexCorrelation = costs.indexCorrelation;
+#if PG_VERSION_NUM >= 100000
 	*indexPages = costs.numIndexPages;
+#endif
 }

 /*
@@ -156,7 +164,7 @@ ivfflatvalidate(Oid opclassoid)
 *
 * See https://www.postgresql.org/docs/current/index-api.html
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(ivfflathandler);
+PG_FUNCTION_INFO_V1(ivfflathandler);
 Datum
 ivfflathandler(PG_FUNCTION_ARGS)
 {
@@ -178,8 +186,12 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->amstorage = false;
 	amroutine->amclusterable = false;
 	amroutine->ampredlocks = false;
+#if PG_VERSION_NUM >= 100000
 	amroutine->amcanparallel = false;
+#endif
+#if PG_VERSION_NUM >= 110000
 	amroutine->amcaninclude = false;
+#endif
 #if PG_VERSION_NUM >= 130000
 	amroutine->amusemaintenanceworkmem = false; /* not used during VACUUM */
 	amroutine->amparallelvacuumoptions = VACUUM_OPTION_PARALLEL_BULKDEL;
@@ -212,9 +224,11 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->amrestrpos = NULL;

 	/* Interface functions to support parallel index scans */
+#if PG_VERSION_NUM >= 100000
 	amroutine->amestimateparallelscan = NULL;
 	amroutine->aminitparallelscan = NULL;
 	amroutine->amparallelrescan = NULL;
+#endif

 	PG_RETURN_POINTER(amroutine);
 }
--- a/src/ivfflat.h
+++ b/src/ivfflat.h
@@ -3,10 +3,6 @@

 #include "postgres.h"

-#if PG_VERSION_NUM < 110000
-#error "Requires PostgreSQL 11+"
-#endif
-
 #include "access/generic_xlog.h"
 #include "access/reloptions.h"
 #include "nodes/execnodes.h"
@@ -18,7 +14,9 @@
 #include "portability/instr_time.h"
 #endif

-#define IVFFLAT_MAX_DIM 2000
+#if PG_VERSION_NUM < 90600
+#error "Requires PostgreSQL 9.6+"
+#endif

 /* Support functions */
 #define IVFFLAT_DISTANCE_PROC 1
@@ -39,9 +37,10 @@

 /* Build phases */
 /* PROGRESS_CREATEIDX_SUBPHASE_INITIALIZE is 1 */
-#define PROGRESS_IVFFLAT_PHASE_KMEANS	2
-#define PROGRESS_IVFFLAT_PHASE_SORT		3
-#define PROGRESS_IVFFLAT_PHASE_LOAD		4
+#define PROGRESS_IVFFLAT_PHASE_SAMPLE	2
+#define PROGRESS_IVFFLAT_PHASE_KMEANS	3
+#define PROGRESS_IVFFLAT_PHASE_SORT		4
+#define PROGRESS_IVFFLAT_PHASE_LOAD		5

 #define IVFFLAT_LIST_SIZE(_dim)	(offsetof(IvfflatListData, center) + VECTOR_SIZE(_dim))

@@ -66,15 +65,12 @@
 /* Variables */
 extern int	ivfflat_probes;

-/* Exported functions */
-PGDLLEXPORT void _PG_init(void);
-
 typedef struct VectorArrayData
 {
 	int			length;
 	int			maxlen;
 	int			dim;
-	Vector	   *items;
+	Vector		items[FLEXIBLE_ARRAY_MEMBER];
 }			VectorArrayData;

 typedef VectorArrayData * VectorArray;
@@ -134,9 +130,6 @@ typedef struct IvfflatBuildState
 	Tuplesortstate *sortstate;
 	TupleDesc	tupdesc;
 	TupleTableSlot *slot;
-
-	/* Memory */
-	MemoryContext tmpCtx;
 }			IvfflatBuildState;

 typedef struct IvfflatMetaPageData
@@ -174,12 +167,28 @@ typedef struct IvfflatScanList
 	double		distance;
 }			IvfflatScanList;

+typedef struct IvfflatScanItem
+{
+	pairingheap_node ph_node;
+	BlockNumber searchPage;
+	double		distance;
+	ItemPointerData tid;
+}			IvfflatScanItem;
+
 typedef struct IvfflatScanOpaqueData
 {
 	int			probes;
-	bool		first;
+	int			stage;
 	Buffer		buf;

+	/* Items */
+	int			maxItems;
+	int			itemCount;
+	pairingheap *itemQueue;
+	IvfflatScanItem *items;
+	IvfflatScanItem **sortedItems;
+	bool		heapFull;
+
 	/* Sorting */
 	Tuplesortstate *sortstate;
 	TupleDesc	tupdesc;
@@ -193,19 +202,20 @@ typedef struct IvfflatScanOpaqueData

 	/* Lists */
 	pairingheap *listQueue;
+	IvfflatScanList **sortedLists;
 	IvfflatScanList lists[FLEXIBLE_ARRAY_MEMBER];	/* must come last */
 }			IvfflatScanOpaqueData;

 typedef IvfflatScanOpaqueData * IvfflatScanOpaque;

-#define VECTOR_ARRAY_SIZE(_length, _dim) (sizeof(VectorArrayData) + (_length) * VECTOR_SIZE(_dim))
-#define VECTOR_ARRAY_OFFSET(_arr, _offset) ((char*) (_arr)->items + (_offset) * VECTOR_SIZE((_arr)->dim))
+#define VECTOR_ARRAY_SIZE(_length, _dim) (offsetof(VectorArrayData, items) + _length * VECTOR_SIZE(_dim))
+#define VECTOR_ARRAY_OFFSET(_arr, _offset) ((char*) _arr + offsetof(VectorArrayData, items) + (_offset) * VECTOR_SIZE(_arr->dim))
 #define VectorArrayGet(_arr, _offset) ((Vector *) VECTOR_ARRAY_OFFSET(_arr, _offset))
-#define VectorArraySet(_arr, _offset, _val) memcpy(VECTOR_ARRAY_OFFSET(_arr, _offset), _val, VECTOR_SIZE((_arr)->dim))
+#define VectorArraySet(_arr, _offset, _val) (memcpy(VECTOR_ARRAY_OFFSET(_arr, _offset), _val, VECTOR_SIZE(_arr->dim)))

 /* Methods */
+void		_PG_init(void);
 VectorArray VectorArrayInit(int maxlen, int dimensions);
-void		VectorArrayFree(VectorArray arr);
 void		PrintVectorArray(char *msg, VectorArray arr);
 void		IvfflatKmeans(Relation index, VectorArray samples, VectorArray centers);
 FmgrInfo   *IvfflatOptionalProcInfo(Relation rel, uint16 procnum);
@@ -215,8 +225,7 @@ void		IvfflatUpdateList(Relation index, GenericXLogState *state, ListInfo listIn
 void		IvfflatCommitBuffer(Buffer buf, GenericXLogState *state);
 void		IvfflatAppendPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, ForkNumber forkNum);
 Buffer		IvfflatNewBuffer(Relation index, ForkNumber forkNum);
-void		IvfflatInitPage(Buffer buf, Page page);
-void		IvfflatInitRegisterPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state);
+void		IvfflatInitPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state);

 /* Index access methods */
 IndexBuildResult *ivfflatbuild(Relation heap, Relation index, IndexInfo *indexInfo);
@@ -225,7 +234,9 @@ bool		ivfflatinsert(Relation index, Datum *values, bool *isnull, ItemPointer hea
 #if PG_VERSION_NUM >= 140000
 						  ,bool indexUnchanged
 #endif
+#if PG_VERSION_NUM >= 100000
 						  ,IndexInfo *indexInfo
+#endif
 );
 IndexBulkDeleteResult *ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats, IndexBulkDeleteCallback callback, void *callback_state);
 IndexBulkDeleteResult *ivfflatvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats);
--- a/src/ivfinsert.c
+++ b/src/ivfinsert.c
@@ -4,7 +4,6 @@

 #include "ivfflat.h"
 #include "storage/bufmgr.h"
-#include "utils/memutils.h"

 /*
 * Find the list that minimizes the distance function
@@ -54,15 +53,24 @@ FindInsertPage(Relation rel, Datum *values, BlockNumber *insertPage, ListInfo *
 	}
 }

+/*
+ * Prepare to insert an index tuple
+ */
+static void
+LoadInsertPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, BlockNumber insertPage)
+{
+	*buf = ReadBuffer(index, insertPage);
+	LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE);
+	*state = GenericXLogStart(index);
+	*page = GenericXLogRegisterBuffer(*state, *buf, 0);
+}
+
 /*
 * Insert a tuple into the index
 */
 static void
-InsertTuple(Relation rel, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel)
+InsertTuple(Relation rel, IndexTuple itup, Relation heapRel, Datum *values)
 {
-	IndexTuple	itup;
-	Datum		value;
-	FmgrInfo   *normprocinfo;
 	Buffer		buf;
 	Page		page;
 	GenericXLogState *state;
@@ -71,42 +79,19 @@ InsertTuple(Relation rel, Datum *values, bool *isnull, ItemPointer heap_tid, Rel
 	ListInfo	listInfo;
 	BlockNumber originalInsertPage;

-	/* Detoast once for all calls */
-	value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
-
-	/* Normalize if needed */
-	normprocinfo = IvfflatOptionalProcInfo(rel, IVFFLAT_NORM_PROC);
-	if (normprocinfo != NULL)
-	{
-		if (!IvfflatNormValue(normprocinfo, rel->rd_indcollation[0], &value, NULL))
-			return;
-	}
-
 	/* Find the insert page - sets the page and list info */
 	FindInsertPage(rel, values, &insertPage, &listInfo);
 	Assert(BlockNumberIsValid(insertPage));
 	originalInsertPage = insertPage;

-	/* Form tuple */
-	itup = index_form_tuple(RelationGetDescr(rel), &value, isnull);
-	itup->t_tid = *heap_tid;
-
-	/* Get tuple size */
 	itemsz = MAXALIGN(IndexTupleSize(itup));
 	Assert(itemsz <= BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(IvfflatPageOpaqueData)));

+	LoadInsertPage(rel, &buf, &page, &state, insertPage);
+
 	/* Find a page to insert the item */
-	for (;;)
+	while (PageGetFreeSpace(page) < itemsz)
 	{
-		buf = ReadBuffer(rel, insertPage);
-		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-
-		state = GenericXLogStart(rel);
-		page = GenericXLogRegisterBuffer(state, buf, 0);
-
-		if (PageGetFreeSpace(page) >= itemsz)
-			break;
-
 		insertPage = IvfflatPageGetOpaque(page)->nextblkno;

 		if (BlockNumberIsValid(insertPage))
@@ -114,50 +99,15 @@ InsertTuple(Relation rel, Datum *values, bool *isnull, ItemPointer heap_tid, Rel
 			/* Move to next page */
 			GenericXLogAbort(state);
 			UnlockReleaseBuffer(buf);
+
+			LoadInsertPage(rel, &buf, &page, &state, insertPage);
 		}
 		else
 		{
-			Buffer		metabuf;
-			Buffer		newbuf;
-			Page		newpage;
-
-			/*
-			 * From ReadBufferExtended: Caller is responsible for ensuring
-			 * that only one backend tries to extend a relation at the same
-			 * time!
-			 */
-			metabuf = ReadBuffer(rel, IVFFLAT_METAPAGE_BLKNO);
-			LockBuffer(metabuf, BUFFER_LOCK_EXCLUSIVE);
-
 			/* Add a new page */
-			newbuf = IvfflatNewBuffer(rel, MAIN_FORKNUM);
-			newpage = GenericXLogRegisterBuffer(state, newbuf, GENERIC_XLOG_FULL_IMAGE);
+			IvfflatAppendPage(rel, &buf, &page, &state, MAIN_FORKNUM);

-			/* Init new page */
-			IvfflatInitPage(newbuf, newpage);
-
-			/* Update insert page */
-			insertPage = BufferGetBlockNumber(newbuf);
-
-			/* Update previous buffer */
-			IvfflatPageGetOpaque(page)->nextblkno = insertPage;
-
-			/* Commit */
-			MarkBufferDirty(newbuf);
-			MarkBufferDirty(buf);
-			GenericXLogFinish(state);
-
-			/* Unlock extend relation lock as early as possible */
-			UnlockReleaseBuffer(metabuf);
-
-			/* Unlock previous buffer */
-			UnlockReleaseBuffer(buf);
-
-			/* Prepare new buffer */
-			state = GenericXLogStart(rel);
-			buf = newbuf;
-			page = GenericXLogRegisterBuffer(state, buf, 0);
-			break;
+			insertPage = BufferGetBlockNumber(buf);
 		}
 	}

@@ -181,31 +131,36 @@ ivfflatinsert(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid,
 #if PG_VERSION_NUM >= 140000
 			  ,bool indexUnchanged
 #endif
+#if PG_VERSION_NUM >= 100000
 			  ,IndexInfo *indexInfo
+#endif
 )
 {
-	MemoryContext oldCtx;
-	MemoryContext insertCtx;
+	IndexTuple	itup;
+	Datum		value;
+	FmgrInfo   *normprocinfo;

-	/* Skip nulls */
 	if (isnull[0])
 		return false;

-	/*
-	 * Use memory context since detoast, IvfflatNormValue, and
-	 * index_form_tuple can allocate
-	 */
-	insertCtx = AllocSetContextCreate(CurrentMemoryContext,
-									  "Ivfflat insert temporary context",
-									  ALLOCSET_DEFAULT_SIZES);
-	oldCtx = MemoryContextSwitchTo(insertCtx);
+	value = values[0];

-	/* Insert tuple */
-	InsertTuple(index, values, isnull, heap_tid, heap);
+	/* Normalize if needed */
+	normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
+	if (normprocinfo != NULL)
+	{
+		if (!IvfflatNormValue(normprocinfo, index->rd_indcollation[0], &value, NULL))
+			return false;
+	}

-	/* Delete memory context */
-	MemoryContextSwitchTo(oldCtx);
-	MemoryContextDelete(insertCtx);
+	itup = index_form_tuple(RelationGetDescr(index), &value, isnull);
+	itup->t_tid = *heap_tid;
+	InsertTuple(index, itup, heap, &value);
+	pfree(itup);
+
+	/* Clean up if we allocated a new value */
+	if (value != values[0])
+		pfree(DatumGetPointer(value));

 	return false;
 }
--- a/src/ivfkmeans.c
+++ b/src/ivfkmeans.c
@@ -16,7 +16,7 @@ InitCenters(Relation index, VectorArray samples, VectorArray centers, float *low
 	FmgrInfo   *procinfo;
 	Oid			collation;
 	int			i;
-	int64		j;
+	int			j;
 	double		distance;
 	double		sum;
 	double		choice;
@@ -29,7 +29,7 @@ InitCenters(Relation index, VectorArray samples, VectorArray centers, float *low
 	collation = index->rd_indcollation[0];

 	/* Choose an initial center uniformly at random */
-	VectorArraySet(centers, 0, VectorArrayGet(samples, RandomInt() % samples->length));
+	VectorArraySet(centers, 0, VectorArrayGet(samples, random() % samples->length));
 	centers->length++;

 	for (j = 0; j < numSamples; j++)
@@ -66,7 +66,7 @@ InitCenters(Relation index, VectorArray samples, VectorArray centers, float *low
 			break;

 		/* Choose new center using weighted probability distribution. */
-		choice = sum * RandomDouble();
+		choice = sum * (((double) random()) / MAX_RANDOM_VALUE);
 		for (j = 0; j < numSamples - 1; j++)
 		{
 			choice -= weight[j];
@@ -145,7 +145,7 @@ QuickCenters(Relation index, VectorArray samples, VectorArray centers)
 		vec->dim = dimensions;

 		for (j = 0; j < dimensions; j++)
-			vec->x[j] = RandomDouble();
+			vec->x[j] = ((double) random()) / MAX_RANDOM_VALUE;

 		/* Normalize if needed (only needed for random centers) */
 		if (normprocinfo != NULL)
@@ -172,8 +172,8 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 	Vector	   *vec;
 	Vector	   *newCenter;
 	int			iteration;
-	int64		j;
-	int64		k;
+	int			j;
+	int			k;
 	int			dimensions = centers->dim;
 	int			numCenters = centers->maxlen;
 	int			numSamples = samples->length;
@@ -217,10 +217,6 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 				 errmsg("memory required is %zu MB, maintenance_work_mem is %d MB",
 						totalSize / (1024 * 1024) + 1, maintenance_work_mem / 1024)));

-	/* Ensure indexing does not overflow */
-	if (numCenters * numCenters > INT_MAX)
-		elog(ERROR, "Indexing overflow detected. Please report a bug.");
-
 	/* Set support functions */
 	procinfo = index_getprocinfo(index, 1, IVFFLAT_KMEANS_DISTANCE_PROC);
 	normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_KMEANS_NORM_PROC);
@@ -233,7 +229,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 	lowerBound = palloc_extended(lowerBoundSize, MCXT_ALLOC_HUGE);
 	upperBound = palloc(upperBoundSize);
 	s = palloc(sSize);
-	halfcdist = palloc_extended(halfcdistSize, MCXT_ALLOC_HUGE);
+	halfcdist = palloc(halfcdistSize);
 	newcdist = palloc(newcdistSize);

 	newCenters = VectorArrayInit(numCenters, dimensions);
@@ -253,6 +249,8 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 		minDistance = DBL_MAX;
 		closestCenter = -1;

+		vec = VectorArrayGet(samples, j);
+
 		/* Find closest center */
 		for (k = 0; k < numCenters; k++)
 		{
@@ -405,7 +403,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 			{
 				/* TODO Handle empty centers properly */
 				for (k = 0; k < dimensions; k++)
-					vec->x[k] = RandomDouble();
+					vec->x[k] = ((double) random()) / MAX_RANDOM_VALUE;
 			}

 			/* Normalize if needed */
@@ -443,7 +441,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 			break;
 	}

-	VectorArrayFree(newCenters);
+	pfree(newCenters);
 	pfree(centerCounts);
 	pfree(closestCenters);
 	pfree(lowerBound);
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -7,8 +7,13 @@
 #include "miscadmin.h"
 #include "storage/bufmgr.h"

+#if PG_VERSION_NUM >= 110000
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
+#else
+#include "catalog/pg_operator.h"
+#include "catalog/pg_type.h"
+#endif

 /*
 * Compare list distances
@@ -25,6 +30,21 @@ CompareLists(const pairingheap_node *a, const pairingheap_node *b, void *arg)
 	return 0;
 }

+/*
+ * Compare item distances
+ */
+static int
+CompareItems(const pairingheap_node *a, const pairingheap_node *b, void *arg)
+{
+	if (((const IvfflatScanItem *) a)->distance > ((const IvfflatScanItem *) b)->distance)
+		return 1;
+
+	if (((const IvfflatScanItem *) a)->distance < ((const IvfflatScanItem *) b)->distance)
+		return -1;
+
+	return ItemPointerCompare(&((IvfflatScanItem *) a)->tid, &((IvfflatScanItem *) b)->tid);
+}
+
 /*
 * Get lists and sort by distance
 */
@@ -39,6 +59,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 	BlockNumber nextblkno = IVFFLAT_HEAD_BLKNO;
 	int			listCount = 0;
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
+	int			i;
 	double		distance;
 	IvfflatScanList *scanlist;
 	double		maxDistance = DBL_MAX;
@@ -92,6 +113,140 @@ GetScanLists(IndexScanDesc scan, Datum value)

 		UnlockReleaseBuffer(cbuf);
 	}
+
+	for (i = 0; i < so->probes; i++)
+		so->sortedLists[i] = (IvfflatScanList *) pairingheap_remove_first(so->listQueue);
+
+	Assert(pairingheap_is_empty(so->listQueue));
+}
+
+/*
+ * Get items
+ */
+static void
+GetScanItemsQuick(IndexScanDesc scan, Datum value)
+{
+	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
+	Buffer		buf;
+	Page		page;
+	IndexTuple	itup;
+	BlockNumber searchPage;
+	OffsetNumber offno;
+	OffsetNumber maxoffno;
+	Datum		datum;
+	bool		isnull;
+	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
+	int			i;
+	double		distance;
+	IvfflatScanItem *scanitem;
+	double		maxDistance = DBL_MAX;
+
+	/*
+	 * Reuse same set of shared buffers for scan
+	 *
+	 * See postgres/src/backend/storage/buffer/README for description
+	 */
+	BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD);
+
+	/* Search closest probes lists */
+	for (i = 0; i < so->probes; i++)
+	{
+		/* Read closest lists first for performance */
+		searchPage = so->sortedLists[i]->startPage;
+
+		/* Search all entry pages for list */
+		while (BlockNumberIsValid(searchPage))
+		{
+			buf = ReadBufferExtended(scan->indexRelation, MAIN_FORKNUM, searchPage, RBM_NORMAL, bas);
+			LockBuffer(buf, BUFFER_LOCK_SHARE);
+			page = BufferGetPage(buf);
+			maxoffno = PageGetMaxOffsetNumber(page);
+
+			for (offno = FirstOffsetNumber; offno <= maxoffno; offno = OffsetNumberNext(offno))
+			{
+				itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offno));
+				datum = index_getattr(itup, 1, tupdesc, &isnull);
+				distance = DatumGetFloat8(FunctionCall2Coll(so->procinfo, so->collation, datum, value));
+
+				if (so->itemCount < so->maxItems)
+				{
+					scanitem = &so->items[so->itemCount];
+					scanitem->searchPage = searchPage;
+					scanitem->tid = itup->t_tid;
+					scanitem->distance = distance;
+					so->itemCount++;
+
+					/* Add to heap */
+					pairingheap_add(so->itemQueue, &scanitem->ph_node);
+
+					/* Calculate max distance */
+					if (so->itemCount == so->maxItems)
+					{
+						maxDistance = ((IvfflatScanItem *) pairingheap_first(so->itemQueue))->distance;
+						scanitem = &so->items[so->itemCount];
+					}
+				}
+				else if (distance <= maxDistance)
+				{
+					/* Reuse */
+					scanitem->searchPage = searchPage;
+					scanitem->tid = itup->t_tid;
+					scanitem->distance = distance;
+					pairingheap_add(so->itemQueue, &scanitem->ph_node);
+
+					/* Remove */
+					scanitem = (IvfflatScanItem *) pairingheap_remove_first(so->itemQueue);
+
+					/* Update max distance */
+					maxDistance = ((IvfflatScanItem *) pairingheap_first(so->itemQueue))->distance;
+				}
+			}
+
+			searchPage = IvfflatPageGetOpaque(page)->nextblkno;
+
+			UnlockReleaseBuffer(buf);
+		}
+	}
+
+	for (i = 0; i < so->itemCount; i++)
+		so->sortedItems[i] = (IvfflatScanItem *) pairingheap_remove_first(so->itemQueue);
+
+	Assert(pairingheap_is_empty(so->itemQueue));
+}
+
+/*
+ * Initialize sort
+ */
+static void
+InitSort(IvfflatScanOpaque so)
+{
+	AttrNumber	attNums[] = {1, 2};
+	Oid			sortOperators[] = {Float8LessOperator, TIDLessOperator};
+	Oid			sortCollations[] = {InvalidOid, InvalidOid};
+	bool		nullsFirstFlags[] = {false, false};
+
+	/* Create tuple description for sorting */
+#if PG_VERSION_NUM >= 120000
+	so->tupdesc = CreateTemplateTupleDesc(3);
+#else
+	so->tupdesc = CreateTemplateTupleDesc(3, false);
+#endif
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
+	TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0);
+
+	/* Prep sort */
+#if PG_VERSION_NUM >= 110000
+	so->sortstate = tuplesort_begin_heap(so->tupdesc, sizeof(attNums) / sizeof(attNums[0]), attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, NULL, false);
+#else
+	so->sortstate = tuplesort_begin_heap(so->tupdesc, sizeof(attNums) / sizeof(attNums[0]), attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, false);
+#endif
+
+#if PG_VERSION_NUM >= 120000
+	so->slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);
+#else
+	so->slot = MakeSingleTupleTableSlot(so->tupdesc);
+#endif
 }

 /*
@@ -110,6 +265,7 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	Datum		datum;
 	bool		isnull;
 	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
+	int			i;

 #if PG_VERSION_NUM >= 120000
 	TupleTableSlot *slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsVirtual);
@@ -125,9 +281,9 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	BufferAccessStrategy bas = GetAccessStrategy(BAS_BULKREAD);

 	/* Search closest probes lists */
-	while (!pairingheap_is_empty(so->listQueue))
+	for (i = 0; i < so->probes; i++)
 	{
-		searchPage = ((IvfflatScanList *) pairingheap_remove_first(so->listQueue))->startPage;
+		searchPage = so->sortedLists[i]->startPage;

 		/* Search all entry pages for list */
 		while (BlockNumberIsValid(searchPage))
@@ -167,6 +323,7 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	}

 	tuplesort_performsort(so->sortstate);
+	tuplesort_skiptuples(so->sortstate, so->maxItems, true);
 }

 /*
@@ -175,24 +332,17 @@ GetScanItems(IndexScanDesc scan, Datum value)
 IndexScanDesc
 ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 {
-	IndexScanDesc scan;
-	IvfflatScanOpaque so;
-	int			lists;
-	AttrNumber	attNums[] = {1};
-	Oid			sortOperators[] = {Float8LessOperator};
-	Oid			sortCollations[] = {InvalidOid};
-	bool		nullsFirstFlags[] = {false};
+	IndexScanDesc scan = RelationGetIndexScan(index, nkeys, norderbys);
+	int			lists = IvfflatGetLists(scan->indexRelation);
 	int			probes = ivfflat_probes;
-
-	scan = RelationGetIndexScan(index, nkeys, norderbys);
-	lists = IvfflatGetLists(scan->indexRelation);
+	IvfflatScanOpaque so;

 	if (probes > lists)
 		probes = lists;

 	so = (IvfflatScanOpaque) palloc(offsetof(IvfflatScanOpaqueData, lists) + probes * sizeof(IvfflatScanList));
 	so->buf = InvalidBuffer;
-	so->first = true;
+	so->stage = 0;
 	so->probes = probes;

 	/* Set support functions */
@@ -200,26 +350,16 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	so->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	so->collation = index->rd_indcollation[0];

-	/* Create tuple description for sorting */
-#if PG_VERSION_NUM >= 120000
-	so->tupdesc = CreateTemplateTupleDesc(3);
-#else
-	so->tupdesc = CreateTemplateTupleDesc(3, false);
-#endif
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
-	TupleDescInitEntry(so->tupdesc, (AttrNumber) 3, "indexblkno", INT4OID, -1, 0);
-
-	/* Prep sort */
-	so->sortstate = tuplesort_begin_heap(so->tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, work_mem, NULL, false);
-
-#if PG_VERSION_NUM >= 120000
-	so->slot = MakeSingleTupleTableSlot(so->tupdesc, &TTSOpsMinimalTuple);
-#else
-	so->slot = MakeSingleTupleTableSlot(so->tupdesc);
-#endif
-
 	so->listQueue = pairingheap_allocate(CompareLists, scan);
+	so->sortedLists = palloc(sizeof(IvfflatScanItem *) * probes);
+
+	so->maxItems = 1024;
+	so->itemCount = 0;
+	so->itemQueue = pairingheap_allocate(CompareItems, scan);
+	so->items = palloc(sizeof(IvfflatScanItem) * (so->maxItems + 1));
+	so->sortedItems = palloc(sizeof(IvfflatScanItem *) * so->maxItems);
+
+	so->sortstate = NULL;

 	scan->opaque = so;

@@ -235,12 +375,14 @@ ivfflatrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;

 #if PG_VERSION_NUM >= 130000
-	if (!so->first)
+	if (so->sortstate != NULL)
 		tuplesort_reset(so->sortstate);
 #endif

-	so->first = true;
+	so->stage = 0;
 	pairingheap_reset(so->listQueue);
+	pairingheap_reset(so->itemQueue);
+	so->itemCount = 0;

 	if (keys && scan->numberOfKeys > 0)
 		memmove(scan->keyData, keys, scan->numberOfKeys * sizeof(ScanKeyData));
@@ -263,7 +405,7 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 	 */
 	Assert(ScanDirectionIsForward(dir));

-	if (so->first)
+	if (so->stage == 0)
 	{
 		Datum		value;

@@ -277,10 +419,6 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)

 		value = scan->orderByData->sk_argument;

-		/* Value should not be compressed or toasted */
-		Assert(!VARATT_IS_COMPRESSED(DatumGetPointer(value)));
-		Assert(!VARATT_IS_EXTENDED(DatumGetPointer(value)));
-
 		if (so->normprocinfo != NULL)
 		{
 			/* No items will match if normalization fails */
@@ -289,38 +427,101 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		}

 		IvfflatBench("GetScanLists", GetScanLists(scan, value));
-		IvfflatBench("GetScanItems", GetScanItems(scan, value));
-		so->first = false;
+		IvfflatBench("GetScanItemsQuick", GetScanItemsQuick(scan, value));
+		so->heapFull = so->itemCount == so->maxItems;
+		so->stage++;

 		/* Clean up if we allocated a new value */
 		if (value != scan->orderByData->sk_argument)
 			pfree(DatumGetPointer(value));
 	}

-	if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
+	if (so->stage == 1)
 	{
-		ItemPointer tid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));
-		BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull));
+		if (so->itemCount > 0)
+		{
+			IvfflatScanItem *scanitem;
+
+			so->itemCount--;
+
+			scanitem = so->sortedItems[so->itemCount];

 #if PG_VERSION_NUM >= 120000
-		scan->xs_heaptid = *tid;
+			scan->xs_heaptid = scanitem->tid;
 #else
-		scan->xs_ctup.t_self = *tid;
+			scan->xs_ctup.t_sef = scanitem->tid;
 #endif

-		if (BufferIsValid(so->buf))
-			ReleaseBuffer(so->buf);
+			if (BufferIsValid(so->buf))
+				ReleaseBuffer(so->buf);

-		/*
-		 * An index scan must maintain a pin on the index page holding the
-		 * item last returned by amgettuple
-		 *
-		 * https://www.postgresql.org/docs/current/index-locking.html
-		 */
-		so->buf = ReadBuffer(scan->indexRelation, indexblkno);
+			/*
+			 * An index scan must maintain a pin on the index page holding the
+			 * item last returned by amgettuple
+			 *
+			 * https://www.postgresql.org/docs/current/index-locking.html
+			 */
+			so->buf = ReadBuffer(scan->indexRelation, scanitem->searchPage);

-		scan->xs_recheckorderby = false;
-		return true;
+			scan->xs_recheckorderby = false;
+			return true;
+		}
+		else if (so->heapFull)
+		{
+			Datum value = scan->orderByData->sk_argument;
+
+			if (so->normprocinfo != NULL)
+			{
+				/* No items will match if normalization fails */
+				if (!IvfflatNormValue(so->normprocinfo, so->collation, &value, NULL))
+					return false;
+			}
+
+			if (so->sortstate == NULL)
+				InitSort(so);
+
+			IvfflatBench("GetScanItems", GetScanItems(scan, value));
+			so->stage++;
+
+			/* Clean up if we allocated a new value */
+			if (value != scan->orderByData->sk_argument)
+				pfree(DatumGetPointer(value));
+		}
+		else
+			so->stage = 3;
+	}
+
+	if (so->stage == 2)
+	{
+#if PG_VERSION_NUM >= 100000
+		if (tuplesort_gettupleslot(so->sortstate, true, false, so->slot, NULL))
+#else
+		if (tuplesort_gettupleslot(so->sortstate, true, so->slot, NULL))
+#endif
+		{
+			ItemPointer tid = (ItemPointer) DatumGetPointer(slot_getattr(so->slot, 2, &so->isnull));
+			BlockNumber indexblkno = DatumGetInt32(slot_getattr(so->slot, 3, &so->isnull));
+
+#if PG_VERSION_NUM >= 120000
+			scan->xs_heaptid = *tid;
+#else
+			scan->xs_ctup.t_self = *tid;
+#endif
+
+			if (BufferIsValid(so->buf))
+				ReleaseBuffer(so->buf);
+
+			/*
+			 * An index scan must maintain a pin on the index page holding the
+			 * item last returned by amgettuple
+			 *
+			 * https://www.postgresql.org/docs/current/index-locking.html
+			 */
+			so->buf = ReadBuffer(scan->indexRelation, indexblkno);
+
+			scan->xs_recheckorderby = false;
+			return true;
+		}
 	}

 	return false;
@@ -339,7 +540,14 @@ ivfflatendscan(IndexScanDesc scan)
 		ReleaseBuffer(so->buf);

 	pairingheap_free(so->listQueue);
-	tuplesort_end(so->sortstate);
+	pfree(so->sortedLists);
+
+	if (so->sortstate != NULL)
+		tuplesort_end(so->sortstate);
+
+	pairingheap_free(so->itemQueue);
+	pfree(so->items);
+	pfree(so->sortedItems);

 	pfree(so);
 	scan->opaque = NULL;
--- a/src/ivfutils.c
+++ b/src/ivfutils.c
@@ -10,25 +10,14 @@
 VectorArray
 VectorArrayInit(int maxlen, int dimensions)
 {
-	VectorArray res = palloc(sizeof(VectorArrayData));
+	VectorArray res = palloc0(VECTOR_ARRAY_SIZE(maxlen, dimensions));

 	res->length = 0;
 	res->maxlen = maxlen;
 	res->dim = dimensions;
-	res->items = palloc_extended(maxlen * VECTOR_SIZE(dimensions), MCXT_ALLOC_ZERO | MCXT_ALLOC_HUGE);
 	return res;
 }

-/*
- * Free a vector array
- */
-void
-VectorArrayFree(VectorArray arr)
-{
-	pfree(arr->items);
-	pfree(arr);
-}
-
 /*
 * Print vector array - useful for debugging
 */
@@ -86,7 +75,7 @@ IvfflatNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, Vector * resul

 	if (norm > 0)
 	{
-		v = DatumGetVector(*value);
+		v = (Vector *) DatumGetPointer(*value);

 		if (result == NULL)
 			result = InitVector(v->dim);
@@ -118,22 +107,13 @@ IvfflatNewBuffer(Relation index, ForkNumber forkNum)
 * Init page
 */
 void
-IvfflatInitPage(Buffer buf, Page page)
-{
-	PageInit(page, BufferGetPageSize(buf), sizeof(IvfflatPageOpaqueData));
-	IvfflatPageGetOpaque(page)->nextblkno = InvalidBlockNumber;
-	IvfflatPageGetOpaque(page)->page_id = IVFFLAT_PAGE_ID;
-}
-
-/*
- * Init and register page
- */
-void
-IvfflatInitRegisterPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state)
+IvfflatInitPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state)
 {
 	*state = GenericXLogStart(index);
 	*page = GenericXLogRegisterBuffer(*state, *buf, GENERIC_XLOG_FULL_IMAGE);
-	IvfflatInitPage(*buf, *page);
+	PageInit(*page, BufferGetPageSize(*buf), sizeof(IvfflatPageOpaqueData));
+	IvfflatPageGetOpaque(*page)->nextblkno = InvalidBlockNumber;
+	IvfflatPageGetOpaque(*page)->page_id = IVFFLAT_PAGE_ID;
 }

 /*
@@ -155,27 +135,17 @@ IvfflatCommitBuffer(Buffer buf, GenericXLogState *state)
 void
 IvfflatAppendPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, ForkNumber forkNum)
 {
-	/* Get new buffer */
-	Buffer		newbuf = IvfflatNewBuffer(index, forkNum);
-	Page		newpage = GenericXLogRegisterBuffer(*state, newbuf, GENERIC_XLOG_FULL_IMAGE);
+	Buffer		prevbuf = *buf;

-	/* Update the previous buffer */
-	IvfflatPageGetOpaque(*page)->nextblkno = BufferGetBlockNumber(newbuf);
+	/* Get new buffer */
+	*buf = IvfflatNewBuffer(index, forkNum);
+
+	/* Update and commit previous buffer */
+	IvfflatPageGetOpaque(*page)->nextblkno = BufferGetBlockNumber(*buf);
+	IvfflatCommitBuffer(prevbuf, *state);

 	/* Init new page */
-	IvfflatInitPage(newbuf, newpage);
-
-	/* Commit */
-	MarkBufferDirty(*buf);
-	MarkBufferDirty(newbuf);
-	GenericXLogFinish(*state);
-
-	/* Unlock */
-	UnlockReleaseBuffer(*buf);
-
-	*state = GenericXLogStart(index);
-	*page = GenericXLogRegisterBuffer(*state, newbuf, GENERIC_XLOG_FULL_IMAGE);
-	*buf = newbuf;
+	IvfflatInitPage(index, buf, page, state);
 }

 /*
--- a/src/vector.c
+++ b/src/vector.c
@@ -13,20 +13,13 @@
 #include "utils/numeric.h"

 #if PG_VERSION_NUM >= 120000
-#include "common/shortest_dec.h"
 #include "utils/float.h"
-#else
-#include <float.h>
 #endif

 #if PG_VERSION_NUM < 130000
-#define TYPALIGN_DOUBLE 'd'
 #define TYPALIGN_INT 'i'
 #endif

-#define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
-#define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
-
 PG_MODULE_MAGIC;

 /*
@@ -86,30 +79,6 @@ CheckElement(float value)
 				 errmsg("infinite value not allowed in vector")));
 }

-/*
- * Check state array
- */
-static float8 *
-CheckStateArray(ArrayType *statearray, const char *caller)
-{
-	if (ARR_NDIM(statearray) != 1 ||
-		ARR_DIMS(statearray)[0] < 1 ||
-		ARR_HASNULL(statearray) ||
-		ARR_ELEMTYPE(statearray) != FLOAT8OID)
-		elog(ERROR, "%s: expected state array", caller);
-	return (float8 *) ARR_DATA_PTR(statearray);
-}
-
-#if PG_VERSION_NUM < 120000
-static pg_noinline void
-float_overflow_error(void)
-{
-	ereport(ERROR,
-			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-			 errmsg("value out of range: overflow")));
-}
-#endif
-
 /*
 * Print vector - useful for debugging
 */
@@ -137,14 +106,14 @@ PrintVector(char *msg, Vector * vector)
 /*
 * Convert textual representation to internal representation
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_in);
+PG_FUNCTION_INFO_V1(vector_in);
 Datum
 vector_in(PG_FUNCTION_ARGS)
 {
 	char	   *str = PG_GETARG_CSTRING(0);
 	int32		typmod = PG_GETARG_INT32(2);
 	int			i;
-	float		x[VECTOR_MAX_DIM];
+	double		x[VECTOR_MAX_DIM];
 	int			dim = 0;
 	char	   *pt;
 	char	   *stringEnd;
@@ -167,8 +136,7 @@ vector_in(PG_FUNCTION_ARGS)
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 					 errmsg("vector cannot have more than %d dimensions", VECTOR_MAX_DIM)));

-		/* Use strtof like float4in to avoid a double-rounding problem */
-		x[dim] = strtof(pt, &stringEnd);
+		x[dim] = strtod(pt, &stringEnd);
 		CheckElement(x[dim]);
 		dim++;

@@ -214,68 +182,35 @@ vector_in(PG_FUNCTION_ARGS)
 /*
 * Convert internal representation to textual representation
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_out);
+PG_FUNCTION_INFO_V1(vector_out);
 Datum
 vector_out(PG_FUNCTION_ARGS)
 {
 	Vector	   *vector = PG_GETARG_VECTOR_P(0);
+	StringInfoData buf;
 	int			dim = vector->dim;
-	char	   *buf;
-	char	   *ptr;
 	int			i;
-	int			n;

-#if PG_VERSION_NUM < 120000
-	int			ndig = FLT_DIG + extra_float_digits;
+	initStringInfo(&buf);

-	if (ndig < 1)
-		ndig = 1;
-
-#define FLOAT_SHORTEST_DECIMAL_LEN (ndig + 10)
-#endif
-
-	/*
-	 * Need:
-	 *
-	 * dim * (FLOAT_SHORTEST_DECIMAL_LEN - 1) bytes for
-	 * float_to_shortest_decimal_bufn
-	 *
-	 * dim - 1 bytes for separator
-	 *
-	 * 3 bytes for [, ], and \0
-	 */
-	buf = (char *) palloc(FLOAT_SHORTEST_DECIMAL_LEN * dim + 2);
-	ptr = buf;
-
-	*ptr = '[';
-	ptr++;
+	appendStringInfoChar(&buf, '[');
 	for (i = 0; i < dim; i++)
 	{
 		if (i > 0)
-		{
-			*ptr = ',';
-			ptr++;
-		}
+			appendStringInfoString(&buf, ",");

-#if PG_VERSION_NUM >= 120000
-		n = float_to_shortest_decimal_bufn(vector->x[i], ptr);
-#else
-		n = sprintf(ptr, "%.*g", ndig, vector->x[i]);
-#endif
-		ptr += n;
+		appendStringInfoString(&buf, float8out_internal(vector->x[i]));
 	}
-	*ptr = ']';
-	ptr++;
-	*ptr = '\0';
+	appendStringInfoChar(&buf, ']');

 	PG_FREE_IF_COPY(vector, 0);
-	PG_RETURN_CSTRING(buf);
+	PG_RETURN_CSTRING(buf.data);
 }

 /*
 * Convert type modifier
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_typmod_in);
+PG_FUNCTION_INFO_V1(vector_typmod_in);
 Datum
 vector_typmod_in(PG_FUNCTION_ARGS)
 {
@@ -306,7 +241,7 @@ vector_typmod_in(PG_FUNCTION_ARGS)
 /*
 * Convert external binary representation to internal representation
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_recv);
+PG_FUNCTION_INFO_V1(vector_recv);
 Datum
 vector_recv(PG_FUNCTION_ARGS)
 {
@@ -338,7 +273,7 @@ vector_recv(PG_FUNCTION_ARGS)
 /*
 * Convert internal representation to the external binary representation
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_send);
+PG_FUNCTION_INFO_V1(vector_send);
 Datum
 vector_send(PG_FUNCTION_ARGS)
 {
@@ -358,7 +293,7 @@ vector_send(PG_FUNCTION_ARGS)
 /*
 * Convert vector to vector
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector);
+PG_FUNCTION_INFO_V1(vector);
 Datum
 vector(PG_FUNCTION_ARGS)
 {
@@ -373,7 +308,7 @@ vector(PG_FUNCTION_ARGS)
 /*
 * Convert array to vector
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(array_to_vector);
+PG_FUNCTION_INFO_V1(array_to_vector);
 Datum
 array_to_vector(PG_FUNCTION_ARGS)
 {
@@ -431,7 +366,7 @@ array_to_vector(PG_FUNCTION_ARGS)
 /*
 * Convert vector to float4[]
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_to_float4);
+PG_FUNCTION_INFO_V1(vector_to_float4);
 Datum
 vector_to_float4(PG_FUNCTION_ARGS)
 {
@@ -454,14 +389,12 @@ vector_to_float4(PG_FUNCTION_ARGS)
 /*
 * Get the L2 distance between vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(l2_distance);
+PG_FUNCTION_INFO_V1(l2_distance);
 Datum
 l2_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	double		distance = 0.0;
 	double		diff;

@@ -469,7 +402,7 @@ l2_distance(PG_FUNCTION_ARGS)

 	for (int i = 0; i < a->dim; i++)
 	{
-		diff = ax[i] - bx[i];
+		diff = a->x[i] - b->x[i];
 		distance += diff * diff;
 	}

@@ -480,14 +413,12 @@ l2_distance(PG_FUNCTION_ARGS)
 * Get the L2 squared distance between vectors
 * This saves a sqrt calculation
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_l2_squared_distance);
+PG_FUNCTION_INFO_V1(vector_l2_squared_distance);
 Datum
 vector_l2_squared_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	double		distance = 0.0;
 	double		diff;

@@ -495,7 +426,7 @@ vector_l2_squared_distance(PG_FUNCTION_ARGS)

 	for (int i = 0; i < a->dim; i++)
 	{
-		diff = ax[i] - bx[i];
+		diff = a->x[i] - b->x[i];
 		distance += diff * diff;
 	}

@@ -505,20 +436,18 @@ vector_l2_squared_distance(PG_FUNCTION_ARGS)
 /*
 * Get the inner product of two vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(inner_product);
+PG_FUNCTION_INFO_V1(inner_product);
 Datum
 inner_product(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	double		distance = 0.0;

 	CheckDims(a, b);

 	for (int i = 0; i < a->dim; i++)
-		distance += ax[i] * bx[i];
+		distance += a->x[i] * b->x[i];

 	PG_RETURN_FLOAT8(distance);
 }
@@ -526,20 +455,18 @@ inner_product(PG_FUNCTION_ARGS)
 /*
 * Get the negative inner product of two vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_negative_inner_product);
+PG_FUNCTION_INFO_V1(vector_negative_inner_product);
 Datum
 vector_negative_inner_product(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	double		distance = 0.0;

 	CheckDims(a, b);

 	for (int i = 0; i < a->dim; i++)
-		distance += ax[i] * bx[i];
+		distance += a->x[i] * b->x[i];

 	PG_RETURN_FLOAT8(distance * -1);
 }
@@ -547,14 +474,12 @@ vector_negative_inner_product(PG_FUNCTION_ARGS)
 /*
 * Get the cosine distance between two vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(cosine_distance);
+PG_FUNCTION_INFO_V1(cosine_distance);
 Datum
 cosine_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	double		distance = 0.0;
 	double		norma = 0.0;
 	double		normb = 0.0;
@@ -563,9 +488,9 @@ cosine_distance(PG_FUNCTION_ARGS)

 	for (int i = 0; i < a->dim; i++)
 	{
-		distance += ax[i] * bx[i];
-		norma += ax[i] * ax[i];
-		normb += bx[i] * bx[i];
+		distance += a->x[i] * b->x[i];
+		norma += a->x[i] * a->x[i];
+		normb += b->x[i] * b->x[i];
 	}

 	PG_RETURN_FLOAT8(1 - (distance / (sqrt(norma) * sqrt(normb))));
@@ -576,7 +501,7 @@ cosine_distance(PG_FUNCTION_ARGS)
 * Currently uses angular distance since needs to satisfy triangle inequality
 * Assumes inputs are unit vectors (skips norm)
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_spherical_distance);
+PG_FUNCTION_INFO_V1(vector_spherical_distance);
 Datum
 vector_spherical_distance(PG_FUNCTION_ARGS)
 {
@@ -601,7 +526,7 @@ vector_spherical_distance(PG_FUNCTION_ARGS)
 /*
 * Get the dimensions of a vector
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_dims);
+PG_FUNCTION_INFO_V1(vector_dims);
 Datum
 vector_dims(PG_FUNCTION_ARGS)
 {
@@ -613,16 +538,15 @@ vector_dims(PG_FUNCTION_ARGS)
 /*
 * Get the L2 norm of a vector
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_norm);
+PG_FUNCTION_INFO_V1(vector_norm);
 Datum
 vector_norm(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	float	   *ax = a->x;
 	double		norm = 0.0;

 	for (int i = 0; i < a->dim; i++)
-		norm += ax[i] * ax[i];
+		norm += a->x[i] * a->x[i];

 	PG_RETURN_FLOAT8(sqrt(norm));
 }
@@ -630,23 +554,20 @@ vector_norm(PG_FUNCTION_ARGS)
 /*
 * Add vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_add);
+PG_FUNCTION_INFO_V1(vector_add);
 Datum
 vector_add(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	Vector	   *result;
-	float	   *rx;
+	int			i;

 	CheckDims(a, b);

 	result = InitVector(a->dim);
-	rx = result->x;
-	for (int i = 0, imax = a->dim; i < imax; i++)
-		rx[i] = ax[i] + bx[i];
+	for (i = 0; i < a->dim; i++)
+		result->x[i] = a->x[i] + b->x[i];

 	PG_RETURN_POINTER(result);
 }
@@ -654,23 +575,20 @@ vector_add(PG_FUNCTION_ARGS)
 /*
 * Subtract vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_sub);
+PG_FUNCTION_INFO_V1(vector_sub);
 Datum
 vector_sub(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	float	   *ax = a->x;
-	float	   *bx = b->x;
 	Vector	   *result;
-	float	   *rx;
+	int			i;

 	CheckDims(a, b);

 	result = InitVector(a->dim);
-	rx = result->x;
-	for (int i = 0, imax = a->dim; i < imax; i++)
-		rx[i] = ax[i] - bx[i];
+	for (i = 0; i < a->dim; i++)
+		result->x[i] = a->x[i] - b->x[i];

 	PG_RETURN_POINTER(result);
 }
@@ -699,7 +617,7 @@ vector_cmp_internal(Vector * a, Vector * b)
 /*
 * Less than
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_lt);
+PG_FUNCTION_INFO_V1(vector_lt);
 Datum
 vector_lt(PG_FUNCTION_ARGS)
 {
@@ -712,7 +630,7 @@ vector_lt(PG_FUNCTION_ARGS)
 /*
 * Less than or equal
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_le);
+PG_FUNCTION_INFO_V1(vector_le);
 Datum
 vector_le(PG_FUNCTION_ARGS)
 {
@@ -725,7 +643,7 @@ vector_le(PG_FUNCTION_ARGS)
 /*
 * Equal
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_eq);
+PG_FUNCTION_INFO_V1(vector_eq);
 Datum
 vector_eq(PG_FUNCTION_ARGS)
 {
@@ -738,7 +656,7 @@ vector_eq(PG_FUNCTION_ARGS)
 /*
 * Not equal
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_ne);
+PG_FUNCTION_INFO_V1(vector_ne);
 Datum
 vector_ne(PG_FUNCTION_ARGS)
 {
@@ -751,7 +669,7 @@ vector_ne(PG_FUNCTION_ARGS)
 /*
 * Greater than or equal
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_ge);
+PG_FUNCTION_INFO_V1(vector_ge);
 Datum
 vector_ge(PG_FUNCTION_ARGS)
 {
@@ -764,7 +682,7 @@ vector_ge(PG_FUNCTION_ARGS)
 /*
 * Greater than
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_gt);
+PG_FUNCTION_INFO_V1(vector_gt);
 Datum
 vector_gt(PG_FUNCTION_ARGS)
 {
@@ -777,7 +695,7 @@ vector_gt(PG_FUNCTION_ARGS)
 /*
 * Compare vectors
 */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_cmp);
+PG_FUNCTION_INFO_V1(vector_cmp);
 Datum
 vector_cmp(PG_FUNCTION_ARGS)
 {
@@ -786,186 +704,3 @@ vector_cmp(PG_FUNCTION_ARGS)

 	PG_RETURN_INT32(vector_cmp_internal(a, b));
 }
-
-/*
- * Accumulate vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_accum);
-Datum
-vector_accum(PG_FUNCTION_ARGS)
-{
-	ArrayType  *statearray = PG_GETARG_ARRAYTYPE_P(0);
-	Vector	   *newval = PG_GETARG_VECTOR_P(1);
-	float8	   *statevalues;
-	int16		dim;
-	bool		newarr;
-	float8		n;
-	Datum	   *statedatums;
-	float	   *x = newval->x;
-	ArrayType  *result;
-
-	/* Check array before using */
-	statevalues = CheckStateArray(statearray, "vector_accum");
-	dim = STATE_DIMS(statearray);
-	newarr = dim == 0;
-
-	if (newarr)
-		dim = newval->dim;
-	else
-		CheckExpectedDim(dim, newval->dim);
-
-	n = statevalues[0] + 1.0;
-
-	statedatums = CreateStateDatums(dim);
-	statedatums[0] = Float8GetDatumFast(n);
-
-	if (newarr)
-	{
-		for (int i = 0; i < dim; i++)
-			statedatums[i + 1] = Float8GetDatumFast(x[i]);
-	}
-	else
-	{
-		for (int i = 0; i < dim; i++)
-		{
-			double		v = statevalues[i + 1] + x[i];
-
-			if (isinf(v))
-				float_overflow_error();
-
-			statedatums[i + 1] = Float8GetDatumFast(v);
-		}
-	}
-
-	/* Use float8 array like float4_accum */
-	result = construct_array(statedatums, dim + 1,
-							 FLOAT8OID,
-							 sizeof(float8), FLOAT8PASSBYVAL, TYPALIGN_DOUBLE);
-
-	pfree(statedatums);
-
-	PG_RETURN_ARRAYTYPE_P(result);
-}
-
-/*
- * Combine vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_combine);
-Datum
-vector_combine(PG_FUNCTION_ARGS)
-{
-	ArrayType  *statearray1 = PG_GETARG_ARRAYTYPE_P(0);
-	ArrayType  *statearray2 = PG_GETARG_ARRAYTYPE_P(1);
-	float8	   *statevalues1;
-	float8	   *statevalues2;
-	float8		n;
-	float8		n1;
-	float8		n2;
-	int16		dim;
-	Datum	   *statedatums;
-	ArrayType  *result;
-
-	/* Check arrays before using */
-	statevalues1 = CheckStateArray(statearray1, "vector_combine");
-	statevalues2 = CheckStateArray(statearray2, "vector_combine");
-
-	n1 = statevalues1[0];
-	n2 = statevalues2[0];
-
-	if (n1 == 0.0)
-	{
-		n = n2;
-		dim = STATE_DIMS(statearray2);
-		statedatums = CreateStateDatums(dim);
-		for (int i = 1; i <= dim; i++)
-			statedatums[i] = Float8GetDatumFast(statevalues2[i]);
-	}
-	else if (n2 == 0.0)
-	{
-		n = n1;
-		dim = STATE_DIMS(statearray1);
-		statedatums = CreateStateDatums(dim);
-		for (int i = 1; i <= dim; i++)
-			statedatums[i] = Float8GetDatumFast(statevalues1[i]);
-	}
-	else
-	{
-		n = n1 + n2;
-		dim = STATE_DIMS(statearray1);
-		CheckExpectedDim(dim, STATE_DIMS(statearray2));
-		statedatums = CreateStateDatums(dim);
-		for (int i = 1; i <= dim; i++)
-		{
-			double		v = statevalues1[i] + statevalues2[i];
-
-			if (isinf(v))
-				float_overflow_error();
-
-			statedatums[i] = Float8GetDatumFast(v);
-		}
-	}
-
-	statedatums[0] = Float8GetDatumFast(n);
-
-	result = construct_array(statedatums, dim + 1,
-							 FLOAT8OID,
-							 sizeof(float8), FLOAT8PASSBYVAL, TYPALIGN_DOUBLE);
-
-	pfree(statedatums);
-
-	PG_RETURN_ARRAYTYPE_P(result);
-}
-
-/*
- * Average vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_avg);
-Datum
-vector_avg(PG_FUNCTION_ARGS)
-{
-	ArrayType  *statearray = PG_GETARG_ARRAYTYPE_P(0);
-	float8	   *statevalues;
-	float8		n;
-	uint16		dim;
-	Vector	   *result;
-	float		v;
-
-	/* Check array before using */
-	statevalues = CheckStateArray(statearray, "vector_avg");
-	n = statevalues[0];
-
-	/* SQL defines AVG of no values to be NULL */
-	if (n == 0.0)
-		PG_RETURN_NULL();
-
-	/* Create vector */
-	dim = STATE_DIMS(statearray);
-	result = InitVector(dim);
-	for (int i = 0; i < dim; i++)
-	{
-		v = statevalues[i + 1] / n;
-		CheckElement(v);
-		result->x[i] = v;
-	}
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Generate a random vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(random_vector);
-Datum
-random_vector(PG_FUNCTION_ARGS)
-{
-	int32		dim = PG_GETARG_INT32(0);
-	Vector	   *result;
-
-	CheckDim(dim);
-
-	result = InitVector(dim);
-	for (int i = 0; i < dim; i++)
-		result->x[i] = RandomDouble();
-
-	PG_RETURN_POINTER(result);
-}
--- a/src/vector.h
+++ b/src/vector.h
@@ -3,27 +3,13 @@

 #include "postgres.h"

-#include "port.h"				/* for strtof() and random() */
-
-#if PG_VERSION_NUM >= 150000
-#include "common/pg_prng.h"
-#endif
-
-#define VECTOR_MAX_DIM 16000
+#define VECTOR_MAX_DIM 1024

 #define VECTOR_SIZE(_dim)		(offsetof(Vector, x) + sizeof(float)*(_dim))
 #define DatumGetVector(x)		((Vector *) PG_DETOAST_DATUM(x))
 #define PG_GETARG_VECTOR_P(x)	DatumGetVector(PG_GETARG_DATUM(x))
 #define PG_RETURN_VECTOR_P(x)	PG_RETURN_POINTER(x)

-#if PG_VERSION_NUM >= 150000
-#define RandomDouble() pg_prng_double(&pg_global_prng_state)
-#define RandomInt() pg_prng_uint32(&pg_global_prng_state)
-#else
-#define RandomDouble() (((double) random()) / MAX_RANDOM_VALUE)
-#define RandomInt() random()
-#endif
-
 typedef struct Vector
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
--- a/test/expected/btree.out
+++ b/test/expected/btree.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
--- a/test/expected/cast.out
+++ b/test/expected/cast.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SELECT ARRAY[1,2,3]::vector;
  array  
 ---------
@@ -38,8 +40,8 @@ SELECT '[1,2,3]'::vector::real[];
 {1,2,3}
 (1 row)

-SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;
-ERROR:  vector cannot have more than 16000 dimensions
+SELECT array_agg(n)::vector FROM generate_series(1, 1025) n;
+ERROR:  vector cannot have more than 1024 dimensions
 -- ensure no error
 SELECT ARRAY[1,2,3] = ARRAY[1,2,3];
 ?column? 
--- a/test/expected/copy.out
+++ b/test/expected/copy.out
@@ -1,8 +1,10 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE TABLE t2 (val vector(3));
-\copy t TO 'results/data.bin' WITH (FORMAT binary)
-\copy t2 FROM 'results/data.bin' WITH (FORMAT binary)
+\copy t TO '/tmp/data.bin' WITH (FORMAT binary)
+\copy t2 FROM '/tmp/data.bin' WITH (FORMAT binary)
 SELECT * FROM t2 ORDER BY val;
   val   
 ---------
--- a/test/expected/functions.out
+++ b/test/expected/functions.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SELECT '[1,2,3]'::vector + '[4,5,6]';
 ?column? 
 ----------
@@ -52,23 +54,3 @@ SELECT cosine_distance('[1,2]', '[0,0]');

 SELECT cosine_distance('[1,2]', '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
-    avg    
-----------
- [2,3.5,5]
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]', NULL]) v;
-    avg    
-----------
- [2,3.5,5]
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY[]::vector[]) v;
- avg 
-----
- 
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v;
-ERROR:  expected 2 dimensions, not 1
--- a/test/expected/input.out
+++ b/test/expected/input.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SELECT '[1,2,3]'::vector;
 vector  
 ---------
@@ -10,12 +12,6 @@ SELECT '[-1,2,3]'::vector;
 [-1,2,3]
 (1 row)

-SELECT '[1.23456]'::vector;
-  vector   
-----------
- [1.23456]
-(1 row)
-
 SELECT '[hello,1]'::vector;
 ERROR:  invalid input syntax for type vector: "hello"
 LINE 1: SELECT '[hello,1]'::vector;
--- a/test/expected/ivfflat_cosine.out
+++ b/test/expected/ivfflat_cosine.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
--- a/test/expected/ivfflat_ip.out
+++ b/test/expected/ivfflat_ip.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
--- a/test/expected/ivfflat_l2.out
+++ b/test/expected/ivfflat_l2.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
--- a/test/expected/ivfflat_options.out
+++ b/test/expected/ivfflat_options.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE TABLE t (val vector(3));
 CREATE INDEX ON t USING ivfflat (val) WITH (lists = 0);
--- a/test/expected/ivfflat_unlogged.out
+++ b/test/expected/ivfflat_unlogged.out
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;
 CREATE UNLOGGED TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
--- a/test/perl/PostgresNode.pm
+++ b/test/perl/PostgresNode.pm
@@ -1,8 +0,0 @@
-use PostgreSQL::Test::Cluster;
-
-sub get_new_node
-{
-	return PostgreSQL::Test::Cluster->new(@_);
-}
-
-1;
--- a/test/perl/TestLib.pm
+++ b/test/perl/TestLib.pm
@@ -1,3 +0,0 @@
-use PostgreSQL::Test::Utils;
-
-1;
--- a/test/sql/btree.sql
+++ b/test/sql/btree.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE TABLE t (val vector(3));
--- a/test/sql/cast.sql
+++ b/test/sql/cast.sql
@@ -1,3 +1,6 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
+
 SELECT ARRAY[1,2,3]::vector;
 SELECT ARRAY[1.0,2.0,3.0]::vector;
 SELECT ARRAY[1,2,3]::float4[]::vector;
@@ -8,7 +11,7 @@ SELECT '{Infinity}'::real[]::vector;
 SELECT '{-Infinity}'::real[]::vector;
 SELECT '{}'::real[]::vector;
 SELECT '[1,2,3]'::vector::real[];
-SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;
+SELECT array_agg(n)::vector FROM generate_series(1, 1025) n;

 -- ensure no error
 SELECT ARRAY[1,2,3] = ARRAY[1,2,3];
--- a/test/sql/copy.sql
+++ b/test/sql/copy.sql
@@ -1,10 +1,13 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
+
 CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);

 CREATE TABLE t2 (val vector(3));

-\copy t TO 'results/data.bin' WITH (FORMAT binary)
-\copy t2 FROM 'results/data.bin' WITH (FORMAT binary)
+\copy t TO '/tmp/data.bin' WITH (FORMAT binary)
+\copy t2 FROM '/tmp/data.bin' WITH (FORMAT binary)

 SELECT * FROM t2 ORDER BY val;

--- a/test/sql/functions.sql
+++ b/test/sql/functions.sql
@@ -1,3 +1,6 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
+
 SELECT '[1,2,3]'::vector + '[4,5,6]';
 SELECT '[1,2,3]'::vector - '[4,5,6]';

@@ -13,8 +16,3 @@ SELECT inner_product('[1,2]', '[3]');
 SELECT round(cosine_distance('[1,2]', '[2,4]')::numeric, 5);
 SELECT cosine_distance('[1,2]', '[0,0]');
 SELECT cosine_distance('[1,2]', '[3]');
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]', NULL]) v;
-SELECT avg(v) FROM unnest(ARRAY[]::vector[]) v;
-SELECT avg(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v;
--- a/test/sql/input.sql
+++ b/test/sql/input.sql
@@ -1,6 +1,8 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
+
 SELECT '[1,2,3]'::vector;
 SELECT '[-1,2,3]'::vector;
-SELECT '[1.23456]'::vector;
 SELECT '[hello,1]'::vector;
 SELECT '[NaN,1]'::vector;
 SELECT '[Infinity,1]'::vector;
--- a/test/sql/ivfflat_cosine.sql
+++ b/test/sql/ivfflat_cosine.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE TABLE t (val vector(3));
--- a/test/sql/ivfflat_ip.sql
+++ b/test/sql/ivfflat_ip.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE TABLE t (val vector(3));
--- a/test/sql/ivfflat_l2.sql
+++ b/test/sql/ivfflat_l2.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE TABLE t (val vector(3));
--- a/test/sql/ivfflat_options.sql
+++ b/test/sql/ivfflat_options.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE TABLE t (val vector(3));
--- a/test/sql/ivfflat_unlogged.sql
+++ b/test/sql/ivfflat_unlogged.sql
@@ -1,3 +1,5 @@
+SET client_min_messages = warning;
+CREATE EXTENSION IF NOT EXISTS vector;
 SET enable_seqscan = off;

 CREATE UNLOGGED TABLE t (val vector(3));
--- a/test/t/001_wal.pl
+++ b/test/t/001_wal.pl
@@ -7,8 +7,6 @@ use PostgresNode;
 use TestLib;
 use Test::More tests => 31;

-my $dim = 32;
-
 my $node_primary;
 my $node_replica;

@@ -20,20 +18,25 @@ sub test_index_replay
 	# Wait for replica to catch up
 	my $applname = $node_replica->name;

+	my $caughtup_query;
 	my $server_version_num = $node_primary->safe_psql("postgres", "SHOW server_version_num");
-	my $caughtup_query = "SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
+	if ($server_version_num >= 100000) {
+		$caughtup_query = "SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
+	} else {
+		# TODO figure out why replay location doesn't work
+		$caughtup_query = "SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname';";
+	}
+
 	$node_primary->poll_query_until('postgres', $caughtup_query)
 	  or die "Timed out while waiting for replica 1 to catch up";

-	my @r = ();
-	for (1 .. $dim) {
-		push(@r, rand());
-	}
-	my $sql = join(",", @r);
+	my $r1 = rand();
+	my $r2 = rand();
+	my $r3 = rand();

 	my $queries = qq(
 		SET enable_seqscan = off;
-		SELECT * FROM tst ORDER BY v <-> '[$sql]' LIMIT 10;
+		SELECT * FROM tst ORDER BY v <-> '[$r1,$r2,$r3]' LIMIT 10;
 	);

 	# Run test queries and compare their result
@@ -47,13 +50,6 @@ sub test_index_replay
 # Initialize primary node
 $node_primary = get_new_node('primary');
 $node_primary->init(allows_streaming => 1);
-if ($dim > 32) {
-	# TODO use wal_keep_segments for Postgres < 13
-	$node_primary->append_conf('postgresql.conf', qq(wal_keep_size = 1GB));
-}
-if ($dim > 1500) {
-	$node_primary->append_conf('postgresql.conf', qq(maintenance_work_mem = 128MB));
-}
 $node_primary->start;
 my $backup_name = 'my_backup';

@@ -68,9 +64,9 @@ $node_replica->start;

 # Create ivfflat index on primary
 $node_primary->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node_primary->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
+$node_primary->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
 $node_primary->safe_psql("postgres",
-	"INSERT INTO tst SELECT i % 10, random_vector($dim) FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i % 10, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
 );
 $node_primary->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v);");

@@ -86,7 +82,7 @@ for my $i (1 .. 10)
 	test_index_replay("vacuum $i");
 	my ($start, $end) = (100001 + ($i - 1) * 10000, 100000 + $i * 10000);
 	$node_primary->safe_psql("postgres",
-		"INSERT INTO tst SELECT i % 10, random_vector($dim) FROM generate_series($start, $end) i;"
+		"INSERT INTO tst SELECT i % 10, ARRAY[random(), random(), random()] FROM generate_series($start, $end) i;"
 	);
 	test_index_replay("insert $i");
 }
--- a/test/t/002_vacuum.pl
+++ b/test/t/002_vacuum.pl
@@ -4,15 +4,6 @@ use PostgresNode;
 use TestLib;
 use Test::More tests => 1;

-my $dim = 3;
-
-my @r = ();
-for (1 .. $dim) {
-	my $v = int(rand(1000)) + 1;
-	push(@r, "i % $v");
-}
-my $array_sql = join(", ", @r);
-
 # Initialize node
 my $node = get_new_node('node');
 $node->init;
@@ -20,9 +11,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));");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i % 10, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i % 10, ARRAY[i % 1000, i % 333, i % 55] FROM generate_series(1, 100000) i;"
 );
 $node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v);");

@@ -33,7 +24,7 @@ my $size = $node->safe_psql("postgres", "SELECT pg_total_relation_size('tst_v_id
 $node->safe_psql("postgres", "DELETE FROM tst;");
 $node->safe_psql("postgres", "VACUUM tst;");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i % 10, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i % 10, ARRAY[i % 1000, i % 333, i % 55] FROM generate_series(1, 100000) i;"
 );

 # Check size
--- a/test/t/003_recall.pl
+++ b/test/t/003_recall.pl
@@ -46,7 +46,7 @@ $node->start;
 $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, random_vector(3) FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
 );

 # Generate queries
--- a/test/t/005_query_recall.pl
+++ b/test/t/005_query_recall.pl
@@ -13,7 +13,7 @@ $node->start;
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 $node->safe_psql("postgres", "CREATE TABLE tst (i int4 primary key, v vector(3));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, random_vector(3) FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
 );

 # Check each index type
--- a/test/t/006_lists.pl
+++ b/test/t/006_lists.pl
@@ -13,7 +13,7 @@ $node->start;
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 $node->safe_psql("postgres", "CREATE TABLE tst (v vector(3));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT random_vector(3) FROM generate_series(1, 100000) i;"
+	"INSERT INTO tst SELECT ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
 );

 $node->safe_psql("postgres", "CREATE INDEX lists50 ON tst USING ivfflat (v) WITH (lists = 50);");
--- a/test/t/007_inserts.pl
+++ b/test/t/007_inserts.pl
@@ -1,43 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More tests => 5;
-
-my $dim = 768;
-
-# Initialize node
-my $node = get_new_node('node');
-$node->init;
-$node->start;
-
-# Create table and index
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (v vector($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT random_vector($dim) FROM generate_series(1, 10000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v);");
-
-$node->pgbench(
-	"--no-vacuum --client=5 --transactions=100",
-	0,
-	[qr{actually processed}],
-	[qr{^$}],
-	"concurrent INSERTs",
-	{
-		"007_inserts" => "INSERT INTO tst SELECT random_vector($dim) FROM generate_series(1, 10) i;"
-	}
-);
-
-my $expected = 10000 + 5 * 100 * 10;
-
-my $count = $node->safe_psql("postgres", "SELECT COUNT(*) FROM tst;");
-is($count, $expected);
-
-$count = $node->safe_psql("postgres", qq(
-	SET enable_seqscan = off;
-	SET ivfflat.probes = 100;
-	SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1)) t;
-));
-is($count, $expected);
--- a/test/t/007_stages.pl
+++ b/test/t/007_stages.pl
@@ -0,0 +1,38 @@
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 2;
+
+# Initialize node
+my $node = get_new_node('node');
+$node->init;
+$node->start;
+
+# Create table
+$node->safe_psql("postgres", "CREATE EXTENSION vector;");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT i, ARRAY[i % 1000, i % 1000, i % 1000] FROM generate_series(1, 10000) i;"
+);
+
+my @limits = (128, 2048);
+my @expected = ();
+
+foreach (@limits) {
+	my $res = $node->safe_psql("postgres", "SELECT i, v FROM tst ORDER BY v <-> '[0,0,0]', i LIMIT $_;");
+	push(@expected, $res);
+}
+
+$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v) WITH (lists = 5);");
+
+for my $i (0 .. $#limits) {
+	my $res = $node->safe_psql("postgres", qq(
+		SET enable_seqscan = off;
+		SET ivfflat.probes = 5;
+		WITH tmp AS (
+			SELECT *, v <-> '[0,0,0]' AS d FROM tst ORDER BY v <-> '[0,0,0]' LIMIT $limits[$i]
+		) SELECT i, v FROM tmp ORDER BY d, i;
+	));
+	is($res, $expected[$i]);
+}
--- a/test/t/008_avg.pl
+++ b/test/t/008_avg.pl
@@ -1,35 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More tests => 5;
-
-# Initialize node
-my $node = get_new_node('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (r1 real, r2 real, r3 real, v vector(3));");
-$node->safe_psql("postgres", qq(
-	INSERT INTO tst SELECT r1, r2, r3, ARRAY[r1, r2, r3] FROM (
-		SELECT random() + 1.01 AS r1, random() + 2.01 AS r2, random() + 3.01 AS r3 FROM generate_series(1, 1000000) t
-	) i;
-));
-
-# Test avg
-my $avg = $node->safe_psql("postgres", "SELECT AVG(v) FROM tst;");
-like($avg, qr/\[1\.5/);
-like($avg, qr/,2\.5/);
-like($avg, qr/,3\.5/);
-
-# Test matches real
-my $r1 = $node->safe_psql("postgres", "SELECT AVG(r1)::float4 FROM tst;");
-my $r2 = $node->safe_psql("postgres", "SELECT AVG(r2)::float4 FROM tst;");
-my $r3 = $node->safe_psql("postgres", "SELECT AVG(r3)::float4 FROM tst;");
-is($avg, "[$r1,$r2,$r3]");
-
-# Test explain
-my $explain = $node->safe_psql("postgres", "EXPLAIN SELECT AVG(v) FROM tst;");
-like($explain, qr/Partial Aggregate/);
--- a/test/t/009_storage.pl
+++ b/test/t/009_storage.pl
@@ -1,32 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More tests => 1;
-
-my $dim = 1024;
-
-# Initialize node
-my $node = get_new_node('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (v1 vector(1024), v2 vector(1024), v3 vector(1024));");
-
-# Test insert succeeds
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT random_vector($dim), random_vector($dim), random_vector($dim)"
-);
-
-# Change storage to PLAIN
-$node->safe_psql("postgres", "ALTER TABLE tst ALTER COLUMN v1 SET STORAGE PLAIN");
-$node->safe_psql("postgres", "ALTER TABLE tst ALTER COLUMN v2 SET STORAGE PLAIN");
-$node->safe_psql("postgres", "ALTER TABLE tst ALTER COLUMN v3 SET STORAGE PLAIN");
-
-# Test insert fails
-my ($ret, $stdout, $stderr) = $node->psql("postgres",
-	"INSERT INTO tst SELECT random_vector($dim), random_vector($dim), random_vector($dim)"
-);
-like($stderr, qr/row is too big/);
--- a/vector.control
+++ b/vector.control
@@ -1,4 +1,4 @@
 comment = 'vector data type and ivfflat access method'
-default_version = '0.4.0'
+default_version = '0.2.5'
 module_pathname = '$libdir/vector'
 relocatable = true
Author	SHA1	Message	Date
Andrew Kane	f7f989d1b0	Fixed alloc [skip ci]	2022-03-12 12:58:35 -08:00
Andrew Kane	aabe549ec6	Significantly improved index query performance [skip ci]	2022-02-15 20:21:29 -08:00