Added support for inline filtering with IVFFlat

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
           - postgres: 16
             os: macos-14
           - postgres: 14
-            os: macos-13
+            os: macos-12
     steps:
       - uses: actions/checkout@v4
       - uses: ankane/setup-postgres@v1

CHANGELOG.md

@@ -1,7 +1,6 @@
 ## 0.8.0 (unreleased)
 
-- Added support for iterative index scans
-- Added `intvec` type
+- Added support for inline filtering with IVFFlat
 - Added casts for arrays to `sparsevec`
 - Improved cost estimation
 - Improved performance of HNSW inserts and on-disk index builds

Makefile

@@ -4,8 +4,8 @@ EXTVERSION = 0.7.4
 MODULE_big = vector
 DATA = $(wildcard sql/*--*--*.sql)
 DATA_built = sql/$(EXTENSION)--$(EXTVERSION).sql
-OBJS = src/bitutils.o src/bitvec.o src/halfutils.o src/halfvec.o src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/intvec.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/sparsevec.o src/vector.o
-HEADERS = src/halfvec.h src/intvec.h src/sparsevec.h src/vector.h
+OBJS = src/bitutils.o src/bitvec.o src/halfutils.o src/halfvec.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/sparsevec.o src/vector.o
+HEADERS = src/halfvec.h src/sparsevec.h src/vector.h
 
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))

Makefile.win

@@ -2,8 +2,8 @@ EXTENSION = vector
 EXTVERSION = 0.7.4
 
 DATA_built = sql\$(EXTENSION)--$(EXTVERSION).sql
-OBJS = src\bitutils.obj src\bitvec.obj src\halfutils.obj src\halfvec.obj src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\intvec.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\sparsevec.obj src\vector.obj
-HEADERS = src\halfvec.h src\intvec.h src\sparsevec.h src\vector.h
+OBJS = src\bitutils.obj src\bitvec.obj src\halfutils.obj src\halfvec.obj src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\sparsevec.obj src\vector.obj
+HEADERS = src\halfvec.h src\sparsevec.h src\vector.h
 
 REGRESS = bit btree cast copy halfvec hnsw_bit hnsw_halfvec hnsw_sparsevec hnsw_vector ivfflat_bit ivfflat_halfvec ivfflat_vector sparsevec vector_type
 REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)

README.md

@@ -223,7 +223,7 @@ L2 distance
 CREATE INDEX ON items USING hnsw (embedding vector_l2_ops);
 ```
 
-Note: Use `halfvec_l2_ops` for `halfvec`, `intvec_l2_ops` for `intvec`, and `sparsevec_l2_ops` for `sparsevec` (and similar with the other distance functions)
+Note: Use `halfvec_l2_ops` for `halfvec` and `sparsevec_l2_ops` for `sparsevec` (and similar with the other distance functions)
 
 Inner product
 
@@ -259,7 +259,6 @@ Supported types are:
 
 - `vector` - up to 2,000 dimensions
 - `halfvec` - up to 4,000 dimensions (added in 0.7.0)
-- `intvec` - up to 8,000 dimensions (added in 0.8.0)
 - `bit` - up to 64,000 dimensions (added in 0.7.0)
 - `sparsevec` - up to 1,000 non-zero elements (added in 0.7.0)
 
@@ -440,6 +439,12 @@ Create an index on one [or more](https://www.postgresql.org/docs/current/indexes
 CREATE INDEX ON items (category_id);
 ```
 
+Or a composite IVFFlat index for approximate search (added in 0.8.0)
+
+```sql
+CREATE INDEX ON items USING ivfflat (embedding vector_l2_ops, category_id) WITH (lists = 100);
+```
+
 Or a [partial index](https://www.postgresql.org/docs/current/indexes-partial.html) on the vector column for approximate search
 
 ```sql
@@ -478,16 +483,6 @@ Get the nearest neighbors
 SELECT * FROM items ORDER BY embedding::halfvec(3) <-> '[1,2,3]' LIMIT 5;
 ```
 
-## Integer Vectors
-
-*Added in 0.8.0*
-
-Use the `intvec` type to store 8-bit integer vectors
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding intvec(3));
-```
-
 ## Binary Vectors
 
 Use the `bit` type to store binary vectors ([example](https://github.com/pgvector/pgvector-python/blob/master/examples/imagehash/example.py))
@@ -951,30 +946,6 @@ Function | Description | Added
 avg(halfvec) → halfvec | average | 0.7.0
 sum(halfvec) → halfvec | sum | 0.7.0
 
-### Intvec Type
-
-Each int vector takes `dimensions + 8` bytes of storage. Each element is a single byte signed integer. Int vectors can have up to 16,000 dimensions.
-
-### Intvec Operators
-
-Operator | Description | Added
---- | --- | ---
-<-> | Euclidean distance | 0.8.0
-<#> | negative inner product | 0.8.0
-<=> | cosine distance | 0.8.0
-<+> | taxicab distance | 0.8.0
-
-### Intvec Functions
-
-Function | Description | Added
---- | --- | ---
-cosine_distance(intvec, intvec) → double precision | cosine distance | 0.8.0
-inner_product(intvec, intvec) → double precision | inner product | 0.8.0
-l1_distance(intvec, intvec) → double precision | taxicab distance | 0.8.0
-l2_distance(intvec, intvec) → double precision | Euclidean distance | 0.8.0
-l2_norm(intvec) → double precision | Euclidean norm | 0.8.0
-vector_dims(intvec) → integer | number of dimensions | 0.8.0
-
 ### Bit Type
 
 Each bit vector takes `dimensions / 8 + 8` bytes of storage. See the [Postgres docs](https://www.postgresql.org/docs/current/datatype-bit.html) for more info.

sql/vector--0.7.4--0.8.0.sql

@@ -1,188 +1,6 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "ALTER EXTENSION vector UPDATE TO '0.8.0'" to load this file. \quit
 
-CREATE FUNCTION hnsw_intvec_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C;
-
-CREATE TYPE intvec;
-
-CREATE FUNCTION intvec_in(cstring, oid, integer) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_out(intvec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_recv(internal, oid, integer) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_send(intvec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE intvec (
-	INPUT     = intvec_in,
-	OUTPUT    = intvec_out,
-	TYPMOD_IN = intvec_typmod_in,
-	RECEIVE   = intvec_recv,
-	SEND      = intvec_send,
-	STORAGE   = external
-);
-
-CREATE FUNCTION l2_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_dims(intvec) RETURNS integer
-	AS 'MODULE_PATHNAME', 'intvec_vector_dims' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_lt(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_le(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_eq(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_ne(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_ge(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_gt(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_cmp(intvec, intvec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_l2_squared_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_negative_inner_product(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec(intvec, integer, boolean) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_intvec(integer[], integer, boolean) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_to_integer(intvec, integer, boolean) RETURNS integer[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE CAST (intvec AS intvec)
-	WITH FUNCTION intvec(intvec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (intvec AS integer[])
-	WITH FUNCTION intvec_to_integer(intvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (integer[] AS intvec)
-	WITH FUNCTION array_to_intvec(integer[], integer, boolean) AS ASSIGNMENT;
-
-CREATE OPERATOR <-> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR < (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR CLASS intvec_ops
-	DEFAULT FOR TYPE intvec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 intvec_cmp(intvec, intvec);
-
-CREATE OPERATOR CLASS intvec_l2_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <-> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 intvec_l2_squared_distance(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_ip_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <#> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 intvec_negative_inner_product(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_cosine_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <=> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 cosine_distance(intvec, intvec),
-	FUNCTION 2 l2_norm(intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_l1_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <+> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
 CREATE FUNCTION array_to_sparsevec(integer[], integer, boolean) RETURNS sparsevec
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
@@ -206,3 +24,5 @@ CREATE CAST (double precision[] AS sparsevec)
 
 CREATE CAST (numeric[] AS sparsevec)
 	WITH FUNCTION array_to_sparsevec(numeric[], integer, boolean) AS ASSIGNMENT;
+
+-- TODO add ivfflat attributes

sql/vector.sql

@@ -272,9 +272,6 @@ CREATE FUNCTION ivfflat_bit_support(internal) RETURNS internal
 CREATE FUNCTION hnsw_halfvec_support(internal) RETURNS internal
 	AS 'MODULE_PATHNAME' LANGUAGE C;
 
-CREATE FUNCTION hnsw_intvec_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C;
-
 CREATE FUNCTION hnsw_bit_support(internal) RETURNS internal
 	AS 'MODULE_PATHNAME' LANGUAGE C;
 
@@ -650,199 +647,6 @@ CREATE OPERATOR CLASS halfvec_l1_ops
 	FUNCTION 1 l1_distance(halfvec, halfvec),
 	FUNCTION 3 hnsw_halfvec_support(internal);
 
--- intvec type
-
-CREATE TYPE intvec;
-
-CREATE FUNCTION intvec_in(cstring, oid, integer) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_out(intvec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_recv(internal, oid, integer) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_send(intvec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE intvec (
-	INPUT     = intvec_in,
-	OUTPUT    = intvec_out,
-	TYPMOD_IN = intvec_typmod_in,
-	RECEIVE   = intvec_recv,
-	SEND      = intvec_send,
-	STORAGE   = external
-);
-
--- intvec functions
-
-CREATE FUNCTION l2_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_dims(intvec) RETURNS integer
-	AS 'MODULE_PATHNAME', 'intvec_vector_dims' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(intvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'intvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- intvec private functions
-
-CREATE FUNCTION intvec_lt(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_le(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_eq(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_ne(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_ge(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_gt(intvec, intvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_cmp(intvec, intvec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_l2_squared_distance(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_negative_inner_product(intvec, intvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- intvec cast functions
-
-CREATE FUNCTION intvec(intvec, integer, boolean) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_intvec(integer[], integer, boolean) RETURNS intvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION intvec_to_integer(intvec, integer, boolean) RETURNS integer[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- intvec casts
-
-CREATE CAST (intvec AS intvec)
-	WITH FUNCTION intvec(intvec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (intvec AS integer[])
-	WITH FUNCTION intvec_to_integer(intvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (integer[] AS intvec)
-	WITH FUNCTION array_to_intvec(integer[], integer, boolean) AS ASSIGNMENT;
-
--- intvec operators
-
-CREATE OPERATOR <-> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR < (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
--- intvec opclasses
-
-CREATE OPERATOR CLASS intvec_ops
-	DEFAULT FOR TYPE intvec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 intvec_cmp(intvec, intvec);
-
-CREATE OPERATOR CLASS intvec_l2_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <-> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 intvec_l2_squared_distance(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_ip_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <#> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 intvec_negative_inner_product(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_cosine_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <=> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 cosine_distance(intvec, intvec),
-	FUNCTION 2 l2_norm(intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
-CREATE OPERATOR CLASS intvec_l1_ops
-	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <+> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(intvec, intvec),
-	FUNCTION 3 hnsw_intvec_support(internal);
-
 -- bit functions
 
 CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
@@ -1112,3 +916,13 @@ CREATE OPERATOR CLASS sparsevec_l1_ops
 	OPERATOR 1 <+> (sparsevec, sparsevec) FOR ORDER BY float_ops,
 	FUNCTION 1 l1_distance(sparsevec, sparsevec),
 	FUNCTION 3 hnsw_sparsevec_support(internal);
+
+-- ivfflat attributes
+
+CREATE OPERATOR CLASS vector_integer_ops
+	DEFAULT FOR TYPE integer USING ivfflat AS
+	OPERATOR 2 < ,
+	OPERATOR 3 <= ,
+	OPERATOR 4 = ,
+	OPERATOR 5 >= ,
+	OPERATOR 6 > ;

src/hnsw.c

@@ -18,16 +18,7 @@
 #define MarkGUCPrefixReserved(x) EmitWarningsOnPlaceholders(x)
 #endif
 
-static const struct config_enum_entry hnsw_iterative_search_options[] = {
-	{"off", HNSW_ITERATIVE_SEARCH_OFF, false},
-	{"relaxed_order", HNSW_ITERATIVE_SEARCH_RELAXED, false},
-	{"strict_order", HNSW_ITERATIVE_SEARCH_STRICT, false},
-	{NULL, 0, false}
-};
-
 int			hnsw_ef_search;
-int			hnsw_max_search_tuples;
-int			hnsw_iterative_search;
 int			hnsw_lock_tranche_id;
 static relopt_kind hnsw_relopt_kind;
 
@@ -78,15 +69,6 @@ HnswInit(void)
 							"Valid range is 1..1000.", &hnsw_ef_search,
 							HNSW_DEFAULT_EF_SEARCH, HNSW_MIN_EF_SEARCH, HNSW_MAX_EF_SEARCH, PGC_USERSET, 0, NULL, NULL, NULL);
 
-	DefineCustomEnumVariable("hnsw.iterative_search", "Sets the iterative search mode",
-							 NULL, &hnsw_iterative_search,
-							 HNSW_ITERATIVE_SEARCH_OFF, hnsw_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL);
-
-	/* This is approximate and does not apply to the initial scan */
-	DefineCustomIntVariable("hnsw.max_search_tuples", "Sets the max number of candidates to visit for iterative search",
-							"-1 means no limit", &hnsw_max_search_tuples,
-							-1, -1, INT_MAX, PGC_USERSET, 0, NULL, NULL, NULL);
-
 	MarkGUCPrefixReserved("hnsw");
 }
 

src/hnsw.h

@@ -109,17 +109,8 @@
 
 /* Variables */
 extern int	hnsw_ef_search;
-extern int	hnsw_iterative_search;
-extern int	hnsw_max_search_tuples;
 extern int	hnsw_lock_tranche_id;
 
-typedef enum HnswIterativeSearchMode
-{
-	HNSW_ITERATIVE_SEARCH_OFF,
-	HNSW_ITERATIVE_SEARCH_RELAXED,
-	HNSW_ITERATIVE_SEARCH_STRICT
-}			HnswIterativeSearchMode;
-
 typedef struct HnswElementData HnswElementData;
 typedef struct HnswNeighborArray HnswNeighborArray;
 
@@ -141,7 +132,6 @@ struct HnswElementData
 	uint8		heaptidsLength;
 	uint8		level;
 	uint8		deleted;
-	uint8		version;
 	uint32		hash;
 	HnswNeighborsPtr neighbors;
 	BlockNumber blkno;
@@ -329,10 +319,10 @@ typedef struct HnswElementTupleData
 	uint8		type;
 	uint8		level;
 	uint8		deleted;
-	uint8		version;
+	uint8		unused;
 	ItemPointerData heaptids[HNSW_HEAPTIDS];
 	ItemPointerData neighbortid;
-	uint16		unused;
+	uint16		unused2;
 	Vector		data;
 }			HnswElementTupleData;
 
@@ -341,7 +331,7 @@ typedef HnswElementTupleData * HnswElementTuple;
 typedef struct HnswNeighborTupleData
 {
 	uint8		type;
-	uint8		version;
+	uint8		unused;
 	uint16		count;
 	ItemPointerData indextids[FLEXIBLE_ARRAY_MEMBER];
 }			HnswNeighborTupleData;
