Removed comments [skip ci]

Fixed comments [skip ci]
Improved check [skip ci]
2026-07-22 20:15:46 +08:00 · 2023-12-18 14:38:10 -05:00 · 2023-12-18 14:08:48 -05:00 · 2023-12-04 13:59:48 -08:00 · 2023-12-04 13:53:07 -08:00 · 2023-12-04 13:38:00 -08:00
50 changed files with 1795 additions and 1260 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,6 @@ jobs:
            os: ubuntu-20.04
          - postgres: 12
            os: ubuntu-20.04
-          - postgres: 11
-            os: ubuntu-20.04
    steps:
      - uses: actions/checkout@v4
      - uses: ankane/setup-postgres@v1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,6 @@
 ## 0.5.2 (unreleased)

- Improved performance of HNSW
 - Added support for on-disk parallel index builds for HNSW
- Reduced memory usage for HNSW index builds
- Reduced WAL generation for HNSW index builds
- Fixed error with logical replication
- Fixed `invalid memory alloc request size` error with HNSW index build

 ## 0.5.1 (2023-10-10)

--- a/4
+++ b/4
@@ -3,8 +3,8 @@ EXTVERSION = 0.5.1

 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)
-OBJS = src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/vector.o
-HEADERS = src/vector.h
+OBJS = src/half.o src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/vector.o
+HEADERS = src/half.h src/vector.h

 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,8 +1,8 @@
 EXTENSION = vector
 EXTVERSION = 0.5.1

-OBJS = src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
-HEADERS = src\vector.h
+OBJS = src\half.obj src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
+HEADERS = src\half.h src\vector.h

 REGRESS = btree cast copy functions input ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged
 REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)
--- a/README.md
+++ b/README.md
@@ -161,12 +161,80 @@ You can add an index to use approximate nearest neighbor search, which trades so

 Supported index types are:

- [HNSW](#hnsw) - added in 0.5.0
 - [IVFFlat](#ivfflat)
+- [HNSW](#hnsw) - added in 0.5.0
+
+## IVFFlat
+
+An IVFFlat index divides vectors into lists, and then searches a subset of those lists that are closest to the query vector. It has faster build times and uses less memory than HNSW, but has lower query performance (in terms of speed-recall tradeoff).
+
+Three keys to achieving good recall are:
+
+1. Create the index *after* the table has some data
+2. Choose an appropriate number of lists - a good place to start is `rows / 1000` for up to 1M rows and `sqrt(rows)` for over 1M rows
+3. When querying, specify an appropriate number of [probes](#query-options) (higher is better for recall, lower is better for speed) - a good place to start is `sqrt(lists)`
+
+Add an index for each distance function you want to use.
+
+L2 distance
+
+```sql
+CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100);
+```
+
+Inner product
+
+```sql
+CREATE INDEX ON items USING ivfflat (embedding vector_ip_ops) WITH (lists = 100);
+```
+
+Cosine distance
+
+```sql
+CREATE INDEX ON items USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
+```
+
+Vectors with up to 2,000 dimensions can be indexed.
+
+### Query Options
+
+Specify the number of probes (1 by default)
+
+```sql
+SET ivfflat.probes = 10;
+```
+
+A higher value provides better recall at the cost of speed, and it can be set to the number of lists for exact nearest neighbor search (at which point the planner won’t use the index)
+
+Use `SET LOCAL` inside a transaction to set it for a single query
+
+```sql
+BEGIN;
+SET LOCAL ivfflat.probes = 10;
+SELECT ...
+COMMIT;
+```
+
+### Indexing Progress
+
+Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
+
+```sql
+SELECT phase, round(100.0 * tuples_done / nullif(tuples_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
+```
+
+The phases for IVFFlat are:
+
+1. `initializing`
+2. `performing k-means`
+3. `assigning tuples`
+4. `loading tuples`
+
+Note: `%` is only populated during the `loading tuples` phase

 ## HNSW

-An HNSW index creates a multilayer graph. It has better query performance than IVFFlat (in terms of speed-recall tradeoff), but has slower build times and uses more memory. Also, an index can be created without any data in the table since there isn’t a training step like IVFFlat.
+An HNSW index creates a multilayer graph. It has slower build times and uses more memory than IVFFlat, but has better query performance (in terms of speed-recall tradeoff). There’s no training step like IVFFlat, so the index can be created without any data in the table.

 Add an index for each distance function you want to use.

@@ -222,24 +290,6 @@ SELECT ...
 COMMIT;
 ```

-### Index Build Time
-
-Indexes build significantly faster when the graph fits into `maintenance_work_mem`
-
-```sql
-SET maintenance_work_mem = '8GB';
-```
-
-A notice is shown when the graph no longer fits
-
-```text
-NOTICE:  hnsw graph no longer fits into maintenance_work_mem after 100000 tuples
-DETAIL:  Building will take significantly more time.
-HINT:  Increase maintenance_work_mem to speed up builds.
-```
-
-Note: Do not set `maintenance_work_mem` so high that it exhausts the memory on the server
-
 ### Indexing Progress

 Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
@@ -253,84 +303,6 @@ The phases for HNSW are:
 1. `initializing`
 2. `loading tuples`

-## IVFFlat
-
-An IVFFlat index divides vectors into lists, and then searches a subset of those lists that are closest to the query vector. It has faster build times and uses less memory than HNSW, but has lower query performance (in terms of speed-recall tradeoff).
-
-Three keys to achieving good recall are:
-
-1. Create the index *after* the table has some data
-2. Choose an appropriate number of lists - a good place to start is `rows / 1000` for up to 1M rows and `sqrt(rows)` for over 1M rows
-3. When querying, specify an appropriate number of [probes](#query-options) (higher is better for recall, lower is better for speed) - a good place to start is `sqrt(lists)`
-
-Add an index for each distance function you want to use.
-
-L2 distance
-
-```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100);
-```
-
-Inner product
-
-```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_ip_ops) WITH (lists = 100);
-```
-
-Cosine distance
-
-```sql
-CREATE INDEX ON items USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
-```
-
-Vectors with up to 2,000 dimensions can be indexed.
-
-### Query Options
-
-Specify the number of probes (1 by default)
-
-```sql
-SET ivfflat.probes = 10;
-```
-
-A higher value provides better recall at the cost of speed, and it can be set to the number of lists for exact nearest neighbor search (at which point the planner won’t use the index)
-
-Use `SET LOCAL` inside a transaction to set it for a single query
-
-```sql
-BEGIN;
-SET LOCAL ivfflat.probes = 10;
-SELECT ...
-COMMIT;
-```
-
-### Index Build Time
-
-Speed up index creation on large tables by increasing the number of parallel workers (2 by default)
-
-```sql
-SET max_parallel_maintenance_workers = 7; -- plus leader
-```
-
-For a large number of workers, you may also need to increase `max_parallel_workers` (8 by default)
-
-### Indexing Progress
-
-Check [indexing progress](https://www.postgresql.org/docs/current/progress-reporting.html#CREATE-INDEX-PROGRESS-REPORTING) with Postgres 12+
-
-```sql
-SELECT phase, round(100.0 * tuples_done / nullif(tuples_total, 0), 1) AS "%" FROM pg_stat_progress_create_index;
-```
-
-The phases for IVFFlat are:
-
-1. `initializing`
-2. `performing k-means`
-3. `assigning tuples`
-4. `loading tuples`
-
-Note: `%` is only populated during the `loading tuples` phase
-
 ## Filtering

 There are a few ways to index nearest neighbor queries with a `WHERE` clause
@@ -348,7 +320,8 @@ CREATE INDEX ON items (category_id);
 Or a [partial index](https://www.postgresql.org/docs/current/indexes-partial.html) on the vector column for approximate search

 ```sql
-CREATE INDEX ON items USING hnsw (embedding vector_l2_ops) WHERE (category_id = 123);
+CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100)
+    WHERE (category_id = 123);
 ```

 Use [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html) for approximate search on many different values of the `WHERE` columns
@@ -582,7 +555,7 @@ sum(vector) → vector | sum | 0.5.0
 If your machine has multiple Postgres installations, specify the path to [pg_config](https://www.postgresql.org/docs/current/app-pgconfig.html) with:

 ```sh
-export PG_CONFIG=/Library/PostgreSQL/16/bin/pg_config
+export PG_CONFIG=/Applications/Postgres.app/Contents/Versions/latest/bin/pg_config
 ```

 Then re-run the installation instructions (run `make clean` before `make` if needed). If `sudo` is needed for `make install`, use:
@@ -591,14 +564,6 @@ Then re-run the installation instructions (run `make clean` before `make` if nee
 sudo --preserve-env=PG_CONFIG make install
 ```

-A few common paths on Mac are:
-
- EDB installer - `/Library/PostgreSQL/16/bin/pg_config`
- Homebrew (arm64) - `/opt/homebrew/opt/postgresql@16/bin/pg_config`
- Homebrew (x86-64) - `/usr/local/opt/postgresql@16/bin/pg_config`
-
-Note: Replace `16` with your Postgres server version
-
 ### Missing Header

 If compilation fails with `fatal error: postgres.h: No such file or directory`, make sure Postgres development files are installed on the server.
@@ -606,14 +571,10 @@ If compilation fails with `fatal error: postgres.h: No such file or directory`,
 For Ubuntu and Debian, use:

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

-Note: Replace `16` with your Postgres server version
-
-### Missing SDK
-
-If compilation fails and the output includes `warning: no such sysroot directory` on Mac, reinstall Xcode Command Line Tools.
+Note: Replace `15` with your Postgres server version

 ### Windows

@@ -628,7 +589,7 @@ Note: The exact path will vary depending on your Visual Studio version and editi
 Then use `nmake` to build:

 ```cmd
-set "PGROOT=C:\Program Files\PostgreSQL\16"
+set "PGROOT=C:\Program Files\PostgreSQL\15"
 git clone --branch v0.5.1 https://github.com/pgvector/pgvector.git
 cd pgvector
 nmake /F Makefile.win
@@ -678,22 +639,22 @@ pgxn install vector
 Debian and Ubuntu packages are available from the [PostgreSQL APT Repository](https://wiki.postgresql.org/wiki/Apt). Follow the [setup instructions](https://wiki.postgresql.org/wiki/Apt#Quickstart) and run:

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

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

 ### Yum

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

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

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

 ### conda-forge

@@ -803,25 +764,7 @@ make prove_installcheck PROVE_TESTS=test/t/001_wal.pl  # TAP test
 To enable benchmarking:

 ```sh
-make clean && PG_CFLAGS="-DIVFFLAT_BENCH" make && make install
-```
-
-To show memory usage:
-
-```sh
-make clean && PG_CFLAGS="-DHNSW_MEMORY -DIVFFLAT_MEMORY" make && make install
-```
-
-To enable assertions:
-
-```sh
-make clean && PG_CFLAGS="-DUSE_ASSERT_CHECKING" make && make install
-```
-
-To get k-means metrics:
-
-```sh
-make clean && PG_CFLAGS="-DIVFFLAT_KMEANS_DEBUG" make && make install
+make clean && PG_CFLAGS=-DIVFFLAT_BENCH make && make install
 ```

 Resources for contributors
--- a/sql/vector--0.5.1--0.6.0.sql
+++ b/sql/vector--0.5.1--0.6.0.sql
@@ -0,0 +1,101 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION vector UPDATE TO '0.6.0'" to load this file. \quit
+
+CREATE TYPE half;
+
+CREATE FUNCTION half_in(cstring, oid, integer) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_out(half) RETURNS cstring
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_recv(internal, oid, integer) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_send(half) RETURNS bytea
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE TYPE half (
+	INPUT     = half_in,
+	OUTPUT    = half_out,
+	RECEIVE   = half_recv,
+	SEND      = half_send,
+	INTERNALLENGTH = 2,
+	PASSEDBYVALUE,
+	ALIGNMENT = int2
+);
+
+CREATE FUNCTION l2_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION inner_product(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION cosine_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION l1_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_l2_squared_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_negative_inner_product(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION float4_to_half(real, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_float4(half, integer, boolean) RETURNS real
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION float8_to_half(float8, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_float8(half, integer, boolean) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION integer_to_half(integer, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION numeric_to_half(numeric, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_numeric(half, integer, boolean) RETURNS numeric
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE CAST (real AS half)
+	WITH FUNCTION float4_to_half(real, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS real)
+	WITH FUNCTION half_to_float4(half, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (float8 AS half)
+	WITH FUNCTION float8_to_half(float8, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS float8)
+	WITH FUNCTION half_to_float8(half, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (integer AS half)
+	WITH FUNCTION integer_to_half(integer, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (numeric AS half)
+	WITH FUNCTION numeric_to_half(numeric, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS numeric)
+	WITH FUNCTION half_to_numeric(half, integer, boolean) AS IMPLICIT;
+
+CREATE OPERATOR <-> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = l2_distance,
+	COMMUTATOR = '<->'
+);
+
+CREATE OPERATOR <#> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = half_negative_inner_product,
+	COMMUTATOR = '<#>'
+);
+
+CREATE OPERATOR <=> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = cosine_distance,
+	COMMUTATOR = '<=>'
+);
--- a/sql/vector.sql
+++ b/sql/vector.sql
@@ -290,3 +290,114 @@ CREATE OPERATOR CLASS vector_cosine_ops
 	OPERATOR 1 <=> (vector, vector) FOR ORDER BY float_ops,
 	FUNCTION 1 vector_negative_inner_product(vector, vector),
 	FUNCTION 2 vector_norm(vector);
+
+-- half type
+
+CREATE TYPE half;
+
+CREATE FUNCTION half_in(cstring, oid, integer) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_out(half) RETURNS cstring
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_recv(internal, oid, integer) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_send(half) RETURNS bytea
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE TYPE half (
+	INPUT     = half_in,
+	OUTPUT    = half_out,
+	RECEIVE   = half_recv,
+	SEND      = half_send,
+	INTERNALLENGTH = 2,
+	PASSEDBYVALUE,
+	ALIGNMENT = int2
+);
+
+-- half functions
+
+CREATE FUNCTION l2_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION inner_product(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION cosine_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION l1_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME', 'half_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+-- half private functions
+
+CREATE FUNCTION half_l2_squared_distance(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_negative_inner_product(half[], half[]) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+-- half cast functions
+
+CREATE FUNCTION float4_to_half(real, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_float4(half, integer, boolean) RETURNS real
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION float8_to_half(float8, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_float8(half, integer, boolean) RETURNS float8
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION integer_to_half(integer, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION numeric_to_half(numeric, integer, boolean) RETURNS half
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION half_to_numeric(half, integer, boolean) RETURNS numeric
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+-- half casts
+
+CREATE CAST (real AS half)
+	WITH FUNCTION float4_to_half(real, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS real)
+	WITH FUNCTION half_to_float4(half, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (float8 AS half)
+	WITH FUNCTION float8_to_half(float8, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS float8)
+	WITH FUNCTION half_to_float8(half, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (integer AS half)
+	WITH FUNCTION integer_to_half(integer, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (numeric AS half)
+	WITH FUNCTION numeric_to_half(numeric, integer, boolean) AS IMPLICIT;
+
+CREATE CAST (half AS numeric)
+	WITH FUNCTION half_to_numeric(half, integer, boolean) AS IMPLICIT;
+
+-- half operators
+
+CREATE OPERATOR <-> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = l2_distance,
+	COMMUTATOR = '<->'
+);
+
+CREATE OPERATOR <#> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = half_negative_inner_product,
+	COMMUTATOR = '<#>'
+);
+
+CREATE OPERATOR <=> (
+	LEFTARG = half[], RIGHTARG = half[], PROCEDURE = cosine_distance,
+	COMMUTATOR = '<=>'
+);
--- a/src/half.c
+++ b/src/half.c
@@ -0,0 +1,694 @@
+#include "postgres.h"
+
+#include <math.h>
+
+#include "common/shortest_dec.h"
+#include "fmgr.h"
+#include "half.h"
+#include "lib/stringinfo.h"
+#include "libpq/pqformat.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
+#include "utils/float.h"
+#include "utils/numeric.h"
+
+#if PG_VERSION_NUM < 120003
+static pg_noinline void
+float_overflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: overflow")));
+}
+
+static pg_noinline void
+float_underflow_error(void)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+			 errmsg("value out of range: underflow")));
+}
+#endif
+
+/*
+ * Check if array is a vector
+ */
+static void
+CheckArrayIsVector(ArrayType *array)
+{
+	if (ARR_NDIM(array) > 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_EXCEPTION),
+				 errmsg("array must be 1-D")));
+
+	if (ARR_HASNULL(array) && array_contains_nulls(array))
+		ereport(ERROR,
+				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+				 errmsg("array must not contain nulls")));
+}
+
+/*
+ * Check if dimensions are the same
+ */
+static int
+CheckDims(ArrayType *a, ArrayType *b)
+{
+	int			dima;
+	int			dimb;
+
+	CheckArrayIsVector(a);
+	CheckArrayIsVector(b);
+
+	dima = ARR_DIMS(a)[0];
+	dimb = ARR_DIMS(b)[0];
+
+	if (dima != dimb)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_EXCEPTION),
+				 errmsg("different dimensions %d and %d", dima, dimb)));
+
+	return dima;
+}
+
+/*
+ * Return the datum representation for a half
+ */
+static inline Datum
+HalfGetDatum(half X)
+{
+	union
+	{
+		half		value;
+		int16		retval;
+	}			myunion;
+
+	myunion.value = X;
+	return Int16GetDatum(myunion.retval);
+}
+
+/*
+ * Return the half value of a datum
+ */
+static inline half
+DatumGetHalf(Datum X)
+{
+	union
+	{
+		int16		value;
+		half		retval;
+	}			myunion;
+
+	myunion.value = DatumGetInt16(X);
+	return myunion.retval;
+}
+
+/*
+ * Get a half from a message buffer
+ */
+static half
+pq_getmsghalf(StringInfo msg)
+{
+	union
+	{
+		half		h;
+		uint16		i;
+	}			swap;
+
+	swap.i = pq_getmsgint(msg, 2);
+	return swap.h;
+}
+
+/*
+ * Append a half to a StringInfo buffer
+ */
+static void
+pq_sendhalf(StringInfo buf, half h)
+{
+	union
+	{
+		half		h;
+		uint16		i;
+	}			swap;
+
+	swap.h = h;
+	pq_sendint16(buf, swap.i);
+}
+
+/*
+ * Convert a half to a float4
+ */
+static float
+HalfToFloat4(half num)
+{
+#ifdef FLT16_SUPPORT
+	return (float) num;
+#else
+	/* TODO Improve performance */
+	/* TODO Check endianness */
+	uint16		bin = *((uint16 *) &num);
+	uint32		exponent = (bin & 0x7C00) >> 10;
+	uint32		mantissa = bin & 0x03FF;
+
+	/* Sign */
+	uint32		result = (bin & 0x8000) << 16;
+
+	if (exponent == 31)
+	{
+		if (mantissa == 0)
+		{
+			/* Infinite */
+			result |= 0x7F800000;
+		}
+		else
+		{
+			/* NaN */
+			result |= 0x7FC00000;
+			result |= mantissa << 13;
+		}
+	}
+	else if (exponent == 0)
+	{
+		/* Subnormal */
+		if (mantissa != 0)
+		{
+			exponent = -14;
+
+			for (int i = 0; i < 10; i++)
+			{
+				mantissa <<= 1;
+				exponent -= 1;
+
+				if ((mantissa >> 10) % 2 == 1)
+				{
+					mantissa &= 0x03ff;
+					break;
+				}
+			}
+
+			result |= (exponent + 127) << 23;
+			result |= mantissa << 13;
+		}
+	}
+	else
+	{
+		/* Normal */
+		result |= (exponent - 15 + 127) << 23;
+		result |= mantissa << 13;
+	}
+
+	return *((float *) &result);
+#endif
+}
+
+/*
+ * Convert a float4 to a half
+ */
+static half
+Float4ToHalfUnchecked(float num)
+{
+#ifdef FLT16_SUPPORT
+	return (_Float16) num;
+#else
+	/* TODO Improve performance */
+	/* TODO Check endianness */
+	uint32		bin = *((uint32 *) &num);
+	int			exponent = (bin & 0x7F800000) >> 23;
+	int			mantissa = bin & 0x007FFFFF;
+
+	/* Sign */
+	uint16		result = (bin & 0x80000000) >> 16;
+
+	if (isinf(num))
+	{
+		/* Infinite */
+		result |= 0x7C00;
+	}
+	else if (isnan(num))
+	{
+		/* NaN */
+		result |= 0x7E00;
+		result |= mantissa >> 13;
+	}
+	else if (exponent > 98)
+	{
+		int			m;
+		int			gr;
+		int			s;
+
+		exponent -= 127;
+		s = mantissa & 0x00000FFF;
+
+		/* Subnormal */
+		if (exponent < -14)
+		{
+			int			diff = -exponent - 14;
+
+			mantissa >>= diff;
+			mantissa += 1 << (23 - diff);
+			s |= mantissa & 0x00000FFF;
+		}
+
+		m = mantissa >> 13;
+
+		/* Round */
+		gr = (mantissa >> 12) % 4;
+		if (gr == 3 || (gr == 1 && s != 0))
+			m += 1;
+
+		if (m == 1024)
+		{
+			m = 0;
+			exponent += 1;
+		}
+
+		if (exponent > 15)
+		{
+			/* Infinite */
+			result |= 0x7C00;
+		}
+		else
+		{
+			if (exponent >= -14)
+				result |= (exponent + 15) << 10;
+
+			result |= m;
+		}
+	}
+
+	return *((half *) & result);
+#endif
+}
+
+/*
+ * Check if half is infinite
+ */
+static inline bool
+HalfIsInf(half num)
+{
+#ifdef FLT16_SUPPORT
+	return isinf(num);
+#else
+	return (num << 1) == 0xF800;
+#endif
+}
+
+/*
+ * Check if half is zero
+ */
+static inline bool
+HalfIsZero(half num)
+{
+#ifdef FLT16_SUPPORT
+	return num == 0;
+#else
+	return (num << 1) == 0x0000;
+#endif
+}
+
+/*
+ * Convert a float4 to a half
+ */
+static half
+Float4ToHalf(float num)
+{
+	half		result = Float4ToHalfUnchecked(num);
+
+	if (unlikely(HalfIsInf(result)) && !isinf(num))
+		float_overflow_error();
+	if (unlikely(HalfIsZero(result)) && num != 0.0)
+		float_underflow_error();
+
+	return result;
+}
+
+/*
+ * Convert a float8 to a half
+ */
+static half
+Float8ToHalf(double num)
+{
+	/* TODO Convert directly for greater accuracy */
+	half		result = Float4ToHalfUnchecked((float) num);
+
+	if (unlikely(HalfIsInf(result)) && !isinf(num))
+		float_overflow_error();
+	if (unlikely(HalfIsZero(result)) && num != 0.0)
+		float_underflow_error();
+
+	return result;
+}
+
+/*
+ * Convert textual representation to internal representation
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_in);
+Datum
+half_in(PG_FUNCTION_ARGS)
+{
+	char	   *num = PG_GETARG_CSTRING(0);
+	char	   *orig_num;
+	float		val;
+	char	   *endptr;
+
+	orig_num = num;
+
+	/* Skip leading whitespace */
+	while (*num != '\0' && isspace((unsigned char) *num))
+		num++;
+
+	/*
+	 * Check for an empty-string input to begin with, to avoid the vagaries of
+	 * strtof() on different platforms.
+	 */
+	if (*num == '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input syntax for type %s: \"%s\"",
+						"half", orig_num)));
+
+	val = strtof(num, &endptr);
+
+	if (val < -HALF_MAX || val > HALF_MAX)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("\"%s\" is out of range for type %s",
+						orig_num, "half")));
+
+	/* Skip trailing whitespace */
+	while (*endptr != '\0' && isspace((unsigned char) *endptr))
+		endptr++;
+
+	/* If there is any junk left at the end of the string, bail out */
+	if (*endptr != '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input syntax for type %s: \"%s\"",
+						"half", orig_num)));
+
+	PG_RETURN_HALF(Float4ToHalf(val));
+}
+
+/*
+ * Convert internal representation to textual representation
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_out);
+Datum
+half_out(PG_FUNCTION_ARGS)
+{
+	float		num = HalfToFloat4(PG_GETARG_HALF(0));
+	char	   *ascii = (char *) palloc(32);
+	int			ndig = FLT_DIG + extra_float_digits;
+
+	if (extra_float_digits > 0)
+	{
+		float_to_shortest_decimal_buf(num, ascii);
+		PG_RETURN_CSTRING(ascii);
+	}
+
+	(void) pg_strfromd(ascii, 32, ndig, num);
+	PG_RETURN_CSTRING(ascii);
+}
+
+/*
+ * Convert external binary representation to internal representation
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_recv);
+Datum
+half_recv(PG_FUNCTION_ARGS)
+{
+	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
+
+	PG_RETURN_HALF(pq_getmsghalf(buf));
+}
+
+/*
+ * Convert internal representation to the external binary representation
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_send);
+Datum
+half_send(PG_FUNCTION_ARGS)
+{
+	half		arg1 = PG_GETARG_HALF(0);
+	StringInfoData buf;
+
+	pq_begintypsend(&buf);
+	pq_sendhalf(&buf, arg1);
+	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
+}
+
+/*
+ * Convert integer to half
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(integer_to_half);
+Datum
+integer_to_half(PG_FUNCTION_ARGS)
+{
+	int32		i = PG_GETARG_INT32(0);
+
+	/* TODO Figure out correct error */
+	float		f = (float) i;
+	half		h = Float4ToHalf(f);
+
+	PG_RETURN_HALF(h);
+}
+
+/*
+ * Convert numeric to half
+ *
+ * TODO Improve error message if out of range
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(numeric_to_half);
+Datum
+numeric_to_half(PG_FUNCTION_ARGS)
+{
+	Numeric		num = PG_GETARG_NUMERIC(0);
+	float		f = DatumGetFloat4(DirectFunctionCall1(numeric_float4, NumericGetDatum(num)));
+	half		h = Float4ToHalf(f);
+
+	PG_RETURN_HALF(h);
+}
+
+/*
+ * Convert half to numeric
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_to_numeric);
+Datum
+half_to_numeric(PG_FUNCTION_ARGS)
+{
+	half		h = PG_GETARG_HALF(0);
+	float		f = HalfToFloat4(h);
+	Numeric		num = DatumGetNumeric(DirectFunctionCall1(float4_numeric, Float4GetDatum(f)));
+
+	PG_RETURN_NUMERIC(num);
+}
+
+/*
+ * Convert float4 to half
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(float4_to_half);
+Datum
+float4_to_half(PG_FUNCTION_ARGS)
+{
+	float		f = PG_GETARG_FLOAT4(0);
+	half		h = Float4ToHalf(f);
+
+	PG_RETURN_HALF(h);
+}
+
+/*
+ * Convert half to float4
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_to_float4);
+Datum
+half_to_float4(PG_FUNCTION_ARGS)
+{
+	half		h = PG_GETARG_HALF(0);
+	float		f = HalfToFloat4(h);
+
+	PG_RETURN_FLOAT4(f);
+}
+
+/*
+ * Convert float8 to half
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(float8_to_half);
+Datum
+float8_to_half(PG_FUNCTION_ARGS)
+{
+	float8		d = PG_GETARG_FLOAT8(0);
+	half		h = Float8ToHalf(d);
+
+	PG_RETURN_HALF(h);
+}
+
+/*
+ * Convert half to float8
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_to_float8);
+Datum
+half_to_float8(PG_FUNCTION_ARGS)
+{
+	half		h = PG_GETARG_HALF(0);
+	float		f = HalfToFloat4(h);
+
+	PG_RETURN_FLOAT8((double) f);
+}
+
+/*
+ * Get the L2 distance between half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_l2_distance);
+Datum
+half_l2_distance(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+	{
+		float		diff = HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]);
+
+		distance += diff * diff;
+	}
+
+	PG_RETURN_FLOAT8(sqrt((double) distance));
+}
+
+/*
+ * Get the L2 squared distance between half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_l2_squared_distance);
+Datum
+half_l2_squared_distance(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+	{
+		float		diff = HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]);
+
+		distance += diff * diff;
+	}
+
+	PG_RETURN_FLOAT8((double) distance);
+}
+
+/*
+ * Get the inner product of two half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_inner_product);
+Datum
+half_inner_product(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+		distance += HalfToFloat4(ax[i]) * HalfToFloat4(bx[i]);
+
+	PG_RETURN_FLOAT8((double) distance);
+}
+
+/*
+ * Get the negative inner product of two half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_negative_inner_product);
+Datum
+half_negative_inner_product(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+		distance += HalfToFloat4(ax[i]) * HalfToFloat4(bx[i]);
+
+	PG_RETURN_FLOAT8((double) distance * -1);
+}
+
+/*
+ * Get the cosine distance between two half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_cosine_distance);
+Datum
+half_cosine_distance(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	float		norma = 0.0;
+	float		normb = 0.0;
+	double		similarity;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+	{
+		float		axi = HalfToFloat4(ax[i]);
+		float		bxi = HalfToFloat4(bx[i]);
+
+		distance += axi * bxi;
+		norma += axi * axi;
+		normb += bxi * bxi;
+	}
+
+	/* Use sqrt(a * b) over sqrt(a) * sqrt(b) */
+	similarity = (double) distance / sqrt((double) norma * (double) normb);
+
+#ifdef _MSC_VER
+	/* /fp:fast may not propagate NaN */
+	if (isnan(similarity))
+		PG_RETURN_FLOAT8(NAN);
+#endif
+
+	/* Keep in range */
+	if (similarity > 1)
+		similarity = 1;
+	else if (similarity < -1)
+		similarity = -1;
+
+	PG_RETURN_FLOAT8(1 - similarity);
+}
+
+/*
+ * Get the L1 distance between two half arrays
+ */
+PGDLLEXPORT PG_FUNCTION_INFO_V1(half_l1_distance);
+Datum
+half_l1_distance(PG_FUNCTION_ARGS)
+{
+	ArrayType  *a = PG_GETARG_ARRAYTYPE_P(0);
+	ArrayType  *b = PG_GETARG_ARRAYTYPE_P(1);
+	half	   *ax = (half *) ARR_DATA_PTR(a);
+	half	   *bx = (half *) ARR_DATA_PTR(b);
+	float		distance = 0.0;
+	int			dim = CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < dim; i++)
+		distance += fabsf(HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]));
+
+	PG_RETURN_FLOAT8((double) distance);
+}
--- a/src/half.h
+++ b/src/half.h
@@ -0,0 +1,23 @@
+#ifndef HALF_H
+#define HALF_H
+
+#define __STDC_WANT_IEC_60559_TYPES_EXT__
+
+#include <float.h>
+
+#ifdef __FLT16_MAX__
+#define FLT16_SUPPORT
+#endif
+
+#ifdef FLT16_SUPPORT
+#define half _Float16
+#define HALF_MAX FLT16_MAX
+#else
+#define half uint16
+#define HALF_MAX 65504
+#endif
+
+#define PG_GETARG_HALF(n)  DatumGetHalf(PG_GETARG_DATUM(n))
+#define PG_RETURN_HALF(x)  return HalfGetDatum(x)
+
+#endif
--- a/src/hnsw.c
+++ b/src/hnsw.c
@@ -79,14 +79,12 @@ hnswcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	int			m;
 	int			entryLevel;
 	Relation	index;
-	double		selectivity = 1;
-	ListCell   *lc;
 #if PG_VERSION_NUM < 120000
 	List	   *qinfos;
 #endif

-	/* Never use index without order or limit */
-	if (path->indexorderbys == NULL || root->limit_tuples < 0)
+	/* Never use index without order */
+	if (path->indexorderbys == NULL)
 	{
 		*indexStartupCost = DBL_MAX;
 		*indexTotalCost = DBL_MAX;
@@ -96,29 +94,6 @@ hnswcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 		return;
 	}

-	/* Get the selectivity of non-index conditions */
-	foreach(lc, path->indexinfo->indrestrictinfo)
-	{
-		RestrictInfo *rinfo = lfirst(lc);
-
-		if (rinfo->norm_selec >= 0 && rinfo->norm_selec <= 1 && rinfo->norm_selec != (Selectivity) DEFAULT_INEQ_SEL)
-			selectivity *= rinfo->norm_selec;
-	}
-
-	/*
-	 * Do not use index if limit + offset > expected tuples unless
-	 * enable_seqscan = off
-	 */
-	if (root->limit_tuples > hnsw_ef_search * selectivity)
-	{
-		*indexStartupCost = 1.0e10 - 1;
-		*indexTotalCost = 1.0e10 - 1;
-		*indexSelectivity = 0;
-		*indexCorrelation = 0;
-		*indexPages = 0;
-		return;
-	}
-
 	MemSet(&costs, 0, sizeof(costs));

 	index = index_open(path->indexinfo->indexoid, NoLock);
--- a/src/hnsw.h
+++ b/src/hnsw.h
@@ -6,7 +6,6 @@
 #include "access/generic_xlog.h"
 #include "access/parallel.h"
 #include "access/reloptions.h"
-#include "lib/ilist.h"
 #include "nodes/execnodes.h"
 #include "port.h"				/* for random() */
 #include "utils/sampling.h"
@@ -73,10 +72,8 @@

 #if PG_VERSION_NUM >= 150000
 #define RandomDouble() pg_prng_double(&pg_global_prng_state)
-#define SeedRandom(seed) pg_prng_seed(&pg_global_prng_state, seed)
 #else
 #define RandomDouble() (((double) random()) / MAX_RANDOM_VALUE)
-#define SeedRandom(seed) srandom(seed)
 #endif

 #if PG_VERSION_NUM < 130000
@@ -94,23 +91,20 @@
 #define HnswGetMl(m) (1 / log(m))

 /* Ensure fits on page and in uint8 */
-#define HnswGetMaxLevel(m) Min(((BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(HnswPageOpaqueData)) - offsetof(HnswNeighborTupleData, indextids) - sizeof(ItemIdData)) / (sizeof(ItemPointerData)) / (m)) - 2, 255)
-
-#define HnswGetNeighbors(element, lc) (AssertMacro((element)->level >= (lc)), &(element)->neighbors[lc])
+#define HnswGetMaxLevel(m) Min(((BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(HnswPageOpaqueData)) - offsetof(HnswNeighborTupleData, indextids) - sizeof(ItemIdData)) / (sizeof(ItemPointerData)) / m) - 2, 255)

 /* Variables */
 extern int	hnsw_ef_search;
 extern bool hnsw_enable_parallel_build;

+typedef struct HnswNeighborArray HnswNeighborArray;
+
 typedef struct HnswElementData
 {
-	slist_node	next;
-	ItemPointerData heaptids[HNSW_HEAPTIDS];
-	uint8		heaptidsLength;
+	List	   *heaptids;
 	uint8		level;
 	uint8		deleted;
-	uint32		hash;
-	struct HnswNeighborArray *neighbors;
+	HnswNeighborArray *neighbors;
 	BlockNumber blkno;
 	OffsetNumber offno;
 	OffsetNumber neighborOffno;
@@ -148,16 +142,6 @@ typedef struct HnswOptions
 	int			efConstruction; /* size of dynamic candidate list */
 }			HnswOptions;

-typedef struct HnswGraph
-{
-	slist_head	elements;
-	HnswElement entryPoint;
-	long		memoryUsed;
-	long		memoryTotal;
-	bool		flushed;
-	double		indtuples;
-}			HnswGraph;
-
 typedef struct HnswSpool
 {
 	Relation	heap;
@@ -181,7 +165,7 @@ typedef struct HnswShared
 	/* Mutable state */
 	int			nparticipantsdone;
 	double		reltuples;
-	HnswGraph	graphData;
+	double		indtuples;

 #if PG_VERSION_NUM < 120000
 	ParallelHeapScanDescData heapdesc;	/* must come last */
@@ -224,14 +208,15 @@ typedef struct HnswBuildState
 	Oid			collation;

 	/* Variables */
-	HnswGraph	graphData;
-	HnswGraph  *graph;
+	List	   *elements;
+	HnswElement entryPoint;
 	double		ml;
 	int			maxLevel;
+	long		memoryLeft;
+	bool		flushed;
 	Vector	   *normvec;

 	/* Memory */
-	MemoryContext graphCtx;
 	MemoryContext tmpCtx;

 	/* Parallel builds */
@@ -318,7 +303,7 @@ typedef struct HnswVacuumState
 	Oid			collation;

 	/* Variables */
-	struct tidhash_hash *deleted;
+	HTAB	   *deleted;
 	BufferAccessStrategy bas;
 	HnswNeighborTuple ntup;
 	HnswElementData highestPoint;
@@ -332,22 +317,26 @@ int			HnswGetM(Relation index);
 int			HnswGetEfConstruction(Relation index);
 FmgrInfo   *HnswOptionalProcInfo(Relation index, uint16 procnum);
 bool		HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, Vector * result);
+void		HnswCommitBuffer(Buffer buf, GenericXLogState *state);
 Buffer		HnswNewBuffer(Relation index, ForkNumber forkNum);
 void		HnswInitPage(Buffer buf, Page page);
+void		HnswInitRegisterPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state);
 void		HnswInit(void);
 List	   *HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *procinfo, Oid collation, int m, bool inserting, HnswElement skipElement);
 HnswElement HnswGetEntryPoint(Relation index);
 void		HnswGetMetaPageInfo(Relation index, int *m, HnswElement * entryPoint);
 HnswElement HnswInitElement(ItemPointer tid, int m, double ml, int maxLevel);
+void		HnswFreeElement(HnswElement element);
 HnswElement HnswInitElementFromBlock(BlockNumber blkno, OffsetNumber offno);
 void		HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, FmgrInfo *procinfo, Oid collation, int m, int efConstruction, bool existing);
+HnswElement HnswFindDuplicate(HnswElement e);
 HnswCandidate *HnswEntryCandidate(HnswElement em, Datum q, Relation rel, FmgrInfo *procinfo, Oid collation, bool loadVec);
-void		HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, BlockNumber insertPage, ForkNumber forkNum, bool building);
+void		HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, BlockNumber insertPage, ForkNumber forkNum);
 void		HnswSetNeighborTuple(HnswNeighborTuple ntup, HnswElement e, int m);
 void		HnswAddHeapTid(HnswElement element, ItemPointer heaptid);
 void		HnswInitNeighbors(HnswElement element, int m);
-bool		HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel, bool building);
-void		HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting, bool building);
+bool		HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel);
+void		HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting);
 void		HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHeaptids, bool loadVec);
 void		HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index, FmgrInfo *procinfo, Oid collation, bool loadVec);
 void		HnswSetElementTuple(HnswElementTuple etup, HnswElement element);
@@ -371,31 +360,4 @@ void		hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys,
 bool		hnswgettuple(IndexScanDesc scan, ScanDirection dir);
 void		hnswendscan(IndexScanDesc scan);

-/* Hash tables */
-typedef struct TidHashEntry
-{
-	ItemPointerData tid;
-	char		status;
-}			TidHashEntry;
-
-#define SH_PREFIX tidhash
-#define SH_ELEMENT_TYPE TidHashEntry
-#define SH_KEY_TYPE ItemPointerData
-#define SH_SCOPE extern
-#define SH_DECLARE
-#include "lib/simplehash.h"
-
-typedef struct PointerHashEntry
-{
-	uintptr_t	ptr;
-	char		status;
-}			PointerHashEntry;
-
-#define SH_PREFIX pointerhash
-#define SH_ELEMENT_TYPE PointerHashEntry
-#define SH_KEY_TYPE uintptr_t
-#define SH_SCOPE extern
-#define SH_DECLARE
-#include "lib/simplehash.h"
-
 #endif
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -56,10 +56,6 @@
 #define PARALLEL_KEY_HNSW_SHARED		UINT64CONST(0xA000000000000001)
 #define PARALLEL_KEY_QUERY_TEXT			UINT64CONST(0xA000000000000002)

-#if PG_VERSION_NUM < 130000
-#define GENERATIONCHUNK_RAWSIZE (SIZEOF_SIZE_T + SIZEOF_VOID_P * 2)
-#endif
-
 /*
 * Create the metapage
 */
@@ -70,11 +66,11 @@ CreateMetaPage(HnswBuildState * buildstate)
 	ForkNumber	forkNum = buildstate->forkNum;
 	Buffer		buf;
 	Page		page;
+	GenericXLogState *state;
 	HnswMetaPage metap;

 	buf = HnswNewBuffer(index, forkNum);
-	page = BufferGetPage(buf);
-	HnswInitPage(buf, page);
+	HnswInitRegisterPage(index, &buf, &page, &state);

 	/* Set metapage data */
 	metap = HnswPageGetMeta(page);
@@ -90,15 +86,14 @@ CreateMetaPage(HnswBuildState * buildstate)
 	((PageHeader) page)->pd_lower =
 		((char *) metap + sizeof(HnswMetaPageData)) - (char *) page;

-	MarkBufferDirty(buf);
-	UnlockReleaseBuffer(buf);
+	HnswCommitBuffer(buf, state);
 }

 /*
 * Add a new page
 */
 static void
-HnswBuildAppendPage(Relation index, Buffer *buf, Page *page, ForkNumber forkNum)
+HnswBuildAppendPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state, ForkNumber forkNum)
 {
 	/* Add a new page */
 	Buffer		newbuf = HnswNewBuffer(index, forkNum);
@@ -107,7 +102,7 @@ HnswBuildAppendPage(Relation index, Buffer *buf, Page *page, ForkNumber forkNum)
 	HnswPageGetOpaque(*page)->nextblkno = BufferGetBlockNumber(newbuf);

 	/* Commit */
-	MarkBufferDirty(*buf);
+	GenericXLogFinish(*state);
 	UnlockReleaseBuffer(*buf);

 	/* Can take a while, so ensure we can interrupt */
@@ -118,7 +113,8 @@ HnswBuildAppendPage(Relation index, Buffer *buf, Page *page, ForkNumber forkNum)

 	/* Prepare new page */
 	*buf = newbuf;
-	*page = BufferGetPage(*buf);
+	*state = GenericXLogStart(index);
+	*page = GenericXLogRegisterBuffer(*state, *buf, GENERIC_XLOG_FULL_IMAGE);
 	HnswInitPage(*buf, *page);
 }

@@ -137,7 +133,8 @@ CreateElementPages(HnswBuildState * buildstate)
 	BlockNumber insertPage;
 	Buffer		buf;
 	Page		page;
-	slist_iter	iter;
+	GenericXLogState *state;
+	ListCell   *lc;

 	/* Calculate sizes */
 	etupAllocSize = BLCKSZ;
@@ -149,12 +146,13 @@ CreateElementPages(HnswBuildState * buildstate)

 	/* Prepare first page */
 	buf = HnswNewBuffer(index, forkNum);
-	page = BufferGetPage(buf);
+	state = GenericXLogStart(index);
+	page = GenericXLogRegisterBuffer(state, buf, GENERIC_XLOG_FULL_IMAGE);
 	HnswInitPage(buf, page);

-	slist_foreach(iter, &buildstate->graph->elements)
+	foreach(lc, buildstate->elements)
 	{
-		HnswElement element = slist_container(HnswElementData, next, iter.cur);
+		HnswElement element = lfirst(lc);
 		Size		etupSize;
 		Size		ntupSize;
 		Size		combinedSize;
@@ -175,7 +173,7 @@ CreateElementPages(HnswBuildState * buildstate)

 		/* Keep element and neighbors on the same page if possible */
 		if (PageGetFreeSpace(page) < etupSize || (combinedSize <= maxSize && PageGetFreeSpace(page) < combinedSize))
-			HnswBuildAppendPage(index, &buf, &page, forkNum);
+			HnswBuildAppendPage(index, &buf, &page, &state, forkNum);

 		/* Calculate offsets */
 		element->blkno = BufferGetBlockNumber(buf);
@@ -199,7 +197,7 @@ CreateElementPages(HnswBuildState * buildstate)

 		/* Add new page if needed */
 		if (PageGetFreeSpace(page) < ntupSize)
-			HnswBuildAppendPage(index, &buf, &page, forkNum);
+			HnswBuildAppendPage(index, &buf, &page, &state, forkNum);

 		/* Add placeholder for neighbors */
 		if (PageAddItem(page, (Item) ntup, ntupSize, InvalidOffsetNumber, false, false) != element->neighborOffno)
@@ -209,10 +207,10 @@ CreateElementPages(HnswBuildState * buildstate)
 	insertPage = BufferGetBlockNumber(buf);

 	/* Commit */
-	MarkBufferDirty(buf);
+	GenericXLogFinish(state);
 	UnlockReleaseBuffer(buf);

-	HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_ALWAYS, buildstate->graph->entryPoint, insertPage, forkNum, true);
+	HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_ALWAYS, buildstate->entryPoint, insertPage, forkNum);

 	pfree(etup);
 	pfree(ntup);
@@ -227,17 +225,18 @@ CreateNeighborPages(HnswBuildState * buildstate)
 	Relation	index = buildstate->index;
 	ForkNumber	forkNum = buildstate->forkNum;
 	int			m = buildstate->m;
-	slist_iter	iter;
+	ListCell   *lc;
 	HnswNeighborTuple ntup;

 	/* Allocate once */
 	ntup = palloc0(BLCKSZ);

-	slist_foreach(iter, &buildstate->graph->elements)
+	foreach(lc, buildstate->elements)
 	{
-		HnswElement e = slist_container(HnswElementData, next, iter.cur);
+		HnswElement e = lfirst(lc);
 		Buffer		buf;
 		Page		page;
+		GenericXLogState *state;
 		Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);

 		/* Can take a while, so ensure we can interrupt */
@@ -246,7 +245,8 @@ CreateNeighborPages(HnswBuildState * buildstate)

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

 		HnswSetNeighborTuple(ntup, e, m);

@@ -254,30 +254,26 @@ CreateNeighborPages(HnswBuildState * buildstate)
 			elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));

 		/* Commit */
-		MarkBufferDirty(buf);
+		GenericXLogFinish(state);
 		UnlockReleaseBuffer(buf);
 	}

 	pfree(ntup);
 }

-#ifdef HNSW_MEMORY
 /*
- * Show memory usage
+ * Free elements
 */
 static void
-ShowMemoryUsage(HnswBuildState * buildstate)
+FreeElements(HnswBuildState * buildstate)
 {
-#if PG_VERSION_NUM >= 130000
-	elog(INFO, "graph memory: %zu MB, total memory: %zu MB",
-		 MemoryContextMemAllocated(buildstate->graphCtx, false) / (1024 * 1024),
-		 MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
-#else
-	MemoryContextStats(CurrentMemoryContext);
-	elog(INFO, "estimated memory: %zu MB", buildstate->memoryUsed / (1024 * 1024));
-#endif
+	ListCell   *lc;
+
+	foreach(lc, buildstate->elements)
+		HnswFreeElement(lfirst(lc));
+
+	list_free(buildstate->elements);
 }
-#endif

 /*
 * Flush pages
@@ -285,78 +281,26 @@ ShowMemoryUsage(HnswBuildState * buildstate)
 static void
 FlushPages(HnswBuildState * buildstate)
 {
-#ifdef HNSW_MEMORY
-	ShowMemoryUsage(buildstate);
-#endif
-
 	CreateMetaPage(buildstate);
 	CreateElementPages(buildstate);
 	CreateNeighborPages(buildstate);

-	buildstate->graph->flushed = true;
-	MemoryContextReset(buildstate->graphCtx);
+	buildstate->flushed = true;
+	FreeElements(buildstate);
 }

-#if PG_VERSION_NUM < 130000
 /*
- * Get the memory used by an element
- */
-static long
-HnswElementMemory(HnswElement e, int m)
-{
-	long		elementSize = sizeof(HnswElementData);
-
-	elementSize += sizeof(HnswNeighborArray) * (e->level + 1);
-	elementSize += sizeof(HnswCandidate) * (m * (e->level + 2));
-	elementSize += VARSIZE_ANY(DatumGetPointer(e->value));
-	/* Each allocation has a chunk header */
-	elementSize += (e->level + 4) * GENERATIONCHUNK_RAWSIZE;
-	/* Add an extra 5% for alignment and other overhead */
-	return elementSize * 1.05;
-}
-#endif
-
-/*
- * Find duplicate element
+ * Insert tuple
 */
 static bool
-HnswFindDuplicateInMemory(HnswElement element)
-{
-	HnswNeighborArray *neighbors = HnswGetNeighbors(element, 0);
-
-	for (int i = 0; i < neighbors->length; i++)
-	{
-		HnswCandidate *neighbor = &neighbors->items[i];
-
-		/* Exit early since ordered by distance */
-		if (!datumIsEqual(element->value, neighbor->element->value, false, -1))
-			return false;
-
-		/* Check for space */
-		if (neighbor->element->heaptidsLength < HNSW_HEAPTIDS)
-		{
-			HnswAddHeapTid(neighbor->element, &element->heaptids[0]);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/*
- * Insert tuple into in-memory graph
- */
-static bool
-InsertTupleInMemory(Relation index, Datum *values, ItemPointer heaptid, HnswBuildState * buildstate)
+InsertTuple(Relation index, Datum *values, HnswElement element, HnswBuildState * buildstate, HnswElement * dup, MemoryContext outerCtx)
 {
 	FmgrInfo   *procinfo = buildstate->procinfo;
 	Oid			collation = buildstate->collation;
-	HnswGraph  *graph = buildstate->graph;
-	HnswElement entryPoint = graph->entryPoint;
+	HnswElement entryPoint = buildstate->entryPoint;
 	int			efConstruction = buildstate->efConstruction;
 	int			m = buildstate->m;
 	MemoryContext oldCtx;
-	HnswElement element;

 	/* Detoast once for all calls */
 	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
@@ -368,67 +312,52 @@ InsertTupleInMemory(Relation index, Datum *values, ItemPointer heaptid, HnswBuil
 			return false;
 	}

-	/* Allocate element in graph memory context */
-	oldCtx = MemoryContextSwitchTo(buildstate->graphCtx);
-	element = HnswInitElement(heaptid, buildstate->m, buildstate->ml, buildstate->maxLevel);
+	/* Copy value to element so accessible outside of memory context */
+	oldCtx = MemoryContextSwitchTo(outerCtx);
 	element->value = datumCopy(value, false, -1);
 	MemoryContextSwitchTo(oldCtx);

-	/* Update memory usage */
-#if PG_VERSION_NUM >= 130000
-	graph->memoryUsed = MemoryContextMemAllocated(buildstate->graphCtx, false);
-#else
-	graph->memoryUsed += HnswElementMemory(element, buildstate->m);
-#endif
-
 	/* Insert element in graph */
 	HnswInsertElement(element, entryPoint, NULL, procinfo, collation, m, efConstruction, false);

 	/* Look for duplicate */
-	if (HnswFindDuplicateInMemory(element))
+	*dup = HnswFindDuplicate(element);
+
+	/* Update neighbors if needed */
+	if (*dup == NULL)
 	{
-		/* No need to free element since memory unlikely to be reallocated */
-		return true;
-	}
+		for (int lc = element->level; lc >= 0; lc--)
+		{
+			int			lm = HnswGetLayerM(m, lc);
+			HnswNeighborArray *neighbors = &element->neighbors[lc];

-	/* Add element */
-	slist_push_head(&graph->elements, &element->next);
-
-	/* Update neighbors */
-	for (int lc = element->level; lc >= 0; lc--)
-	{
-		int			lm = HnswGetLayerM(m, lc);
-		HnswNeighborArray *neighbors = HnswGetNeighbors(element, lc);
-
-		for (int i = 0; i < neighbors->length; i++)
-			HnswUpdateConnection(element, &neighbors->items[i], lm, lc, NULL, NULL, procinfo, collation);
+			for (int i = 0; i < neighbors->length; i++)
+				HnswUpdateConnection(element, &neighbors->items[i], lm, lc, NULL, NULL, procinfo, collation);
+		}
 	}

 	/* Update entry point if needed */
-	if (entryPoint == NULL || element->level > entryPoint->level)
-		graph->entryPoint = element;
+	if (*dup == NULL && (entryPoint == NULL || element->level > entryPoint->level))
+		buildstate->entryPoint = element;

-	return true;
+	UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++buildstate->indtuples);
+
+	return *dup == NULL;
 }

 /*
- * Acquire a lock if needed
+ * Get the memory used by an element
 */
-static inline void
-HnswLockAcquire(HnswShared * hnswshared)
+static long
+HnswElementMemory(HnswElement e, int m)
 {
-	if (hnswshared)
-		SpinLockAcquire(&hnswshared->mutex);
-}
+	long		elementSize = sizeof(HnswElementData);

-/*
- * Release a lock if needed
- */
-static inline void
-HnswLockRelease(HnswShared * hnswshared)
-{
-	if (hnswshared)
-		SpinLockRelease(&hnswshared->mutex);
+	elementSize += sizeof(HnswNeighborArray) * (e->level + 1);
+	elementSize += sizeof(HnswCandidate) * (m * (e->level + 2));
+	elementSize += sizeof(ItemPointerData);
+	elementSize += VARSIZE_ANY(DatumGetPointer(e->value));
+	return elementSize;
 }

 /*
@@ -439,9 +368,9 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 			  bool *isnull, bool tupleIsAlive, void *state)
 {
 	HnswBuildState *buildstate = (HnswBuildState *) state;
-	HnswGraph  *graph = buildstate->graph;
-	HnswShared *hnswshared = buildstate->hnswshared;
 	MemoryContext oldCtx;
+	HnswElement element;
+	HnswElement dup = NULL;
 	bool		inserted;

 #if PG_VERSION_NUM < 130000
@@ -452,50 +381,69 @@ BuildCallback(Relation index, CALLBACK_ITEM_POINTER, Datum *values,
 	if (isnull[0])
 		return;

-	/* Flush pages if needed */
-	if (!graph->flushed && graph->memoryUsed >= graph->memoryTotal)
+	if (buildstate->memoryLeft <= 0)
 	{
-		ereport(NOTICE,
-				(errmsg("hnsw graph no longer fits into maintenance_work_mem after " INT64_FORMAT " tuples", (int64) graph->indtuples),
-				 errdetail("Building will take significantly more time."),
-				 errhint("Increase maintenance_work_mem to speed up builds.")));
+		if (!buildstate->flushed)
+		{
+			ereport(NOTICE,
+					(errmsg("hnsw graph no longer fits into maintenance_work_mem after " INT64_FORMAT " tuples", (int64) buildstate->indtuples),
+					 errdetail("Building will take significantly more time."),
+					 errhint("Increase maintenance_work_mem to speed up builds.")));

-		FlushPages(buildstate);
+			FlushPages(buildstate);
+		}
+
+		oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
+
+		if (HnswInsertTuple(buildstate->index, values, isnull, tid, buildstate->heap))
+		{
+			if (buildstate->hnswshared)
+			{
+				HnswShared *hnswshared = buildstate->hnswshared;
+
+				SpinLockAcquire(&hnswshared->mutex);
+				UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++hnswshared->indtuples);
+				SpinLockRelease(&hnswshared->mutex);
+			}
+			else
+				UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++buildstate->indtuples);
+		}
+
+		/* Reset memory context */
+		MemoryContextSwitchTo(oldCtx);
+		MemoryContextReset(buildstate->tmpCtx);
+
+		return;
 	}

+	/* Allocate necessary memory outside of memory context */
+	element = HnswInitElement(tid, buildstate->m, buildstate->ml, buildstate->maxLevel);
+
+	/* Use memory context since detoast can allocate */
 	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);

 	/* Insert tuple */
-	if (graph->flushed)
-		inserted = HnswInsertTuple(index, values, isnull, tid, buildstate->heap, true);
-	else
-		inserted = InsertTupleInMemory(index, values, tid, buildstate);
-
-	/* Update progress */
-	if (inserted)
-	{
-		HnswLockAcquire(hnswshared);
-		UpdateProgress(PROGRESS_CREATEIDX_TUPLES_DONE, ++graph->indtuples);
-		HnswLockRelease(hnswshared);
-	}
+	inserted = InsertTuple(index, values, element, buildstate, &dup, oldCtx);

 	/* Reset memory context */
 	MemoryContextSwitchTo(oldCtx);
 	MemoryContextReset(buildstate->tmpCtx);
-}

-/*
- * Initialize the graph
- */
-static void
-InitGraph(HnswGraph * graph)
-{
-	slist_init(&graph->elements);
-	graph->entryPoint = NULL;
-	graph->memoryUsed = 0;
-	graph->memoryTotal = maintenance_work_mem * 1024L;
-	graph->flushed = false;
-	graph->indtuples = 0;
+	/* Add outside memory context */
+	if (dup != NULL)
+	{
+		HnswAddHeapTid(dup, tid);
+		buildstate->memoryLeft -= sizeof(ItemPointerData);
+	}
+
+	/* Add to buildstate or free */
+	if (inserted)
+	{
+		buildstate->elements = lappend(buildstate->elements, element);
+		buildstate->memoryLeft -= HnswElementMemory(element, buildstate->m);
+	}
+	else
+		HnswFreeElement(element);
 }

 /*
@@ -531,20 +479,16 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 	buildstate->normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
 	buildstate->collation = index->rd_indcollation[0];

-	InitGraph(&buildstate->graphData);
-	buildstate->graph = &buildstate->graphData;
+	buildstate->elements = NIL;
+	buildstate->entryPoint = NULL;
 	buildstate->ml = HnswGetMl(buildstate->m);
 	buildstate->maxLevel = HnswGetMaxLevel(buildstate->m);
+	buildstate->memoryLeft = maintenance_work_mem * 1024L;
+	buildstate->flushed = false;

 	/* Reuse for each tuple */
 	buildstate->normvec = InitVector(buildstate->dimensions);

-	buildstate->graphCtx = GenerationContextCreate(CurrentMemoryContext,
-												   "Hnsw build graph context",
-#if PG_VERSION_NUM >= 150000
-												   1024 * 1024, 1024 * 1024,
-#endif
-												   1024 * 1024);
 	buildstate->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
 											   "Hnsw build temporary context",
 											   ALLOCSET_DEFAULT_SIZES);
@@ -560,7 +504,6 @@ static void
 FreeBuildState(HnswBuildState * buildstate)
 {
 	pfree(buildstate->normvec);
-	MemoryContextDelete(buildstate->graphCtx);
 	MemoryContextDelete(buildstate->tmpCtx);
 }

@@ -580,7 +523,7 @@ ParallelHeapScan(HnswBuildState * buildstate)
 		SpinLockAcquire(&hnswshared->mutex);
 		if (hnswshared->nparticipantsdone == nparticipanttuplesorts)
 		{
-			buildstate->graph = &hnswshared->graphData;
+			buildstate->indtuples = hnswshared->indtuples;
 			reltuples = hnswshared->reltuples;
 			SpinLockRelease(&hnswshared->mutex);
 			break;
@@ -615,7 +558,9 @@ HnswParallelScanAndInsert(HnswSpool * hnswspool, HnswShared * hnswshared, bool p
 	indexInfo = BuildIndexInfo(hnswspool->index);
 	indexInfo->ii_Concurrent = hnswshared->isconcurrent;
 	InitBuildState(&buildstate, hnswspool->heap, hnswspool->index, indexInfo, MAIN_FORKNUM);
-	buildstate.graph = &hnswshared->graphData;
+	/* TODO Support in-memory builds */
+	buildstate.memoryLeft = 0;
+	buildstate.flushed = true;
 	buildstate.hnswshared = hnswshared;
 #if PG_VERSION_NUM >= 120000
 	scan = table_beginscan_parallel(hnswspool->heap,
@@ -840,10 +785,7 @@ HnswBeginParallel(HnswBuildState * buildstate, bool isconcurrent, int request)
 	/* Initialize mutable state */
 	hnswshared->nparticipantsdone = 0;
 	hnswshared->reltuples = 0;
-	InitGraph(&hnswshared->graphData);
-	/* TODO Support in-memory builds */
-	hnswshared->graphData.memoryTotal = 0;
-	hnswshared->graphData.flushed = true;
+	hnswshared->indtuples = 0;
 #if PG_VERSION_NUM >= 120000
 	table_parallelscan_initialize(buildstate->heap,
 								  ParallelTableScanFromHnswShared(hnswshared),
@@ -894,27 +836,6 @@ HnswBeginParallel(HnswBuildState * buildstate, bool isconcurrent, int request)
 	WaitForParallelWorkersToAttach(pcxt);
 }

-/*
- * Compute parallel workers
- */
-static int
-ComputeParallelWorkers(Relation heap, Relation index)
-{
-	int			parallel_workers;
-
-	/* Make sure it's safe to use parallel workers */
-	parallel_workers = plan_create_index_workers(RelationGetRelid(heap), RelationGetRelid(index));
-	if (parallel_workers == 0)
-		return 0;
-
-	/* Use parallel_workers storage parameter on table if set */
-	parallel_workers = RelationGetParallelWorkers(heap, -1);
-	if (parallel_workers != -1)
-		return Min(parallel_workers, max_parallel_maintenance_workers);
-
-	return max_parallel_maintenance_workers;
-}
-
 /*
 * Build graph
 */
@@ -926,8 +847,8 @@ BuildGraph(HnswBuildState * buildstate, ForkNumber forkNum)
 	UpdateProgress(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_HNSW_PHASE_LOAD);

 	/* Calculate parallel workers */
-	if (buildstate->heap != NULL && hnsw_enable_parallel_build)
-		parallel_workers = ComputeParallelWorkers(buildstate->heap, buildstate->index);
+	if (hnsw_enable_parallel_build)
+		parallel_workers = plan_create_index_workers(RelationGetRelid(buildstate->heap), RelationGetRelid(buildstate->index));

 	/* Attempt to launch parallel worker scan when required */
 	if (parallel_workers > 0)
@@ -937,50 +858,25 @@ BuildGraph(HnswBuildState * buildstate, ForkNumber forkNum)
 		HnswBeginParallel(buildstate, buildstate->indexInfo->ii_Concurrent, parallel_workers);
 	}

-	/* Add tuples to graph */
-	if (buildstate->heap != NULL)
+	/* Add tuples to sort */
+	if (buildstate->hnswleader)
+		buildstate->reltuples = ParallelHeapScan(buildstate);
+	else
 	{
-		if (buildstate->hnswleader)
-			buildstate->reltuples = ParallelHeapScan(buildstate);
-		else
-		{
 #if PG_VERSION_NUM >= 120000
-			buildstate->reltuples = table_index_build_scan(buildstate->heap, buildstate->index, buildstate->indexInfo,
-														   true, true, BuildCallback, (void *) buildstate, NULL);
+		buildstate->reltuples = table_index_build_scan(buildstate->heap, buildstate->index, buildstate->indexInfo,
+													   true, true, BuildCallback, (void *) buildstate, NULL);
 #else
-			buildstate->reltuples = IndexBuildHeapScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
-													   true, BuildCallback, (void *) buildstate, NULL);
+		buildstate->reltuples = IndexBuildHeapScan(buildstate->heap, buildstate->index, buildstate->indexInfo,
+												   true, BuildCallback, (void *) buildstate, NULL);
 #endif
-		}
-
-		buildstate->indtuples = buildstate->graph->indtuples;
 	}

-	/* Flush pages */
-	if (!buildstate->graph->flushed)
-		FlushPages(buildstate);
-
 	/* End parallel build */
 	if (buildstate->hnswleader)
 		HnswEndParallel(buildstate->hnswleader);
 }

-#if PG_VERSION_NUM < 110008
-void
-log_newpage_range(Relation rel, ForkNumber forkNum, BlockNumber startblk, BlockNumber endblk, bool page_std)
-{
-	for (BlockNumber blkno = startblk; blkno < endblk; blkno++)
-	{
-		Buffer		buf = ReadBufferExtended(rel, forkNum, blkno, RBM_NORMAL, NULL);
-
-		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-		MarkBufferDirty(buf);
-		log_newpage_buffer(buf, page_std);
-		UnlockReleaseBuffer(buf);
-	}
-}
-#endif
-
 /*
 * Build the index
 */
@@ -988,16 +884,13 @@ static void
 BuildIndex(Relation heap, Relation index, IndexInfo *indexInfo,
 		   HnswBuildState * buildstate, ForkNumber forkNum)
 {
-#ifdef HNSW_MEMORY
-	SeedRandom(42);
-#endif
-
 	InitBuildState(buildstate, heap, index, indexInfo, forkNum);

-	BuildGraph(buildstate, forkNum);
+	if (buildstate->heap != NULL)
+		BuildGraph(buildstate, forkNum);

-	if (RelationNeedsWAL(index))
-		log_newpage_range(index, forkNum, 0, RelationGetNumberOfBlocks(index), true);
+	if (!buildstate->flushed)
+		FlushPages(buildstate);

 	FreeBuildState(buildstate);
 }
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -5,7 +5,6 @@
 #include "hnsw.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
-#include "utils/datum.h"
 #include "utils/memutils.h"

 /*
@@ -93,7 +92,7 @@ HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size
 * Add a new page
 */
 static void
-HnswInsertAppendPage(Relation index, Buffer *nbuf, Page *npage, GenericXLogState *state, Page page, bool building)
+HnswInsertAppendPage(Relation index, Buffer *nbuf, Page *npage, GenericXLogState *state, Page page)
 {
 	/* Add a new page */
 	LockRelationForExtension(index, ExclusiveLock);
@@ -101,11 +100,7 @@ HnswInsertAppendPage(Relation index, Buffer *nbuf, Page *npage, GenericXLogState
 	UnlockRelationForExtension(index, ExclusiveLock);

 	/* Init new page */
-	if (building)
-		*npage = BufferGetPage(*nbuf);
-	else
-		*npage = GenericXLogRegisterBuffer(state, *nbuf, GENERIC_XLOG_FULL_IMAGE);
-
+	*npage = GenericXLogRegisterBuffer(state, *nbuf, GENERIC_XLOG_FULL_IMAGE);
 	HnswInitPage(*nbuf, *npage);

 	/* Update previous buffer */
@@ -116,7 +111,7 @@ HnswInsertAppendPage(Relation index, Buffer *nbuf, Page *npage, GenericXLogState
 * Add to element and neighbor pages
 */
 static void
-WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPage, BlockNumber *updatedInsertPage, bool building)
+WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPage, BlockNumber *updatedInsertPage)
 {
 	Buffer		buf;
 	Page		page;
@@ -156,16 +151,8 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 		buf = ReadBuffer(index, currentPage);
 		LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);

-		if (building)
-		{
-			state = NULL;
-			page = BufferGetPage(buf);
-		}
-		else
-		{
-			state = GenericXLogStart(index);
-			page = GenericXLogRegisterBuffer(state, buf, 0);
-		}
+		state = GenericXLogStart(index);
+		page = GenericXLogRegisterBuffer(state, buf, 0);

 		/* Keep track of first page where element at level 0 can fit */
 		if (!BlockNumberIsValid(newInsertPage) && PageGetFreeSpace(page) >= minCombinedSize)
@@ -185,12 +172,7 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 		if (HnswFreeOffset(index, buf, page, e, ntupSize, &nbuf, &npage, &freeOffno, &freeNeighborOffno, &newInsertPage))
 		{
 			if (nbuf != buf)
-			{
-				if (building)
-					npage = BufferGetPage(nbuf);
-				else
-					npage = GenericXLogRegisterBuffer(state, nbuf, 0);
-			}
+				npage = GenericXLogRegisterBuffer(state, nbuf, 0);

 			break;
 		}
@@ -199,7 +181,7 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 		/* Skip if both tuples can fit on the same page */
 		if (combinedSize > maxSize && PageGetFreeSpace(page) >= etupSize && !BlockNumberIsValid(HnswPageGetOpaque(page)->nextblkno))
 		{
-			HnswInsertAppendPage(index, &nbuf, &npage, state, page, building);
+			HnswInsertAppendPage(index, &nbuf, &npage, state, page);
 			break;
 		}

@@ -208,8 +190,7 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 		if (BlockNumberIsValid(currentPage))
 		{
 			/* Move to next page */
-			if (!building)
-				GenericXLogAbort(state);
+			GenericXLogAbort(state);
 			UnlockReleaseBuffer(buf);
 		}
 		else
@@ -217,33 +198,22 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 			Buffer		newbuf;
 			Page		newpage;

-			HnswInsertAppendPage(index, &newbuf, &newpage, state, page, building);
+			HnswInsertAppendPage(index, &newbuf, &newpage, state, page);

 			/* Commit */
-			if (building)
-				MarkBufferDirty(buf);
-			else
-				GenericXLogFinish(state);
+			GenericXLogFinish(state);

 			/* Unlock previous buffer */
 			UnlockReleaseBuffer(buf);

 			/* Prepare new buffer */
+			state = GenericXLogStart(index);
 			buf = newbuf;
-			if (building)
-			{
-				state = NULL;
-				page = BufferGetPage(buf);
-			}
-			else
-			{
-				state = GenericXLogStart(index);
-				page = GenericXLogRegisterBuffer(state, buf, 0);
-			}
+			page = GenericXLogRegisterBuffer(state, buf, 0);

 			/* Create new page for neighbors if needed */
 			if (PageGetFreeSpace(page) < combinedSize)
-				HnswInsertAppendPage(index, &nbuf, &npage, state, page, building);
+				HnswInsertAppendPage(index, &nbuf, &npage, state, page);
 			else
 			{
 				nbuf = buf;
@@ -297,14 +267,7 @@ WriteNewElementPages(Relation index, HnswElement e, int m, BlockNumber insertPag
 	}

 	/* Commit */
-	if (building)
-	{
-		MarkBufferDirty(buf);
-		if (nbuf != buf)
-			MarkBufferDirty(nbuf);
-	}
-	else
-		GenericXLogFinish(state);
+	GenericXLogFinish(state);
 	UnlockReleaseBuffer(buf);
 	if (nbuf != buf)
 		UnlockReleaseBuffer(nbuf);
@@ -338,12 +301,12 @@ ConnectionExists(HnswElement e, HnswNeighborTuple ntup, int startIdx, int lm)
 * Update neighbors
 */
 void
-HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting, bool building)
+HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement e, int m, bool checkExisting)
 {
 	for (int lc = e->level; lc >= 0; lc--)
 	{
 		int			lm = HnswGetLayerM(m, lc);
-		HnswNeighborArray *neighbors = HnswGetNeighbors(e, lc);
+		HnswNeighborArray *neighbors = &e->neighbors[lc];

 		for (int i = 0; i < neighbors->length; i++)
 		{
@@ -379,16 +342,8 @@ HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswE
 			/* Register page */
 			buf = ReadBuffer(index, hc->element->neighborPage);
 			LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-			if (building)
-			{
-				state = NULL;
-				page = BufferGetPage(buf);
-			}
-			else
-			{
-				state = GenericXLogStart(index);
-				page = GenericXLogRegisterBuffer(state, buf, 0);
-			}
+			state = GenericXLogStart(index);
+			page = GenericXLogRegisterBuffer(state, buf, 0);

 			/* Get tuple */
 			itemid = PageGetItemId(page, offno);
@@ -430,12 +385,9 @@ HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswE
 					elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));

 				/* Commit */
-				if (building)
-					MarkBufferDirty(buf);
-				else
-					GenericXLogFinish(state);
+				GenericXLogFinish(state);
 			}
-			else if (!building)
+			else
 				GenericXLogAbort(state);

 			UnlockReleaseBuffer(buf);
@@ -447,7 +399,7 @@ HnswUpdateNeighborPages(Relation index, FmgrInfo *procinfo, Oid collation, HnswE
 * Add a heap TID to an existing element
 */
 static bool
-HnswAddDuplicate(Relation index, HnswElement element, HnswElement dup, bool building)
+HnswAddDuplicate(Relation index, HnswElement element, HnswElement dup)
 {
 	Buffer		buf;
 	Page		page;
@@ -460,16 +412,8 @@ HnswAddDuplicate(Relation index, HnswElement element, HnswElement dup, bool buil
 	/* Read page */
 	buf = ReadBuffer(index, dup->blkno);
 	LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-	if (building)
-	{
-		state = NULL;
-		page = BufferGetPage(buf);
-	}
-	else
-	{
-		state = GenericXLogStart(index);
-		page = GenericXLogRegisterBuffer(state, buf, 0);
-	}
+	state = GenericXLogStart(index);
+	page = GenericXLogRegisterBuffer(state, buf, 0);

 	/* Find space */
 	itemid = PageGetItemId(page, dup->offno);
@@ -484,84 +428,60 @@ HnswAddDuplicate(Relation index, HnswElement element, HnswElement dup, bool buil
 	/* Either being deleted or we lost our chance to another backend */
 	if (i == 0 || i == HNSW_HEAPTIDS)
 	{
-		if (!building)
-			GenericXLogAbort(state);
+		GenericXLogAbort(state);
 		UnlockReleaseBuffer(buf);
 		return false;
 	}

 	/* Add heap TID */
-	etup->heaptids[i] = element->heaptids[0];
+	etup->heaptids[i] = *((ItemPointer) linitial(element->heaptids));

 	/* Overwrite tuple */
 	if (!PageIndexTupleOverwrite(page, dup->offno, (Item) etup, etupSize))
 		elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));

 	/* Commit */
-	if (building)
-		MarkBufferDirty(buf);
-	else
-		GenericXLogFinish(state);
+	GenericXLogFinish(state);
 	UnlockReleaseBuffer(buf);

 	return true;
 }

-/*
- * Find duplicate element
- */
-static bool
-HnswFindDuplicate(Relation index, HnswElement element, bool building)
-{
-	HnswNeighborArray *neighbors = HnswGetNeighbors(element, 0);
-
-	for (int i = 0; i < neighbors->length; i++)
-	{
-		HnswCandidate *neighbor = &neighbors->items[i];
-
-		/* Exit early since ordered by distance */
-		if (!datumIsEqual(element->value, neighbor->element->value, false, -1))
-			return false;
-
-		if (HnswAddDuplicate(index, element, neighbor->element, building))
-			return true;
-	}
-
-	return false;
-}
-
 /*
 * Write changes to disk
 */
 static void
-WriteElement(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement element, int m, int efConstruction, HnswElement entryPoint, bool building)
+WriteElement(Relation index, FmgrInfo *procinfo, Oid collation, HnswElement element, int m, int efConstruction, HnswElement dup, HnswElement entryPoint)
 {
 	BlockNumber newInsertPage = InvalidBlockNumber;

-	/* Look for duplicate */
-	if (HnswFindDuplicate(index, element, building))
-		return;
+	/* Try to add to existing page */
+	if (dup != NULL)
+	{
+		if (HnswAddDuplicate(index, element, dup))
+			return;
+	}

 	/* Write element and neighbor tuples */
-	WriteNewElementPages(index, element, m, GetInsertPage(index), &newInsertPage, building);
+	WriteNewElementPages(index, element, m, GetInsertPage(index), &newInsertPage);

 	/* Update insert page if needed */
 	if (BlockNumberIsValid(newInsertPage))
-		HnswUpdateMetaPage(index, 0, NULL, newInsertPage, MAIN_FORKNUM, building);
+		HnswUpdateMetaPage(index, 0, NULL, newInsertPage, MAIN_FORKNUM);

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

-	/* Update entry point if needed */
+	/* Update metapage if needed */
 	if (entryPoint == NULL || element->level > entryPoint->level)
-		HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_GREATER, element, InvalidBlockNumber, MAIN_FORKNUM, building);
+		HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_GREATER, element, InvalidBlockNumber, MAIN_FORKNUM);
 }

 /*
 * Insert a tuple into the index
 */
 bool
-HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel, bool building)
+HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, Relation heapRel)
 {
 	Datum		value;
 	FmgrInfo   *normprocinfo;
@@ -571,6 +491,7 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
 	int			efConstruction = HnswGetEfConstruction(index);
 	FmgrInfo   *procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
 	Oid			collation = index->rd_indcollation[0];
+	HnswElement dup;
 	LOCKMODE	lockmode = ShareLock;

 	/* Detoast once for all calls */
@@ -615,8 +536,11 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
 	/* Insert element in graph */
 	HnswInsertElement(element, entryPoint, index, procinfo, collation, m, efConstruction, false);

+	/* Look for duplicate */
+	dup = HnswFindDuplicate(element);
+
 	/* Write to disk */
-	WriteElement(index, procinfo, collation, element, m, efConstruction, entryPoint, building);
+	WriteElement(index, procinfo, collation, element, m, efConstruction, dup, entryPoint);

 	/* Release lock */
 	UnlockPage(index, HNSW_UPDATE_LOCK, lockmode);
@@ -650,7 +574,7 @@ hnswinsert(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid,
 	oldCtx = MemoryContextSwitchTo(insertCtx);

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

 	/* Delete memory context */
 	MemoryContextSwitchTo(oldCtx);
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -188,13 +188,15 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		ItemPointer heaptid;

 		/* Move to next element if no valid heap TIDs */
-		if (hc->element->heaptidsLength == 0)
+		if (list_length(hc->element->heaptids) == 0)
 		{
 			so->w = list_delete_last(so->w);
 			continue;
 		}

-		heaptid = &hc->element->heaptids[--hc->element->heaptidsLength];
+		heaptid = llast(hc->element->heaptids);
+
+		hc->element->heaptids = list_delete_last(hc->element->heaptids);

 		MemoryContextSwitchTo(oldCtx);

--- a/src/hnswutils.c
+++ b/src/hnswutils.c
@@ -7,89 +7,6 @@
 #include "utils/datum.h"
 #include "vector.h"

-#if PG_VERSION_NUM >= 130000
-#include "common/hashfn.h"
-#else
-#include "utils/hashutils.h"
-#endif
-
-#if PG_VERSION_NUM < 170000
-static inline uint64
-murmurhash64(uint64 data)
-{
-	uint64		h = data;
-
-	h ^= h >> 33;
-	h *= 0xff51afd7ed558ccd;
-	h ^= h >> 33;
-	h *= 0xc4ceb9fe1a85ec53;
-	h ^= h >> 33;
-
-	return h;
-}
-#endif
-
-/* TID hash table */
-static uint32
-hash_tid(ItemPointerData tid)
-{
-	union
-	{
-		uint64		i;
-		ItemPointerData tid;
-	}			x;
-
-	/* Initialize unused bytes */
-	x.i = 0;
-	x.tid = tid;
-
-	return murmurhash64(x.i);
-}
-
-#define SH_PREFIX		tidhash
-#define SH_ELEMENT_TYPE	TidHashEntry
-#define SH_KEY_TYPE		ItemPointerData
-#define	SH_KEY			tid
-#define SH_HASH_KEY(tb, key)	hash_tid(key)
-#define SH_EQUAL(tb, a, b)		ItemPointerEquals(&a, &b)
-#define	SH_SCOPE		extern
-#define SH_DEFINE
-#include "lib/simplehash.h"
-
-/* Needed to include simplehash.h twice */
-#if PG_VERSION_NUM < 120000
-#undef SH_EQUAL
-#define sh_log2 pointerhash_sh_log2
-#define sh_pow2 pointerhash_sh_pow2
-#endif
-
-/* Pointer hash table */
-static uint32
-hash_pointer(uintptr_t ptr)
-{
-#if SIZEOF_VOID_P == 8
-	return murmurhash64((uint64) ptr);
-#else
-	return murmurhash32((uint32) ptr);
-#endif
-}
-
-#define SH_PREFIX		pointerhash
-#define SH_ELEMENT_TYPE	PointerHashEntry
-#define SH_KEY_TYPE		uintptr_t
-#define	SH_KEY			ptr
-#define SH_HASH_KEY(tb, key)	hash_pointer(key)
-#define SH_EQUAL(tb, a, b)		(a == b)
-#define	SH_SCOPE		extern
-#define SH_DEFINE
-#include "lib/simplehash.h"
-
-typedef union
-{
-	pointerhash_hash *pointers;
-	tidhash_hash *tids;
-}			visited_hash;
-
 /*
 * Get the max number of connections in an upper layer for each element in the index
 */
@@ -184,6 +101,27 @@ HnswInitPage(Buffer buf, Page page)
 	HnswPageGetOpaque(page)->page_id = HNSW_PAGE_ID;
 }

+/*
+ * Init and register page
+ */
+void
+HnswInitRegisterPage(Relation index, Buffer *buf, Page *page, GenericXLogState **state)
+{
+	*state = GenericXLogStart(index);
+	*page = GenericXLogRegisterBuffer(*state, *buf, GENERIC_XLOG_FULL_IMAGE);
+	HnswInitPage(*buf, *page);
+}
+
+/*
+ * Commit buffer
+ */
+void
+HnswCommitBuffer(Buffer buf, GenericXLogState *state)
+{
+	GenericXLogFinish(state);
+	UnlockReleaseBuffer(buf);
+}
+
 /*
 * Allocate neighbors
 */
@@ -206,6 +144,17 @@ HnswInitNeighbors(HnswElement element, int m)
 	}
 }

+/*
+ * Free neighbors
+ */
+static void
+HnswFreeNeighbors(HnswElement element)
+{
+	for (int lc = 0; lc <= element->level; lc++)
+		pfree(element->neighbors[lc].items);
+	pfree(element->neighbors);
+}
+
 /*
 * Allocate an element
 */
@@ -220,7 +169,7 @@ HnswInitElement(ItemPointer heaptid, int m, double ml, int maxLevel)
 	if (level > maxLevel)
 		level = maxLevel;

-	element->heaptidsLength = 0;
+	element->heaptids = NIL;
 	HnswAddHeapTid(element, heaptid);

 	element->level = level;
@@ -233,13 +182,29 @@ HnswInitElement(ItemPointer heaptid, int m, double ml, int maxLevel)
 	return element;
 }

+/*
+ * Free an element
+ */
+void
+HnswFreeElement(HnswElement element)
+{
+	HnswFreeNeighbors(element);
+	list_free_deep(element->heaptids);
+	if (DatumGetPointer(element->value))
+		pfree(DatumGetPointer(element->value));
+	pfree(element);
+}
+
 /*
 * Add a heap TID to an element
 */
 void
 HnswAddHeapTid(HnswElement element, ItemPointer heaptid)
 {
-	element->heaptids[element->heaptidsLength++] = *heaptid;
+	ItemPointer copy = palloc(sizeof(ItemPointerData));
+
+	ItemPointerCopy(heaptid, copy);
+	element->heaptids = lappend(element->heaptids, copy);
 }

 /*
@@ -331,7 +296,7 @@ HnswUpdateMetaPageInfo(Page page, int updateEntry, HnswElement entryPoint, Block
 * Update the metapage
 */
 void
-HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, BlockNumber insertPage, ForkNumber forkNum, bool building)
+HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, BlockNumber insertPage, ForkNumber forkNum)
 {
 	Buffer		buf;
 	Page		page;
@@ -339,24 +304,12 @@ HnswUpdateMetaPage(Relation index, int updateEntry, HnswElement entryPoint, Bloc

 	buf = ReadBufferExtended(index, forkNum, HNSW_METAPAGE_BLKNO, RBM_NORMAL, NULL);
 	LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
-	if (building)
-	{
-		state = NULL;
-		page = BufferGetPage(buf);
-	}
-	else
-	{
-		state = GenericXLogStart(index);
-		page = GenericXLogRegisterBuffer(state, buf, 0);
-	}
+	state = GenericXLogStart(index);
+	page = GenericXLogRegisterBuffer(state, buf, 0);

 	HnswUpdateMetaPageInfo(page, updateEntry, entryPoint, insertPage);

-	if (building)
-		MarkBufferDirty(buf);
-	else
-		GenericXLogFinish(state);
-	UnlockReleaseBuffer(buf);
+	HnswCommitBuffer(buf, state);
 }

 /*
@@ -370,8 +323,8 @@ HnswSetElementTuple(HnswElementTuple etup, HnswElement element)
 	etup->deleted = 0;
 	for (int i = 0; i < HNSW_HEAPTIDS; i++)
 	{
-		if (i < element->heaptidsLength)
-			etup->heaptids[i] = element->heaptids[i];
+		if (i < list_length(element->heaptids))
+			etup->heaptids[i] = *((ItemPointer) list_nth(element->heaptids, i));
 		else
 			ItemPointerSetInvalid(&etup->heaptids[i]);
 	}
@@ -390,7 +343,7 @@ HnswSetNeighborTuple(HnswNeighborTuple ntup, HnswElement e, int m)

 	for (int lc = e->level; lc >= 0; lc--)
 	{
-		HnswNeighborArray *neighbors = HnswGetNeighbors(e, lc);
+		HnswNeighborArray *neighbors = &e->neighbors[lc];
 		int			lm = HnswGetLayerM(m, lc);

 		for (int i = 0; i < lm; i++)
@@ -448,7 +401,7 @@ LoadNeighborsFromPage(HnswElement element, Relation index, Page page, int m)
 		if (level < 0)
 			level = 0;

-		neighbors = HnswGetNeighbors(element, level);
+		neighbors = &element->neighbors[level];
 		hc = &neighbors->items[neighbors->length++];
 		hc->element = e;
 	}
@@ -482,7 +435,7 @@ HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHe
 	element->deleted = etup->deleted;
 	element->neighborPage = ItemPointerGetBlockNumber(&etup->neighbortid);
 	element->neighborOffno = ItemPointerGetOffsetNumber(&etup->neighbortid);
-	element->heaptidsLength = 0;
+	element->heaptids = NIL;

 	if (loadHeaptids)
 	{
@@ -600,22 +553,16 @@ CreatePairingHeapNode(HnswCandidate * c)
 * Add to visited
 */
 static inline void
-AddToVisited(visited_hash v, HnswCandidate * hc, Relation index, bool *found)
+AddToVisited(HTAB *v, HnswCandidate * hc, Relation index, bool *found)
 {
 	if (index == NULL)
-	{
-#if PG_VERSION_NUM >= 130000
-		pointerhash_insert_hash(v.pointers, (uintptr_t) hc->element, hc->element->hash, found);
-#else
-		pointerhash_insert(v.pointers, (uintptr_t) hc->element, found);
-#endif
-	}
+		hash_search(v, &hc->element, HASH_ENTER, found);
 	else
 	{
 		ItemPointerData indextid;

 		ItemPointerSet(&indextid, hc->element->blkno, hc->element->offno);
-		tidhash_insert(v.tids, indextid, found);
+		hash_search(v, &indextid, HASH_ENTER, found);
 	}
 }

@@ -625,26 +572,36 @@ AddToVisited(visited_hash v, HnswCandidate * hc, Relation index, bool *found)
 List *
 HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *procinfo, Oid collation, int m, bool inserting, HnswElement skipElement)
 {
+	ListCell   *lc2;
+
 	List	   *w = NIL;
 	pairingheap *C = pairingheap_allocate(CompareNearestCandidates, NULL);
 	pairingheap *W = pairingheap_allocate(CompareFurthestCandidates, NULL);
 	int			wlen = 0;
-	visited_hash v;
-	ListCell   *lc2;
+	HASHCTL		hash_ctl;
+	HTAB	   *v;

 	/* Create hash table */
 	if (index == NULL)
-		v.pointers = pointerhash_create(CurrentMemoryContext, ef * m * 2, NULL);
+	{
+		hash_ctl.keysize = sizeof(HnswElement *);
+		hash_ctl.entrysize = sizeof(HnswElement *);
+	}
 	else
-		v.tids = tidhash_create(CurrentMemoryContext, ef * m * 2, NULL);
+	{
+		hash_ctl.keysize = sizeof(ItemPointerData);
+		hash_ctl.entrysize = sizeof(ItemPointerData);
+	}
+
+	hash_ctl.hcxt = CurrentMemoryContext;
+	v = hash_create("hnsw visited", 256, &hash_ctl, HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);

 	/* Add entry points to v, C, and W */
 	foreach(lc2, ep)
 	{
 		HnswCandidate *hc = (HnswCandidate *) lfirst(lc2);
-		bool		found;

-		AddToVisited(v, hc, index, &found);
+		AddToVisited(v, hc, index, NULL);

 		pairingheap_add(C, &(CreatePairingHeapNode(hc)->ph_node));
 		pairingheap_add(W, &(CreatePairingHeapNode(hc)->ph_node));
@@ -654,7 +611,7 @@ HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *pro
 		 * would be ideal to do this for inserts as well, but this could
 		 * affect insert performance.
 		 */
-		if (skipElement == NULL || hc->element->heaptidsLength != 0)
+		if (skipElement == NULL || list_length(hc->element->heaptids) != 0)
 			wlen++;
 	}

@@ -671,7 +628,7 @@ HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *pro
 			HnswLoadNeighbors(c->element, index, m);

 		/* Get the neighborhood at layer lc */
-		neighborhood = HnswGetNeighbors(c->element, lc);
+		neighborhood = &c->element->neighbors[lc];

 		for (int i = 0; i < neighborhood->length; i++)
 		{
@@ -713,7 +670,7 @@ HnswSearchLayer(Datum q, List *ep, int ef, int lc, Relation index, FmgrInfo *pro
 					 * vacuuming. It would be ideal to do this for inserts as
 					 * well, but this could affect insert performance.
 					 */
-					if (skipElement == NULL || e->element->heaptidsLength != 0)
+					if (skipElement == NULL || list_length(e->element->heaptids) != 0)
 					{
 						wlen++;

@@ -774,23 +731,23 @@ HnswGetDistance(HnswElement a, HnswElement b, int lc, FmgrInfo *procinfo, Oid co
 	/* Look for cached distance */
 	if (a->neighbors != NULL)
 	{
-		HnswNeighborArray *neighbors = HnswGetNeighbors(a, lc);
+		Assert(a->level >= lc);

-		for (int i = 0; i < neighbors->length; i++)
+		for (int i = 0; i < a->neighbors[lc].length; i++)
 		{
-			if (neighbors->items[i].element == b)
-				return neighbors->items[i].distance;
+			if (a->neighbors[lc].items[i].element == b)
+				return a->neighbors[lc].items[i].distance;
 		}
 	}

 	if (b->neighbors != NULL)
 	{
-		HnswNeighborArray *neighbors = HnswGetNeighbors(b, lc);
+		Assert(b->level >= lc);

-		for (int i = 0; i < neighbors->length; i++)
+		for (int i = 0; i < b->neighbors[lc].length; i++)
 		{
-			if (neighbors->items[i].element == a)
-				return neighbors->items[i].distance;
+			if (b->neighbors[lc].items[i].element == a)
+				return b->neighbors[lc].items[i].distance;
 		}
 	}

@@ -826,8 +783,7 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE
 	List	   *r = NIL;
 	List	   *w = list_copy(c);
 	pairingheap *wd;
-	HnswNeighborArray *neighbors = HnswGetNeighbors(e2, lc);
-	bool		mustCalculate = !neighbors->closerSet;
+	bool		mustCalculate = !e2->neighbors[lc].closerSet;
 	List	   *added = NIL;
 	bool		removedAny = false;

@@ -891,7 +847,7 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE
 	}

 	/* Cached value can only be used in future if sorted deterministically */
-	neighbors->closerSet = sortCandidates;
+	e2->neighbors[lc].closerSet = sortCandidates;

 	/* Keep pruned connections */
 	while (!pairingheap_is_empty(wd) && list_length(r) < m)
@@ -909,6 +865,30 @@ SelectNeighbors(List *c, int m, int lc, FmgrInfo *procinfo, Oid collation, HnswE
 	return r;
 }

+/*
+ * Find duplicate element
+ */
+HnswElement
+HnswFindDuplicate(HnswElement e)
+{
+	HnswNeighborArray *neighbors = &e->neighbors[0];
+
+	for (int i = 0; i < neighbors->length; i++)
+	{
+		HnswCandidate *neighbor = &neighbors->items[i];
+
+		/* Exit early since ordered by distance */
+		if (!datumIsEqual(e->value, neighbor->element->value, false, -1))
+			break;
+
+		/* Check for space */
+		if (list_length(neighbor->element->heaptids) < HNSW_HEAPTIDS)
+			return neighbor->element;
+	}
+
+	return NULL;
+}
+
 /*
 * Add connections
 */
@@ -916,7 +896,7 @@ static void
 AddConnections(HnswElement element, List *neighbors, int m, int lc)
 {
 	ListCell   *lc2;
-	HnswNeighborArray *a = HnswGetNeighbors(element, lc);
+	HnswNeighborArray *a = &element->neighbors[lc];

 	foreach(lc2, neighbors)
 		a->items[a->length++] = *((HnswCandidate *) lfirst(lc2));
@@ -928,7 +908,7 @@ AddConnections(HnswElement element, List *neighbors, int m, int lc)
 void
 HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int *updateIdx, Relation index, FmgrInfo *procinfo, Oid collation)
 {
-	HnswNeighborArray *currentNeighbors = HnswGetNeighbors(hc->element, lc);
+	HnswNeighborArray *currentNeighbors = &hc->element->neighbors[lc];

 	HnswCandidate hc2;

@@ -963,7 +943,7 @@ HnswUpdateConnection(HnswElement element, HnswCandidate * hc, int m, int lc, int
 					hc3->distance = GetCandidateDistance(hc3, q, procinfo, collation);

 				/* Prune element if being deleted */
-				if (hc3->element->heaptidsLength == 0)
+				if (list_length(hc3->element->heaptids) == 0)
 				{
 					pruned = &currentNeighbors->items[i];
 					break;
@@ -1021,7 +1001,7 @@ RemoveElements(List *w, HnswElement skipElement)
 		if (skipElement != NULL && hc->element->blkno == skipElement->blkno && hc->element->offno == skipElement->offno)
 			continue;

-		if (hc->element->heaptidsLength != 0)
+		if (list_length(hc->element->heaptids) != 0)
 			w2 = lappend(w2, hc);
 	}

@@ -1041,12 +1021,6 @@ HnswInsertElement(HnswElement element, HnswElement entryPoint, Relation index, F
 	Datum		q = element->value;
 	HnswElement skipElement = existing ? element : NULL;

-#if PG_VERSION_NUM >= 130000
-	/* Precompute hash */
-	if (index == NULL)
-		element->hash = hash_pointer((uintptr_t) element);
-#endif
-
 	/* No neighbors if no entry point */
 	if (entryPoint == NULL)
 		return;
--- a/src/hnswvacuum.c
+++ b/src/hnswvacuum.c
@@ -12,9 +12,12 @@
 * Check if deleted list contains an index TID
 */
 static bool
-DeletedContains(tidhash_hash * deleted, ItemPointer indextid)
+DeletedContains(HTAB *deleted, ItemPointer indextid)
 {
-	return tidhash_lookup(deleted, *indextid) != NULL;
+	bool		found;
+
+	hash_search(deleted, indextid, HASH_FIND, &found);
+	return found;
 }

 /*
@@ -107,13 +110,11 @@ RemoveHeapTids(HnswVacuumState * vacuumstate)
 			if (!ItemPointerIsValid(&etup->heaptids[0]))
 			{
 				ItemPointerData ip;
-				bool		found;

 				/* Add to deleted list */
 				ItemPointerSet(&ip, blkno, offno);

-				tidhash_insert(vacuumstate->deleted, ip, &found);
-				Assert(!found);
+				(void) hash_search(vacuumstate->deleted, &ip, HASH_ENTER, NULL);
 			}
 			else if (etup->level > highestLevel && !(entryPoint != NULL && blkno == entryPoint->blkno && offno == entryPoint->offno))
 			{
@@ -206,7 +207,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswEleme

 	/* Init fields */
 	HnswInitNeighbors(element, m);
-	element->heaptidsLength = 0;
+	element->heaptids = NIL;

 	/* Add element to graph, skipping itself */
 	HnswInsertElement(element, entryPoint, index, procinfo, collation, m, efConstruction, true);
@@ -230,7 +231,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element, HnswEleme
 	UnlockReleaseBuffer(buf);

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

 /*
@@ -286,7 +287,7 @@ RepairGraphEntryPoint(HnswVacuumState * vacuumstate)
 			 * point is outdated and empty, the entry point will be empty
 			 * until an element is repaired.
 			 */
-			HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_ALWAYS, highestPoint, InvalidBlockNumber, MAIN_FORKNUM, false);
+			HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_ALWAYS, highestPoint, InvalidBlockNumber, MAIN_FORKNUM);
 		}
 		else
 		{
@@ -419,7 +420,7 @@ RepairGraph(HnswVacuumState * vacuumstate)
 			 * was replaced and highest point was outdated.
 			 */
 			if (entryPoint == NULL || element->level > entryPoint->level)
-				HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_GREATER, element, InvalidBlockNumber, MAIN_FORKNUM, false);
+				HnswUpdateMetaPage(index, HNSW_UPDATE_ENTRY_GREATER, element, InvalidBlockNumber, MAIN_FORKNUM);

 			/* Release lock */
 			UnlockPage(index, HNSW_UPDATE_LOCK, lockmode);
@@ -564,7 +565,7 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 	}

 	/* Update insert page last, after everything has been marked as deleted */
-	HnswUpdateMetaPage(index, 0, NULL, insertPage, MAIN_FORKNUM, false);
+	HnswUpdateMetaPage(index, 0, NULL, insertPage, MAIN_FORKNUM);
 }

 /*
@@ -574,6 +575,7 @@ static void
 InitVacuumState(HnswVacuumState * vacuumstate, IndexVacuumInfo *info, IndexBulkDeleteResult *stats, IndexBulkDeleteCallback callback, void *callback_state)
 {
 	Relation	index = info->index;
+	HASHCTL		hash_ctl;

 	if (stats == NULL)
 		stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));
@@ -595,7 +597,10 @@ InitVacuumState(HnswVacuumState * vacuumstate, IndexVacuumInfo *info, IndexBulkD
 	HnswGetMetaPageInfo(index, &vacuumstate->m, NULL);

 	/* Create hash table */
-	vacuumstate->deleted = tidhash_create(CurrentMemoryContext, 256, NULL);
+	hash_ctl.keysize = sizeof(ItemPointerData);
+	hash_ctl.entrysize = sizeof(ItemPointerData);
+	hash_ctl.hcxt = CurrentMemoryContext;
+	vacuumstate->deleted = hash_create("hnswbulkdelete indextids", 256, &hash_ctl, HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
 }

 /*
@@ -604,7 +609,7 @@ InitVacuumState(HnswVacuumState * vacuumstate, IndexVacuumInfo *info, IndexBulkD
 static void
 FreeVacuumState(HnswVacuumState * vacuumstate)
 {
-	tidhash_destroy(vacuumstate->deleted);
+	hash_destroy(vacuumstate->deleted);
 	FreeAccessStrategy(vacuumstate->bas);
 	pfree(vacuumstate->ntup);
 	MemoryContextDelete(vacuumstate->tmpCtx);
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -543,10 +543,10 @@ CreateListPages(Relation index, VectorArray centers, int dimensions,
 	pfree(list);
 }

-#ifdef IVFFLAT_KMEANS_DEBUG
 /*
 * Print k-means metrics
 */
+#ifdef IVFFLAT_KMEANS_DEBUG
 static void
 PrintKmeansMetrics(IvfflatBuildState * buildstate)
 {
--- a/src/ivfflat.c
+++ b/src/ivfflat.c
@@ -72,14 +72,12 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	double		ratio;
 	double		spc_seq_page_cost;
 	Relation	index;
-	double		selectivity = 1;
-	ListCell   *lc;
 #if PG_VERSION_NUM < 120000
 	List	   *qinfos;
 #endif

-	/* Never use index without order or limit */
-	if (path->indexorderbys == NULL || root->limit_tuples < 0)
+	/* Never use index without order */
+	if (path->indexorderbys == NULL)
 	{
 		*indexStartupCost = DBL_MAX;
 		*indexTotalCost = DBL_MAX;
@@ -107,29 +105,6 @@ ivfflatcostestimate(PlannerInfo *root, IndexPath *path, double loop_count,
 	 */
 	costs.numIndexTuples = path->indexinfo->tuples * ratio;

-	/* Get the selectivity of non-index conditions */
-	foreach(lc, path->indexinfo->indrestrictinfo)
-	{
-		RestrictInfo *rinfo = lfirst(lc);
-
-		if (rinfo->norm_selec >= 0 && rinfo->norm_selec <= 1 && rinfo->norm_selec != (Selectivity) DEFAULT_INEQ_SEL)
-			selectivity *= rinfo->norm_selec;
-	}
-
-	/*
-	 * Do not use index if limit + offset > expected tuples unless
-	 * enable_seqscan = off
-	 */
-	if (root->limit_tuples > costs.numIndexTuples * selectivity)
-	{
-		*indexStartupCost = 1.0e10 - 1;
-		*indexTotalCost = 1.0e10 - 1;
-		*indexSelectivity = 0;
-		*indexCorrelation = 0;
-		*indexPages = 0;
-		return;
-	}
-
 #if PG_VERSION_NUM >= 120000
 	genericcostestimate(root, path, loop_count, &costs);
 #else
--- a/src/ivfkmeans.c
+++ b/src/ivfkmeans.c
@@ -6,10 +6,6 @@
 #include "ivfflat.h"
 #include "miscadmin.h"

-#ifdef IVFFLAT_MEMORY
-#include "utils/memutils.h"
-#endif
-
 /*
 * Initialize with kmeans++
 *
@@ -155,23 +151,6 @@ QuickCenters(Relation index, VectorArray samples, VectorArray centers)
 	}
 }

-#ifdef IVFFLAT_MEMORY
-/*
- * Show memory usage
- */
-static void
-ShowMemoryUsage(Size estimatedSize)
-{
-#if PG_VERSION_NUM >= 130000
-	elog(INFO, "total memory: %zu MB",
-		 MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
-#else
-	MemoryContextStats(CurrentMemoryContext);
-#endif
-	elog(INFO, "estimated memory: %zu MB", estimatedSize / (1024 * 1024));
-}
-#endif
-
 /*
 * Use Elkan for performance. This requires distance function to satisfy triangle inequality.
 *
@@ -252,10 +231,6 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 		vec->dim = dimensions;
 	}

-#ifdef IVFFLAT_MEMORY
-	ShowMemoryUsage(totalSize);
-#endif
-
 	/* Pick initial centers */
 	InitCenters(index, samples, centers, lowerBound);

--- a/src/vector.c
+++ b/src/vector.c
@@ -177,15 +177,14 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_in);
 Datum
 vector_in(PG_FUNCTION_ARGS)
 {
-	char	   *lit = PG_GETARG_CSTRING(0);
+	char	   *str = PG_GETARG_CSTRING(0);
 	int32		typmod = PG_GETARG_INT32(2);
 	float		x[VECTOR_MAX_DIM];
 	int			dim = 0;
 	char	   *pt;
 	char	   *stringEnd;
 	Vector	   *result;
-	char	   *litcopy = pstrdup(lit);
-	char	   *str = litcopy;
+	char	   *lit = pstrdup(str);

 	while (vector_isspace(*str))
 		str++;
@@ -269,7 +268,7 @@ vector_in(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_DATA_EXCEPTION),
 				 errmsg("vector must have at least 1 dimension")));

-	pfree(litcopy);
+	pfree(lit);

 	CheckExpectedDim(typmod, dim);

@@ -725,7 +724,7 @@ vector_spherical_distance(PG_FUNCTION_ARGS)
 }

 /*
- * Get the L1 distance between two vectors
+ * Get the L1 distance between vectors
 */
 PGDLLEXPORT PG_FUNCTION_INFO_V1(l1_distance);
 Datum
@@ -904,8 +903,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_lt);
 Datum
 vector_lt(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) < 0);
 }
@@ -917,8 +916,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_le);
 Datum
 vector_le(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) <= 0);
 }
@@ -930,8 +929,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_eq);
 Datum
 vector_eq(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) == 0);
 }
@@ -943,8 +942,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_ne);
 Datum
 vector_ne(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) != 0);
 }
@@ -956,8 +955,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_ge);
 Datum
 vector_ge(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) >= 0);
 }
@@ -969,8 +968,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_gt);
 Datum
 vector_gt(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_BOOL(vector_cmp_internal(a, b) > 0);
 }
@@ -982,8 +981,8 @@ PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_cmp);
 Datum
 vector_cmp(PG_FUNCTION_ARGS)
 {
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	Vector	   *a = (Vector *) PG_GETARG_VECTOR_P(0);
+	Vector	   *b = (Vector *) PG_GETARG_VECTOR_P(1);

 	PG_RETURN_INT32(vector_cmp_internal(a, b));
 }
--- a/test/expected/copy.out
+++ b/test/expected/copy.out
@@ -1,15 +1,15 @@
-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));
+CREATE TABLE t (val vector(3), val2 half[]);
+INSERT INTO t (val, val2) VALUES ('[0,0,0]', '{0,0,0}'), ('[1,2,3]', '{1,2,3}'), ('[1,1,1]', '{1,1,1}'), (NULL, NULL);
+CREATE TABLE t2 (val vector(3), val2 half[]);
 \copy t TO 'results/data.bin' WITH (FORMAT binary)
 \copy t2 FROM 'results/data.bin' WITH (FORMAT binary)
 SELECT * FROM t2 ORDER BY val;
-   val   
---------
- [0,0,0]
- [1,1,1]
- [1,2,3]
- 
+   val   |  val2   
+---------+---------
+ [0,0,0] | {0,0,0}
+ [1,1,1] | {1,1,1}
+ [1,2,3] | {1,2,3}
+         | 
 (4 rows)

 DROP TABLE t;
--- a/test/expected/functions.out
+++ b/test/expected/functions.out
@@ -54,105 +54,105 @@ SELECT vector_norm('[3e37,4e37]')::real;
       5e+37
 (1 row)

-SELECT l2_distance('[0,0]', '[3,4]');
+SELECT l2_distance('[0,0]'::vector, '[3,4]');
 l2_distance 
 -------------
           5
 (1 row)

-SELECT l2_distance('[0,0]', '[0,1]');
+SELECT l2_distance('[0,0]'::vector, '[0,1]');
 l2_distance 
 -------------
           1
 (1 row)

-SELECT l2_distance('[1,2]', '[3]');
+SELECT l2_distance('[1,2]'::vector, '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT l2_distance('[3e38]', '[-3e38]');
+SELECT l2_distance('[3e38]'::vector, '[-3e38]');
 l2_distance 
 -------------
    Infinity
 (1 row)

-SELECT inner_product('[1,2]', '[3,4]');
+SELECT inner_product('[1,2]'::vector, '[3,4]');
 inner_product 
 ---------------
            11
 (1 row)

-SELECT inner_product('[1,2]', '[3]');
+SELECT inner_product('[1,2]'::vector, '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT inner_product('[3e38]', '[3e38]');
+SELECT inner_product('[3e38]'::vector, '[3e38]');
 inner_product 
 ---------------
      Infinity
 (1 row)

-SELECT cosine_distance('[1,2]', '[2,4]');
+SELECT cosine_distance('[1,2]'::vector, '[2,4]');
 cosine_distance 
 -----------------
               0
 (1 row)

-SELECT cosine_distance('[1,2]', '[0,0]');
+SELECT cosine_distance('[1,2]'::vector, '[0,0]');
 cosine_distance 
 -----------------
             NaN
 (1 row)

-SELECT cosine_distance('[1,1]', '[1,1]');
+SELECT cosine_distance('[1,1]'::vector, '[1,1]');
 cosine_distance 
 -----------------
               0
 (1 row)

-SELECT cosine_distance('[1,0]', '[0,2]');
+SELECT cosine_distance('[1,0]'::vector, '[0,2]');
 cosine_distance 
 -----------------
               1
 (1 row)

-SELECT cosine_distance('[1,1]', '[-1,-1]');
+SELECT cosine_distance('[1,1]'::vector, '[-1,-1]');
 cosine_distance 
 -----------------
               2
 (1 row)

-SELECT cosine_distance('[1,2]', '[3]');
+SELECT cosine_distance('[1,2]'::vector, '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT cosine_distance('[1,1]', '[1.1,1.1]');
+SELECT cosine_distance('[1,1]'::vector, '[1.1,1.1]');
 cosine_distance 
 -----------------
               0
 (1 row)

-SELECT cosine_distance('[1,1]', '[-1.1,-1.1]');
+SELECT cosine_distance('[1,1]'::vector, '[-1.1,-1.1]');
 cosine_distance 
 -----------------
               2
 (1 row)

-SELECT cosine_distance('[3e38]', '[3e38]');
+SELECT cosine_distance('[3e38]'::vector, '[3e38]');
 cosine_distance 
 -----------------
             NaN
 (1 row)

-SELECT l1_distance('[0,0]', '[3,4]');
+SELECT l1_distance('[0,0]'::vector, '[3,4]');
 l1_distance 
 -------------
           7
 (1 row)

-SELECT l1_distance('[0,0]', '[0,1]');
+SELECT l1_distance('[0,0]'::vector, '[0,1]');
 l1_distance 
 -------------
           1
 (1 row)

-SELECT l1_distance('[1,2]', '[3]');
+SELECT l1_distance('[1,2]'::vector, '[3]');
 ERROR:  different vector dimensions 2 and 1
-SELECT l1_distance('[3e38]', '[-3e38]');
+SELECT l1_distance('[3e38]'::vector, '[-3e38]');
 l1_distance 
 -------------
    Infinity
--- a/test/expected/half.out
+++ b/test/expected/half.out
@@ -0,0 +1,226 @@
+SELECT '1.5'::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT '65504'::half;
+ half  
+-------
+ 65504
+(1 row)
+
+SELECT '65505'::half;
+ERROR:  "65505" is out of range for type half
+LINE 1: SELECT '65505'::half;
+               ^
+SELECT '-65504'::half;
+  half  
+--------
+ -65504
+(1 row)
+
+SELECT '-65505'::half;
+ERROR:  "-65505" is out of range for type half
+LINE 1: SELECT '-65505'::half;
+               ^
+SELECT ''::half;
+ERROR:  invalid input syntax for type half: ""
+LINE 1: SELECT ''::half;
+               ^
+SELECT ' '::half;
+ERROR:  invalid input syntax for type half: " "
+LINE 1: SELECT ' '::half;
+               ^
+SELECT '-'::half;
+ERROR:  invalid input syntax for type half: "-"
+LINE 1: SELECT '-'::half;
+               ^
+SELECT ' 1.5'::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT '1.5 '::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT '1.5a'::half;
+ERROR:  invalid input syntax for type half: "1.5a"
+LINE 1: SELECT '1.5a'::half;
+               ^
+SELECT '{1,2,3}'::half[];
+  half   
+---------
+ {1,2,3}
+(1 row)
+
+SELECT '{1,2,3}'::half[]::real[];
+ float4  
+---------
+ {1,2,3}
+(1 row)
+
+SELECT '65505'::integer::half;
+ half  
+-------
+ 65504
+(1 row)
+
+SELECT 'NaN'::real::half;
+ half 
+------
+ NaN
+(1 row)
+
+SELECT 'Infinity'::real::half;
+   half   
+----------
+ Infinity
+(1 row)
+
+SELECT '1e-38'::real::half;
+ERROR:  value out of range: underflow
+SELECT '1.5'::half::real;
+ float4 
+--------
+    1.5
+(1 row)
+
+SELECT '1.5'::real::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT '1.5'::half::double precision;
+ float8 
+--------
+    1.5
+(1 row)
+
+SELECT '1.5'::double precision::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT '1.5'::half::numeric;
+ numeric 
+---------
+     1.5
+(1 row)
+
+SELECT '1.5'::numeric::half;
+ half 
+------
+ 1.5
+(1 row)
+
+SELECT l2_distance('{0,0}'::half[], '{3,4}'::half[]);
+ l2_distance 
+-------------
+           5
+(1 row)
+
+SELECT l2_distance('{0,0}'::half[], '{0,1}'::half[]);
+ l2_distance 
+-------------
+           1
+(1 row)
+
+SELECT l2_distance('{1,2}'::half[], '{3}'::half[]);
+ERROR:  different dimensions 2 and 1
+SELECT '{0,0}'::half[] <-> '{3,4}'::half[];
+ ?column? 
+----------
+        5
+(1 row)
+
+SELECT inner_product('{1,2}'::half[], '{3,4}'::half[]);
+ inner_product 
+---------------
+            11
+(1 row)
+
+SELECT inner_product('{1,2}'::half[], '{3}'::half[]);
+ERROR:  different dimensions 2 and 1
+SELECT inner_product('{65504}'::half[], '{65504}'::half[]);
+ inner_product 
+---------------
+    4290774016
+(1 row)
+
+SELECT '{1,2}'::half[] <#> '{3,4}'::half[];
+ ?column? 
+----------
+      -11
+(1 row)
+
+SELECT cosine_distance('{1,2}'::half[], '{2,4}'::half[]);
+ cosine_distance 
+-----------------
+               0
+(1 row)
+
+SELECT cosine_distance('{1,2}'::half[], '{0,0}'::half[]);
+ cosine_distance 
+-----------------
+             NaN
+(1 row)
+
+SELECT cosine_distance('{1,1}'::half[], '{1,1}'::half[]);
+ cosine_distance 
+-----------------
+               0
+(1 row)
+
+SELECT cosine_distance('{1,0}'::half[], '{0,2}'::half[]);
+ cosine_distance 
+-----------------
+               1
+(1 row)
+
+SELECT cosine_distance('{1,1}'::half[], '{-1,-1}'::half[]);
+ cosine_distance 
+-----------------
+               2
+(1 row)
+
+SELECT cosine_distance('{1,2}'::half[], '{3}'::half[]);
+ERROR:  different dimensions 2 and 1
+SELECT cosine_distance('{1,1}'::half[], '{1.1,1.1}'::half[]);
+ cosine_distance 
+-----------------
+               0
+(1 row)
+
+SELECT cosine_distance('{1,1}'::half[], '{-1.1,-1.1}'::half[]);
+ cosine_distance 
+-----------------
+               2
+(1 row)
+
+SELECT '{1,2}'::half[] <=> '{2,4}'::half[];
+ ?column? 
+----------
+        0
+(1 row)
+
+SELECT l1_distance('{0,0}'::half[], '{3,4}');
+ l1_distance 
+-------------
+           7
+(1 row)
+
+SELECT l1_distance('{0,0}'::half[], '{0,1}');
+ l1_distance 
+-------------
+           1
+(1 row)
+
+SELECT l1_distance('{1,2}'::half[], '{3}');
+ERROR:  different dimensions 2 and 1
--- a/test/expected/hnsw_cosine.out
+++ b/test/expected/hnsw_cosine.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING hnsw (val vector_cosine_ops);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <=> '[3,3,3]';
   val   
 ---------
 [1,1,1]
@@ -11,13 +11,13 @@ SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
 [1,2,4]
 (3 rows)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]' LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]') t2;
 count 
 -------
     3
 (1 row)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2;
 count 
 -------
     3
--- a/test/expected/hnsw_ip.out
+++ b/test/expected/hnsw_ip.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING hnsw (val vector_ip_ops);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <#> '[3,3,3]';
   val   
 ---------
 [1,2,4]
@@ -12,7 +12,7 @@ SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
 [0,0,0]
 (4 rows)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector)) t2;
 count 
 -------
     4
--- a/test/expected/hnsw_l2.out
+++ b/test/expected/hnsw_l2.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING hnsw (val vector_l2_ops);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
   val   
 ---------
 [1,2,3]
@@ -12,7 +12,7 @@ SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
 [0,0,0]
 (4 rows)

-SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector) LIMIT 5;
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
   val   
 ---------
 [0,0,0]
@@ -28,7 +28,7 @@ SELECT COUNT(*) FROM t;
 (1 row)

 TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
 val 
 -----
 (0 rows)
--- a/test/expected/hnsw_unlogged.out
+++ b/test/expected/hnsw_unlogged.out
@@ -2,7 +2,7 @@ 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);
 CREATE INDEX ON t USING hnsw (val vector_l2_ops);
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
   val   
 ---------
 [1,2,3]
--- a/test/expected/ivfflat_cosine.out
+++ b/test/expected/ivfflat_cosine.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING ivfflat (val vector_cosine_ops) WITH (lists = 1);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <=> '[3,3,3]';
   val   
 ---------
 [1,1,1]
@@ -11,13 +11,13 @@ SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
 [1,2,4]
 (3 rows)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]' LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]') t2;
 count 
 -------
     3
 (1 row)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2;
 count 
 -------
     3
--- a/test/expected/ivfflat_ip.out
+++ b/test/expected/ivfflat_ip.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING ivfflat (val vector_ip_ops) WITH (lists = 1);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <#> '[3,3,3]';
   val   
 ---------
 [1,2,4]
@@ -12,7 +12,7 @@ SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
 [0,0,0]
 (4 rows)

-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector)) t2;
 count 
 -------
     4
--- a/test/expected/ivfflat_l2.out
+++ b/test/expected/ivfflat_l2.out
@@ -3,7 +3,7 @@ CREATE TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 1);
 INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
   val   
 ---------
 [1,2,3]
@@ -12,7 +12,7 @@ SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
 [0,0,0]
 (4 rows)

-SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector) LIMIT 5;
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
   val   
 ---------
 [0,0,0]
@@ -31,7 +31,7 @@ TRUNCATE t;
 NOTICE:  ivfflat index created with little data
 DETAIL:  This will cause low recall.
 HINT:  Drop the index until the table has more data.
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
 val 
 -----
 (0 rows)
--- a/test/expected/ivfflat_unlogged.out
+++ b/test/expected/ivfflat_unlogged.out
@@ -2,7 +2,7 @@ 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);
 CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 1);
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
   val   
 ---------
 [1,2,3]
--- a/test/sql/copy.sql
+++ b/test/sql/copy.sql
@@ -1,7 +1,7 @@
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
+CREATE TABLE t (val vector(3), val2 half[]);
+INSERT INTO t (val, val2) VALUES ('[0,0,0]', '{0,0,0}'), ('[1,2,3]', '{1,2,3}'), ('[1,1,1]', '{1,1,1}'), (NULL, NULL);

-CREATE TABLE t2 (val vector(3));
+CREATE TABLE t2 (val vector(3), val2 half[]);

 \copy t TO 'results/data.bin' WITH (FORMAT binary)
 \copy t2 FROM 'results/data.bin' WITH (FORMAT binary)
--- a/test/sql/functions.sql
+++ b/test/sql/functions.sql
@@ -13,29 +13,29 @@ SELECT vector_norm('[3,4]');
 SELECT vector_norm('[0,1]');
 SELECT vector_norm('[3e37,4e37]')::real;

-SELECT l2_distance('[0,0]', '[3,4]');
-SELECT l2_distance('[0,0]', '[0,1]');
-SELECT l2_distance('[1,2]', '[3]');
-SELECT l2_distance('[3e38]', '[-3e38]');
+SELECT l2_distance('[0,0]'::vector, '[3,4]');
+SELECT l2_distance('[0,0]'::vector, '[0,1]');
+SELECT l2_distance('[1,2]'::vector, '[3]');
+SELECT l2_distance('[3e38]'::vector, '[-3e38]');

-SELECT inner_product('[1,2]', '[3,4]');
-SELECT inner_product('[1,2]', '[3]');
-SELECT inner_product('[3e38]', '[3e38]');
+SELECT inner_product('[1,2]'::vector, '[3,4]');
+SELECT inner_product('[1,2]'::vector, '[3]');
+SELECT inner_product('[3e38]'::vector, '[3e38]');

-SELECT cosine_distance('[1,2]', '[2,4]');
-SELECT cosine_distance('[1,2]', '[0,0]');
-SELECT cosine_distance('[1,1]', '[1,1]');
-SELECT cosine_distance('[1,0]', '[0,2]');
-SELECT cosine_distance('[1,1]', '[-1,-1]');
-SELECT cosine_distance('[1,2]', '[3]');
-SELECT cosine_distance('[1,1]', '[1.1,1.1]');
-SELECT cosine_distance('[1,1]', '[-1.1,-1.1]');
-SELECT cosine_distance('[3e38]', '[3e38]');
+SELECT cosine_distance('[1,2]'::vector, '[2,4]');
+SELECT cosine_distance('[1,2]'::vector, '[0,0]');
+SELECT cosine_distance('[1,1]'::vector, '[1,1]');
+SELECT cosine_distance('[1,0]'::vector, '[0,2]');
+SELECT cosine_distance('[1,1]'::vector, '[-1,-1]');
+SELECT cosine_distance('[1,2]'::vector, '[3]');
+SELECT cosine_distance('[1,1]'::vector, '[1.1,1.1]');
+SELECT cosine_distance('[1,1]'::vector, '[-1.1,-1.1]');
+SELECT cosine_distance('[3e38]'::vector, '[3e38]');

-SELECT l1_distance('[0,0]', '[3,4]');
-SELECT l1_distance('[0,0]', '[0,1]');
-SELECT l1_distance('[1,2]', '[3]');
-SELECT l1_distance('[3e38]', '[-3e38]');
+SELECT l1_distance('[0,0]'::vector, '[3,4]');
+SELECT l1_distance('[0,0]'::vector, '[0,1]');
+SELECT l1_distance('[1,2]'::vector, '[3]');
+SELECT l1_distance('[3e38]'::vector, '[-3e38]');

 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;
--- a/test/sql/half.sql
+++ b/test/sql/half.sql
@@ -0,0 +1,53 @@
+SELECT '1.5'::half;
+SELECT '65504'::half;
+SELECT '65505'::half;
+SELECT '-65504'::half;
+SELECT '-65505'::half;
+
+SELECT ''::half;
+SELECT ' '::half;
+SELECT '-'::half;
+SELECT ' 1.5'::half;
+SELECT '1.5 '::half;
+SELECT '1.5a'::half;
+
+SELECT '{1,2,3}'::half[];
+SELECT '{1,2,3}'::half[]::real[];
+
+SELECT '65505'::integer::half;
+SELECT 'NaN'::real::half;
+SELECT 'Infinity'::real::half;
+SELECT '1e-38'::real::half;
+
+SELECT '1.5'::half::real;
+SELECT '1.5'::real::half;
+
+SELECT '1.5'::half::double precision;
+SELECT '1.5'::double precision::half;
+
+SELECT '1.5'::half::numeric;
+SELECT '1.5'::numeric::half;
+
+SELECT l2_distance('{0,0}'::half[], '{3,4}'::half[]);
+SELECT l2_distance('{0,0}'::half[], '{0,1}'::half[]);
+SELECT l2_distance('{1,2}'::half[], '{3}'::half[]);
+SELECT '{0,0}'::half[] <-> '{3,4}'::half[];
+
+SELECT inner_product('{1,2}'::half[], '{3,4}'::half[]);
+SELECT inner_product('{1,2}'::half[], '{3}'::half[]);
+SELECT inner_product('{65504}'::half[], '{65504}'::half[]);
+SELECT '{1,2}'::half[] <#> '{3,4}'::half[];
+
+SELECT cosine_distance('{1,2}'::half[], '{2,4}'::half[]);
+SELECT cosine_distance('{1,2}'::half[], '{0,0}'::half[]);
+SELECT cosine_distance('{1,1}'::half[], '{1,1}'::half[]);
+SELECT cosine_distance('{1,0}'::half[], '{0,2}'::half[]);
+SELECT cosine_distance('{1,1}'::half[], '{-1,-1}'::half[]);
+SELECT cosine_distance('{1,2}'::half[], '{3}'::half[]);
+SELECT cosine_distance('{1,1}'::half[], '{1.1,1.1}'::half[]);
+SELECT cosine_distance('{1,1}'::half[], '{-1.1,-1.1}'::half[]);
+SELECT '{1,2}'::half[] <=> '{2,4}'::half[];
+
+SELECT l1_distance('{0,0}'::half[], '{3,4}');
+SELECT l1_distance('{0,0}'::half[], '{0,1}');
+SELECT l1_distance('{1,2}'::half[], '{3}');
--- a/test/sql/hnsw_cosine.sql
+++ b/test/sql/hnsw_cosine.sql
@@ -6,8 +6,8 @@ CREATE INDEX ON t USING hnsw (val vector_cosine_ops);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]' LIMIT 5) t2;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT * FROM t ORDER BY val <=> '[3,3,3]';
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]') t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2;

 DROP TABLE t;
--- a/test/sql/hnsw_ip.sql
+++ b/test/sql/hnsw_ip.sql
@@ -6,7 +6,7 @@ CREATE INDEX ON t USING hnsw (val vector_ip_ops);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT * FROM t ORDER BY val <#> '[3,3,3]';
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector)) t2;

 DROP TABLE t;
--- a/test/sql/hnsw_l2.sql
+++ b/test/sql/hnsw_l2.sql
@@ -6,11 +6,11 @@ CREATE INDEX ON t USING hnsw (val vector_l2_ops);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
-SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector) LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
 SELECT COUNT(*) FROM t;

 TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';

 DROP TABLE t;
--- a/test/sql/hnsw_unlogged.sql
+++ b/test/sql/hnsw_unlogged.sql
@@ -4,6 +4,6 @@ CREATE UNLOGGED TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING hnsw (val vector_l2_ops);

-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';

 DROP TABLE t;
--- a/test/sql/ivfflat_cosine.sql
+++ b/test/sql/ivfflat_cosine.sql
@@ -6,8 +6,8 @@ CREATE INDEX ON t USING ivfflat (val vector_cosine_ops) WITH (lists = 1);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <=> '[3,3,3]' LIMIT 5;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]' LIMIT 5) t2;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT * FROM t ORDER BY val <=> '[3,3,3]';
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '[0,0,0]') t2;
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2;

 DROP TABLE t;
--- a/test/sql/ivfflat_ip.sql
+++ b/test/sql/ivfflat_ip.sql
@@ -6,7 +6,7 @@ CREATE INDEX ON t USING ivfflat (val vector_ip_ops) WITH (lists = 1);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <#> '[3,3,3]' LIMIT 5;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector) LIMIT 5) t2;
+SELECT * FROM t ORDER BY val <#> '[3,3,3]';
+SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::vector)) t2;

 DROP TABLE t;
--- a/test/sql/ivfflat_l2.sql
+++ b/test/sql/ivfflat_l2.sql
@@ -6,11 +6,11 @@ CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 1);

 INSERT INTO t (val) VALUES ('[1,2,4]');

-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
-SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector) LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
 SELECT COUNT(*) FROM t;

 TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';

 DROP TABLE t;
--- a/test/sql/ivfflat_unlogged.sql
+++ b/test/sql/ivfflat_unlogged.sql
@@ -4,6 +4,6 @@ CREATE UNLOGGED TABLE t (val vector(3));
 INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 1);

-SELECT * FROM t ORDER BY val <-> '[3,3,3]' LIMIT 5;
+SELECT * FROM t ORDER BY val <-> '[3,3,3]';

 DROP TABLE t;
--- a/test/t/007_ivfflat_inserts.pl
+++ b/test/t/007_ivfflat_inserts.pl
@@ -49,7 +49,7 @@ is(idx_scan(), 0);
 $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) LIMIT 20000) t;
+	SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1)) t;
 ));
 is($count, $expected);
 is(idx_scan(), 1);
--- a/test/t/014_hnsw_inserts.pl
+++ b/test/t/014_hnsw_inserts.pl
@@ -42,7 +42,7 @@ for my $i (1 .. 20)

 	my $count = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
-		SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 20) t;
+		SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1)) t;
 	));
 	is($count, 10);

@@ -63,7 +63,7 @@ $node->pgbench(
 my $count = $node->safe_psql("postgres", qq(
 	SET enable_seqscan = off;
 	SET hnsw.ef_search = 1000;
-	SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 1000) t;
+	SELECT COUNT(*) FROM (SELECT v FROM tst ORDER BY v <-> (SELECT v FROM tst LIMIT 1)) t;
 ));
 # Elements may lose all incoming connections with the HNSW algorithm
 # Vacuuming can fix this if one of the elements neighbors is deleted
--- a/test/t/015_hnsw_duplicates.pl
+++ b/test/t/015_hnsw_duplicates.pl
@@ -26,7 +26,7 @@ sub test_duplicates
 	my $res = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
 		SET hnsw.ef_search = 1;
-		SELECT COUNT(*) FROM (SELECT * FROM tst ORDER BY v <-> '[1,1,1]' LIMIT 20) t;
+		SELECT COUNT(*) FROM (SELECT * FROM tst ORDER BY v <-> '[1,1,1]') t;
 	));
 	is($res, 10);
 }
--- a/test/t/018_hnsw_filtering.pl
+++ b/test/t/018_hnsw_filtering.pl
@@ -1,111 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More;
-
-my $dim = 3;
-my $nc = 50;
-my $limit = 20;
-
-my $array_sql = join(",", ('random()') x $dim);
-
-# 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 (i int4, v vector($dim), c int4, t text);");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc, 'test ' || i FROM generate_series(1, 10000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v vector_l2_ops);");
-$node->safe_psql("postgres", "ANALYZE tst;");
-
-# Generate query
-my @r = ();
-for (1 .. $dim)
-{
-	push(@r, rand());
-}
-my $query = "[" . join(",", @r) . "]";
-my $c = int(rand() * $nc);
-
-# Test attribute filtering
-my $explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Seq Scan/);
-
-# Test attribute filtering with few rows removed
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c != $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test attribute filtering with few rows removed comparison
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c >= 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test attribute filtering with many rows removed comparison
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c < 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Seq Scan/);
-
-# Test attribute filtering with few rows removed like
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE t LIKE '%%test%%' ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test attribute filtering with many rows removed like
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE t LIKE '%%other%%' ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Seq Scan/);
-
-# Test distance filtering
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test distance filtering greater than distance
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' > 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-# TODO Do not use index
-like($explain, qr/Index Scan using idx/);
-
-# Test distance filtering without order
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1;
-));
-like($explain, qr/Seq Scan/);
-
-# Test distance filtering without limit
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query';
-));
-like($explain, qr/Seq Scan/);
-
-# Test attribute index
-$node->safe_psql("postgres", "CREATE INDEX attribute_idx ON tst (c);");
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Bitmap Index Scan on attribute_idx/);
-
-# Test partial index
-$node->safe_psql("postgres", "CREATE INDEX partial_idx ON tst USING hnsw (v vector_l2_ops) WHERE (c = $c);");
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using partial_idx/);
-
-done_testing();
--- a/test/t/018_ivfflat_deletes.pl
+++ b/test/t/018_ivfflat_deletes.pl
@@ -0,0 +1,43 @@
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More;
+
+my $dim = 3;
+
+my $array_sql = join(",", ('random()') x $dim);
+
+# 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 (i serial, v vector($dim));");
+$node->safe_psql("postgres",
+	"INSERT INTO tst (v) SELECT ARRAY[$array_sql] FROM generate_series(1, 10000) i;"
+);
+$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops);");
+
+# Delete data
+$node->safe_psql("postgres", "DELETE FROM tst WHERE i % 100 != 0;");
+
+my $exp = $node->safe_psql("postgres", qq(
+	SET enable_indexscan = off;
+	SELECT i FROM tst ORDER BY v <-> '[0,0,0]';
+));
+
+# Run twice to make sure correct tuples marked as dead
+for (1 .. 2)
+{
+	my $res = $node->safe_psql("postgres", qq(
+		SET enable_seqscan = off;
+		SET ivfflat.probes = 100;
+		SELECT i FROM tst ORDER BY v <-> '[0,0,0]';
+	));
+	is($res, $exp);
+}
+
+done_testing();
--- a/test/t/019_ivfflat_filtering.pl
+++ b/test/t/019_ivfflat_filtering.pl
@@ -1,99 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More;
-
-my $dim = 3;
-my $nc = 50;
-my $limit = 20;
-
-my $array_sql = join(",", ('random()') x $dim);
-
-# 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 (i int4, v vector($dim), c int4);");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc FROM generate_series(1, 10000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING ivfflat (v vector_l2_ops) WITH (lists = 100);");
-$node->safe_psql("postgres", "ANALYZE tst;");
-
-# Generate query
-my @r = ();
-for (1 .. $dim)
-{
-	push(@r, rand());
-}
-my $query = "[" . join(",", @r) . "]";
-my $c = int(rand() * $nc);
-
-# Test attribute filtering
-my $explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Seq Scan/);
-
-# Test attribute filtering with few rows removed
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c != $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test attribute filtering with few rows removed comparison
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c >= 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test attribute filtering with many rows removed comparison
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c < 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Seq Scan/);
-
-# Test distance filtering
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using idx/);
-
-# Test distance filtering greater than distance
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' > 1 ORDER BY v <-> '$query' LIMIT $limit;
-));
-# TODO Do not use index
-like($explain, qr/Index Scan using idx/);
-
-# Test distance filtering without order
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1;
-));
-like($explain, qr/Seq Scan/);
-
-# Test distance filtering without limit
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE v <-> '$query' < 1 ORDER BY v <-> '$query';
-));
-like($explain, qr/Seq Scan/);
-
-# Test attribute index
-$node->safe_psql("postgres", "CREATE INDEX attribute_idx ON tst (c);");
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Bitmap Index Scan on attribute_idx/);
-
-# Test partial index
-$node->safe_psql("postgres", "CREATE INDEX partial_idx ON tst USING ivfflat (v vector_l2_ops) WITH (lists = 5) WHERE (c = $c);");
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = $c ORDER BY v <-> '$query' LIMIT $limit;
-));
-like($explain, qr/Index Scan using partial_idx/);
-
-done_testing();
--- a/test/t/020_ivfflat_limit.pl
+++ b/test/t/020_ivfflat_limit.pl
@@ -1,64 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More;
-
-# 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(3));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT ARRAY[random(), random(), random()] FROM generate_series(1, 1000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops) WITH (lists = 10);");
-
-# Test limit
-my $explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 100;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit with probes
-$explain = $node->safe_psql("postgres", qq(
-	SET ivfflat.probes = 2;
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 200;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit + offset
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 90 OFFSET 10;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit > expected tuples
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 101;
-));
-like($explain, qr/Seq Scan/);
-
-# Test limit > expected tuples with probes
-$explain = $node->safe_psql("postgres", qq(
-	SET ivfflat.probes = 2;
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 201;
-));
-like($explain, qr/Seq Scan/);
-
-# Test limit + offset > expected tuples
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 91 OFFSET 10;
-));
-like($explain, qr/Seq Scan/);
-
-# Test no limit
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]';
-));
-like($explain, qr/Seq Scan/);
-
-done_testing();
--- a/test/t/021_hnsw_limit.pl
+++ b/test/t/021_hnsw_limit.pl
@@ -1,62 +0,0 @@
-use strict;
-use warnings;
-use PostgresNode;
-use TestLib;
-use Test::More;
-
-# 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(3));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT ARRAY[random(), random(), random()] FROM generate_series(1, 1000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING hnsw (v vector_l2_ops);");
-
-# Test limit
-my $explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 40;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit with CTE
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE WITH cte AS (SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 40) SELECT * FROM cte;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit + offset
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 30 OFFSET 10;
-));
-like($explain, qr/Index Scan/);
-
-# Test limit > ef_search
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 41;
-));
-like($explain, qr/Seq Scan/);
-
-# Test limit > ef_search with CTE
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE WITH cte AS (SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 41) SELECT * FROM cte;
-));
-like($explain, qr/Seq Scan/);
-
-# Test limit + offset > ef_search
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]' LIMIT 31 OFFSET 10;
-));
-like($explain, qr/Seq Scan/);
-
-# Test no limit
-$explain = $node->safe_psql("postgres", qq(
-	EXPLAIN ANALYZE SELECT * FROM tst ORDER BY v <-> '[1,2,3]';
-));
-like($explain, qr/Seq Scan/);
-
-done_testing();
Author	SHA1	Message	Date
Andrew Kane	46eda44530	Removed comments [skip ci]	2023-12-18 14:38:10 -05:00
Andrew Kane	02f55399eb	Fixed comments [skip ci]	2023-12-18 14:08:48 -05:00
Andrew Kane	a679b584e9	Improved check [skip ci]	2023-12-04 13:59:48 -08:00
Andrew Kane	006e5c7aca	Fixed identifier check	2023-12-04 13:53:07 -08:00
Andrew Kane	ba3730d2a5	Fixed identifier check	2023-12-04 13:38:00 -08:00
Andrew Kane	7aea658b26	Added HalfIsInf [skip ci]	2023-12-04 13:33:39 -08:00
Andrew Kane	7620089901	Improved Float8ToHalf [skip ci]	2023-12-04 13:03:59 -08:00
Andrew Kane	544e303d74	Added todo [skip ci]	2023-12-04 13:01:25 -08:00
Andrew Kane	d09aa9f873	Added casts between half to double precision [skip ci]	2023-12-04 12:49:28 -08:00
Andrew Kane	95eff595f0	Added cast from half to numeric [skip ci]	2023-12-04 12:38:34 -08:00
Andrew Kane	4b630d4f27	Added cast from half to real [skip ci]	2023-12-04 12:27:13 -08:00
Andrew Kane	3b2198d52c	Removed comment [skip ci]	2023-12-04 10:27:03 -08:00
Andrew Kane	422667f6c6	Added half type	2023-12-03 13:01:47 -08:00