@@ -366,12 +356,6 @@ typedef struct HnswScanOpaqueData
 	const		HnswTypeInfo *typeInfo;
 	bool		first;
 	List	   *w;
-	visited_hash v;
-	pairingheap *discarded;
-	HnswQuery	q;
-	int			m;
-	int64		tuples;
-	double		previousDistance;
 	MemoryContext tmpCtx;
 
 	/* Support functions */
@@ -415,7 +399,7 @@ bool		HnswCheckNorm(HnswSupport * support, Datum value);
 Buffer		HnswNewBuffer(Relation index, ForkNumber forkNum);
 void		HnswInitPage(Buffer buf, Page page);
 void		HnswInit(void);
-List	   *HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation index, HnswSupport * support, int m, bool inserting, HnswElement skipElement, visited_hash * v, pairingheap **discarded, bool initVisited, int64 *tuples);
+List	   *HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation index, HnswSupport * support, int m, bool inserting, HnswElement skipElement);
 HnswElement HnswGetEntryPoint(Relation index);
 void		HnswGetMetaPageInfo(Relation index, int *m, HnswElement * entryPoint);
 void	   *HnswAlloc(HnswAllocator * allocator, Size size);

src/hnswinsert.c

@@ -36,7 +36,7 @@ GetInsertPage(Relation index)
  * Check for a free offset
  */
 static bool
-HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size etupSize, Size ntupSize, Buffer *nbuf, Page *npage, OffsetNumber *freeOffno, OffsetNumber *freeNeighborOffno, BlockNumber *newInsertPage, uint8 *tupleVersion)
+HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size etupSize, Size ntupSize, Buffer *nbuf, Page *npage, OffsetNumber *freeOffno, OffsetNumber *freeNeighborOffno, BlockNumber *newInsertPage)
 {
 	OffsetNumber offno;
 	OffsetNumber maxoffno = PageGetMaxOffsetNumber(page);
@@ -98,7 +98,6 @@ HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size
 			{
 				*freeOffno = offno;
 				*freeNeighborOffno = neighborOffno;
-				*tupleVersion = etup->version;
 				return true;
 			}
 			else if (*nbuf != buf)
@@ -154,7 +153,6 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B
 	OffsetNumber freeOffno = InvalidOffsetNumber;
 	OffsetNumber freeNeighborOffno = InvalidOffsetNumber;
 	BlockNumber newInsertPage = InvalidBlockNumber;
-	uint8		tupleVersion;
 	char	   *base = NULL;
 
 	/* Calculate sizes */
@@ -204,7 +202,7 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B
 		}
 
 		/* Next, try space from a deleted element */
-		if (HnswFreeOffset(index, buf, page, e, etupSize, ntupSize, &nbuf, &npage, &freeOffno, &freeNeighborOffno, &newInsertPage, &tupleVersion))
+		if (HnswFreeOffset(index, buf, page, e, etupSize, ntupSize, &nbuf, &npage, &freeOffno, &freeNeighborOffno, &newInsertPage))
 		{
 			if (nbuf != buf)
 			{
@@ -214,10 +212,6 @@ AddElementOnDisk(Relation index, HnswElement e, int m, BlockNumber insertPage, B
 					npage = GenericXLogRegisterBuffer(state, nbuf, 0);
 			}
 
-			/* Set tuple version */
-			etup->version = tupleVersion;
-			ntup->version = tupleVersion;
-
 			break;
 		}
 

src/hnswscan.c

@@ -5,7 +5,6 @@
 #include "pgstat.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
-#include "utils/float.h"
 #include "utils/memutils.h"
 
 /*
@@ -22,57 +21,25 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	int			m;
 	HnswElement entryPoint;
 	char	   *base = NULL;
-	HnswQuery  *q = &so->q;
+	HnswQuery	q;
+
+	q.value = value;
 
 	/* Get m and entry point */
 	HnswGetMetaPageInfo(index, &m, &entryPoint);
 
-	q->value = value;
-	so->m = m;
-
 	if (entryPoint == NULL)
 		return NIL;
 
-	ep = list_make1(HnswEntryCandidate(base, entryPoint, q, index, support, false));
+	ep = list_make1(HnswEntryCandidate(base, entryPoint, &q, index, support, false));
 
 	for (int lc = entryPoint->level; lc >= 1; lc--)
 	{
-		w = HnswSearchLayer(base, q, ep, 1, lc, index, support, m, false, NULL, NULL, NULL, true, NULL);
+		w = HnswSearchLayer(base, &q, ep, 1, lc, index, support, m, false, NULL);
 		ep = w;
 	}
 
-	return HnswSearchLayer(base, q, ep, hnsw_ef_search, 0, index, support, m, false, NULL, &so->v, hnsw_iterative_search != HNSW_ITERATIVE_SEARCH_OFF ? &so->discarded : NULL, true, &so->tuples);
-}
-
-/*
- * Resume scan at ground level with discarded candidates
- */
-static List *
-ResumeScanItems(IndexScanDesc scan)
-{
-	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
-	Relation	index = scan->indexRelation;
-	List	   *ep = NIL;
-	char	   *base = NULL;
-	int			batch_size = hnsw_ef_search;
-
-	if (pairingheap_is_empty(so->discarded))
-		return NIL;
-
-	/* Get next batch of candidates */
-	for (int i = 0; i < batch_size; i++)
-	{
-		HnswSearchCandidate *sc;
-
-		if (pairingheap_is_empty(so->discarded))
-			break;
-
-		sc = HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded));
-
-		ep = lappend(ep, sc);
-	}
-
-	return HnswSearchLayer(base, &so->q, ep, batch_size, 0, index, &so->support, so->m, false, NULL, &so->v, &so->discarded, false, &so->tuples);
+	return HnswSearchLayer(base, &q, ep, hnsw_ef_search, 0, index, support, m, false, NULL);
 }
 
 /*
@@ -102,17 +69,6 @@ GetScanValue(IndexScanDesc scan)
 	return value;
 }
 
-#if defined(HNSW_MEMORY)
-/*
- * Show memory usage
- */
-static void
-ShowMemoryUsage(HnswScanOpaque so)
-{
-	elog(INFO, "memory: %zu KB, tuples: " INT64_FORMAT, MemoryContextMemAllocated(so->tmpCtx, false) / 1024, so->tuples);
-}
-#endif
-
 /*
  * Prepare for an index scan
  */
@@ -127,16 +83,9 @@ hnswbeginscan(Relation index, int nkeys, int norderbys)
 	so = (HnswScanOpaque) palloc(sizeof(HnswScanOpaqueData));
 	so->typeInfo = HnswGetTypeInfo(index);
 	so->first = true;
-	so->v.tids = NULL;
-	so->discarded = NULL;
-
-	/*
-	 * Use a lower max allocation size than default to allow scanning more
-	 * tuples for iterative search before exceeding work_mem
-	 */
 	so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
 									   "Hnsw scan temporary context",
-									   0, 8 * 1024, 512 * 1024);
+									   ALLOCSET_DEFAULT_SIZES);
 
 	/* Set support functions */
 	HnswInitSupport(&so->support, index);
@@ -154,15 +103,7 @@ hnswrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int no
 {
 	HnswScanOpaque so = (HnswScanOpaque) scan->opaque;
 
-	if (so->v.tids != NULL)
-		tidhash_reset(so->v.tids);
-
-	if (so->discarded != NULL)
-		pairingheap_reset(so->discarded);
-
 	so->first = true;
-	so->tuples = 0;
-	so->previousDistance = -get_float8_infinity();
 	MemoryContextReset(so->tmpCtx);
 
 	if (keys && scan->numberOfKeys > 0)
@@ -220,104 +161,26 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		so->first = false;
 
 #if defined(HNSW_MEMORY)
-		ShowMemoryUsage(so);
+		elog(INFO, "memory: %zu KB", MemoryContextMemAllocated(so->tmpCtx, false) / 1024);
 #endif
 	}
 
-	for (;;)
+	while (list_length(so->w) > 0)
 	{
 		char	   *base = NULL;
-		HnswSearchCandidate *sc;
-		HnswElement element;
+		HnswSearchCandidate *sc = llast(so->w);
+		HnswElement element = HnswPtrAccess(base, sc->element);
 		ItemPointer heaptid;
 
-		if (list_length(so->w) == 0)
-		{
-			if (hnsw_iterative_search == HNSW_ITERATIVE_SEARCH_OFF)
-				break;
-
-			/* Empty index */
-			if (so->discarded == NULL)
-				break;
-
-			/* Reached max number of tuples */
-			if (hnsw_max_search_tuples != -1 && so->tuples >= hnsw_max_search_tuples)
-			{
-				if (pairingheap_is_empty(so->discarded))
-					break;
-
-				/* Return remaining tuples */
-				so->w = lappend(so->w, HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded)));
-			}
-			/* Prevent scans from consuming too much memory */
-			else if (MemoryContextMemAllocated(so->tmpCtx, false) > (Size) work_mem * 1024L)
-			{
-				if (pairingheap_is_empty(so->discarded))
-				{
-					ereport(DEBUG1,
-							(errmsg("hnsw index scan exceeded work_mem after " INT64_FORMAT " tuples", so->tuples),
-							 errhint("Increase work_mem to scan more tuples.")));
-
-					break;
-				}
-
-				/* Return remaining tuples */
-				so->w = lappend(so->w, HnswGetSearchCandidate(w_node, pairingheap_remove_first(so->discarded)));
-			}
-			else
-			{
-				/*
-				 * Locking ensures when neighbors are read, the elements they
-				 * reference will not be deleted (and replaced) during the
-				 * iteration.
-				 *
-				 * Elements loaded into memory on previous iterations may have
-				 * been deleted (and replaced), so when reading neighbors, the
-				 * element version must be checked.
-				 */
-				LockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);
-
-				so->w = ResumeScanItems(scan);
-
-				UnlockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);
-
-#if defined(HNSW_MEMORY)
-				ShowMemoryUsage(so);
-#endif
-			}
-
-			if (list_length(so->w) == 0)
-				break;
-		}
-
-		sc = llast(so->w);
-		element = HnswPtrAccess(base, sc->element);
-
 		/* Move to next element if no valid heap TIDs */
 		if (element->heaptidsLength == 0)
 		{
 			so->w = list_delete_last(so->w);
-
-			/* Mark memory as free for next iteration */
-			if (hnsw_iterative_search != HNSW_ITERATIVE_SEARCH_OFF)
-			{
-				pfree(element);
-				pfree(sc);
-			}
-
 			continue;
 		}
 
 		heaptid = &element->heaptids[--element->heaptidsLength];
 
-		if (hnsw_iterative_search == HNSW_ITERATIVE_SEARCH_STRICT)
-		{
-			if (sc->distance < so->previousDistance)
-				continue;
-
-			so->previousDistance = sc->distance;
-		}
-
 		MemoryContextSwitchTo(oldCtx);
 
 		scan->xs_heaptid = *heaptid;

src/hnswutils.c

@@ -1,6 +1,5 @@
 #include "postgres.h"
 
-#include <float.h>
 #include <math.h>
 
 #include "access/generic_xlog.h"
@@ -158,9 +157,6 @@ HnswInitSupport(HnswSupport * support, Relation index)
 Datum
 HnswNormValue(const HnswTypeInfo * typeInfo, Oid collation, Datum value)
 {
-	if (!typeInfo->normalize)
-		return value;
-
 	return DirectFunctionCall1Coll(typeInfo->normalize, collation, value);
 }
 
@@ -255,8 +251,6 @@ HnswInitElement(char *base, ItemPointer heaptid, int m, double ml, int maxLevel,
 
 	element->level = level;
 	element->deleted = 0;
-	/* Start at one to make it easier to find issues */
-	element->version = 1;
 
 	HnswInitNeighbors(base, element, m, allocator);
 
@@ -436,7 +430,6 @@ HnswSetElementTuple(char *base, HnswElementTuple etup, HnswElement element)
 	etup->type = HNSW_ELEMENT_TUPLE_TYPE;
 	etup->level = element->level;
 	etup->deleted = 0;
-	etup->version = element->version;
 	for (int i = 0; i < HNSW_HEAPTIDS; i++)
 	{
 		if (i < element->heaptidsLength)
@@ -479,7 +472,6 @@ HnswSetNeighborTuple(char *base, HnswNeighborTuple ntup, HnswElement e, int m)
 	}
 
 	ntup->count = idx;
-	ntup->version = e->version;
 }
 
 /*
@@ -490,7 +482,6 @@ HnswLoadElementFromTuple(HnswElement element, HnswElementTuple etup, bool loadHe
 {
 	element->level = etup->level;
 	element->deleted = etup->deleted;
-	element->version = etup->version;
 	element->neighborPage = ItemPointerGetBlockNumber(&etup->neighbortid);
 	element->neighborOffno = ItemPointerGetOffsetNumber(&etup->neighbortid);
 	element->heaptidsLength = 0;
@@ -550,14 +541,7 @@ HnswLoadElementImpl(BlockNumber blkno, OffsetNumber offno, double *distance, Hns
 		if (DatumGetPointer(q->value) == NULL)
 			*distance = 0;
 		else
-		{
 			*distance = HnswGetDistance(q->value, PointerGetDatum(&etup->data), support);
-
-			/* Needed for intvec cosine distance */
-			/* TODO Improve */
-			if (isnan(*distance))
-				*distance = DBL_MAX;
-		}
 	}
 
 	/* Load element */
@@ -592,34 +576,21 @@ GetElementDistance(char *base, HnswElement element, HnswQuery * q, HnswSupport *
 	return HnswGetDistance(q->value, value, support);
 }
 
-/*
- * Allocate a search candidate
- */
-static HnswSearchCandidate *
-HnswInitSearchCandidate(char *base, HnswElement element, double distance)
-{
-	HnswSearchCandidate *sc = palloc(sizeof(HnswSearchCandidate));
-
-	HnswPtrStore(base, sc->element, element);
-	sc->distance = distance;
-	return sc;
-}
-
 /*
  * Create a candidate for the entry point
  */
 HnswSearchCandidate *
 HnswEntryCandidate(char *base, HnswElement entryPoint, HnswQuery * q, Relation index, HnswSupport * support, bool loadVec)
 {
+	HnswSearchCandidate *sc = palloc(sizeof(HnswSearchCandidate));
 	bool		inMemory = index == NULL;
-	double		distance;
 
+	HnswPtrStore(base, sc->element, entryPoint);
 	if (inMemory)
-		distance = GetElementDistance(base, entryPoint, q, support);
+		sc->distance = GetElementDistance(base, entryPoint, q, support);
 	else
-		HnswLoadElement(entryPoint, &distance, q, index, support, loadVec, NULL);
-
-	return HnswInitSearchCandidate(base, entryPoint, distance);
+		HnswLoadElement(entryPoint, &sc->distance, q, index, support, loadVec, NULL);
+	return sc;
 }
 
 /*
@@ -637,21 +608,6 @@ CompareNearestCandidates(const pairingheap_node *a, const pairingheap_node *b, v
 	return 0;
 }
 
-/*
- * Compare discarded candidate distances
- */
-static int
-CompareNearestDiscardedCandidates(const pairingheap_node *a, const pairingheap_node *b, void *arg)
-{
-	if (HnswGetSearchCandidateConst(w_node, a)->distance < HnswGetSearchCandidateConst(w_node, b)->distance)
-		return 1;
-
-	if (HnswGetSearchCandidateConst(w_node, a)->distance > HnswGetSearchCandidateConst(w_node, b)->distance)
-		return -1;
-
-	return 0;
-}
-
 /*
  * Compare candidate distances
  */
@@ -772,11 +728,8 @@ HnswLoadNeighborTids(HnswElement element, ItemPointerData *indextids, Relation i
 
 	ntup = (HnswNeighborTuple) PageGetItem(page, PageGetItemId(page, element->neighborOffno));
 
-	/*
-	 * Ensure the neighbor tuple has not been deleted or replaced between
-	 * index scan iterations
-	 */
-	if (ntup->version != element->version || ntup->count != (element->level + 2) * m)
+	/* Ensure expected neighbors */
+	if (ntup->count != (element->level + 2) * m)
 	{
 		UnlockReleaseBuffer(buf);
 		return false;
@@ -822,13 +775,13 @@ HnswLoadUnvisitedFromDisk(HnswElement element, HnswUnvisited * unvisited, int *u
  * Algorithm 2 from paper
  */
 List *
-HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation index, HnswSupport * support, int m, bool inserting, HnswElement skipElement, visited_hash * v, pairingheap **discarded, bool initVisited, int64 *tuples)
+HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation index, HnswSupport * support, int m, bool inserting, HnswElement skipElement)
 {
 	List	   *w = NIL;
 	pairingheap *C = pairingheap_allocate(CompareNearestCandidates, NULL);
 	pairingheap *W = pairingheap_allocate(CompareFurthestCandidates, NULL);
 	int			wlen = 0;
-	visited_hash vh;
+	visited_hash v;
 	ListCell   *lc2;
 	HnswNeighborArray *localNeighborhood = NULL;
 	Size		neighborhoodSize = 0;
@@ -837,19 +790,7 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 	int			unvisitedLength;
 	bool		inMemory = index == NULL;
 
-	if (v == NULL)
-	{
-		v = &vh;
-		initVisited = true;
-	}
-
-	if (initVisited)
-	{
-		InitVisited(base, v, inMemory, ef, m);
-
-		if (discarded != NULL)
-			*discarded = pairingheap_allocate(CompareNearestDiscardedCandidates, NULL);
-	}
+	InitVisited(base, &v, inMemory, ef, m);
 
 	/* Create local memory for neighborhood if needed */
 	if (inMemory)
@@ -864,13 +805,7 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 		HnswSearchCandidate *sc = (HnswSearchCandidate *) lfirst(lc2);
 		bool		found;
 
-		if (initVisited)
-		{
-			AddToVisited(base, v, sc->element, inMemory, &found);
-
-			if (tuples != NULL)
-				(*tuples)++;
-		}
+		AddToVisited(base, &v, sc->element, inMemory, &found);
 
 		pairingheap_add(C, &sc->c_node);
 		pairingheap_add(W, &sc->w_node);
@@ -896,12 +831,9 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 		cElement = HnswPtrAccess(base, c->element);
 
 		if (inMemory)
-			HnswLoadUnvisitedFromMemory(base, cElement, unvisited, &unvisitedLength, v, lc, localNeighborhood, neighborhoodSize);
+			HnswLoadUnvisitedFromMemory(base, cElement, unvisited, &unvisitedLength, &v, lc, localNeighborhood, neighborhoodSize);
 		else
-			HnswLoadUnvisitedFromDisk(cElement, unvisited, &unvisitedLength, v, index, m, lm, lc);
-
-		if (tuples != NULL)
-			(*tuples) += unvisitedLength;
+			HnswLoadUnvisitedFromDisk(cElement, unvisited, &unvisitedLength, &v, index, m, lm, lc);
 
 		for (int i = 0; i < unvisitedLength; i++)
 		{
@@ -925,30 +857,25 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 
 				/* Avoid any allocations if not adding */
 				eElement = NULL;
-				HnswLoadElementImpl(blkno, offno, &eDistance, q, index, support, inserting, alwaysAdd || discarded != NULL ? NULL : &f->distance, &eElement);
+				HnswLoadElementImpl(blkno, offno, &eDistance, q, index, support, inserting, alwaysAdd ? NULL : &f->distance, &eElement);
 
 				if (eElement == NULL)
 					continue;
 			}
 
-			if (eElement == NULL || !(eDistance < f->distance || alwaysAdd))
-			{
-				if (discarded != NULL)
-				{
-					/* Create a new candidate */
-					e = HnswInitSearchCandidate(base, eElement, eDistance);
-					pairingheap_add(*discarded, &e->w_node);
-				}
-
+			if (!(eDistance < f->distance || alwaysAdd))
 				continue;
-			}
+
+			Assert(!eElement->deleted);
 
 			/* Make robust to issues */
 			if (eElement->level < lc)
 				continue;
 
 			/* Create a new candidate */
-			e = HnswInitSearchCandidate(base, eElement, eDistance);
+			e = palloc(sizeof(HnswSearchCandidate));
+			HnswPtrStore(base, e->element, eElement);
+			e->distance = eDistance;
 			pairingheap_add(C, &e->c_node);
 			pairingheap_add(W, &e->w_node);
 
@@ -963,12 +890,7 @@ HnswSearchLayer(char *base, HnswQuery * q, List *ep, int ef, int lc, Relation in
 
 				/* No need to decrement wlen */
 				if (wlen > ef)
-				{
-					HnswSearchCandidate *d = HnswGetSearchCandidate(w_node, pairingheap_remove_first(W));
-
-					if (discarded != NULL)
-						pairingheap_add(*discarded, &d->w_node);
-				}
+					pairingheap_remove_first(W);
 			}
 		}
 	}
@@ -1303,7 +1225,7 @@ HnswFindElementNeighbors(char *base, HnswElement element, HnswElement entryPoint
 	/* 1st phase: greedy search to insert level */
 	for (int lc = entryLevel; lc >= level + 1; lc--)
 	{
-		w = HnswSearchLayer(base, &q, ep, 1, lc, index, support, m, true, skipElement, NULL, NULL, true, NULL);
+		w = HnswSearchLayer(base, &q, ep, 1, lc, index, support, m, true, skipElement);
 		ep = w;
 	}
 
@@ -1322,7 +1244,7 @@ HnswFindElementNeighbors(char *base, HnswElement element, HnswElement entryPoint
 		List	   *lw = NIL;
 		ListCell   *lc2;
 
-		w = HnswSearchLayer(base, &q, ep, efConstruction, lc, index, support, m, true, skipElement, NULL, NULL, true, NULL);
+		w = HnswSearchLayer(base, &q, ep, efConstruction, lc, index, support, m, true, skipElement);
 
 		/* Convert search candidates to candidates */
 		foreach(lc2, w)
@@ -1404,19 +1326,6 @@ hnsw_halfvec_support(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(&typeInfo);
 };
 
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(hnsw_intvec_support);
-Datum
-hnsw_intvec_support(PG_FUNCTION_ARGS)
-{
-	static const HnswTypeInfo typeInfo = {
-		.maxDimensions = HNSW_MAX_DIM * 4,
-		.normalize = NULL,
-		.checkValue = NULL
-	};
-
-	PG_RETURN_POINTER(&typeInfo);
-};
-
 FUNCTION_PREFIX PG_FUNCTION_INFO_V1(hnsw_bit_support);
 Datum
 hnsw_bit_support(PG_FUNCTION_ARGS)

src/hnswvacuum.c

@@ -527,14 +527,6 @@ MarkDeleted(HnswVacuumState * vacuumstate)
 			for (int i = 0; i < ntup->count; i++)
 				ItemPointerSetInvalid(&ntup->indextids[i]);
 
-			/* Increment version */
-			/* This is used to avoid incorrect reads for iterative scans */
-			/* Reserve some bits for future use */
-			etup->version++;
-			if (etup->version > 15)
-				etup->version = 1;
-			ntup->version = etup->version;
-
 			/*
 			 * We modified the tuples in place, no need to call
 			 * PageIndexTupleOverwrite

src/intvec.c

@@ -1,754 +0,0 @@
-#include "postgres.h"
-
-#include <limits.h>
-#include <math.h>
-
-#include "catalog/pg_type.h"
-#include "fmgr.h"
-#include "intvec.h"
-#include "lib/stringinfo.h"
-#include "libpq/pqformat.h"
-#include "utils/array.h"
-#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-
-/*
- * Ensure same dimensions
- */
-static inline void
-CheckDims(IntVector * a, IntVector * b)
-{
-	if (a->dim != b->dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("different intvec dimensions %d and %d", a->dim, b->dim)));
-}
-
-/*
- * Ensure expected dimensions
- */
-static inline void
-CheckExpectedDim(int32 typmod, int dim)
-{
-	if (typmod != -1 && typmod != dim)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("expected %d dimensions, not %d", typmod, dim)));
-}
-
-/*
- * Ensure valid dimensions
- */
-static inline void
-CheckDim(int dim)
-{
-	if (dim < 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("intvec must have at least 1 dimension")));
-
-	if (dim > INTVEC_MAX_DIM)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("intvec cannot have more than %d dimensions", INTVEC_MAX_DIM)));
-}
-
-/*
- * Ensure element in range
- */
-static inline void
-CheckElement(long value)
-{
-	if (value < SCHAR_MIN || value > SCHAR_MAX)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("value \"%ld\" is out of range for type intvec", value)));
-}
-
-/*
- * Allocate and initialize a new int vector
- */
-IntVector *
-InitIntVector(int dim)
-{
-	IntVector  *result;
-	int			size;
-
-	size = INTVEC_SIZE(dim);
-	result = (IntVector *) palloc0(size);
-	SET_VARSIZE(result, size);
-	result->dim = dim;
-
-	return result;
-}
-
-/*
- * Check for whitespace, since array_isspace() is static
- */
-static inline bool
-intvec_isspace(char ch)
-{
-	if (ch == ' ' ||
-		ch == '\t' ||
-		ch == '\n' ||
-		ch == '\r' ||
-		ch == '\v' ||
-		ch == '\f')
-		return true;
-	return false;
-}
-
-/*
- * Convert textual representation to internal representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_in);
-Datum
-intvec_in(PG_FUNCTION_ARGS)
-{
-	char	   *lit = PG_GETARG_CSTRING(0);
-	int32		typmod = PG_GETARG_INT32(2);
-	int8		x[INTVEC_MAX_DIM];
-	int			dim = 0;
-	char	   *pt = lit;
-	IntVector  *result;
-
-	while (intvec_isspace(*pt))
-		pt++;
-
-	if (*pt != '[')
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type intvec: \"%s\"", lit),
-				 errdetail("Vector contents must start with \"[\".")));
-
-	pt++;
-
-	while (intvec_isspace(*pt))
-		pt++;
-
-	if (*pt == ']')
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("intvec must have at least 1 dimension")));
-
-	for (;;)
-	{
-		long		val;
-		char	   *stringEnd;
-
-		if (dim == INTVEC_MAX_DIM)
-			ereport(ERROR,
-					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-					 errmsg("intvec cannot have more than %d dimensions", VECTOR_MAX_DIM)));
-
-		while (intvec_isspace(*pt))
-			pt++;
-
-		/* Check for empty string like float4in */
-		if (*pt == '\0')
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for type intvec: \"%s\"", lit)));
-
-		errno = 0;
-
-		/* Use similar logic as int2vectorin */
-		val = strtol(pt, &stringEnd, 10);
-
-		if (stringEnd == pt)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for type intvec: \"%s\"", lit)));
-
-		/* Check for range error like float4in */
-		if (errno == ERANGE || val < SCHAR_MIN || val > SCHAR_MAX)
-			ereport(ERROR,
-					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-					 errmsg("\"%s\" is out of range for type intvec", pnstrdup(pt, stringEnd - pt))));
-
-		CheckElement(val);
-		x[dim++] = val;
-
-		pt = stringEnd;
-
-		while (intvec_isspace(*pt))
-			pt++;
-
-		if (*pt == ',')
-			pt++;
-		else if (*pt == ']')
-		{
-			pt++;
-			break;
-		}
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for type intvec: \"%s\"", lit)));
-	}
-
-	/* Only whitespace is allowed after the closing brace */
-	while (intvec_isspace(*pt))
-		pt++;
-
-	if (*pt != '\0')
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type intvec: \"%s\"", lit),
-				 errdetail("Junk after closing right brace.")));
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	result = InitIntVector(dim);
-	for (int i = 0; i < dim; i++)
-		result->x[i] = x[i];
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Convert internal representation to textual representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_out);
-Datum
-intvec_out(PG_FUNCTION_ARGS)
-{
-	IntVector  *vector = PG_GETARG_INTVEC_P(0);
-	int			dim = vector->dim;
-	char	   *buf;
-	char	   *ptr;
-
-	/*
-	 * Need:
-	 *
-	 * dim * 4 bytes for elements (-128 to 127)
-	 *
-	 * dim - 1 bytes for separator
-	 *
-	 * 3 bytes for [, ], and \0
-	 */
-	buf = (char *) palloc(5 * dim + 2);
-	ptr = buf;
-
-	*ptr = '[';
-	ptr++;
-	for (int i = 0; i < dim; i++)
-	{
-		if (i > 0)
-		{
-			*ptr = ',';
-			ptr++;
-		}
-
-#if PG_VERSION_NUM >= 140000
-		ptr += pg_ltoa(vector->x[i], ptr);
-#else
-		pg_ltoa(vector->x[i], ptr);
-		while (*ptr != '\0')
-			ptr++;
-#endif
-	}
-	*ptr = ']';
-	ptr++;
-	*ptr = '\0';
-
-	PG_FREE_IF_COPY(vector, 0);
-	PG_RETURN_CSTRING(buf);
-}
-
-/*
- * Convert type modifier
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_typmod_in);
-Datum
-intvec_typmod_in(PG_FUNCTION_ARGS)
-{
-	ArrayType  *ta = PG_GETARG_ARRAYTYPE_P(0);
-	int32	   *tl;
-	int			n;
-
-	tl = ArrayGetIntegerTypmods(ta, &n);
-
-	if (n != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid type modifier")));
-
-	if (*tl < 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("dimensions for type intvec must be at least 1")));
-
-	if (*tl > INTVEC_MAX_DIM)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("dimensions for type intvec cannot exceed %d", INTVEC_MAX_DIM)));
-
-	PG_RETURN_INT32(*tl);
-}
-
-/*
- * Convert external binary representation to internal representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_recv);
-Datum
-intvec_recv(PG_FUNCTION_ARGS)
-{
-	StringInfo	buf = (StringInfo) PG_GETARG_POINTER(0);
-	int32		typmod = PG_GETARG_INT32(2);
-	IntVector  *result;
-	int16		dim;
-	int16		unused;
-
-	dim = pq_getmsgint(buf, sizeof(int16));
-	unused = pq_getmsgint(buf, sizeof(int16));
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	if (unused != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("expected unused to be 0, not %d", unused)));
-
-	result = InitIntVector(dim);
-	for (int i = 0; i < dim; i++)
-		result->x[i] = pq_getmsgint(buf, sizeof(int8));
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Convert internal representation to the external binary representation
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_send);
-Datum
-intvec_send(PG_FUNCTION_ARGS)
-{
-	IntVector  *vec = PG_GETARG_INTVEC_P(0);
-	StringInfoData buf;
-
-	pq_begintypsend(&buf);
-	pq_sendint(&buf, vec->dim, sizeof(int16));
-	pq_sendint(&buf, vec->unused, sizeof(int16));
-	for (int i = 0; i < vec->dim; i++)
-		pq_sendint8(&buf, vec->x[i]);
-
-	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
-}
-
-/*
- * Convert int vector to int vector
- * This is needed to check the type modifier
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec);
-Datum
-intvec(PG_FUNCTION_ARGS)
-{
-	IntVector  *vec = PG_GETARG_INTVEC_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-
-	CheckExpectedDim(typmod, vec->dim);
-
-	PG_RETURN_POINTER(vec);
-}
-
-/*
- * Convert array to intvec vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(array_to_intvec);
-Datum
-array_to_intvec(PG_FUNCTION_ARGS)
-{
-	ArrayType  *array = PG_GETARG_ARRAYTYPE_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-	IntVector  *result;
-	int16		typlen;
-	bool		typbyval;
-	char		typalign;
-	Datum	   *elemsp;
-	int			nelemsp;
-
-	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")));
-
-	get_typlenbyvalalign(ARR_ELEMTYPE(array), &typlen, &typbyval, &typalign);
-	deconstruct_array(array, ARR_ELEMTYPE(array), typlen, typbyval, typalign, &elemsp, NULL, &nelemsp);
-
-	CheckDim(nelemsp);
-	CheckExpectedDim(typmod, nelemsp);
-
-	result = InitIntVector(nelemsp);
-
-	if (ARR_ELEMTYPE(array) == INT4OID)
-	{
-		for (int i = 0; i < nelemsp; i++)
-		{
-			long		l = DatumGetInt32(elemsp[i]);
-
-			CheckElement(l);
-
-			result->x[i] = l;
-		}
-	}
-	else
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("unsupported array type")));
-	}
-
-	/*
-	 * Free allocation from deconstruct_array. Do not free individual elements
-	 * when pass-by-reference since they point to original array.
-	 */
-	pfree(elemsp);
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Convert int vector to integer[]
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_to_integer);
-Datum
-intvec_to_integer(PG_FUNCTION_ARGS)
-{
-	IntVector  *vec = PG_GETARG_INTVEC_P(0);
-	Datum	   *datums;
-	ArrayType  *result;
-
-	datums = (Datum *) palloc(sizeof(Datum) * vec->dim);
-
-	for (int i = 0; i < vec->dim; i++)
-		datums[i] = Int32GetDatum((int) vec->x[i]);
-
-	result = construct_array(datums, vec->dim, INT4OID, sizeof(int32), true, TYPALIGN_INT);
-
-	pfree(datums);
-
-	PG_RETURN_POINTER(result);
-}
-
-static int
-IntvecL2SquaredDistance(int dim, int8 *ax, int8 *bx)
-{
-	int			distance = 0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-	{
-		int			diff = (int) ax[i] - (int) bx[i];
-
-		distance += diff * diff;
-	}
-
-	return distance;
-}
-
-/*
- * Get the L2 distance between int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_l2_distance);
-Datum
-intvec_l2_distance(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8(sqrt((double) IntvecL2SquaredDistance(a->dim, a->x, b->x)));
-}
-
-/*
- * Get the L2 squared distance between int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_l2_squared_distance);
-Datum
-intvec_l2_squared_distance(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8((double) IntvecL2SquaredDistance(a->dim, a->x, b->x));
-}
-
-static int
-IntvecInnerProduct(int dim, int8 *ax, int8 *bx)
-{
-	int			distance = 0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		distance += (int) ax[i] * (int) bx[i];
-
-	return distance;
-}
-
-/*
- * Get the inner product of two int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_inner_product);
-Datum
-intvec_inner_product(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8((double) IntvecInnerProduct(a->dim, a->x, b->x));
-}
-
-/*
- * Get the negative inner product of two int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_negative_inner_product);
-Datum
-intvec_negative_inner_product(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8((double) -IntvecInnerProduct(a->dim, a->x, b->x));
-}
-
-static double
-IntvecCosineSimilarity(int dim, int8 *ax, int8 *bx)
-{
-	int			similarity = 0;
-	int			norma = 0;
-	int			normb = 0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-	{
-		int			axi = ax[i];
-		int			bxi = bx[i];
-
-		similarity += axi * bxi;
-		norma += axi * axi;
-		normb += bxi * bxi;
-	}
-
-	/* Use sqrt(a * b) over sqrt(a) * sqrt(b) */
-	return (double) similarity / sqrt((double) norma * (double) normb);
-}
-
-/*
- * Get the cosine distance between two int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_cosine_distance);
-Datum
-intvec_cosine_distance(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-	double		similarity;
-
-	CheckDims(a, b);
-
-	similarity = IntvecCosineSimilarity(a->dim, a->x, b->x);
-
-#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);
-}
-
-static int
-IntvecL1Distance(int dim, int8 *ax, int8 *bx)
-{
-	int			distance = 0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		distance += abs((int) ax[i] - (int) bx[i]);
-
-	return distance;
-}
-
-/*
- * Get the L1 distance between two int vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_l1_distance);
-Datum
-intvec_l1_distance(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	CheckDims(a, b);
-
-	PG_RETURN_FLOAT8((double) IntvecL1Distance(a->dim, a->x, b->x));
-}
-
-/*
- * Get the dimensions of an int vector
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_vector_dims);
-Datum
-intvec_vector_dims(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-
-	PG_RETURN_INT32(a->dim);
-}
-
-/*
- * Get the L2 norm of an int vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(intvec_l2_norm);
-Datum
-intvec_l2_norm(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	int8	   *ax = a->x;
-	int			norm = 0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < a->dim; i++)
-		norm += (int) ax[i] * (int) ax[i];
-
-	PG_RETURN_FLOAT8(sqrt((double) norm));
-}
-
-/*
- * Internal helper to compare int vectors
- */
-static int
-intvec_cmp_internal(IntVector * a, IntVector * b)
-{
-	int			dim = Min(a->dim, b->dim);
-
-	/* Check values before dimensions to be consistent with Postgres arrays */
-	for (int i = 0; i < dim; i++)
-	{
-		if (a->x[i] < b->x[i])
-			return -1;
-
-		if (a->x[i] > b->x[i])
-			return 1;
-	}
-
-	if (a->dim < b->dim)
-		return -1;
-
-	if (a->dim > b->dim)
-		return 1;
-
-	return 0;
-}
-
-/*
- * Less than
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_lt);
-Datum
-intvec_lt(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) < 0);
-}
-
-/*
- * Less than or equal
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_le);
-Datum
-intvec_le(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) <= 0);
-}
-
-/*
- * Equal
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_eq);
-Datum
-intvec_eq(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) == 0);
-}
-
-/*
- * Not equal
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_ne);
-Datum
-intvec_ne(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) != 0);
-}
-
-/*
- * Greater than or equal
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_ge);
-Datum
-intvec_ge(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) >= 0);
-}
-
-/*
- * Greater than
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_gt);
-Datum
-intvec_gt(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_BOOL(intvec_cmp_internal(a, b) > 0);
-}
-
-/*
- * Compare int vectors
- */
-FUNCTION_PREFIX PG_FUNCTION_INFO_V1(intvec_cmp);
-Datum
-intvec_cmp(PG_FUNCTION_ARGS)
-{
-	IntVector  *a = PG_GETARG_INTVEC_P(0);
-	IntVector  *b = PG_GETARG_INTVEC_P(1);
-
-	PG_RETURN_INT32(intvec_cmp_internal(a, b));
-}

src/intvec.h

@@ -1,23 +0,0 @@
-#ifndef INTVEC_H
-#define INTVEC_H
-
-#include "vector.h"
-
-#define INTVEC_MAX_DIM VECTOR_MAX_DIM
-
-#define INTVEC_SIZE(_dim)		(offsetof(IntVector, x) + sizeof(int8)*(_dim))
-#define DatumGetIntVector(x)	((IntVector *) PG_DETOAST_DATUM(x))
-#define PG_GETARG_INTVEC_P(x)	DatumGetIntVector(PG_GETARG_DATUM(x))
-#define PG_RETURN_INTVEC_P(x)	PG_RETURN_POINTER(x)
-
-typedef struct IntVector
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int16		dim;			/* number of dimensions */
-	int16		unused;
-	int8		x[FLEXIBLE_ARRAY_MEMBER];
-}			IntVector;
-
-IntVector  *InitIntVector(int dim);
-
-#endif

src/ivfbuild.c

@@ -138,7 +138,7 @@ SampleRows(IvfflatBuildState * buildstate)
  * Add tuple to sort
  */
 static void
-AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState * buildstate)
+AddTupleToSort(Relation index, ItemPointer tid, Datum *values, bool *isnull, IvfflatBuildState * buildstate)
 {
 	double		distance;
 	double		minDistance = DBL_MAX;
@@ -184,6 +184,11 @@ AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState
 	slot->tts_isnull[1] = false;
 	slot->tts_values[2] = value;
 	slot->tts_isnull[2] = false;
+	for (int i = 1; i < buildstate->tupdesc->natts; i++)
+	{
+		slot->tts_values[2 + i] = values[i];
+		slot->tts_isnull[2 + i] = isnull[i];
+	}
 	ExecStoreVirtualTuple(slot);
 
 	/*
@@ -215,7 +220,7 @@ BuildCallback(Relation index, ItemPointer tid, Datum *values,
 	oldCtx = MemoryContextSwitchTo(buildstate->tmpCtx);
 
 	/* Add tuple to sort */
-	AddTupleToSort(index, tid, values, buildstate);
+	AddTupleToSort(index, tid, values, isnull, buildstate);
 
 	/* Reset memory context */
 	MemoryContextSwitchTo(oldCtx);
@@ -226,19 +231,20 @@ BuildCallback(Relation index, ItemPointer tid, Datum *values,
  * Get index tuple from sort state
  */
 static inline void
-GetNextTuple(Tuplesortstate *sortstate, TupleDesc tupdesc, TupleTableSlot *slot, IndexTuple *itup, int *list)
+GetNextTuple(Tuplesortstate *sortstate, TupleDesc tupdesc, TupleTableSlot *slot, Datum *values, bool *isnull, IndexTuple *itup, int *list)
 {
 	if (tuplesort_gettupleslot(sortstate, true, false, slot, NULL))
 	{
-		Datum		value;
-		bool		isnull;
+		bool		unused;
 
-		*list = DatumGetInt32(slot_getattr(slot, 1, &isnull));
-		value = slot_getattr(slot, 3, &isnull);
+		*list = DatumGetInt32(slot_getattr(slot, 1, &unused));
+
+		for (int i = 0; i < tupdesc->natts; i++)
+			values[i] = slot_getattr(slot, 3 + i, &isnull[i]);
 
 		/* Form the index tuple */
-		*itup = index_form_tuple(tupdesc, &value, &isnull);
-		(*itup)->t_tid = *((ItemPointer) DatumGetPointer(slot_getattr(slot, 2, &isnull)));
+		*itup = index_form_tuple(tupdesc, values, isnull);
+		(*itup)->t_tid = *((ItemPointer) DatumGetPointer(slot_getattr(slot, 2, &unused)));
 	}
 	else
 		*list = -1;
@@ -256,12 +262,14 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 
 	TupleTableSlot *slot = MakeSingleTupleTableSlot(buildstate->sortdesc, &TTSOpsMinimalTuple);
 	TupleDesc	tupdesc = buildstate->tupdesc;
+	Datum	   *values = palloc(tupdesc->natts * sizeof(Datum));
+	bool	   *isnull = palloc(tupdesc->natts * sizeof(bool));
 
 	pgstat_progress_update_param(PROGRESS_CREATEIDX_SUBPHASE, PROGRESS_IVFFLAT_PHASE_LOAD);
 
 	pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_TOTAL, buildstate->indtuples);
 
-	GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list);
+	GetNextTuple(buildstate->sortstate, tupdesc, slot, values, isnull, &itup, &list);
 
 	for (int i = 0; i < buildstate->centers->length; i++)
 	{
@@ -297,7 +305,7 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 
 			pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE, ++inserted);
 
-			GetNextTuple(buildstate->sortstate, tupdesc, slot, &itup, &list);
+			GetNextTuple(buildstate->sortstate, tupdesc, slot, values, isnull, &itup, &list);
 		}
 
 		insertPage = BufferGetBlockNumber(buf);
@@ -307,6 +315,9 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 		/* Set the start and insert pages */
 		IvfflatUpdateList(index, buildstate->listInfo[i], insertPage, InvalidBlockNumber, startPage, forkNum);
 	}
+
+	pfree(values);
+	pfree(isnull);
 }
 
 /*
@@ -330,6 +341,19 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("type not supported for ivfflat index")));
 
+	/* TODO See if needed */
+	if (IndexRelationGetNumberOfKeyAttributes(index) > 3)
+		elog(ERROR, "index cannot have more than three columns");
+
+	if (!OidIsValid(index_getprocid(index, 1, IVFFLAT_DISTANCE_PROC)))
+		elog(ERROR, "first column must be a vector");
+
+	for (int i = 1; i < IndexRelationGetNumberOfKeyAttributes(index); i++)
+	{
+		if (OidIsValid(index_getprocid(index, i + 1, IVFFLAT_DISTANCE_PROC)))
+			elog(ERROR, "column %d cannot be a vector", i + 1);
+	}
+
 	/* Require column to have dimensions to be indexed */
 	if (buildstate->dimensions < 0)
 		ereport(ERROR,
@@ -357,10 +381,11 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 				 errmsg("dimensions must be greater than one for this opclass")));
 
 	/* Create tuple description for sorting */
-	buildstate->sortdesc = CreateTemplateTupleDesc(3);
+	buildstate->sortdesc = CreateTemplateTupleDesc(2 + buildstate->tupdesc->natts);
 	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 1, "list", INT4OID, -1, 0);
 	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 2, "tid", TIDOID, -1, 0);
-	TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) 3, "vector", buildstate->tupdesc->attrs[0].atttypid, -1, 0);
+	for (int i = 0; i < buildstate->tupdesc->natts; i++)
+		TupleDescInitEntry(buildstate->sortdesc, (AttrNumber) (3 + i), NULL, buildstate->tupdesc->attrs[i].atttypid, -1, 0);
 
 	buildstate->slot = MakeSingleTupleTableSlot(buildstate->sortdesc, &TTSOpsVirtual);
 

src/ivfflat.c

@@ -17,16 +17,8 @@
 #endif
 
 int			ivfflat_probes;
-int			ivfflat_iterative_search;
-int			ivfflat_max_probes;
 static relopt_kind ivfflat_relopt_kind;
 
-static const struct config_enum_entry ivfflat_iterative_search_options[] = {
-	{"off", IVFFLAT_ITERATIVE_SEARCH_OFF, false},
-	{"relaxed_order", IVFFLAT_ITERATIVE_SEARCH_RELAXED, false},
-	{NULL, 0, false}
-};
-
 /*
  * Initialize index options and variables
  */
@@ -41,15 +33,6 @@ IvfflatInit(void)
 							"Valid range is 1..lists.", &ivfflat_probes,
 							IVFFLAT_DEFAULT_PROBES, IVFFLAT_MIN_LISTS, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL);
 
-	DefineCustomEnumVariable("ivfflat.iterative_search", "Sets the iterative search mode",
-							 NULL, &ivfflat_iterative_search,
-							 IVFFLAT_ITERATIVE_SEARCH_OFF, ivfflat_iterative_search_options, PGC_USERSET, 0, NULL, NULL, NULL);
-
-	/* If this is less than probes, probes is used */
-	DefineCustomIntVariable("ivfflat.max_probes", "Sets the max number of probes for iterative search",
-							"-1 means no limit", &ivfflat_max_probes,
-							-1, -1, IVFFLAT_MAX_LISTS, PGC_USERSET, 0, NULL, NULL, NULL);
-
 	MarkGUCPrefixReserved("ivfflat");
 }
 
@@ -184,7 +167,7 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	amroutine->amcanorderbyop = true;
 	amroutine->amcanbackward = false;	/* can change direction mid-scan */
 	amroutine->amcanunique = false;
-	amroutine->amcanmulticol = false;
+	amroutine->amcanmulticol = true;
 	amroutine->amoptionalkey = true;
 	amroutine->amsearcharray = false;
 	amroutine->amsearchnulls = false;

src/ivfflat.h

@@ -80,14 +80,6 @@
 
 /* Variables */
 extern int	ivfflat_probes;
-extern int	ivfflat_iterative_search;
-extern int	ivfflat_max_probes;
-
-typedef enum IvfflatIterativeSearchMode
-{
-	IVFFLAT_ITERATIVE_SEARCH_OFF,
-	IVFFLAT_ITERATIVE_SEARCH_RELAXED
-}			IvfflatIterativeSearchMode;
 
 typedef struct VectorArrayData
 {
@@ -256,11 +248,8 @@ typedef struct IvfflatScanOpaqueData
 {
 	const		IvfflatTypeInfo *typeInfo;
 	int			probes;
-	int			maxProbes;
 	int			dimensions;
 	bool		first;
-	Datum		value;
-	MemoryContext tmpCtx;
 
 	/* Sorting */
 	Tuplesortstate *sortstate;
@@ -277,9 +266,7 @@ typedef struct IvfflatScanOpaqueData
 
 	/* Lists */
 	pairingheap *listQueue;
-	BlockNumber *listPages;
-	int			listIndex;
-	IvfflatScanList *lists;
+	IvfflatScanList lists[FLEXIBLE_ARRAY_MEMBER];	/* must come last */
 }			IvfflatScanOpaqueData;
 
 typedef IvfflatScanOpaqueData * IvfflatScanOpaque;

src/ivfinsert.c

@@ -78,6 +78,8 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, R
 	BlockNumber insertPage = InvalidBlockNumber;
 	ListInfo	listInfo;
 	BlockNumber originalInsertPage;
+	TupleDesc	tupdesc = RelationGetDescr(index);
+	Datum	   *newValues = palloc(tupdesc->natts * sizeof(Datum));
 
 	/* Detoast once for all calls */
 	value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
@@ -102,8 +104,12 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, R
 	Assert(BlockNumberIsValid(insertPage));
 	originalInsertPage = insertPage;
 
+	newValues[0] = value;
+	for (int i = 1; i < tupdesc->natts; i++)
+		newValues[i] = values[i];
+
 	/* Form tuple */
-	itup = index_form_tuple(RelationGetDescr(index), &value, isnull);
+	itup = index_form_tuple(tupdesc, newValues, isnull);
 	itup->t_tid = *heap_tid;
 
 	/* Get tuple size */

src/ivfscan.c

@@ -10,7 +10,10 @@
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
+
+#ifdef IVFFLAT_MEMORY
 #include "utils/memutils.h"
+#endif
 
 #define GetScanList(ptr) pairingheap_container(IvfflatScanList, ph_node, ptr)
 #define GetScanListConst(ptr) pairingheap_const_container(IvfflatScanList, ph_node, ptr)
@@ -62,7 +65,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 			/* Use procinfo from the index instead of scan key for performance */
 			distance = DatumGetFloat8(so->distfunc(so->procinfo, so->collation, PointerGetDatum(&list->center), value));
 
-			if (listCount < so->maxProbes)
+			if (listCount < so->probes)
 			{
 				IvfflatScanList *scanlist;
 
@@ -75,7 +78,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 				pairingheap_add(so->listQueue, &scanlist->ph_node);
 
 				/* Calculate max distance */
-				if (listCount == so->maxProbes)
+				if (listCount == so->probes)
 					maxDistance = GetScanList(pairingheap_first(so->listQueue))->distance;
 			}
 			else if (distance < maxDistance)
@@ -99,11 +102,34 @@ GetScanLists(IndexScanDesc scan, Datum value)
 
 		UnlockReleaseBuffer(cbuf);
 	}
+}
 
-	for (int i = listCount - 1; i >= 0; i--)
-		so->listPages[i] = GetScanList(pairingheap_remove_first(so->listQueue))->startPage;
+/*
+ * Check if matches scan keys
+ */
+static bool
+MatchesScanKeys(IndexScanDesc scan, IndexTuple itup, TupleDesc tupdesc)
+{
+	for (int i = 0; i < scan->numberOfKeys; i++)
+	{
+		ScanKey		key = &scan->keyData[i];
+		bool		attnull = key->sk_flags & SK_ISNULL;
+		bool		isnull;
+		Datum		value = index_getattr(itup, key->sk_attno, tupdesc, &isnull);
 
-	Assert(pairingheap_is_empty(so->listQueue));
+		if (isnull || attnull)
+		{
+			if (isnull != attnull)
+				return false;
+		}
+		else
+		{
+			if (!DatumGetBool(FunctionCall2Coll(&key->sk_func, key->sk_collation, value, key->sk_argument)))
+				return false;
+		}
+	}
+
+	return true;
 }
 
 /*
@@ -116,14 +142,11 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	TupleDesc	tupdesc = RelationGetDescr(scan->indexRelation);
 	double		tuples = 0;
 	TupleTableSlot *slot = so->vslot;
-	int			batchProbes = 0;
-
-	tuplesort_reset(so->sortstate);
 
 	/* Search closest probes lists */
-	while (so->listIndex < so->maxProbes && (++batchProbes) <= so->probes)
+	while (!pairingheap_is_empty(so->listQueue))
 	{
-		BlockNumber searchPage = so->listPages[so->listIndex++];
+		BlockNumber searchPage = GetScanList(pairingheap_remove_first(so->listQueue))->startPage;
 
 		/* Search all entry pages for list */
 		while (BlockNumberIsValid(searchPage))
@@ -145,6 +168,10 @@ GetScanItems(IndexScanDesc scan, Datum value)
 				ItemId		itemid = PageGetItemId(page, offno);
 
 				itup = (IndexTuple) PageGetItem(page, itemid);
+
+				if (!MatchesScanKeys(scan, itup, tupdesc))
+					continue;
+
 				datum = index_getattr(itup, 1, tupdesc, &isnull);
 
 				/*
@@ -171,17 +198,13 @@ GetScanItems(IndexScanDesc scan, Datum value)
 		}
 	}
 
-	if (tuples < 100 && ivfflat_iterative_search == IVFFLAT_ITERATIVE_SEARCH_OFF)
+	if (tuples < 100)
 		ereport(DEBUG1,
 				(errmsg("index scan found few tuples"),
 				 errdetail("Index may have been created with little data."),
 				 errhint("Recreate the index and possibly decrease lists.")));
 
 	tuplesort_performsort(so->sortstate);
-
-#if defined(IVFFLAT_MEMORY)
-	elog(INFO, "memory: %zu MB", MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
-#endif
 }
 
 /*
@@ -218,13 +241,7 @@ GetScanValue(IndexScanDesc scan)
 
 		/* Normalize if needed */
 		if (so->normprocinfo != NULL)
-		{
-			MemoryContext oldCtx = MemoryContextSwitchTo(so->tmpCtx);
-
 			value = IvfflatNormValue(so->typeInfo, so->collation, value);
-
-			MemoryContextSwitchTo(oldCtx);
-		}
 	}
 
 	return value;
@@ -255,40 +272,19 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	int			lists;
 	int			dimensions;
 	int			probes = ivfflat_probes;
-	int			maxProbes;
-	MemoryContext oldCtx;
 
 	scan = RelationGetIndexScan(index, nkeys, norderbys);
 
 	/* Get lists and dimensions from metapage */
 	IvfflatGetMetaPageInfo(index, &lists, &dimensions);
 
-	if (ivfflat_iterative_search != IVFFLAT_ITERATIVE_SEARCH_OFF)
-	{
-		maxProbes = ivfflat_max_probes;
-
-		if (maxProbes < 0)
-			maxProbes = lists;
-		else if (maxProbes < probes)
-		{
-			/* TODO Show notice */
-			maxProbes = probes;
-		}
-	}
-	else
-		maxProbes = probes;
-
 	if (probes > lists)
 		probes = lists;
 
-	if (maxProbes > lists)
-		maxProbes = lists;
-
-	so = (IvfflatScanOpaque) palloc(sizeof(IvfflatScanOpaqueData));
+	so = (IvfflatScanOpaque) palloc(offsetof(IvfflatScanOpaqueData, lists) + probes * sizeof(IvfflatScanList));
 	so->typeInfo = IvfflatGetTypeInfo(index);
 	so->first = true;
 	so->probes = probes;
-	so->maxProbes = maxProbes;
 	so->dimensions = dimensions;
 
 	/* Set support functions */
@@ -296,12 +292,6 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	so->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	so->collation = index->rd_indcollation[0];
 
-	so->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
-									   "Ivfflat scan temporary context",
-									   ALLOCSET_DEFAULT_SIZES);
-
-	oldCtx = MemoryContextSwitchTo(so->tmpCtx);
-
 	/* Create tuple description for sorting */
 	so->tupdesc = CreateTemplateTupleDesc(2);
 	TupleDescInitEntry(so->tupdesc, (AttrNumber) 1, "distance", FLOAT8OID, -1, 0);
@@ -322,11 +312,6 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	so->bas = GetAccessStrategy(BAS_BULKREAD);
 
 	so->listQueue = pairingheap_allocate(CompareLists, scan);
-	so->listPages = palloc(maxProbes * sizeof(BlockNumber));
-	so->listIndex = 0;
-	so->lists = palloc(maxProbes * sizeof(IvfflatScanList));
-
-	MemoryContextSwitchTo(oldCtx);
 
 	scan->opaque = so;
 
@@ -341,9 +326,11 @@ ivfflatrescan(IndexScanDesc scan, ScanKey keys, int nkeys, ScanKey orderbys, int
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
 
+	if (!so->first)
+		tuplesort_reset(so->sortstate);
+
 	so->first = true;
 	pairingheap_reset(so->listQueue);
-	so->listIndex = 0;
 
 	if (keys && scan->numberOfKeys > 0)
 		memmove(scan->keyData, keys, scan->numberOfKeys * sizeof(ScanKeyData));
@@ -359,8 +346,6 @@ bool
 ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
-	ItemPointer heaptid;
-	bool		isnull;
 
 	/*
 	 * Index can be used to scan backward, but Postgres doesn't support
@@ -388,23 +373,28 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		IvfflatBench("GetScanLists", GetScanLists(scan, value));
 		IvfflatBench("GetScanItems", GetScanItems(scan, value));
 		so->first = false;
-		so->value = value;
+
+#if defined(IVFFLAT_MEMORY)
+		elog(INFO, "memory: %zu MB", MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
+#endif
+
+		/* Clean up if we allocated a new value */
+		if (value != scan->orderByData->sk_argument)
+			pfree(DatumGetPointer(value));
 	}
 
-	while (!tuplesort_gettupleslot(so->sortstate, true, false, so->mslot, NULL))
+	if (tuplesort_gettupleslot(so->sortstate, true, false, so->mslot, NULL))
 	{
-		if (so->listIndex == so->maxProbes)
-			return false;
+		bool		isnull;
+		ItemPointer heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->mslot, 2, &isnull));
 
-		IvfflatBench("GetScanItems", GetScanItems(scan, so->value));
+		scan->xs_heaptid = *heaptid;
+		scan->xs_recheck = false;
+		scan->xs_recheckorderby = false;
+		return true;
 	}
 
-	heaptid = (ItemPointer) DatumGetPointer(slot_getattr(so->mslot, 2, &isnull));
-
-	scan->xs_heaptid = *heaptid;
-	scan->xs_recheck = false;
-	scan->xs_recheckorderby = false;
-	return true;
+	return false;
 }
 
 /*
@@ -415,10 +405,12 @@ ivfflatendscan(IndexScanDesc scan)
 {
 	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
 
-	/* Free any temporary files */
+	pairingheap_free(so->listQueue);
 	tuplesort_end(so->sortstate);
+	FreeAccessStrategy(so->bas);
+	FreeTupleDesc(so->tupdesc);
 
-	MemoryContextDelete(so->tmpCtx);
+	/* TODO Free vslot and mslot without freeing TupleDesc */
 
 	pfree(so);
 	scan->opaque = NULL;

src/ivfvacuum.c

@@ -26,7 +26,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		Page		cpage;
 		OffsetNumber coffno;
 		OffsetNumber cmaxoffno;
-		BlockNumber listPages[MaxOffsetNumber];
+		BlockNumber startPages[MaxOffsetNumber];
 		ListInfo	listInfo;
 
 		cbuf = ReadBuffer(index, blkno);
@@ -40,7 +40,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		{
 			IvfflatList list = (IvfflatList) PageGetItem(cpage, PageGetItemId(cpage, coffno));
 
-			listPages[coffno - FirstOffsetNumber] = list->startPage;
+			startPages[coffno - FirstOffsetNumber] = list->startPage;
 		}
 
 		listInfo.blkno = blkno;
@@ -50,7 +50,7 @@ ivfflatbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 
 		for (coffno = FirstOffsetNumber; coffno <= cmaxoffno; coffno = OffsetNumberNext(coffno))
 		{
-			BlockNumber searchPage = listPages[coffno - FirstOffsetNumber];
+			BlockNumber searchPage = startPages[coffno - FirstOffsetNumber];
 			BlockNumber insertPage = InvalidBlockNumber;
 
 			/* Iterate over entry pages */

test/expected/cast.out

@@ -140,34 +140,6 @@ SELECT '{1e-8,-1e-8}'::real[]::halfvec;
  [0,-0]
 (1 row)
 
-SELECT '[1,2,3]'::intvec::integer[];
-  int4   
----------
- {1,2,3}
-(1 row)
-
-SELECT '{1,2,3}'::integer[]::intvec;
- intvec  
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::integer[]::intvec(3);
- intvec  
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::integer[]::intvec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '{127,-128}'::integer[]::intvec;
-   intvec   
-------------
- [127,-128]
-(1 row)
-
-SELECT '{128,-129}'::integer[]::intvec;
-ERROR:  value "128" is out of range for type intvec
 SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec;
     sparsevec    
 -----------------

test/expected/copy.out

@@ -30,23 +30,6 @@ SELECT * FROM t2 ORDER BY val;
  
 (4 rows)
 
-DROP TABLE t;
-DROP TABLE t2;
--- intvec
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE TABLE t2 (val intvec(3));
-\copy t TO 'results/intvec.bin' WITH (FORMAT binary)
-\copy t2 FROM 'results/intvec.bin' WITH (FORMAT binary)
-SELECT * FROM t2 ORDER BY val;
-   val   
----------
- [0,0,0]
- [1,1,1]
- [1,2,3]
- 
-(4 rows)
-
 DROP TABLE t;
 DROP TABLE t2;
 -- sparsevec

test/expected/hnsw_intvec.out

@@ -1,102 +0,0 @@
-SET enable_seqscan = off;
--- L2
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_l2_ops);
-INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,2,4]
- [1,1,1]
- [0,0,0]
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::intvec)) t2;
- count 
--------
-     4
-(1 row)
-
-SELECT COUNT(*) FROM t;
- count 
--------
-     5
-(1 row)
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
- val 
------
-(0 rows)
-
-DROP TABLE t;
--- inner product
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_ip_ops);
-INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <#> '[3,3,3]';
-   val   
----------
- [1,2,4]
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::intvec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;
--- cosine
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_cosine_ops);
-INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <=> '[3,3,3]';
-   val   
----------
- [1,1,1]
- [1,2,3]
- [1,2,4]
-(3 rows)
-
-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::intvec)) t2;
- count 
--------
-     3
-(1 row)
-
-DROP TABLE t;
--- L1
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_l1_ops);
-INSERT INTO t (val) VALUES ('[1,2,4]');
-SELECT * FROM t ORDER BY val <+> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,2,4]
- [1,1,1]
- [0,0,0]
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::intvec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_vector.out

@@ -99,32 +99,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::vector)) t2
      4
 (1 row)
 
-DROP TABLE t;
--- iterative
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_l2_ops);
-SET hnsw.iterative_search = strict_order;
-SET hnsw.ef_search = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-SET hnsw.iterative_search = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-RESET hnsw.iterative_search;
-RESET hnsw.ef_search;
 DROP TABLE t;
 -- unlogged
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -165,21 +139,4 @@ SET hnsw.ef_search = 0;
 ERROR:  0 is outside the valid range for parameter "hnsw.ef_search" (1 .. 1000)
 SET hnsw.ef_search = 1001;
 ERROR:  1001 is outside the valid range for parameter "hnsw.ef_search" (1 .. 1000)
-SHOW hnsw.iterative_search;
- hnsw.iterative_search 
------------------------
- off
-(1 row)
-
-SET hnsw.iterative_search = on;
-ERROR:  invalid value for parameter "hnsw.iterative_search": "on"
-HINT:  Available values: off, relaxed_order, strict_order.
-SHOW hnsw.max_search_tuples;
- hnsw.max_search_tuples 
-------------------------
- -1
-(1 row)
-
-SET hnsw.max_search_tuples = -2;
-ERROR:  -2 is outside the valid range for parameter "hnsw.max_search_tuples" (-1 .. 2147483647)
 DROP TABLE t;

test/expected/intvec.out

@@ -1,328 +0,0 @@
-SELECT '[1,2,3]'::intvec;
- intvec  
----------
- [1,2,3]
-(1 row)
-
-SELECT '[-1,-2,-3]'::intvec;
-   intvec   
-------------
- [-1,-2,-3]
-(1 row)
-
-SELECT ' [ 1,  2 ,    3  ] '::intvec;
- intvec  
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1.23456]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1.23456]"
-LINE 1: SELECT '[1.23456]'::intvec;
-               ^
-SELECT '[hello,1]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[hello,1]"
-LINE 1: SELECT '[hello,1]'::intvec;
-               ^
-SELECT '[127,-128]'::intvec;
-   intvec   
-------------
- [127,-128]
-(1 row)
-
-SELECT '[128,-129]'::intvec;
-ERROR:  "128" is out of range for type intvec
-LINE 1: SELECT '[128,-129]'::intvec;
-               ^
-SELECT '[1,2,3'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1,2,3"
-LINE 1: SELECT '[1,2,3'::intvec;
-               ^
-SELECT '[1,2,3]9'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1,2,3]9"
-LINE 1: SELECT '[1,2,3]9'::intvec;
-               ^
-DETAIL:  Junk after closing right brace.
-SELECT '1,2,3'::intvec;
-ERROR:  invalid input syntax for type intvec: "1,2,3"
-LINE 1: SELECT '1,2,3'::intvec;
-               ^
-DETAIL:  Vector contents must start with "[".
-SELECT ''::intvec;
-ERROR:  invalid input syntax for type intvec: ""
-LINE 1: SELECT ''::intvec;
-               ^
-DETAIL:  Vector contents must start with "[".
-SELECT '['::intvec;
-ERROR:  invalid input syntax for type intvec: "["
-LINE 1: SELECT '['::intvec;
-               ^
-SELECT '[,'::intvec;
-ERROR:  invalid input syntax for type intvec: "[,"
-LINE 1: SELECT '[,'::intvec;
-               ^
-SELECT '[]'::intvec;
-ERROR:  intvec must have at least 1 dimension
-LINE 1: SELECT '[]'::intvec;
-               ^
-SELECT '[1,]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1,]"
-LINE 1: SELECT '[1,]'::intvec;
-               ^
-SELECT '[1a]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1a]"
-LINE 1: SELECT '[1a]'::intvec;
-               ^
-SELECT '[1,,3]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1,,3]"
-LINE 1: SELECT '[1,,3]'::intvec;
-               ^
-SELECT '[1, ,3]'::intvec;
-ERROR:  invalid input syntax for type intvec: "[1, ,3]"
-LINE 1: SELECT '[1, ,3]'::intvec;
-               ^
-SELECT '[1,2,3]'::intvec(3);
- intvec  
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::intvec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '[1,2,3]'::intvec(3, 2);
-ERROR:  invalid type modifier
-LINE 1: SELECT '[1,2,3]'::intvec(3, 2);
-                          ^
-SELECT '[1,2,3]'::intvec('a');
-ERROR:  invalid input syntax for type integer: "a"
-LINE 1: SELECT '[1,2,3]'::intvec('a');
-                          ^
-SELECT '[1,2,3]'::intvec(0);
-ERROR:  dimensions for type intvec must be at least 1
-LINE 1: SELECT '[1,2,3]'::intvec(0);
-                          ^
-SELECT '[1,2,3]'::intvec(16001);
-ERROR:  dimensions for type intvec cannot exceed 16000
-LINE 1: SELECT '[1,2,3]'::intvec(16001);
-                          ^
-SELECT unnest('{"[1,2,3]", "[4,5,6]"}'::intvec[]);
- unnest  
----------
- [1,2,3]
- [4,5,6]
-(2 rows)
-
-SELECT '{"[1,2,3]"}'::intvec(2)[];
-ERROR:  expected 2 dimensions, not 3
-SELECT '[1,2,3]'::intvec < '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec < '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec <= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::intvec <= '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec = '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::intvec = '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec != '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec != '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::intvec >= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::intvec >= '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::intvec > '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::intvec > '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT intvec_cmp('[1,2,3]', '[1,2,3]');
- intvec_cmp 
-------------
-          0
-(1 row)
-
-SELECT intvec_cmp('[1,2,3]', '[0,0,0]');
- intvec_cmp 
-------------
-          1
-(1 row)
-
-SELECT intvec_cmp('[0,0,0]', '[1,2,3]');
- intvec_cmp 
-------------
-         -1
-(1 row)
-
-SELECT intvec_cmp('[1,2]', '[1,2,3]');
- intvec_cmp 
-------------
-         -1
-(1 row)
-
-SELECT intvec_cmp('[1,2,3]', '[1,2]');
- intvec_cmp 
-------------
-          1
-(1 row)
-
-SELECT intvec_cmp('[1,2]', '[2,3,4]');
- intvec_cmp 
-------------
-         -1
-(1 row)
-
-SELECT intvec_cmp('[2,3]', '[1,2,3]');
- intvec_cmp 
-------------
-          1
-(1 row)
-
-SELECT vector_dims('[1,2,3]'::intvec);
- vector_dims 
--------------
-           3
-(1 row)
-
-SELECT l2_distance('[0,0]'::intvec, '[3,4]');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('[0,0]'::intvec, '[0,1]');
- l2_distance 
--------------
-           1
-(1 row)
-
-SELECT l2_distance('[1,2]'::intvec, '[3]');
-ERROR:  different intvec dimensions 2 and 1
-SELECT '[0,0]'::intvec <-> '[3,4]';
- ?column? 
-----------
-        5
-(1 row)
-
-SELECT inner_product('[1,2]'::intvec, '[3,4]');
- inner_product 
----------------
-            11
-(1 row)
-
-SELECT inner_product('[1,2]'::intvec, '[3]');
-ERROR:  different intvec dimensions 2 and 1
-SELECT inner_product('[127]'::intvec, '[127]');
- inner_product 
----------------
-         16129
-(1 row)
-
-SELECT '[1,2]'::intvec <#> '[3,4]';
- ?column? 
-----------
-      -11
-(1 row)
-
-SELECT cosine_distance('[1,2]'::intvec, '[2,4]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,2]'::intvec, '[0,0]');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('[1,1]'::intvec, '[1,1]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,0]'::intvec, '[0,2]');
- cosine_distance 
------------------
-               1
-(1 row)
-
-SELECT cosine_distance('[1,1]'::intvec, '[-1,-1]');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('[1,2]'::intvec, '[3]');
-ERROR:  different intvec dimensions 2 and 1
-SELECT '[1,2]'::intvec <=> '[2,4]';
- ?column? 
-----------
-        0
-(1 row)
-
-SELECT l1_distance('[0,0]'::intvec, '[3,4]');
- l1_distance 
--------------
-           7
-(1 row)
-
-SELECT l1_distance('[0,0]'::intvec, '[0,1]');
- l1_distance 
--------------
-           1
-(1 row)
-
-SELECT l1_distance('[1,2]'::intvec, '[3]');
-ERROR:  different intvec dimensions 2 and 1

test/expected/ivfflat_vector.out

@@ -81,44 +81,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2
      3
 (1 row)
 
-DROP TABLE t;
--- iterative
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 3);
-SET ivfflat.iterative_search = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,1,1]
- [0,0,0]
-(3 rows)
-
-SET ivfflat.max_probes = 0;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
-(1 row)
-
-SET ivfflat.max_probes = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
-(1 row)
-
-SET ivfflat.max_probes = 2;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-   val   
----------
- [1,2,3]
- [1,1,1]
-(2 rows)
-
-RESET ivfflat.iterative_search;
-RESET ivfflat.max_probes;
 DROP TABLE t;
 -- unlogged
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -147,27 +109,4 @@ SHOW ivfflat.probes;
  1
 (1 row)
 
-SET ivfflat.probes = 0;
-ERROR:  0 is outside the valid range for parameter "ivfflat.probes" (1 .. 32768)
-SET ivfflat.probes = 32769;
-ERROR:  32769 is outside the valid range for parameter "ivfflat.probes" (1 .. 32768)
-SHOW ivfflat.iterative_search;
- ivfflat.iterative_search 
---------------------------
- off
-(1 row)
-
-SET ivfflat.iterative_search = on;
-ERROR:  invalid value for parameter "ivfflat.iterative_search": "on"
-HINT:  Available values: off, relaxed_order.
-SHOW ivfflat.max_probes;
- ivfflat.max_probes 
---------------------
- -1
-(1 row)
-
-SET ivfflat.max_probes = -2;
-ERROR:  -2 is outside the valid range for parameter "ivfflat.max_probes" (-1 .. 32768)
-SET ivfflat.max_probes = 32769;
-ERROR:  32769 is outside the valid range for parameter "ivfflat.max_probes" (-1 .. 32768)
 DROP TABLE t;

test/sql/cast.sql

@@ -38,14 +38,6 @@ SELECT '{1,2,3}'::real[]::halfvec(2);
 SELECT '{65520,-65520}'::real[]::halfvec;
 SELECT '{1e-8,-1e-8}'::real[]::halfvec;
 
-SELECT '[1,2,3]'::intvec::integer[];
-
-SELECT '{1,2,3}'::integer[]::intvec;
-SELECT '{1,2,3}'::integer[]::intvec(3);
-SELECT '{1,2,3}'::integer[]::intvec(2);
-SELECT '{127,-128}'::integer[]::intvec;
-SELECT '{128,-129}'::integer[]::intvec;
-
 SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec;
 SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec(5);
 SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec(4);

test/sql/copy.sql

@@ -28,21 +28,6 @@ SELECT * FROM t2 ORDER BY val;
 DROP TABLE t;
 DROP TABLE t2;
 
--- intvec
-
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-
-CREATE TABLE t2 (val intvec(3));
-
-\copy t TO 'results/intvec.bin' WITH (FORMAT binary)
-\copy t2 FROM 'results/intvec.bin' WITH (FORMAT binary)
-
-SELECT * FROM t2 ORDER BY val;
-
-DROP TABLE t;
-DROP TABLE t2;
-
 -- sparsevec
 
 CREATE TABLE t (val sparsevec(3));

test/sql/hnsw_intvec.sql

@@ -1,58 +0,0 @@
-SET enable_seqscan = off;
-
--- L2
-
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_l2_ops);
-
-INSERT INTO t (val) VALUES ('[1,2,4]');
-
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::intvec)) t2;
-SELECT COUNT(*) FROM t;
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-DROP TABLE t;
-
--- inner product
-
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_ip_ops);
-
-INSERT INTO t (val) VALUES ('[1,2,4]');
-
-SELECT * FROM t ORDER BY val <#> '[3,3,3]';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::intvec)) t2;
-
-DROP TABLE t;
-
--- cosine
-
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_cosine_ops);
-
-INSERT INTO t (val) VALUES ('[1,2,4]');
-
-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::intvec)) t2;
-
-DROP TABLE t;
-
--- L1
-
-CREATE TABLE t (val intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val intvec_l1_ops);
-
-INSERT INTO t (val) VALUES ('[1,2,4]');
-
-SELECT * FROM t ORDER BY val <+> '[3,3,3]';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::intvec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_vector.sql

@@ -57,23 +57,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::vector)) t2
 
 DROP TABLE t;
 
--- iterative
-
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_l2_ops);
-
-SET hnsw.iterative_search = strict_order;
-SET hnsw.ef_search = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET hnsw.iterative_search = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-RESET hnsw.iterative_search;
-RESET hnsw.ef_search;
-DROP TABLE t;
-
 -- unlogged
 
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -98,12 +81,4 @@ SHOW hnsw.ef_search;
 SET hnsw.ef_search = 0;
 SET hnsw.ef_search = 1001;
 
-SHOW hnsw.iterative_search;
-
-SET hnsw.iterative_search = on;
-
-SHOW hnsw.max_search_tuples;
-
-SET hnsw.max_search_tuples = -2;
-
 DROP TABLE t;

test/sql/intvec.sql

@@ -1,73 +0,0 @@
-SELECT '[1,2,3]'::intvec;
-SELECT '[-1,-2,-3]'::intvec;
-SELECT ' [ 1,  2 ,    3  ] '::intvec;
-SELECT '[1.23456]'::intvec;
-SELECT '[hello,1]'::intvec;
-SELECT '[127,-128]'::intvec;
-SELECT '[128,-129]'::intvec;
-SELECT '[1,2,3'::intvec;
-SELECT '[1,2,3]9'::intvec;
-SELECT '1,2,3'::intvec;
-SELECT ''::intvec;
-SELECT '['::intvec;
-SELECT '[,'::intvec;
-SELECT '[]'::intvec;
-SELECT '[1,]'::intvec;
-SELECT '[1a]'::intvec;
-SELECT '[1,,3]'::intvec;
-SELECT '[1, ,3]'::intvec;
-
-SELECT '[1,2,3]'::intvec(3);
-SELECT '[1,2,3]'::intvec(2);
-SELECT '[1,2,3]'::intvec(3, 2);
-SELECT '[1,2,3]'::intvec('a');
-SELECT '[1,2,3]'::intvec(0);
-SELECT '[1,2,3]'::intvec(16001);
-
-SELECT unnest('{"[1,2,3]", "[4,5,6]"}'::intvec[]);
-SELECT '{"[1,2,3]"}'::intvec(2)[];
-
-SELECT '[1,2,3]'::intvec < '[1,2,3]';
-SELECT '[1,2,3]'::intvec < '[1,2]';
-SELECT '[1,2,3]'::intvec <= '[1,2,3]';
-SELECT '[1,2,3]'::intvec <= '[1,2]';
-SELECT '[1,2,3]'::intvec = '[1,2,3]';
-SELECT '[1,2,3]'::intvec = '[1,2]';
-SELECT '[1,2,3]'::intvec != '[1,2,3]';
-SELECT '[1,2,3]'::intvec != '[1,2]';
-SELECT '[1,2,3]'::intvec >= '[1,2,3]';
-SELECT '[1,2,3]'::intvec >= '[1,2]';
-SELECT '[1,2,3]'::intvec > '[1,2,3]';
-SELECT '[1,2,3]'::intvec > '[1,2]';
-
-SELECT intvec_cmp('[1,2,3]', '[1,2,3]');
-SELECT intvec_cmp('[1,2,3]', '[0,0,0]');
-SELECT intvec_cmp('[0,0,0]', '[1,2,3]');
-SELECT intvec_cmp('[1,2]', '[1,2,3]');
-SELECT intvec_cmp('[1,2,3]', '[1,2]');
-SELECT intvec_cmp('[1,2]', '[2,3,4]');
-SELECT intvec_cmp('[2,3]', '[1,2,3]');
-
-SELECT vector_dims('[1,2,3]'::intvec);
-
-SELECT l2_distance('[0,0]'::intvec, '[3,4]');
-SELECT l2_distance('[0,0]'::intvec, '[0,1]');
-SELECT l2_distance('[1,2]'::intvec, '[3]');
-SELECT '[0,0]'::intvec <-> '[3,4]';
-
-SELECT inner_product('[1,2]'::intvec, '[3,4]');
-SELECT inner_product('[1,2]'::intvec, '[3]');
-SELECT inner_product('[127]'::intvec, '[127]');
-SELECT '[1,2]'::intvec <#> '[3,4]';
-
-SELECT cosine_distance('[1,2]'::intvec, '[2,4]');
-SELECT cosine_distance('[1,2]'::intvec, '[0,0]');
-SELECT cosine_distance('[1,1]'::intvec, '[1,1]');
-SELECT cosine_distance('[1,0]'::intvec, '[0,2]');
-SELECT cosine_distance('[1,1]'::intvec, '[-1,-1]');
-SELECT cosine_distance('[1,2]'::intvec, '[3]');
-SELECT '[1,2]'::intvec <=> '[2,4]';
-
-SELECT l1_distance('[0,0]'::intvec, '[3,4]');
-SELECT l1_distance('[0,0]'::intvec, '[0,1]');
-SELECT l1_distance('[1,2]'::intvec, '[3]');

test/sql/ivfflat_vector.sql

@@ -44,28 +44,6 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::vector)) t2
 
 DROP TABLE t;
 
--- iterative
-
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 3);
-
-SET ivfflat.iterative_search = relaxed_order;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET ivfflat.max_probes = 0;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET ivfflat.max_probes = 1;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-SET ivfflat.max_probes = 2;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-RESET ivfflat.iterative_search;
-RESET ivfflat.max_probes;
-DROP TABLE t;
-
 -- unlogged
 
 CREATE UNLOGGED TABLE t (val vector(3));
@@ -84,16 +62,4 @@ CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 32769);
 
 SHOW ivfflat.probes;
 
-SET ivfflat.probes = 0;
-SET ivfflat.probes = 32769;
-
-SHOW ivfflat.iterative_search;
-
-SET ivfflat.iterative_search = on;
-
-SHOW ivfflat.max_probes;
-
-SET ivfflat.max_probes = -2;
-SET ivfflat.max_probes = 32769;
-
 DROP TABLE t;

test/t/033_comparison.pl

@@ -40,10 +40,6 @@ for (1 .. 50)
 	$actual = $node->safe_psql("postgres", "SELECT halfvec_cmp(v::halfvec, '$query'::real[]::halfvec) FROM tst");
 	is($expected, $actual);
 
-	# Test intvec
-	$actual = $node->safe_psql("postgres", "SELECT intvec_cmp(v::integer[]::intvec, '$query'::integer[]::intvec) FROM tst");
-	is($expected, $actual);
-
 	# Test sparsevec
 	$actual = $node->safe_psql("postgres", "SELECT sparsevec_cmp(v::vector::sparsevec, '$query'::real[]::vector::sparsevec) FROM tst");
 	is($expected, $actual);

test/t/034_distance_functions.pl

@@ -45,10 +45,6 @@ for my $function (@functions)
 		my $actual = $node->safe_psql("postgres", "SELECT $function(v::halfvec, '$query'::vector::halfvec) FROM tst");
 		is($expected, $actual, "halfvec $function");
 
-		# Test intvec
-		$actual = $node->safe_psql("postgres", "SELECT $function(v::real[]::integer[]::intvec, '$query'::vector::real[]::integer[]::intvec) FROM tst");
-		is($expected, $actual, "intvec $function");
-
 		# Test sparsevec
 		$actual = $node->safe_psql("postgres", "SELECT $function(v::sparsevec, '$query'::vector::sparsevec) FROM tst");
 		is($expected, $actual, "sparsevec $function");

test/t/037_inputs.pl

@@ -12,8 +12,8 @@ $node->start;
 # Create extension
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
 
-my @types = ("vector", "halfvec", "intvec", "sparsevec");
-my @inputs = ("[1.23,4.56,7.89]", "[1.23,4.56,7.89]", "[1,2,3]", "{1:1.23,2:4.56,3:7.89}/3");
+my @types = ("vector", "halfvec", "sparsevec");
+my @inputs = ("[1.23,4.56,7.89]", "[1.23,4.56,7.89]", "{1:1.23,2:4.56,3:7.89}/3");
 my @subs = (" ", " ", ",", ":", "-", "1", "9", "\0", "2147483648", "-2147483649");
 
 for my $i (0 .. $#types)

test/t/041_ivfflat_inline_filtering.pl

@@ -0,0 +1,197 @@
+use strict;
+use warnings FATAL => 'all';
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+
+my $node;
+my @queries = ();
+my @where = ();
+my @expected;
+my $limit = 20;
+my $dim = 3;
+my $array_sql = join(",", ('random()') x $dim);
+my $nc = 100;
+my $nc2 = 10;
+
+sub test_recall
+{
+	my ($probes, $min, $operator) = @_;
+	my $correct = 0;
+	my $total = 0;
+
+	for my $j (0 .. 2)
+	{
+		my $explain = $node->safe_psql("postgres", qq(
+			SET enable_seqscan = off;
+			SET ivfflat.probes = $probes;
+			EXPLAIN ANALYZE SELECT i FROM tst WHERE $where[$j] ORDER BY v $operator '$queries[$j]' LIMIT $limit;
+		));
+		like($explain, qr/Index Cond/);
+	}
+
+	for my $i (0 .. $#queries)
+	{
+		my $actual = $node->safe_psql("postgres", qq(
+			SET enable_seqscan = off;
+			SET ivfflat.probes = $probes;
+			SELECT i FROM tst WHERE $where[$i] ORDER BY v $operator '$queries[$i]' LIMIT $limit;
+		));
+		my @actual_ids = split("\n", $actual);
+		my %actual_set = map { $_ => 1 } @actual_ids;
+
+		is(scalar(@actual_ids), $limit);
+
+		my @expected_ids = split("\n", $expected[$i]);
+
+		foreach (@expected_ids)
+		{
+			if (exists($actual_set{$_}))
+			{
+				$correct++;
+			}
+			$total++;
+		}
+	}
+
+	cmp_ok($correct / $total, ">=", $min, $operator);
+}
+
+# Initialize node
+$node = PostgreSQL::Test::Cluster->new('node');
+$node->init;
+$node->start;
+
+# Create table
+$node->safe_psql("postgres", "CREATE EXTENSION vector;");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim), c int4, c2 int4);");
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc, i % $nc2 FROM generate_series(1, 50000) i;"
+);
+
+# Generate queries
+for my $i (1 .. 100)
+{
+	my @r = ();
+	for (1 .. $dim)
+	{
+		push(@r, rand());
+	}
+	push(@queries, "[" . join(",", @r) . "]");
+
+	if ($i % 3 == 0)
+	{
+		my $c = int(rand() * $nc);
+		push(@where, "c = $c");
+	}
+	elsif ($i % 3 == 1)
+	{
+		my $c2 = int(rand() * $nc2);
+		push(@where, "c2 = $c2");
+	}
+	else
+	{
+		# use c2 to ensure results
+		my $c2 = int(rand() * $nc2);
+		push(@where, "c = $c2 AND c2 = $c2");
+	}
+}
+
+# Add index
+$node->safe_psql("postgres", qq(
+	CREATE INDEX ON tst USING ivfflat (v vector_l2_ops, c, c2) WITH (lists = 100);
+));
+
+# Insert more rows
+$node->safe_psql("postgres",
+	"INSERT INTO tst SELECT i, ARRAY[$array_sql], i % $nc, i % $nc2 FROM generate_series(1, 50000) i;"
+);
+
+# Get exact results
+@expected = ();
+for my $i (0 .. $#queries)
+{
+	my $res = $node->safe_psql("postgres", qq(
+		SET enable_indexscan = off;
+		SELECT i FROM tst WHERE $where[$i] ORDER BY v <-> '$queries[$i]' LIMIT $limit;
+	));
+	push(@expected, $res);
+}
+
+# Test recall
+test_recall(10, 0.99, '<->');
+
+# Test vacuum
+$node->safe_psql("postgres", "DELETE FROM tst WHERE c > 5;");
+$node->safe_psql("postgres", "VACUUM tst;");
+
+# Test less than
+my $explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c < 10 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(c < 10\)/);
+
+# Test less than or equal
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c <= 10 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(c <= 10\)/);
+
+# Test greater than or equal
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c >= 90 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(c >= 90\)/);
+
+# Test greater than
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c > 90 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(c > 90\)/);
+
+# Test multiple attribute columns
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = 1 AND c2 = 1 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(\(c = 1\) AND \(c2 = 1\)\)/);
+
+# Test only last attribute column
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c2 = 1 ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Cond: \(c2 = 1\)/);
+
+# Test only vector column
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v <-> '$queries[0]' LIMIT $limit;
+));
+like($explain, qr/Index Scan/);
+
+# Test only attribute columns
+$explain = $node->safe_psql("postgres", qq(
+	SET enable_seqscan = off;
+	EXPLAIN ANALYZE SELECT i FROM tst WHERE c = 1;
+));
+like($explain, qr/Seq Scan/);
+
+# Test columns
+my ($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING ivfflat (c);");
+like($stderr, qr/first column must be a vector/);
+
+($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING ivfflat (c, v vector_cosine_ops);");
+like($stderr, qr/first column must be a vector/);
+
+($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_cosine_ops, c, c, c);");
+like($stderr, qr/index cannot have more than three columns/);
+
+($ret, $stdout, $stderr) = $node->psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_cosine_ops, v vector_cosine_ops);");
+like($stderr, qr/column 2 cannot be a vector/);
+
+done_testing();

test/t/041_ivfflat_iterative_search.pl

@@ -1,54 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $dim = 3;
-my $array_sql = join(",", ('random()') x $dim);
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4 PRIMARY KEY, v vector($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
-);
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING ivfflat (v vector_l2_ops);");
-
-my $count = $node->safe_psql("postgres", qq(
-	SET enable_seqscan = off;
-	SET ivfflat.probes = 10;
-	SET ivfflat.iterative_search = relaxed_order;
-	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
-));
-is($count, 10);
-
-foreach ((30, 50, 70))
-{
-	my $max_probes = $_;
-	my $expected = $max_probes / 10;
-	my $sum = 0;
-
-	for my $i (1 .. 20)
-	{
-		$count = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET ivfflat.probes = 10;
-			SET ivfflat.iterative_search = relaxed_order;
-			SET ivfflat.max_probes = $max_probes;
-			SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
-		));
-		$sum += $count;
-	}
-
-	my $avg = $sum / 20;
-	cmp_ok($avg, '>', $expected - 2);
-	cmp_ok($avg, '<', $expected + 2);
-}
-
-done_testing();

test/t/042_ivfflat_iterative_search_recall.pl

@@ -1,125 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my @cs = (100, 1000);
-
-sub test_recall
-{
-	my ($c, $probes, $min, $operator) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		SET ivfflat.probes = $probes;
-		SET ivfflat.iterative_search = relaxed_order;
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx on tst/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET ivfflat.probes = $probes;
-			SET ivfflat.iterative_search = relaxed_order;
-			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-
-		my @expected_ids = split("\n", $expected[$i]);
-		my %expected_set = map { $_ => 1 } @expected_ids;
-
-		foreach (@actual_ids)
-		{
-			if (exists($expected_set{$_}))
-			{
-				$correct++;
-			}
-		}
-
-		$total += $limit;
-	}
-
-	cmp_ok($correct / $total, ">=", $min, "$operator $c");
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector(3));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[random(), random(), random()] FROM generate_series(1, 100000) i;"
-);
-
-# Generate queries
-for (1 .. 20)
-{
-	my $r1 = rand();
-	my $r2 = rand();
-	my $r3 = rand();
-	push(@queries, "[$r1,$r2,$r3]");
-}
-
-# Check each index type
-my @operators = ("<->", "<=>");
-my @opclasses = ("vector_l2_ops", "vector_cosine_ops");
-
-for my $i (0 .. $#operators)
-{
-	my $operator = $operators[$i];
-	my $opclass = $opclasses[$i];
-
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING ivfflat (v $opclass);");
-
-	foreach (@cs)
-	{
-		my $c = $_;
-
-		# Get exact results
-		@expected = ();
-		foreach (@queries)
-		{
-			my $res = $node->safe_psql("postgres", qq(
-				SET enable_indexscan = off;
-				WITH top AS (
-					SELECT v $operator '$_' AS distance FROM tst WHERE i % $c = 0 ORDER BY distance LIMIT $limit
-				)
-				SELECT i FROM tst WHERE (v $operator '$_') <= (SELECT MAX(distance) FROM top)
-			));
-			push(@expected, $res);
-		}
-
-		if ($c == 100)
-		{
-			test_recall($c, 1, 0.57, $operator);
-			test_recall($c, 10, 0.98, $operator);
-		}
-		else
-		{
-			if ($operator eq "<->")
-			{
-				test_recall($c, 1, 0.80, $operator);
-			}
-			else
-			{
-				test_recall($c, 1, 0.88, $operator);
-			}
-		}
-	}
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-}
-
-done_testing();

test/t/043_hnsw_iterative_search.pl

@@ -1,67 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $dim = 3;
-my $array_sql = join(",", ('random()') x $dim);
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4 PRIMARY KEY, v vector($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 100000) i;"
-);
-$node->safe_psql("postgres", qq(
-	SET maintenance_work_mem = '128MB';
-	SET max_parallel_maintenance_workers = 2;
-	CREATE INDEX ON tst USING hnsw (v vector_l2_ops)
-));
-
-my $count = $node->safe_psql("postgres", qq(
-	SET enable_seqscan = off;
-	SET hnsw.iterative_search = relaxed_order;
-	SET work_mem = '8MB';
-	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
-));
-is($count, 10);
-
-foreach ((30000, 50000, 70000))
-{
-	my $max_tuples = $_;
-	my $expected = $max_tuples / 10000;
-	my $sum = 0;
-
-	for my $i (1 .. 20)
-	{
-		$count = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET hnsw.iterative_search = relaxed_order;
-			SET hnsw.max_search_tuples = $max_tuples;
-			SET work_mem = '8MB';
-			SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst WHERE i = $i) LIMIT 11) t;
-		));
-		$sum += $count;
-	}
-
-	my $avg = $sum / 20;
-	cmp_ok($avg, '>', $expected - 2);
-	cmp_ok($avg, '<', $expected + 2);
-}
-
-my ($ret, $stdout, $stderr) = $node->psql("postgres", qq(
-	SET enable_seqscan = off;
-	SET hnsw.iterative_search = relaxed_order;
-	SET client_min_messages = debug1;
-	SET work_mem = '2MB';
-	SELECT COUNT(*) FROM (SELECT v FROM tst WHERE i % 10000 = 0 ORDER BY v <-> (SELECT v FROM tst LIMIT 1) LIMIT 11) t;
-));
-like($stderr, qr/hnsw index scan exceeded work_mem after \d+ tuples/);
-
-done_testing();

test/t/044_hnsw_iterative_search_recall.pl

@@ -1,118 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my $dim = 3;
-my $array_sql = join(",", ('random()') x $dim);
-my @cs = (50, 500);
-
-sub test_recall
-{
-	my ($c, $ef_search, $min, $operator, $mode) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		SET hnsw.ef_search = $ef_search;
-		SET hnsw.iterative_search = $mode;
-		EXPLAIN ANALYZE SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan using idx on tst/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET hnsw.ef_search = $ef_search;
-			SET hnsw.iterative_search = $mode;
-			SELECT i FROM tst WHERE i % $c = 0 ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-
-		my @expected_ids = split("\n", $expected[$i]);
-		my %expected_set = map { $_ => 1 } @expected_ids;
-
-		foreach (@actual_ids)
-		{
-			if (exists($expected_set{$_}))
-			{
-				$correct++;
-			}
-		}
-
-		$total += $limit;
-	}
-
-	cmp_ok($correct / $total, ">=", $min, "$operator $mode $c");
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v vector($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 50000) i;"
-);
-
-# Generate queries
-for (1 .. 20)
-{
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, rand());
-	}
-	push(@queries, "[" . join(",", @r) . "]");
-}
-
-# Check each index type
-my @operators = ("<->", "<=>");
-my @opclasses = ("vector_l2_ops", "vector_cosine_ops");
-
-for my $i (0 .. $#operators)
-{
-	my $operator = $operators[$i];
-	my $opclass = $opclasses[$i];
-
-	$node->safe_psql("postgres", qq(
-		SET maintenance_work_mem = '128MB';
-		CREATE INDEX idx ON tst USING hnsw (v $opclass);
-	));
-
-	foreach (@cs)
-	{
-		my $c = $_;
-
-		# Get exact results
-		@expected = ();
-		foreach (@queries)
-		{
-			my $res = $node->safe_psql("postgres", qq(
-				SET enable_indexscan = off;
-				WITH top AS (
-					SELECT v $operator '$_' AS distance FROM tst WHERE i % $c = 0 ORDER BY distance LIMIT $limit
-				)
-				SELECT i FROM tst WHERE (v $operator '$_') <= (SELECT MAX(distance) FROM top)
-			));
-			push(@expected, $res);
-		}
-
-		test_recall($c, 40, 0.99, $operator, "strict_order");
-		test_recall($c, 40, 0.99, $operator, "relaxed_order");
-	}
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-}
-
-done_testing();

test/t/045_hnsw_intvec_build_recall.pl

@@ -1,132 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my $dim = 10;
-my $array_sql = join(",", ('(random() * 255)::int - 128') x $dim);
-
-sub test_recall
-{
-	my ($min, $operator) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SELECT i FROM tst ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-		my %actual_set = map { $_ => 1 } @actual_ids;
-
-		my @expected_ids = split("\n", $expected[$i]);
-
-		foreach (@expected_ids)
-		{
-			if (exists($actual_set{$_}))
-			{
-				$correct++;
-			}
-			$total++;
-		}
-	}
-
-	cmp_ok($correct / $total, ">=", $min, $operator);
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v intvec($dim));");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 10000) i;"
-);
-
-# Generate queries
-for (1 .. 20)
-{
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, int(rand(256)) - 128);
-	}
-	push(@queries, "[" . join(",", @r) . "]");
-}
-
-# Check each index type
-my @operators = ("<->", "<#>", "<=>", "<+>");
-my @opclasses = ("intvec_l2_ops", "intvec_ip_ops", "intvec_cosine_ops", "intvec_l1_ops");
-
-for my $i (0 .. $#operators)
-{
-	my $operator = $operators[$i];
-	my $opclass = $opclasses[$i];
-
-	# Get exact results
-	@expected = ();
-	foreach (@queries)
-	{
-		my $res = $node->safe_psql("postgres", "SELECT i FROM tst ORDER BY v $operator '$_' LIMIT $limit;");
-		push(@expected, $res);
-	}
-
-	# Build index serially
-	$node->safe_psql("postgres", qq(
-		SET max_parallel_maintenance_workers = 0;
-		CREATE INDEX idx ON tst USING hnsw (v $opclass);
-	));
-
-	# Test approximate results
-	my $min = 0.98;
-	test_recall($min, $operator);
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-
-	# Build index in parallel in memory
-	my ($ret, $stdout, $stderr) = $node->psql("postgres", qq(
-		SET client_min_messages = DEBUG;
-		SET min_parallel_table_scan_size = 1;
-		CREATE INDEX idx ON tst USING hnsw (v $opclass);
-	));
-	is($ret, 0, $stderr);
-	like($stderr, qr/using \d+ parallel workers/);
-
-	# Test approximate results
-	test_recall($min, $operator);
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-
-	# Build index in parallel on disk
-	# Set parallel_workers on table to use workers with low maintenance_work_mem
-	($ret, $stdout, $stderr) = $node->psql("postgres", qq(
-		ALTER TABLE tst SET (parallel_workers = 2);
-		SET client_min_messages = DEBUG;
-		SET maintenance_work_mem = '4MB';
-		CREATE INDEX idx ON tst USING hnsw (v $opclass);
-		ALTER TABLE tst RESET (parallel_workers);
-	));
-	is($ret, 0, $stderr);
-	like($stderr, qr/using \d+ parallel workers/);
-	like($stderr, qr/hnsw graph no longer fits into maintenance_work_mem/);
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-}
-
-done_testing();

test/t/046_hnsw_intvec_insert_recall.pl

@@ -1,113 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my $dim = 10;
-my $array_sql = join(",", ('(random() * 255)::int - 128') x $dim);
-
-sub test_recall
-{
-	my ($min, $operator) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v $operator '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SELECT i FROM tst ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-		my %actual_set = map { $_ => 1 } @actual_ids;
-
-		my @expected_ids = split("\n", $expected[$i]);
-
-		foreach (@expected_ids)
-		{
-			if (exists($actual_set{$_}))
-			{
-				$correct++;
-			}
-			$total++;
-		}
-	}
-
-	cmp_ok($correct / $total, ">=", $min, $operator);
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i serial, v intvec($dim));");
-
-# Generate queries
-for (1 .. 20)
-{
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, int(rand(256)) - 128);
-	}
-	push(@queries, "[" . join(",", @r) . "]");
-}
-
-# Check each index type
-my @operators = ("<->", "<#>", "<=>", "<+>");
-my @opclasses = ("intvec_l2_ops", "intvec_ip_ops", "intvec_cosine_ops", "intvec_l1_ops");
-
-for my $i (0 .. $#operators)
-{
-	my $operator = $operators[$i];
-	my $opclass = $opclasses[$i];
-
-	# Add index
-	$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v $opclass);");
-
-	# Use concurrent inserts
-	$node->pgbench(
-		"--no-vacuum --client=10 --transactions=1000",
-		0,
-		[qr{actually processed}],
-		[qr{^$}],
-		"concurrent INSERTs",
-		{
-			"040_hnsw_intvec_insert_recall_$opclass" => "INSERT INTO tst (v) VALUES (ARRAY[$array_sql]);"
-		}
-	);
-
-	# Get exact results
-	@expected = ();
-	foreach (@queries)
-	{
-		my $res = $node->safe_psql("postgres", qq(
-			SET enable_indexscan = off;
-			SELECT i FROM tst ORDER BY v $operator '$_' LIMIT $limit;
-		));
-		push(@expected, $res);
-	}
-
-	# Test approximate results
-	my $min = 0.98;
-	test_recall($min, $operator);
-
-	$node->safe_psql("postgres", "DROP INDEX idx;");
-	$node->safe_psql("postgres", "TRUNCATE tst;");
-}
-
-done_testing();

test/t/047_hnsw_intvec_vacuum_recall.pl

@@ -1,101 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-my $node;
-my @queries = ();
-my @expected;
-my $limit = 20;
-my $dim = 10;
-my $array_sql = join(",", ('(random() * 255)::int - 128') x $dim);
-
-sub test_recall
-{
-	my ($min, $ef_search, $test_name) = @_;
-	my $correct = 0;
-	my $total = 0;
-
-	my $explain = $node->safe_psql("postgres", qq(
-		SET enable_seqscan = off;
-		SET hnsw.ef_search = $ef_search;
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v <-> '$queries[0]' LIMIT $limit;
-	));
-	like($explain, qr/Index Scan/);
-
-	for my $i (0 .. $#queries)
-	{
-		my $actual = $node->safe_psql("postgres", qq(
-			SET enable_seqscan = off;
-			SET hnsw.ef_search = $ef_search;
-			SELECT i FROM tst ORDER BY v <-> '$queries[$i]' LIMIT $limit;
-		));
-		my @actual_ids = split("\n", $actual);
-		my %actual_set = map { $_ => 1 } @actual_ids;
-
-		my @expected_ids = split("\n", $expected[$i]);
-
-		foreach (@expected_ids)
-		{
-			if (exists($actual_set{$_}))
-			{
-				$correct++;
-			}
-			$total++;
-		}
-	}
-
-	cmp_ok($correct / $total, ">=", $min, $test_name);
-}
-
-# Initialize node
-$node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v intvec($dim));");
-$node->safe_psql("postgres", "ALTER TABLE tst SET (autovacuum_enabled = false);");
-$node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 10000) i;"
-);
-
-# Add index
-$node->safe_psql("postgres", "CREATE INDEX ON tst USING hnsw (v intvec_l2_ops) WITH (m = 4, ef_construction = 8);");
-
-# Delete data
-$node->safe_psql("postgres", "DELETE FROM tst WHERE i > 2500;");
-
-# Generate queries
-for (1 .. 20)
-{
-	my @r = ();
-	for (1 .. $dim)
-	{
-		push(@r, int(rand(256)) - 128);
-	}
-	push(@queries, "[" . join(",", @r) . "]");
-}
-
-# Get exact results
-@expected = ();
-foreach (@queries)
-{
-	my $res = $node->safe_psql("postgres", qq(
-		SET enable_indexscan = off;
-		SELECT i FROM tst ORDER BY v <-> '$_' LIMIT $limit;
-	));
-	push(@expected, $res);
-}
-
-test_recall(0.18, $limit, "before vacuum");
-test_recall(0.84, 100, "before vacuum");
-
-# TODO Test concurrent inserts with vacuum
-$node->safe_psql("postgres", "VACUUM tst;");
-
-test_recall(0.84, $limit, "after vacuum");
-
-done_testing();

test/t/048_hnsw_intvec_duplicates.pl

@@ -1,58 +0,0 @@
-use strict;
-use warnings FATAL => 'all';
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More;
-
-# Initialize node
-my $node = PostgreSQL::Test::Cluster->new('node');
-$node->init;
-$node->start;
-
-# Create table
-$node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (v intvec(3));");
-
-sub insert_vectors
-{
-	for my $i (1 .. 20)
-	{
-		$node->safe_psql("postgres", "INSERT INTO tst VALUES ('[1,1,1]');");
-	}
-}
-
-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]') t;
-	));
-	is($res, 10);
-}
-
-# Test duplicates with build
-insert_vectors();
-$node->safe_psql("postgres", "CREATE INDEX idx ON tst USING hnsw (v intvec_l2_ops);");
-test_duplicates();
-
-# Reset
-$node->safe_psql("postgres", "TRUNCATE tst;");
-
-# Test duplicates with inserts
-insert_vectors();
-test_duplicates();
-
-# Test fallback path for inserts
-$node->pgbench(
-	"--no-vacuum --client=5 --transactions=100",
-	0,
-	[qr{actually processed}],
-	[qr{^$}],
-	"concurrent INSERTs",
-	{
-		"042_hnsw_intvec_duplicates" => "INSERT INTO tst VALUES ('[1,1,1]');"
-	}
-);
-
-done_testing();